openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

判断激活信号需要设备匹配

This commit is contained in:
jzxc95 2021-09-16 14:13:49 +08:00
parent 879835e547
commit 4936fa953e
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/dbus-interface/kywirelessnetresource.cpp
View File

@ -159,9 +159,10 @@ QString KyWirelessNetResource::getDeviceIFace(NetworkManager::ActiveConnection::
return sett->interfaceName(); return sett->interfaceName();
} }
void KyWirelessNetResource::getSsidByUuid(const QString uuid, QString &ssid) void KyWirelessNetResource::getSsidByUuid(const QString uuid, QString &ssid, QString &devName)
{ {
ssid.clear(); ssid.clear();
devName.clear();
NetworkManager::Connection::Ptr connectPtr = m_networkResourceInstance->getConnect(uuid); NetworkManager::Connection::Ptr connectPtr = m_networkResourceInstance->getConnect(uuid);
if (connectPtr.isNull()) { if (connectPtr.isNull()) {
return; return;
@ -173,6 +174,7 @@ void KyWirelessNetResource::getSsidByUuid(const QString uuid, QString &ssid)
return; return;
} }
ssid = wireless_sett->ssid(); ssid = wireless_sett->ssid();
devName = connectPtr->settings()->interfaceName();
qDebug() << "getSsidByUuid success " << ssid; qDebug() << "getSsidByUuid success " << ssid;
return; return;
} }

2
src/backend/dbus-interface/kywirelessnetresource.h
View File

@ -29,7 +29,7 @@ public:
void getWirelessActiveConnection(NetworkManager::ActiveConnection::State state, QMap<QString, QStringList> &map); void getWirelessActiveConnection(NetworkManager::ActiveConnection::State state, QMap<QString, QStringList> &map);
void getSsidByUuid(const QString uuid, QString &ssid); void getSsidByUuid(const QString uuid, QString &ssid, QString &devName);
private: private:

9
src/frontend/list-items/wlanlistitem.cpp
View File

@ -382,13 +382,14 @@ void WlanListItem::onConnectionRemove(QString deviceName, QString ssid)
void WlanListItem::onWlanStatusChange(QString uuid, NetworkManager::ActiveConnection::State state, NetworkManager::ActiveConnection::Reason reason) void WlanListItem::onWlanStatusChange(QString uuid, NetworkManager::ActiveConnection::State state, NetworkManager::ActiveConnection::Reason reason)
{ {
QString ssid; QString ssid, devName;
m_resource->getSsidByUuid(uuid,ssid); m_resource->getSsidByUuid(uuid, ssid, devName);
if (m_data->m_NetSsid == ssid) { if (m_data->m_NetSsid == ssid) {
qDebug() << "[WlanPage] State changed to :" << state << Q_FUNC_INFO <<__LINE__; qDebug() << "[WlanPage] State changed to :" << state << Q_FUNC_INFO <<__LINE__;
if (state == NetworkManager::ActiveConnection::State::Activating) { if ((state == NetworkManager::ActiveConnection::State::Activating || state == NetworkManager::ActiveConnection::State::Deactivating)
&& devName == m_wlanDevice) {
m_netButton->startLoading(); m_netButton->startLoading();
} else { } else if (){
m_netButton->stopLoading(); m_netButton->stopLoading();
} }
} }

4
src/frontend/tab-pages/wlanpage.cpp
View File

@ -430,7 +430,7 @@ void WlanPage::onActivatedWlanChanged(QString uuid, NetworkManager::ActiveConnec
qDebug() << "[WlanPage] onActivatedWlanChanged but uuid is invalid"; qDebug() << "[WlanPage] onActivatedWlanChanged but uuid is invalid";
} }
m_resource->getSsidByUuid(uuid, ssid); m_resource->getSsidByUuid(uuid, ssid, devName);
qDebug() << "emit wlanActiveConnectionStateChanged" << devName << ssid << state; qDebug() << "emit wlanActiveConnectionStateChanged" << devName << ssid << state;
emit wlanActiveConnectionStateChanged(devName, ssid, state); emit wlanActiveConnectionStateChanged(devName, ssid, state);
@ -463,7 +463,7 @@ void WlanPage::onActivatedWlanChanged(QString uuid, NetworkManager::ActiveConnec
} }
} }
if (state == NetworkManager::ActiveConnection::State::Activated) { if (state == NetworkManager::ActiveConnection::State::Activated && defaultDevice == devName) {
//onWlanRemoved(m_wlanDevice, ssid); //onWlanRemoved(m_wlanDevice, ssid);
m_activatedNetListWidget->clear(); m_activatedNetListWidget->clear();
int height = 0; int height = 0;