Optimize the code to get WiFi list

src/ksimplenm.cpp

@@ -27,72 +27,79 @@
 
 KSimpleNM::KSimpleNM(QObject *parent) : QObject(parent)
 {
-    runShellProcess = new QProcess(this);
+    runProcessWifi = new QProcess(this);
+    connect(runProcessWifi, &QProcess::readyRead, this, &KSimpleNM::readProcessWifi);
+    connect(runProcessWifi, SIGNAL(finished(int)), this, SLOT(finishedProcessWifi(int)));
 
-    connect(runShellProcess, &QProcess::readyRead, this, &KSimpleNM::readProcess);
+    runProcessLan = new QProcess(this);
-    connect(runShellProcess, SIGNAL(finished(int)), this, SLOT(finishedProcess(int)));
+    connect(runProcessLan, &QProcess::readyRead, this, &KSimpleNM::readProcessLan);
+    connect(runProcessLan, SIGNAL(finished(int)), this, SLOT(finishedProcessLan(int)));
+}
+
+KSimpleNM::~KSimpleNM()
+{
+    delete runProcessWifi;
+    delete runProcessLan;
 }
 
 //获取有线网络列表数据
 void KSimpleNM::execGetLanList()
 {
-    if (isExecutingGetWifiList || isExecutingGetLanList) {
+    if (isExecutingGetLanList) {
-        syslog(LOG_DEBUG, "It is running getting wifi or lan list when getting lan list");
+        syslog(LOG_DEBUG, "It is running getting lan list when getting lan list");
-        qDebug()<<"debug: it is running getting wifi or lan list when getting lan list";
+        qDebug()<<"debug: it is running getting lan list when getting lan list";
         isUseOldLanSlist = true;
         QStringList slistmEmpty;
         slistmEmpty.append("Empty");
         emit getLanListFinished(slistmEmpty);
         return;
     }
-
     isExecutingGetLanList = true;
-    shellOutput = "";
-    type = 0;
 
-    runShellProcess->start("nmcli -f type,uuid,name connection show");
+    shellOutputLan = "";
-    //runShellProcess->waitForStarted(-1);
+    runProcessLan->start("nmcli -f type,uuid,name connection show");
-    //runShellProcess->waitForFinished(-1);
 }
 
 //获取无线网络列表数据
 void KSimpleNM::execGetWifiList()
 {
-    if (isExecutingGetWifiList || isExecutingGetLanList) {
+    if (isExecutingGetWifiList) {
-        syslog(LOG_DEBUG, "It is running getting wifi or lan list when getting wifi list");
+        syslog(LOG_DEBUG, "It is running getting wifi list when getting wifi list");
-        qDebug()<<"debug: it is running getting wifi or lan list when getting wifi list";
+        qDebug()<<"debug: it is running getting wifi list when getting wifi list";
         isUseOldWifiSlist = true;
         QStringList slistmEmpty;
         slistmEmpty.append("Empty");
         emit getWifiListFinished(slistmEmpty);
         return;
     }
-
     isExecutingGetWifiList = true;
-    shellOutput = "";
-    type = 1;
 
-    runShellProcess->start("nmcli -f signal,security,freq,ssid device wifi");
+    shellOutputWifi = "";
-    //runShellProcess->waitForStarted(-1);
+    runProcessWifi->start("nmcli -f signal,security,freq,ssid device wifi");
-    //runShellProcess->waitForFinished(-1);
 }
 
 //读取获取到的结果
-void KSimpleNM::readProcess()
+void KSimpleNM::readProcessWifi()
 {
-    QString output = runShellProcess->readAll();
+    QString output = runProcessWifi->readAll();
-    shellOutput += output;
+    shellOutputWifi += output;
+}
+void KSimpleNM::readProcessLan()
+{
+    QString output = runProcessLan->readAll();
+    shellOutputLan += output;
 }
 
 //读取完所有列表数据后发信号，将数据发往mainwindow用于显示网络列表
-void KSimpleNM::finishedProcess(int msg)
+void KSimpleNM::finishedProcessWifi(int msg)
 {
-    QStringList slist = shellOutput.split("\n");
+    QStringList slist = shellOutputWifi.split("\n");
-    if (type == 0) {
-        emit getLanListFinished(slist);
-        isExecutingGetLanList = false;
-    } else {
     emit getWifiListFinished(slist);
     isExecutingGetWifiList = false;
-    }
+}
+void KSimpleNM::finishedProcessLan(int msg)
+{
+    QStringList slist = shellOutputLan.split("\n");
+    emit getLanListFinished(slist);
+    isExecutingGetLanList = false;
 }

src/ksimplenm.h

@@ -30,10 +30,13 @@ class KSimpleNM : public QObject
     Q_OBJECT
 public:
     explicit KSimpleNM(QObject *parent = nullptr);
+    ~KSimpleNM();
+
+    QProcess *runProcessWifi;
+    QProcess *runProcessLan;
+    QString shellOutputWifi;
+    QString shellOutputLan;
 
-    QProcess *runShellProcess = nullptr;
-    QString shellOutput;
-    int type;
     bool isExecutingGetLanList = false; //是否正在执行获取有线网列表
     bool isExecutingGetWifiList = false; //是否正在执行获取无线网列表
     bool isUseOldLanSlist = false; //是否应该要用上一次获取的有线列表
@@ -47,8 +50,10 @@ signals:
     void getWifiListFinished(QStringList slist);
 
 public slots:
-    void readProcess();
+    void readProcessWifi();
-    void finishedProcess(int msg);
+    void readProcessLan();
+    void finishedProcessWifi(int msg);
+    void finishedProcessLan(int msg);
 };
 
 #endif // KSIMPLENM_H

src/mainwindow.cpp

@@ -1247,6 +1247,8 @@ void MainWindow::on_btnWifiList_clicked()
         lbLoadUp->hide();
         lbLoadDownImg->hide();
         lbLoadUpImg->hide();
+    } else {
+        hasWifiConnected = true;
     }
 
     ui->lbNetListBG->setStyleSheet(btnOffQss);
@@ -1266,7 +1268,6 @@ void MainWindow::on_btnWifiList_clicked()
         btnWireless->setSwitchStatus(true);
         lbTopWifiList->show();
         btnAddNet->show();
-        hasWifiConnected = true;
 
         this->startLoading();
         this->ksnm->execGetWifiList();
@@ -2390,6 +2391,8 @@ void MainWindow::activeLanDisconn()
 
 void MainWindow::activeWifiDisconn()
 {
+    hasWifiConnected = false;
+
     QThread *tt = new QThread();
     BackThread *btt = new BackThread();
     btt->moveToThread(tt);