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

Fix bug wifi list show abnormal when connect enterprise wifi first

This commit is contained in:
chenlelin 2021-01-22 09:54:22 +08:00
parent 30dacc96d7
commit 356ac49cc7
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -917,6 +917,7 @@ QList<QString> KylinDBus::getAtiveWifiBSsidUuid()
QDBusReply<QVariant> reply = interfaceType.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Type");
if (reply.value().toString() == "wifi" || reply.value().toString() == "802-11-wireless") {
//先获取bssid
QDBusInterface interfaceInfo( "org.freedesktop.NetworkManager",
objPath.path(),
"org.freedesktop.DBus.Properties",
@ -952,6 +953,7 @@ QList<QString> KylinDBus::getAtiveWifiBSsidUuid()
}
}
//再获取uuid
QDBusReply<QVariant> replyUuid = interfaceInfo.call("Get", "org.freedesktop.NetworkManager.Connection.Active", "Uuid");
//qDebug() << "wifi uuid : "<< replyUuid.value().toString();
strBSsidUuid.append(replyUuid.value().toString());

29
src/mainwindow.cpp
View File

@ -1270,7 +1270,7 @@ void MainWindow::on_btnWifiList_clicked()
btnWireless->show();
if (iface->wstate == 0 || iface->wstate == 1) {
//qDebug() << "wifi开关在打开状态";
qDebug() << "debug: wifi开关在打开状态";
btnWireless->setSwitchStatus(true);
lbTopWifiList->show();
btnAddNet->show();
@ -1278,7 +1278,7 @@ void MainWindow::on_btnWifiList_clicked()
this->startLoading();
this->ksnm->execGetWifiList();
} else if (iface->wstate == 3) {
//qDebug() << "连接中，正在配置wifi设备";
qDebug() << "debug: 连接中，正在配置wifi设备";
this->ksnm->isUseOldWifiSlist = true;
QStringList slistWifi;
@ -1289,7 +1289,7 @@ void MainWindow::on_btnWifiList_clicked()
lbTopWifiList->show();
btnAddNet->show();
} else {
//qDebug()<<"debug: WiFi的开关已经关闭";
qDebug()<<"debug: WiFi的开关已经关闭";
btnWireless->setSwitchStatus(false);
delete topWifiListWidget; //清空top列表
createTopWifiUI(); //创建顶部无线网item
@ -1561,13 +1561,13 @@ void MainWindow::getWifiListDone(QStringList slist)
return;
}
qDebug()<<"debug: oldWifiSlist.size()="<<oldWifiSlist.size()<<" slist.size()="<<slist.size();
//qDebug()<<"debug: oldWifiSlist.size()="<<oldWifiSlist.size()<<" slist.size()="<<slist.size();
//qDebug()<<"0 ";
//qDebug()<<"------------";
//foreach (QString str, slist) {
// qDebug()<<str;
//}
//qDebug()<<"0 ";
//qDebug()<<"------------";
//要求使用上一次获取到的列表
if (this->ksnm->isUseOldWifiSlist) {
@ -1599,6 +1599,8 @@ void MainWindow::getWifiListDone(QStringList slist)
// 加载wifi列表
void MainWindow::loadWifiListDone(QStringList slist)
{
qDebug() << "debug: 现在在函数 loadWifiListDone 中";
delete topWifiListWidget; //清空top列表
createTopWifiUI(); //创建topWifiListWidget
@ -1608,7 +1610,16 @@ void MainWindow::loadWifiListDone(QStringList slist)
scrollAreaw->setWidget(wifiListWidget);
scrollAreaw->move(W_LEFT_AREA, Y_SCROLL_AREA);
QList<QString> currConnWifiSsidUuid = objKyDBus->getAtiveWifiBSsidUuid();
QList<QString> currConnWifiSsidUuid;
bool isLoop = true;
do {
currConnWifiSsidUuid = objKyDBus->getAtiveWifiBSsidUuid();
if (currConnWifiSsidUuid.size() == 1) {
sleep(1);
} else {
isLoop = false;
}
} while (isLoop);
// 获取当前连接的wifi name
QString actWifiName = "--";
@ -1618,8 +1629,8 @@ void MainWindow::loadWifiListDone(QStringList slist)
if (currConnWifiSsidUuid.size() > 1) {
actWifiBssid = currConnWifiSsidUuid.at(0);
actWifiUuid = currConnWifiSsidUuid.at(1);
//qDebug() << "获取到的bssid是：" << actWifiBssid;
//qDebug() << "获取到的uuid是：" << actWifiUuid;
//qDebug() << "debug: 获取到的bssid是：" << actWifiBssid;
//qDebug() << "debug: 获取到的uuid是：" << actWifiUuid;
}
activecon *act = kylin_network_get_activecon_info();

4
src/wpawifidialog.cpp
View File

@ -516,7 +516,7 @@ void WpaWifiDialog::activateConnection() {
timeout->start(30 * 1000);
});
connect(upThread, &UpConnThread::connRes, this, [ = ](int res) {
qDebug()<<"qDebug: Connect result is: "<<res;
//qDebug()<<"qDebug: Connect result is: "<<res;
if (res != 0) {
//连接错误或连接超时
setEditorEnable(true);
@ -530,7 +530,7 @@ void WpaWifiDialog::activateConnection() {
upThread->deleteLater();
emit conn_done();
syslog(LOG_DEBUG, "execute 'nmcli connection up' in function 'activateConnection' accepted");
qDebug() << "qDebug: activated wpa wifi successfully";
//qDebug() << "qDebug: activated wpa wifi successfully";
this->close();
}
});