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

Fix bug get more than one bssid of active wifi

This commit is contained in:
chenlelin 2021-02-23 17:55:35 +08:00
parent ab538fda50
commit fe786325b0
3 changed files with 59 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/kylin-dbus-interface.cpp
View File

@ -1014,9 +1014,9 @@ bool KylinDBus::checkNetworkConnectivity()
}
//获取已经连接无线网络的ssid和uuid
QStringList KylinDBus::getAtiveWifiBSsidUuid()
QList<QString> KylinDBus::getAtiveWifiBSsidUuid()
{
QStringList strBSsidUuid;
QList<QString> strBSsidUuid;
QDBusInterface interface( "org.freedesktop.NetworkManager",
"/org/freedesktop/NetworkManager",
@ -1048,48 +1048,73 @@ QStringList KylinDBus::getAtiveWifiBSsidUuid()
QDBusConnection::systemBus() );
//先获取uuid
qDebug() << "00000000000000000000";
QDBusReply<QVariant> replyUuid = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
//qDebug() << "wifi uuid : "<< replyUuid.value().toString();
strBSsidUuid.append(replyUuid.value().toString());
//再获取bssid
QDBusMessage resultConnection = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Connection");
// QDBusMessage resultConnection = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Connection");
QList<QVariant> outArgsConnection = resultConnection.arguments();
QVariant firstConnection = outArgsConnection.at(0);
QDBusVariant dbvFirstConnection = firstConnection.value<QDBusVariant>();
QVariant vFirstConnection = dbvFirstConnection.variant();
QDBusObjectPath dbusArgsConnection = vFirstConnection.value<QDBusObjectPath>();
// QList<QVariant> outArgsConnection = resultConnection.arguments();
// QVariant firstConnection = outArgsConnection.at(0);
// QDBusVariant dbvFirstConnection = firstConnection.value<QDBusVariant>();
// QVariant vFirstConnection = dbvFirstConnection.variant();
// QDBusObjectPath dbusArgsConnection = vFirstConnection.value<QDBusObjectPath>();
QDBusInterface interfaceSet("org.freedesktop.NetworkManager",
dbusArgsConnection.path(),
"org.freedesktop.NetworkManager.Settings.Connection",
QDBusConnection::systemBus());
QDBusMessage resultSet = interfaceSet.call("GetSettings");
// QDBusInterface interfaceSet("org.freedesktop.NetworkManager",
// dbusArgsConnection.path(),
// "org.freedesktop.NetworkManager.Settings.Connection",
// QDBusConnection::systemBus());
// QDBusMessage resultSet = interfaceSet.call("GetSettings");
const QDBusArgument &dbusArg1stSet = resultSet.arguments().at( 0 ).value<QDBusArgument>();
QMap<QString,QMap<QString,QVariant>> mapSet;
dbusArg1stSet >> mapSet;
// const QDBusArgument &dbusArg1stSet = resultSet.arguments().at( 0 ).value<QDBusArgument>();
// QMap<QString,QMap<QString,QVariant>> mapSet;
// dbusArg1stSet >> mapSet;
for (QString setKey : mapSet.keys() ) {
QMap<QString,QVariant> subSetMap = mapSet.value(setKey);
if (setKey == "802-11-wireless") {
for (QString searchKey : subSetMap.keys()) {
if (searchKey == "seen-bssids") {
//qDebug() << "wifi bssid : "<<subSetMap.value(searchKey).toStringList();
QStringList strBssidList = subSetMap.value(searchKey).toStringList();
foreach (QString strBssid, strBssidList) {
strBSsidUuid.append(strBssid);
}
}
}
}
}
// for (QString setKey : mapSet.keys() ) {
// QMap<QString,QVariant> subSetMap = mapSet.value(setKey);
// if (setKey == "802-11-wireless") {
// for (QString searchKey : subSetMap.keys()) {
// if (searchKey == "seen-bssids") {
// //qDebug() << "wifi bssid : "<<subSetMap.value(searchKey).toStringList();
// QStringList strBssidList = subSetMap.value(searchKey).toStringList();
// foreach (QString strBssid, strBssidList) {
// strBSsidUuid.append(strBssid);
// }
// }
// }
// }
// }
}
}
dbusArgs.endArray();
QStringList wifiBSsid;
QString connWifiBSsid = "--";
QProcess * processWifiBSsid = new QProcess;
processWifiBSsid->start("nmcli -f IN-USE,BSSID device wifi");
connect(processWifiBSsid, static_cast<void(QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished), this, [ = ]() {
processWifiBSsid->deleteLater();
});
connect(processWifiBSsid, &QProcess::readyReadStandardOutput, this, [ = ]() {
QString strOutput = processWifiBSsid->readAllStandardOutput();
actWifiListInfo += strOutput;
});
processWifiBSsid->waitForFinished();
wifiBSsid = actWifiListInfo.split("\n");
foreach (QString strActWifiBSsid, wifiBSsid) {
if (strActWifiBSsid.indexOf("*") != -1) {
connWifiBSsid = strActWifiBSsid.mid(3).trimmed();
}
}
if (connWifiBSsid != "--") {
strBSsidUuid.append(connWifiBSsid);
}
actWifiListInfo = "";
return strBSsidUuid;
}

4
src/kylin-dbus-interface.h
View File

@ -52,7 +52,7 @@ public:
void showDesktopNotify(QString message);
void initConnectionInfo();
QList<QString> getAtiveLanSsidUuidState();
QStringList getAtiveWifiBSsidUuid();
QList<QString> getAtiveWifiBSsidUuid();
void reConnectWiredNet(QString netUuid);
bool toConnectWiredNet(QString netUuid, QString netIfName);
void getConnectNetIp(QString netUuid);
@ -118,6 +118,8 @@ private:
Utils *mUtils;
QThread *mUtilsThread;
QString actWifiListInfo;
int a = 0;
bool isRunningFunction = false;
QTimer *time = nullptr;

2
src/mainwindow.cpp
View File

@ -1706,7 +1706,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
bool isLoop = true;
do {
currConnWifiBSsidUuid = objKyDBus->getAtiveWifiBSsidUuid();
if (currConnWifiBSsidUuid.size() == 1) {
if (currConnWifiBSsidUuid.size() == 1 && currConnWifiBSsidUuid.at(0).length() != 17) {
sleep(1); //等于1说明只获取到uuid，1秒后再获取一次
} else {
isLoop = false;