fix bug:140403
This commit is contained in:
parent
cd1735ca69
commit
10dacdcccd
|
@ -149,6 +149,25 @@ KyConnectItem * KyConnectResourse::getConnectionItemByUuid(QString connectUuid)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
KyConnectItem * KyConnectResourse::getConnectionItemByUuidWithoutActivateChecking(QString connectUuid)
|
||||||
|
{
|
||||||
|
NetworkManager::Connection::Ptr connectPtr =
|
||||||
|
m_networkResourceInstance->getConnect(connectUuid);
|
||||||
|
|
||||||
|
if (nullptr == connectPtr) {
|
||||||
|
qWarning()<< "[KyConnectResourse]" <<"get connect failed, connect uuid"<<connectUuid;
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
KyConnectItem *connectItem = getConnectionItem(connectPtr, "");
|
||||||
|
if (nullptr != connectItem) {
|
||||||
|
//connectItem->dumpInfo();
|
||||||
|
return connectItem;
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
KyConnectItem * KyConnectResourse::getConnectionItemByUuid(QString connectUuid, QString deviceName)
|
KyConnectItem * KyConnectResourse::getConnectionItemByUuid(QString connectUuid, QString deviceName)
|
||||||
{
|
{
|
||||||
NetworkManager::Connection::Ptr connectPtr =
|
NetworkManager::Connection::Ptr connectPtr =
|
||||||
|
|
|
@ -38,6 +38,7 @@ public:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
KyConnectItem *getConnectionItemByUuid(QString connectUuid);
|
KyConnectItem *getConnectionItemByUuid(QString connectUuid);
|
||||||
|
KyConnectItem *getConnectionItemByUuidWithoutActivateChecking(QString connectUuid);
|
||||||
KyConnectItem *getConnectionItemByUuid(QString connectUuid, QString deviceName);
|
KyConnectItem *getConnectionItemByUuid(QString connectUuid, QString deviceName);
|
||||||
void getConnectionList(QString deviceName,
|
void getConnectionList(QString deviceName,
|
||||||
NetworkManager::ConnectionSettings::ConnectionType connectionType,
|
NetworkManager::ConnectionSettings::ConnectionType connectionType,
|
||||||
|
|
|
@ -947,7 +947,7 @@ void LanPage::onConnectionStateChange(QString uuid,
|
||||||
updateActivatedConnectionArea(p_newItem);
|
updateActivatedConnectionArea(p_newItem);
|
||||||
updateConnectionState(m_activeConnectionMap, m_activatedLanListWidget, uuid, (ConnectState)state);
|
updateConnectionState(m_activeConnectionMap, m_activatedLanListWidget, uuid, (ConnectState)state);
|
||||||
} else if (state == NetworkManager::ActiveConnection::State::Deactivated) {
|
} else if (state == NetworkManager::ActiveConnection::State::Deactivated) {
|
||||||
p_newItem = m_connectResourse->getConnectionItemByUuid(uuid);
|
p_newItem = m_connectResourse->getConnectionItemByUuidWithoutActivateChecking(uuid);
|
||||||
qDebug() << "[LanPage] deactivated reason" << reason;
|
qDebug() << "[LanPage] deactivated reason" << reason;
|
||||||
if (nullptr == p_newItem) {
|
if (nullptr == p_newItem) {
|
||||||
qWarning()<<"[LanPage] get active connection failed, connection uuid" << uuid;
|
qWarning()<<"[LanPage] get active connection failed, connection uuid" << uuid;
|
||||||
|
|
Loading…
Reference in New Issue