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

Optimize reconnect wifi code

This commit is contained in:
chenlelin 2021-03-26 22:48:55 +08:00
parent 24fc8a0ff8
commit 901a4938ff
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mainwindow.cpp
View File

@ -1901,11 +1901,12 @@ void MainWindow::getFinalWifiList(QStringList &slist)
//从有配置文件的wifi选出最优wifi进行连接
QStringList MainWindow::connectableWifiPriorityList(const QStringList slist){
QStringList target;
if(!slist.size()) return target;
if(slist.size()<2) return target;
OneConnForm *ocf = new OneConnForm();
QString headLine = slist.at(0);
int indexSignal,indexSecu, indexFreq, indexBSsid, indexName;
int indexSignal,indexSecu, indexFreq, indexBSsid, indexName, indexPath;
headLine = headLine.trimmed();
bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
if (isChineseExist) {
indexSignal = headLine.indexOf("SIGNAL");
@ -1913,23 +1914,25 @@ QStringList MainWindow::connectableWifiPriorityList(const QStringList slist){
indexFreq = headLine.indexOf("频率") + 4;
indexBSsid = headLine.indexOf("BSSID") + 6;
indexName = indexBSsid + 19;
indexPath = headLine.indexOf("DBUS-PATH");
} else {
indexSignal = headLine.indexOf("SIGNAL");
indexSecu = headLine.indexOf("SECURITY");
indexFreq = headLine.indexOf("FREQ");
indexBSsid = headLine.indexOf("BSSID");
indexName = indexBSsid + 19;
indexPath = headLine.indexOf("DBUS-PATH");
}
int indexPath = headLine.indexOf("DBUS-PATH");
QStringList tmp = slist;
for (int i=1;i<tmp.size();i++) {
QString line = tmp.at(i);
QString wifiname = line.mid(indexName,indexPath - indexName).trimmed();
QString wifibssid = line.mid(indexBSsid, indexName-indexBSsid).trimmed();
QString wifiObjectPath = line.mid(indexPath).trimmed();
if (ocf->isWifiConfExist(wifiname) && wifiname != DisconnectedWifiSsidManualy) { //两格以上有配置的5Gwifi中选择信号最佳的
if (ocf->isWifiConfExist(wifiname) && canReconnectWifiList.contains(wifiname)) { //两格以上有配置的5Gwifi中选择信号最佳的
target << wifiObjectPath <<wifibssid;
tmp.removeAt(i);
//tmp.removeAt(i);
}
}
@ -2122,7 +2125,6 @@ void MainWindow::loadWifiListDone(QStringList slist)
//qDebug() << "wifi的 bssid: " << wbssid << "当前连接的wifi的bssid: " << actWifiBssidList;
if(actWifiBssid == wbssid && wifiActState == 2){
//对于已经连接的wifi
DisconnectedWifiSsidManualy = "";
connect(ccf, SIGNAL(selectedOneWifiForm(QString,int)), this, SLOT(oneTopWifiFormSelected(QString,int)));
connect(ccf, SIGNAL(disconnActiveWifi()), this, SLOT(activeWifiDisconn()));
QString path = line.mid(indexPath).trimmed();
@ -2130,9 +2132,16 @@ void MainWindow::loadWifiListDone(QStringList slist)
if (path != "" && !path.isEmpty()) m_name= this->objKyDBus->getWifiSsid(QString("/org/freedesktop/NetworkManager/AccessPoint/%1").arg(path.mid(path.lastIndexOf("/") + 1)));
if (m_name.isEmpty() || m_name == "") {
ccf->setName(wname, wbssid, actWifiUuid);
if (!canReconnectWifiList.contains(wname)) {
canReconnectWifiList.append(wname);
}
} else {
ccf->setName(m_name, wbssid, actWifiUuid);
if (!canReconnectWifiList.contains(m_name)) {
canReconnectWifiList.append(m_name);
}
}
//ccf->setRate(wrate);
int signal = wsignal.toInt() + 11;
ccf->setSignal(QString::number(signal), wsecu);

4
src/mainwindow.h
View File

@ -175,7 +175,7 @@ public:
int is_hot_sopt_on = 0; //是否已经打开热点
int is_connect_hide_wifi = 0; //是否正在连接隐藏wifi
QString currSelNetName = ""; //当前ScrollArea中选中的网络名称
QString DisconnectedWifiSsidManualy; //上一次手动断开的wifi
QStringList canReconnectWifiList; //当前可以会连的wifi列表
QString currConnIfname = ""; //当前连接的有线网对应网卡名称，只有一个有线网连接的情况
QString oldWifiIpv4Method = ""; //原来的wifi的ipv4地址获取方式,自动还是手动
int currSelNetNum = 0; //当前选中的item序号
@ -184,7 +184,7 @@ public:
bool isToSetLanValue = true; //本次执行是否进行赋值
bool isToSetWifiValue = true; //本次执行是否进行赋值
bool isWifiReconnecting = false; //是否正在执行wifi的回连
int addNumberForWifi = 0;
int addNumberForWifi = 0; //短时间内收到关于wifi连接信号的次数
int m_priX;
int m_priY;

5
src/oneconnform.cpp
View File

@ -509,7 +509,10 @@ void OneConnForm::on_btnDisConn_clicked()
syslog(LOG_DEBUG, "DisConnect button about wifi net is clicked, current wifi name is %s .", wifiName.toUtf8().data());
qDebug()<<"DisConnect button about wifi net is clicked, current wifi name is "<<wifiName;
mw->DisconnectedWifiSsidManualy = wifiName;
if (mw->canReconnectWifiList.contains(wifiName)) {
mw->canReconnectWifiList.removeOne(wifiName);
}
this->startWaiting(false);
mw->is_stop_check_net_state = 1;