diff --git a/src/backthread.cpp b/src/backthread.cpp index ec015ac6..138c5fa3 100644 --- a/src/backthread.cpp +++ b/src/backthread.cpp @@ -332,7 +332,7 @@ void BackThread::execConnHiddenWifiWPA(QString wifiName, QString wifiPassword) QString tmpPath = "/tmp/kylin-nm-btoutput-" + QDir::home().dirName(); QString cmd = "nmcli device wifi connect '" + wifiName + "' password '" + wifiPassword + "' hidden yes > " + tmpPath + " 2>&1"; -// qDebug() << Q_FUNC_INFO << cmd << tmpPath; + qDebug() << Q_FUNC_INFO << cmd << tmpPath; int status = Utils::m_system(cmd.toUtf8().data()); if (status != 0) { syslog(LOG_ERR, "execute 'nmcli device wifi connect' in function 'on_btnConnect_clicked' failed"); @@ -350,7 +350,7 @@ void BackThread::execConnHiddenWifiWPA(QString wifiName, QString wifiPassword) x = 1; sleep(10);//nm扫描冷却为10s } else { - emit connDone(0); + emit connDone(6); x = 0; } // qDebug() << Q_FUNC_INFO << x << text; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 54d46641..24637b96 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -693,6 +693,8 @@ void MainWindow::iconActivated(QSystemTrayIcon::ActivationReason reason) if (is_btnLanList_clicked == 1&& is_stop_check_net_state==0) { onBtnNetListClicked(0); } + + qDebug() << "00000000000000000 " <showDesktopNotify(txt); } else if (connFlag == 3) { @@ -3698,7 +3701,12 @@ void MainWindow::connWifiDone(int connFlag) is_connect_net_failed = 1; QString txt(tr("Selected Wifi has not been scanned.")); objKyDBus->showDesktopNotify(txt); + } else if (connFlag == 6) { + this->ksnm->execGetWifiList(this->wcardname); + QString txt(tr("Connect Hidden Wifi Success")); + objKyDBus->showDesktopNotify(txt); } + this->stopLoading(); is_stop_check_net_state = 0; } diff --git a/translations/kylin-nm_zh_CN.qm b/translations/kylin-nm_zh_CN.qm index 9d68529b..357778a3 100644 Binary files a/translations/kylin-nm_zh_CN.qm and b/translations/kylin-nm_zh_CN.qm differ diff --git a/translations/kylin-nm_zh_CN.ts b/translations/kylin-nm_zh_CN.ts index 9256cdcb..88435d7b 100644 --- a/translations/kylin-nm_zh_CN.ts +++ b/translations/kylin-nm_zh_CN.ts @@ -1546,6 +1546,11 @@ Selected Wifi has not been scanned. 当前区域未扫描到选中的wifi + + + Connect Hidden Wifi Success + 连接隐藏Wifi成功 + Ethernet Networks