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

Merge pull request #57 from mammonsama666/zjp-new 

fix(wifi-freq): Wifi freq label is not accurate
This commit is contained in:
chenlelin 2020-12-15 20:37:23 +08:00 committed by GitHub
parent a41f4cba26 ee7b8ae73b
commit c813816d2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mainwindow.cpp
View File

@ -1595,15 +1595,14 @@ void MainWindow::loadWifiListDone(QStringList slist)
} }
if(isContinue){ continue; } if(isContinue){ continue; }
bool is_fast = false; int max_freq = wfreq.toInt();
if (wfreq.toInt() >= 5000) { int min_freq = wfreq.toInt();
is_fast = true;
} else {
for (int k = i; k < slist.size(); k ++) { for (int k = i; k < slist.size(); k ++) {
if (wname == slist.at(k).mid(indexName, indexFreq - indexName).trimmed()) { if (wname == slist.at(k).mid(indexName).trimmed()) {
if (slist.at(k).mid(indexFreq, 4).trimmed() >= 5000) { if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() > max_freq) {
is_fast = true; max_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
} } else if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() < min_freq) {
min_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
} }
} }
} }
@ -1617,7 +1616,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
ccf->setSignal(wsignal, wsecu); ccf->setSignal(wsignal, wsecu);
activeWifiSignalLv = wsignal.toInt(); activeWifiSignalLv = wsignal.toInt();
objKyDBus->getWifiMac(wname); objKyDBus->getWifiMac(wname);
ccf->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, is_fast); ccf->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, ((max_freq > 5000) && (min_freq < 3000)));
ccf->setConnedString(1, tr("NetOn,"), wsecu);//"已连接" ccf->setConnedString(1, tr("NetOn,"), wsecu);//"已连接"
ccf->isConnected = true; ccf->isConnected = true;
ifWLanConnected = true; ifWLanConnected = true;
@ -1639,7 +1638,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
ocf->setLine(true); ocf->setLine(true);
ocf->setSignal(wsignal, wsecu); ocf->setSignal(wsignal, wsecu);
objKyDBus->getWifiMac(wname); objKyDBus->getWifiMac(wname);
ocf->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, is_fast); ocf->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, ((max_freq > 5000) && (min_freq < 3000)));
ocf->setConnedString(0, tr("Disconnected"), wsecu); ocf->setConnedString(0, tr("Disconnected"), wsecu);
ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM); ocf->move(L_VERTICAL_LINE_TO_ITEM, j * H_NORMAL_ITEM);
ocf->setSelected(false, false); ocf->setSelected(false, false);
@ -1761,15 +1760,14 @@ void MainWindow::updateWifiListDone(QStringList slist)
} }
if(isContinue){continue;} if(isContinue){continue;}
bool is_fast = false; int max_freq = wfreq.toInt();
if (wfreq.toInt() >= 5000) { int min_freq = wfreq.toInt();
is_fast = true;
} else {
for (int k = i; k < slist.size(); k ++) { for (int k = i; k < slist.size(); k ++) {
if (wname == slist.at(k).mid(indexName, indexFreq - indexName).trimmed()) { if (wname == slist.at(k).mid(indexName).trimmed()) {
if (slist.at(k).mid(indexFreq, 4).trimmed() >= 5000) { if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() > max_freq) {
is_fast = true; max_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
} } else if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() < min_freq) {
min_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();
} }
} }
} }
@ -1803,7 +1801,7 @@ void MainWindow::updateWifiListDone(QStringList slist)
addItem->setLine(false); addItem->setLine(false);
addItem->setSignal(wsignal, wsecu); addItem->setSignal(wsignal, wsecu);
objKyDBus->getWifiMac(wname); objKyDBus->getWifiMac(wname);
addItem->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, is_fast); addItem->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, ((max_freq > 5000) && (min_freq < 3000)));
addItem->setConnedString(0, tr("Disconnected"), wsecu);//"未连接" addItem->setConnedString(0, tr("Disconnected"), wsecu);//"未连接"
addItem->move(L_VERTICAL_LINE_TO_ITEM, posY); addItem->move(L_VERTICAL_LINE_TO_ITEM, posY);
addItem->setSelected(false, false); addItem->setSelected(false, false);