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 #121 from CrankyPants123/0426-dev 

Fixed BUG#50730 Wrong WiFi name displayed
This commit is contained in:
chenlelin 2021-04-26 16:45:48 +08:00 committed by GitHub
parent d06ae50117 525aa1d167
commit caccf96026
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mainwindow.cpp
View File

@ -2201,7 +2201,13 @@ void MainWindow::loadWifiListDone(QStringList slist)
QString line = slist.at(i); QString line = slist.at(i);
QString wbssid = line.mid(indexBSsid, 17).trimmed(); QString wbssid = line.mid(indexBSsid, 17).trimmed();
QString wname = line.mid(indexName, indexPath - indexName).trimmed(); QString wname = line.mid(indexName, indexPath - indexName).trimmed();
int chineseNum = 0;
for(QChar text:wname){
if(text.unicode() > 0x4E00 && text.unicode() <= 0x9FFF){//统计字符串中中文字符的个数
chineseNum++;
}
}
wname = line.mid(indexName, indexPath - indexName - chineseNum).trimmed();
if (actWifiBssidList.contains(wbssid)) { if (actWifiBssidList.contains(wbssid)) {
actWifiName = wname; actWifiName = wname;
} }
@ -2223,6 +2229,13 @@ void MainWindow::loadWifiListDone(QStringList slist)
QString wname = line.mid(indexName, indexPath - indexName).trimmed(); QString wname = line.mid(indexName, indexPath - indexName).trimmed();
QString wfreq = line.mid(indexFreq, 4).trimmed(); QString wfreq = line.mid(indexFreq, 4).trimmed();
QString wcate = line.mid(indexCate).trimmed(); QString wcate = line.mid(indexCate).trimmed();
int chineseNum = 0;
for(QChar text:wname){
if(text.unicode() > 0x4E00 && text.unicode() <= 0x9FFF){//统计字符串中中文字符的个数
chineseNum++;
}
}
wname = line.mid(indexName, indexPath - indexName - chineseNum).trimmed();
if (!isHuaWeiPC) { if (!isHuaWeiPC) {
//如果不是华为的电脑，选择wifi在这里执行 //如果不是华为的电脑，选择wifi在这里执行
@ -2249,6 +2262,14 @@ void MainWindow::loadWifiListDone(QStringList slist)
int min_freq = wfreq.toInt(); int min_freq = wfreq.toInt();
for (int k = i; k < slist.size(); k ++) { for (int k = i; k < slist.size(); k ++) {
QString m_name = slist.at(k).mid(indexName, indexPath - indexName).trimmed(); QString m_name = slist.at(k).mid(indexName, indexPath - indexName).trimmed();
int chineseNum = 0;
for(QChar text:wname){
if(text.unicode() > 0x4E00 && text.unicode() <= 0x9FFF){//统计字符串中中文字符的个数
chineseNum++;
}
}
wname = line.mid(indexName, indexPath - indexName - chineseNum).trimmed();
if (wname == m_name) { if (wname == m_name) {
if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() > max_freq) { if (slist.at(k).mid(indexFreq, 4).trimmed().toInt() > max_freq) {
max_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt(); max_freq = slist.at(k).mid(indexFreq, 4).trimmed().toInt();