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 #131 from mammonsama666/0508-dev 

Fix:Wifi choosen is incorrect.
This commit is contained in:
chenlelin 2021-05-08 21:43:42 +08:00 committed by GitHub
parent e0987904e8 9304a318c8
commit ce661c3e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 105 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/mainwindow.cpp
View File

@ -1716,9 +1716,8 @@ void MainWindow::getWifiListDone(QStringList slist)
// getFinalWifiList(slist); // getFinalWifiList(slist);
} }
} }
if (current_wifi_list_state == RECONNECT_WIFI) { if (current_wifi_list_state == RECONNECT_WIFI) {
QList<structWifiProperty> targetWifiStructList = connectableWifiPriorityList(slist); QVector<structWifiProperty> targetWifiStructList = connectableWifiPriorityList(slist);
if (!targetWifiStructList.isEmpty()) { if (!targetWifiStructList.isEmpty()) {
if (!isReconnectingWifi) { if (!isReconnectingWifi) {
isReconnectingWifi = true; //保证对于连续发出的重连信号，只处理第一个 isReconnectingWifi = true; //保证对于连续发出的重连信号，只处理第一个
@ -1787,6 +1786,66 @@ void MainWindow::getConnListDone(QStringList slist)
return; return;
} }
} }
//QStringList MainWindow::priorityList(QStringList slist){
// QStringList ret;
// ret.append(slist[0]);
// QString headLine = slist.at(0);
// int indexSignal,indexSecu, indexFreq, indexBSsid, indexName,indexPath,indexCate;
// headLine = headLine.trimmed();
// bool isChineseExist = headLine.contains(QRegExp("[\\x4e00-\\x9fa5]+"));
// if (isChineseExist) {
// indexSignal = headLine.indexOf("SIGNAL");
// indexSecu = headLine.indexOf("安全性");
// indexFreq = headLine.indexOf("频率") + 4;
// indexBSsid = headLine.indexOf("BSSID") + 6;
// indexName = indexBSsid + 19;
// indexPath = headLine.indexOf("DBUS-PATH");
// indexCate = headLine.indexOf("CATEGORY");
// } 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");
// indexCate = headLine.indexOf("CATEGORY");
// }
// QStringList p1,p2,p3,p4,p5,p6,p7;//按照信号与频段划分为6个列表
// for(int i=1;i<slist.size();i++){
// QString line = slist.at(i);
// int conSignal = line.mid(indexSignal,3).trimmed().toInt();
// int conFreq = line.mid(indexFreq,4).trimmed().toInt();
// if(conSignal > 75 && conFreq >= 5000){
// p1.append(line);
// continue;
// }else if(conSignal > 55 && conFreq >= 5000){
// p2.append(line);
// continue;
// }else if(conSignal > 75){
// p3.append(line);
// continue;
// }else if(conSignal > 55){
// p4.append(line);
// continue;
// }else if(conSignal > 35){
// p5.append(line);
// continue;
// }else if(conSignal > 15){
// p6.append(line);
// continue;
// }else{
// p7.append(line);
// }
// }
// QVector<QStringList> listVec;
// listVec<<p1<<p2<<p3<<p4<<p5<<p6<<p7;
// for(auto list:listVec){
// list = sortApByCategory(list,indexCate);
// ret += list;
// }
// return ret;
//}
QStringList MainWindow::priorityList(QStringList slist){ QStringList MainWindow::priorityList(QStringList slist){
QStringList ret; QStringList ret;
ret.append(slist[0]); ret.append(slist[0]);
@ -1811,11 +1870,41 @@ QStringList MainWindow::priorityList(QStringList slist){
indexPath = headLine.indexOf("DBUS-PATH"); indexPath = headLine.indexOf("DBUS-PATH");
indexCate = headLine.indexOf("CATEGORY"); indexCate = headLine.indexOf("CATEGORY");
} }
QStringList p1,p2,p3,p4,p5,p6,p7;//按照信号与频段划分为6个列表 QStringList p1,p2,p3;//按照信号与category划分为3个列表
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);
int conSignal = line.mid(indexSignal,3).trimmed().toInt(); int conSignal = line.mid(indexSignal,3).trimmed().toInt();
int conFreq = line.mid(indexFreq,4).trimmed().toInt(); int conCate = line.mid(indexCate).trimmed().toInt();
if(conSignal > 55 && conCate == 2){
p1.append(line);
continue;
}else if(conSignal > 55 && conCate == 1){
p2.append(line);
continue;
}else{
p3.append(line);
continue;
}
}
QVector<QStringList> listVec;
listVec<<p1<<p2<<p3;
for(auto list:listVec){
list = sortApByFreq(list,indexFreq, indexSignal);
ret += list;
}
foreach (QString s, ret) {
qDebug()<<s;
}
return ret;
}
QStringList MainWindow::sortApByFreq(QStringList list, int freqIndex, int signalIndex)
{
QStringList ret;
QStringList p1,p2,p3,p4,p5,p6,p7;
for(auto line:list){
int conSignal = line.mid(signalIndex,3).trimmed().toInt();
int conFreq = line.mid(freqIndex,4).trimmed().toInt();
if(conSignal > 75 && conFreq >= 5000){ if(conSignal > 75 && conFreq >= 5000){
p1.append(line); p1.append(line);
continue; continue;
@ -1838,14 +1927,10 @@ QStringList MainWindow::priorityList(QStringList slist){
p7.append(line); p7.append(line);
} }
} }
QVector<QStringList> listVec; ret<<p1<<p2<<p3<<p4<<p5<<p6<<p7;
listVec<<p1<<p2<<p3<<p4<<p5<<p6<<p7;
for(auto list:listVec){
list = sortApByCategory(list,indexCate);
ret += list;
}
return ret; return ret;
} }
QVector<QStringList> MainWindow::repetitionFilter(QVector<QStringList>){ QVector<QStringList> MainWindow::repetitionFilter(QVector<QStringList>){
QVector<QStringList> ret; QVector<QStringList> ret;
return ret; return ret;
@ -1999,8 +2084,8 @@ void MainWindow::getFinalWifiList(QStringList &slist)
} }
//从有配置文件的wifi选出最优wifi进行连接,同时考虑用户手动设置的优先级,这个函数在回连中用到 //从有配置文件的wifi选出最优wifi进行连接,同时考虑用户手动设置的优先级,这个函数在回连中用到
QList<structWifiProperty> MainWindow::connectableWifiPriorityList(const QStringList slist){ QVector<structWifiProperty> MainWindow::connectableWifiPriorityList(const QStringList slist){
QList<structWifiProperty> selectedWifiListStruct; QVector<structWifiProperty> selectedWifiListStruct;
if(slist.size()<2) return selectedWifiListStruct; if(slist.size()<2) return selectedWifiListStruct;
OneConnForm *ocf = new OneConnForm(); OneConnForm *ocf = new OneConnForm();
QString headLine = slist.at(0); QString headLine = slist.at(0);
@ -2063,6 +2148,7 @@ QList<structWifiProperty> MainWindow::connectableWifiPriorityList(const QStringL
myWifiProStruct.bssid = wifibssid; myWifiProStruct.bssid = wifibssid;
myWifiProStruct.priority = wifiPriority.toInt(); myWifiProStruct.priority = wifiPriority.toInt();
selectedWifiListStruct.append(myWifiProStruct); selectedWifiListStruct.append(myWifiProStruct);
qDebug()<<wifiname<<"->"<<wifibssid<<"->"<<wifiPriority<<"->"<<line.mid(indexCate).trimmed();
} }
} }
} }
@ -2079,13 +2165,14 @@ QList<structWifiProperty> MainWindow::connectableWifiPriorityList(const QStringL
} }
//排序 //排序
void MainWindow::devListSort(QList<structWifiProperty> *list) void MainWindow::devListSort(QVector<structWifiProperty> *list)
{ {
qSort(list->begin(), list->end(), subDevListSort); // qSort(list->begin(), list->end(), subDevListSort);
std::sort(list->begin(), list->end(), subDevListSort);
} }
bool MainWindow::subDevListSort(const structWifiProperty &info1, const structWifiProperty &info2) bool MainWindow::subDevListSort(const structWifiProperty &info1, const structWifiProperty &info2)
{ {
return info1.priority > info2.priority; return info1.priority > info2.priority;
} }
// 加载wifi列表 // 加载wifi列表

