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

fix 38986 设置多个ip之后显示异常；50095 设置网络带宽

This commit is contained in:
lvhan 2021-04-23 14:52:35 +08:00
parent 40952d13c4
commit ff2cd47e7d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,6 +347,7 @@ void KylinDBus::getLanIpDNS(QString uuidName, bool isActNet)
dbusArg2nd.beginArray();
while (!dbusArg2nd.atEnd()) {
dbusArg2nd >> m_map;// append map to a vector here if you want to keep it
break;
}
dbusArg2nd.endArray();
@ -379,6 +380,7 @@ void KylinDBus::getLanIpDNS(QString uuidName, bool isActNet)
dbusArg2nd.beginArray();
while (!dbusArg2nd.atEnd()) {
dbusArg2nd >> m_map;// append map to a vector here if you want to keep it
break;
}
dbusArg2nd.endArray();
@ -578,6 +580,7 @@ void KylinDBus::getConnectNetIp(QString netUuid)
foreach (QVariantMap mDataIpv4, mDatasIpv4) {
dbusActiveLanIpv4 = mDataIpv4.value("address").toString();
break;
}
//ipv6的路径信息和ip信息
@ -609,6 +612,7 @@ void KylinDBus::getConnectNetIp(QString netUuid)
foreach (QVariantMap mDataIpv6, mDatasIpv6) {
dbusActiveLanIpv6 = mDataIpv6.value("address").toString();
break;
}
}

7
src/mainwindow.cpp
View File

@ -926,7 +926,7 @@ void MainWindow::getActiveInfoAndSetTrayIcon()
// 设置图标
if (actLanName != "--") {
QList<QString> lanstate = objKyDBus->getAtiveLanSsidUuidState();
qDebug() << lanstate;
qDebug() << Q_FUNC_INFO << lanstate;
if (lanstate[2] == "connected") {
setTrayIcon(iconLanOnline);
}
@ -1556,7 +1556,8 @@ void MainWindow::getLanListDone(QStringList slist)
ifLanConnected = true;
objKyDBus->getConnectNetIp(nuuid);
if (mwBandWidth == "Unknown!") { getLanBandWidth(); }
// if (mwBandWidth == "Unknown!") { getLanBandWidth(); }
getLanBandWidth();
//QString strLanName = TranslateLanName(nname); //进行中英文系统环境下有线网络名称的汉化
OneLancForm *ccfAct = new OneLancForm(topLanListWidget, this, confForm, ksnm);
@ -1594,12 +1595,14 @@ void MainWindow::getLanListDone(QStringList slist)
\
if (!objKyDBus->dbusLanIpv4.isEmpty()) {
if (!objKyDBus->dbusActiveLanIpv4.isEmpty() && objKyDBus->dbusActiveLanIpv4 != objKyDBus->dbusLanIpv4) {
// qDebug() << Q_FUNC_INFO << __LINE__ << objKyDBus->dbusActiveLanIpv4 << objKyDBus->dbusLanIpv4;
//在第三方nm-connection-editor进行新的IP配置后，重新连接网络
objKyDBus->reConnectWiredNet(nuuid);
} else if ((oldActLanName == actLanSsidName.at(kk)) && (oldDbusActLanDNS != objKyDBus->dbusActLanDNS)) {
//在第三方nm-connection-editor进行新的DNS配置后，重新连接网络
objKyDBus->reConnectWiredNet(nuuid);
} else if (!objKyDBus->dbusActiveLanIpv6.isEmpty() && objKyDBus->dbusActiveLanIpv6 != objKyDBus->dbusLanIpv6 && objKyDBus->dbusLanIpv6Method == "manual") {
// qDebug() << Q_FUNC_INFO << __LINE__ << objKyDBus->dbusActiveLanIpv6 << objKyDBus->dbusLanIpv6 << objKyDBus->dbusLanIpv6Method;
//在第三方nm-connection-editor或kylin-nm配置页进行新的IPV6配置后，重新连接网络
objKyDBus->reConnectWiredNet(nuuid);
}