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

feat(wifi-freq): Add freq label to each wifi. 

Description: 给所有的wifi添加频率标签

Log: 给所有的wifi添加频率标签
This commit is contained in:
zhangjiaping 2020-12-16 15:50:57 +08:00
parent bdc77fee80
commit 45835db3d9
4 changed files with 67 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/mainwindow.cpp
View File

@ -1591,7 +1591,7 @@ void MainWindow::loadWifiListDone(QStringList slist)
for (int i = 1, j = 0; i < slist.size(); i ++) { for (int i = 1, j = 0; i < slist.size(); i ++) {
QString line = slist.at(i); QString line = slist.at(i);
QString wsignal = line.mid(0, indexSecu).trimmed(); QString wsignal = line.mid(0, indexSecu).trimmed();
QString wsecu = line.mid(indexSecu, indexName - indexSecu).trimmed(); QString wsecu = line.mid(indexSecu, indexFreq - indexSecu).trimmed();
QString wname = line.mid(indexName).trimmed(); QString wname = line.mid(indexName).trimmed();
QString wfreq = line.mid(indexFreq, 4).trimmed(); QString wfreq = line.mid(indexFreq, 4).trimmed();
bool isContinue = false; bool isContinue = false;
@ -1612,6 +1612,14 @@ void MainWindow::loadWifiListDone(QStringList slist)
} }
} }
} }
int freqState = 0;
if (max_freq < 3000) {
//只有2.4GHZ
freqState = 1;
} else if (min_freq >= 5000) {
//只有5GHZ
freqState = 2;
}
if (wname != "" && wname != "--") { if (wname != "" && wname != "--") {
// 当前连接的wifi // 当前连接的wifi
if (wname == actWifiName) { if (wname == actWifiName) {
@ -1622,7 +1630,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, ((max_freq > 5000) && (min_freq < 3000))); ccf->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, freqState);
ccf->setConnedString(1, tr("NetOn,"), wsecu);//"已连接" ccf->setConnedString(1, tr("NetOn,"), wsecu);//"已连接"
ccf->isConnected = true; ccf->isConnected = true;
ifWLanConnected = true; ifWLanConnected = true;
@ -1644,7 +1652,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, ((max_freq > 5000) && (min_freq < 3000))); ocf->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, freqState);
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);
@ -1753,7 +1761,7 @@ void MainWindow::updateWifiListDone(QStringList slist)
for(int i = 1; i < slist.size(); i++){ for(int i = 1; i < slist.size(); i++){
QString line = slist.at(i); QString line = slist.at(i);
QString wsignal = line.mid(0, indexSecu).trimmed(); QString wsignal = line.mid(0, indexSecu).trimmed();
QString wsecu = line.mid(indexSecu, indexName - indexSecu).trimmed(); QString wsecu = line.mid(indexSecu, indexFreq - indexSecu).trimmed();
QString wname = line.mid(indexName).trimmed(); QString wname = line.mid(indexName).trimmed();
QString wfreq = line.mid(indexFreq, 4).trimmed(); QString wfreq = line.mid(indexFreq, 4).trimmed();
@ -1778,6 +1786,15 @@ void MainWindow::updateWifiListDone(QStringList slist)
} }
} }
int freqState = 0;
if (max_freq < 3000) {
//只有2.4GHZ
freqState = 1;
} else if (min_freq >= 5000) {
//只有5GHZ
freqState = 2;
}
wnames.append(wname); wnames.append(wname);
for (int j=1; j < oldWifiSlist.size(); j++) { for (int j=1; j < oldWifiSlist.size(); j++) {
@ -1807,7 +1824,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, ((max_freq > 5000) && (min_freq < 3000))); addItem->setWifiInfo(wsecu, wsignal, objKyDBus->dbusWifiMac, freqState);
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);

59
src/oneconnform.cpp
View File

