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

Merge branch '0622-main' into 'main' 

ix bug-58766 show zero value of wifi signal strength

See merge request kylin-desktop/kylin-nm!52
This commit is contained in:
Xiaoshuo Shi 2021-06-23 02:42:54 +00:00
parent 883e2165c8 f8f87faf2f
commit eaf7ac835c
3 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mainwindow.cpp
View File

@ -34,7 +34,6 @@
#include <QtConcurrent> #include <QtConcurrent>
QString llname, lwname, hideWiFiConn; QString llname, lwname, hideWiFiConn;
int currentActWifiSignalLv, count_loop;
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
@ -87,8 +86,6 @@ void MainWindow::firstlyStart()
llname = "-1"; llname = "-1";
lwname = "-1"; lwname = "-1";
hideWiFiConn = "Connect to Hidden WLAN Network"; hideWiFiConn = "Connect to Hidden WLAN Network";
currentActWifiSignalLv = -1;
count_loop = 0;
createTrayIcon(); createTrayIcon();
connect(trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::iconActivated); connect(trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::iconActivated);
@ -1616,7 +1613,7 @@ void MainWindow::on_btnWifiList_clicked()
// 当前连接的wifi // 当前连接的wifi
OneConnForm *ccf = new OneConnForm(topWifiListWidget, this, confForm, ksnm); OneConnForm *ccf = new OneConnForm(topWifiListWidget, this, confForm, ksnm);
ccf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi" ccf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi"
ccf->setSignal("0", "--", "0"); ccf->setSignal("0", "--", "0", false);
ccf->setRate("0"); ccf->setRate("0");
ccf->setConnedString(1, tr("Disconnected"), "");//"未连接" ccf->setConnedString(1, tr("Disconnected"), "");//"未连接"
ccf->isConnected = false; ccf->isConnected = false;
@ -2688,7 +2685,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
OneConnForm *ccf = new OneConnForm(topWifiListWidget, this, confForm, ksnm); OneConnForm *ccf = new OneConnForm(topWifiListWidget, this, confForm, ksnm);
if (actWifiName == "--" || wifiActState == 1 || actWifiBssidList.at(0) == "--" || actWifiBssid == " ") { if (actWifiName == "--" || wifiActState == 1 || actWifiBssidList.at(0) == "--" || actWifiBssid == " ") {
ccf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi" ccf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi"
ccf->setSignal("0", "--" , "0"); ccf->setSignal("0", "--" , "0", false);
activeWifiSignalLv = 0; activeWifiSignalLv = 0;
ccf->setConnedString(1, tr("Disconnected"), "");//"未连接" ccf->setConnedString(1, tr("Disconnected"), "");//"未连接"
ccf->isConnected = false; ccf->isConnected = false;
@ -2808,7 +2805,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
if (actWifiBssid == wbssid && wifiActState == 2) { if (actWifiBssid == wbssid && wifiActState == 2) {
//对于已经连接的wifi //对于已经连接的wifi
connect(this, &MainWindow::actWifiSignalLvChanaged, ccf, [ = ](const int &signalLv) { connect(this, &MainWindow::actWifiSignalLvChanaged, ccf, [ = ](const int &signalLv) {
ccf->setSignal(QString::number(signalLv), wsecu, wcate); ccf->setSignal(QString::number(signalLv), wsecu, wcate, true);
}); });
connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int))); connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int)));
connect(ccf, SIGNAL(requestHandleWifiDisconn()), this, SLOT(handleWifiDisconn())); connect(ccf, SIGNAL(requestHandleWifiDisconn()), this, SLOT(handleWifiDisconn()));
@ -2844,7 +2841,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
signal = ccf->getSignal(); signal = ccf->getSignal();
else else
signal = wsignal.toInt(); signal = wsignal.toInt();
ccf->setSignal(QString::number(signal), wsecu, wcate); ccf->setSignal(QString::number(signal), wsecu, wcate, true);
setTrayIconOfWifi(wsignal.toInt()); setTrayIconOfWifi(wsignal.toInt());
activeWifiSignalLv = wsignal.toInt(); activeWifiSignalLv = wsignal.toInt();
//objKyDBus->getWifiMac(wname); //objKyDBus->getWifiMac(wname);
@ -2899,7 +2896,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
} }
//ocf->setRate(wrate); //ocf->setRate(wrate);
ocf->setLine(true); ocf->setLine(true);
ocf->setSignal(wsignal, wsecu, wcate); ocf->setSignal(wsignal, wsecu, wcate, true);
//objKyDBus->getWifiMac(wname); //objKyDBus->getWifiMac(wname);
ocf->setWifiInfo(wsecu, wsignal, wbssid, freqState); ocf->setWifiInfo(wsecu, wsignal, wbssid, freqState);
ocf->setConnedString(0, tr("Disconnected"), wsecu); ocf->setConnedString(0, tr("Disconnected"), wsecu);
@ -3133,7 +3130,7 @@ void MainWindow::updateWifiListDone(QStringList slist)
} }
//addItem->setRate(wrate); //addItem->setRate(wrate);
addItem->setLine(false); addItem->setLine(false);
addItem->setSignal(wsignal, wsecu, wcate); addItem->setSignal(wsignal, wsecu, wcate, true);
//objKyDBus->getWifiMac(wname); //objKyDBus->getWifiMac(wname);
addItem->setWifiInfo(wsecu, wsignal, wbssid, freqState); addItem->setWifiInfo(wsecu, wsignal, wbssid, freqState);
addItem->setConnedString(0, tr("Disconnected"), wsecu);//"未连接" addItem->setConnedString(0, tr("Disconnected"), wsecu);//"未连接"
@ -3815,7 +3812,7 @@ void MainWindow::disWifiDoneChangeUI()
if (ocf->isActive == true) { if (ocf->isActive == true) {
ocf->setSelected(false, false); ocf->setSelected(false, false);
ocf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi" ocf->setWifiName(tr("Not connected"), "--", "--", "--", isHuaWeiPC, isHuaWei9006C);//"当前未连接任何 Wifi"
ocf->setSignal("0", "--", "0"); ocf->setSignal("0", "--", "0", false);
ocf->setConnedString(1, tr("Disconnected"), "");//"未连接" ocf->setConnedString(1, tr("Disconnected"), "");//"未连接"
ocf->lbFreq->hide(); ocf->lbFreq->hide();
lbLoadDown->hide(); lbLoadDown->hide();

30
src/oneconnform.cpp
View File

@ -34,8 +34,6 @@
#include <QDBusObjectPath> #include <QDBusObjectPath>
#include <QtConcurrent> #include <QtConcurrent>
extern int currentActWifiSignalLv;
OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *confForm, KSimpleNM *ksnm) : OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *confForm, KSimpleNM *ksnm) :
QWidget(parent), QWidget(parent),
ui(new Ui::OneConnForm) ui(new Ui::OneConnForm)
@ -531,7 +529,7 @@ void OneConnForm::setLine(bool isShow)
} }
} }
void OneConnForm::setSignal(QString lv, QString secu, QString category) void OneConnForm::setSignal(QString lv, QString secu, QString category, bool hasSignalStrength)
{ {
this->m_signal = lv.toInt(); this->m_signal = lv.toInt();
int signal = lv.toInt(); int signal = lv.toInt();
@ -562,7 +560,6 @@ void OneConnForm::setSignal(QString lv, QString secu, QString category)
} else { } else {
signalStyle += "-full.png);}"; signalStyle += "-full.png);}";
} }
signalLv = 1;
} }
if (signal > 55 && signal <= 75) { if (signal > 55 && signal <= 75) {
if (hasPwd) { if (hasPwd) {
@ -570,7 +567,6 @@ void OneConnForm::setSignal(QString lv, QString secu, QString category)
} else { } else {
signalStyle += "-high.png);}"; signalStyle += "-high.png);}";
} }
signalLv = 2;
} }
if (signal > 35 && signal <= 55) { if (signal > 35 && signal <= 55) {
if (hasPwd) { if (hasPwd) {
@ -578,24 +574,19 @@ void OneConnForm::setSignal(QString lv, QString secu, QString category)
} else { } else {
signalStyle += "-medium.png);}"; signalStyle += "-medium.png);}";
} }
signalLv = 3;
} }
if (signal > 15 && signal <= 35) { if (signal <= 35) {
if (hasPwd) { if (hasSignalStrength) {
signalStyle += "-low-pwd.png);}"; if (hasPwd) {
} else { signalStyle += "-low-pwd.png);}";
signalStyle += "-low.png);}"; } else {
} signalStyle += "-low.png);}";
signalLv = 4; }
}
if (signal <= 15) {
if (hasPwd) {
signalStyle += "-none-pwd.png);}";
} else { } else {
signalStyle += "-none.png);}"; signalStyle += "-none.png);}";
} }
signalLv = 4;
} }
ui->lbSignal->setStyleSheet(signalStyle); ui->lbSignal->setStyleSheet(signalStyle);
} }
@ -1177,9 +1168,6 @@ void OneConnForm::slotConnWifiResult(int connFlag)
ui->checkBoxPwd->setChecked(false); ui->checkBoxPwd->setChecked(false);
} }
// 设置全局变量，当前连接Wifi的信号强度
currentActWifiSignalLv = signalLv;
this->stopWifiWaiting(true); this->stopWifiWaiting(true);
mw->is_stop_check_net_state = 0; mw->is_stop_check_net_state = 0;

2
src/oneconnform.h
View File

@ -66,7 +66,7 @@ public:
~OneConnForm(); ~OneConnForm();
// category:1->normal protocol 1->wifi 6 2->wifi 6+ // category:1->normal protocol 1->wifi 6 2->wifi 6+
void setSignal(QString lv, QString secu,QString category = "0"); void setSignal(QString lv, QString secu, QString category = "0", bool hasSignalStrength = true);
int getSignal(); int getSignal();
void setWifiName(QString name, QString bssid, QString uuid, QString isname, bool isHW, bool is9006C); void setWifiName(QString name, QString bssid, QString uuid, QString isname, bool isHW, bool is9006C);
QString getName(); QString getName();