5
src/mainwindow.h
View File

@ -319,9 +319,10 @@ private:
QVector<QStringList> repetitionFilter(QVector<QStringList>); QVector<QStringList> repetitionFilter(QVector<QStringList>);
QStringList priorityList(QStringList); QStringList priorityList(QStringList);
QStringList sortApByCategory(QStringList,int); QStringList sortApByCategory(QStringList,int);
QStringList sortApByFreq(QStringList,int, int);
void getFinalWifiList(QStringList& slist); //获取应该显示在wifi列表中的最优列表参数 void getFinalWifiList(QStringList& slist); //获取应该显示在wifi列表中的最优列表参数
QList<structWifiProperty> connectableWifiPriorityList(const QStringList slist); //可连接wifi优先级列表 QVector<structWifiProperty> connectableWifiPriorityList(const QStringList slist); //可连接wifi优先级列表
void devListSort(QList<structWifiProperty> *list); void devListSort(QVector<structWifiProperty> *list);
static bool subDevListSort(const structWifiProperty&info1,const structWifiProperty&info2); static bool subDevListSort(const structWifiProperty&info1,const structWifiProperty&info2);
//循环检测网络连接状态 //循环检测网络连接状态
QTimer *iconTimer = nullptr; QTimer *iconTimer = nullptr;