@ -136,9 +136,18 @@ OneConnForm::OneConnForm(QWidget *parent, MainWindow *mainWindow, ConfForm *conf
connect(mw, SIGNAL(waitWifiStop()), this, SLOT(stopWaiting())); connect(mw, SIGNAL(waitWifiStop()), this, SLOT(stopWaiting()));
connType = ""; connType = "";
lbNameLyt = new QHBoxLayout(ui->lbName);
ui->fiveGlabel->hide(); lbFreq = new QLabel(ui->lbName);
ui->fiveGlabel->setStyleSheet("QLabel{background-color: palette(button); border-radius: 4px;}"); lbFreq->setAlignment(Qt::AlignCenter);
lbFreq->setEnabled(false);
lbFreq->setStyleSheet("QLabel{border: 1px solid rgba(0, 0, 0, 0.5); background: transparent; color: rgba(0, 0, 0, 0.5); border-radius: 4px; font-size: 12px;}");
lbNameText = new QLabel(ui->lbName);
lbNameLyt->setContentsMargins(0, 0, 0, 0);
lbNameLyt->setSpacing(4);
lbNameLyt->addWidget(lbNameText);
lbNameLyt->addWidget(lbFreq);
lbNameLyt->addStretch();
ui->lbName->setLayout(lbNameLyt);
} }
OneConnForm::~OneConnForm() OneConnForm::~OneConnForm()
@ -345,18 +354,18 @@ void OneConnForm::setConnedString(bool showLable, QString str, QString str1)
void OneConnForm::setName(QString name) void OneConnForm::setName(QString name)
{ {
ui->lbName->setText(name); lbNameText->setText(name);
wifiName = name; wifiName = name;
} }
void OneConnForm::setSpecialName(QString name) void OneConnForm::setSpecialName(QString name)
{ {
ui->lbName->setText(tr("Connect to Hidden Wi-Fi Network")); //连接到隐藏的 Wi-Fi 网络 lbNameText->setText(tr("Connect to Hidden Wi-Fi Network")); //连接到隐藏的 Wi-Fi 网络
wifiName = name; wifiName = name;
} }
QString OneConnForm::getName() QString OneConnForm::getName()
{ {
return ui->lbName->text(); return lbNameText->text();
} }
void OneConnForm::setRate(QString rate) void OneConnForm::setRate(QString rate)
@ -426,10 +435,18 @@ void OneConnForm::setSignal(QString lv, QString secu)
} }
} }
void OneConnForm::setWifiInfo(QString str1, QString str2, QString str3, bool is_double_freq) void OneConnForm::setWifiInfo(QString str1, QString str2, QString str3, int freq)
{ {
if (is_double_freq) { //freq 0:含2.4G和5G， 1：只有2.4G， 2：只有5G
ui->fiveGlabel->show(); if (freq == 1) {
//freq ~ 2.4G
lbFreq->setText("2.4G");
} else if (freq == 2) {
//freq ~ 5G
lbFreq->setText("5G");
} else {
//freq ~ 5G&2.4G
lbFreq->setText("2.4/5G");
} }
if (str1 == "--" || str1 == ""){ str1 = tr("None"); }; if (str1 == "--" || str1 == ""){ str1 = tr("None"); };
@ -446,25 +463,25 @@ void OneConnForm::setWifiInfo(QString str1, QString str2, QString str3, bool is_
void OneConnForm::slotConnWifi() void OneConnForm::slotConnWifi()
{ {
this->startWaiting(true); this->startWaiting(true);
emit sigConnWifi(ui->lbName->text()); emit sigConnWifi(lbNameText->text());
} }
void OneConnForm::slotConnWifiPWD() void OneConnForm::slotConnWifiPWD()
{ {
this->startWaiting(true); this->startWaiting(true);
emit sigConnWifiPWD(ui->lbName->text(), ui->lePassword->text(), connType); emit sigConnWifiPWD(lbNameText->text(), ui->lePassword->text(), connType);
} }
//点击后断开wifi网络 //点击后断开wifi网络
void OneConnForm::on_btnDisConn_clicked() void OneConnForm::on_btnDisConn_clicked()
{ {
syslog(LOG_DEBUG, "DisConnect button about wifi net is clicked, current wifi name is %s .", ui->lbName->text().toUtf8().data()); syslog(LOG_DEBUG, "DisConnect button about wifi net is clicked, current wifi name is %s .", lbNameText->text().toUtf8().data());
qDebug()<<"DisConnect button about wifi net is clicked, current wifi name is "<<ui->lbName->text(); qDebug()<<"DisConnect button about wifi net is clicked, current wifi name is "<<lbNameText->text();
this->startWaiting(false); this->startWaiting(false);
mw->is_stop_check_net_state = 1; mw->is_stop_check_net_state = 1;
mw->on_btnHotspotState(); mw->on_btnHotspotState();
kylin_network_set_con_down(ui->lbName->text().toUtf8().data()); kylin_network_set_con_down(lbNameText->text().toUtf8().data());
disconnect(this, SIGNAL(selectedOneWifiForm(QString,int)), mw, SLOT(oneWifiFormSelected(QString,int))); disconnect(this, SIGNAL(selectedOneWifiForm(QString,int)), mw, SLOT(oneWifiFormSelected(QString,int)));
emit disconnActiveWifi(); emit disconnActiveWifi();
} }
@ -521,7 +538,7 @@ void OneConnForm::toConnectWirelessNetwork()
return; return;
} }
if (ui->lbConned->text() == "--" || ui->lbConned->text() == " ") { if (ui->lbConned->text() == "--" || ui->lbConned->text() == " ") {
if (!isWifiConfExist(ui->lbName->text())) { if (!isWifiConfExist(lbNameText->text())) {
//没有配置文件，使用有密码的wifi连接 //没有配置文件，使用有密码的wifi连接
on_btnConnPWD_clicked(); on_btnConnPWD_clicked();
return; return;
@ -654,7 +671,7 @@ void OneConnForm::on_btnInfo_clicked()
} }
BackThread *bt = new BackThread(); BackThread *bt = new BackThread();
QString connProp = bt->getConnProp(ui->lbName->text()); QString connProp = bt->getConnProp(lbNameText->text());
QStringList propList = connProp.split("|"); QStringList propList = connProp.split("|");
QString v4method, addr, mask, gateway, dns; QString v4method, addr, mask, gateway, dns;
foreach (QString line, propList) { foreach (QString line, propList) {
@ -676,7 +693,7 @@ void OneConnForm::on_btnInfo_clicked()
} }
// qDebug()<<"v4method:"<<v4method<<" addr:"<<addr<<" mask:"<<mask<<" gateway:"<<gateway<<" dns:"<<dns; // qDebug()<<"v4method:"<<v4method<<" addr:"<<addr<<" mask:"<<mask<<" gateway:"<<gateway<<" dns:"<<dns;
cf->setProp(ui->lbName->text(), "--", v4method, addr, mask, gateway, dns, this->isActive, true); cf->setProp(lbNameText->text(), "--", v4method, addr, mask, gateway, dns, this->isActive, true);
cf->move(primaryGeometry.width() / 2 - cf->width() / 2, primaryGeometry.height() / 2 - cf->height() / 2); cf->move(primaryGeometry.width() / 2 - cf->width() / 2, primaryGeometry.height() / 2 - cf->height() / 2);
cf->exec(); cf->exec();
cf->raise(); cf->raise();
@ -690,14 +707,14 @@ void OneConnForm::slotConnWifiResult(int connFlag)
qDebug()<<"Function slotConnWifiResult receives a number: "<<connFlag; qDebug()<<"Function slotConnWifiResult receives a number: "<<connFlag;
if (!connType.isEmpty()) { if (!connType.isEmpty()) {
QString strConntype = "nmcli connection modify " + ui->lbName->text() + " wifi-sec.psk-flags 2"; QString strConntype = "nmcli connection modify " + lbNameText->text() + " wifi-sec.psk-flags 2";
system(strConntype.toUtf8().data()); system(strConntype.toUtf8().data());
} }
connType = ""; connType = "";
if (connFlag == 2 || connFlag == 4) { if (connFlag == 2 || connFlag == 4) {
mw->currSelNetName = ""; mw->currSelNetName = "";
emit selectedOneWifiForm(ui->lbName->text(), H_WIFI_ITEM_SMALL_EXTEND); emit selectedOneWifiForm(lbNameText->text(), H_WIFI_ITEM_SMALL_EXTEND);
resize(W_ITEM, H_ITEM_MIDDLE); resize(W_ITEM, H_ITEM_MIDDLE);
ui->wbg->hide(); ui->wbg->hide();
@ -732,12 +749,12 @@ void OneConnForm::slotConnWifiResult(int connFlag)
if (connFlag == 1) { if (connFlag == 1) {
// 使用配置文件连接失败，需要删除该配置文件 // 使用配置文件连接失败，需要删除该配置文件
QString txt(tr("Conn Wifi Failed"));//"连接 Wifi 失败" QString txt(tr("Conn Wifi Failed"));//"连接 Wifi 失败"
syslog(LOG_DEBUG, "Try to connect wifi named %s, but failed, will delete it's configuration file", ui->lbName->text().toUtf8().data()); syslog(LOG_DEBUG, "Try to connect wifi named %s, but failed, will delete it's configuration file", lbNameText->text().toUtf8().data());
KylinDBus kylindbus; KylinDBus kylindbus;
kylindbus.showDesktopNotify(txt); kylindbus.showDesktopNotify(txt);
//QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + ui->lbName->text() + "';notify-send '" + txt + "...' -t 3800"; //QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + ui->lbName->text() + "';notify-send '" + txt + "...' -t 3800";
QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + ui->lbName->text() + "'"; QString cmd = "export LANG='en_US.UTF-8';export LANGUAGE='en_US';nmcli connection delete '" + lbNameText->text() + "'";
int status = system(cmd.toUtf8().data()); int status = system(cmd.toUtf8().data());
if (status != 0) { if (status != 0) {
syslog(LOG_ERR, "execute 'nmcli connection delete' in function 'slotConnWifiResult' failed"); syslog(LOG_ERR, "execute 'nmcli connection delete' in function 'slotConnWifiResult' failed");

7
src/oneconnform.h
View File

@ -26,6 +26,8 @@
#include <QLineEdit> #include <QLineEdit>
#include <QShortcut> #include <QShortcut>
#include <QKeyEvent> #include <QKeyEvent>
#include <QLabel>
#include <QHBoxLayout>
#include "confform.h" #include "confform.h"
#include "backthread.h" #include "backthread.h"
@ -68,7 +70,7 @@ public:
QString getName(); QString getName();
void setRate(QString rate); void setRate(QString rate);
void setLine(bool isShow); void setLine(bool isShow);
void setWifiInfo(QString str1, QString str2, QString str3, bool is_double_freq); void setWifiInfo(QString str1, QString str2, QString str3, int freq);
void setSelected(bool isSelected, bool isCurrName); void setSelected(bool isSelected, bool isCurrName);
void setHideItem(bool isHideItem, bool isShowHideBtn); void setHideItem(bool isHideItem, bool isShowHideBtn);
@ -131,6 +133,9 @@ private:
bool hasPwd; bool hasPwd;
QString leQssLow, leQssHigh; QString leQssLow, leQssHigh;
QLabel * lbFreq = nullptr;
QLabel * lbNameText = nullptr;
QHBoxLayout * lbNameLyt = nullptr;
signals: signals:
void selectedOneWifiForm(QString wifiName, int extendLength); void selectedOneWifiForm(QString wifiName, int extendLength);

19
src/oneconnform.ui
View File

@ -18,7 +18,7 @@
<rect> <rect>
<x>63</x> <x>63</x>
<y>8</y> <y>8</y>
<width>190</width> <width>200</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
@ -259,22 +259,6 @@
<string/> <string/>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="fiveGlabel">
<property name="geometry">
<rect>
<x>255</x>
<y>17</y>
<width>50</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>2.4/5G</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<zorder>wbg_3</zorder> <zorder>wbg_3</zorder>
<zorder>wbg_2</zorder> <zorder>wbg_2</zorder>
<zorder>lbName</zorder> <zorder>lbName</zorder>
@ -289,7 +273,6 @@
<zorder>btnHideConn</zorder> <zorder>btnHideConn</zorder>
<zorder>lbWaiting</zorder> <zorder>lbWaiting</zorder>
<zorder>lbWaitingIcon</zorder> <zorder>lbWaitingIcon</zorder>
<zorder>fiveGlabel</zorder>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>