From 2c33bbcfa4d8d62cb23c4b2cfe866ba5e877bbe7 Mon Sep 17 00:00:00 2001
From: chenlelin <chenlelin@kylinos.cn>
Date: Tue, 8 Jun 2021 11:20:11 +0800
Subject: [PATCH] Change time limit of waiting animation

---
 src/loadingdiv.cpp | 2 +-
 src/main.cpp       | 2 +-
 src/mainwindow.cpp | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/loadingdiv.cpp b/src/loadingdiv.cpp
index 60a6694a..ddaeef31 100644
--- a/src/loadingdiv.cpp
+++ b/src/loadingdiv.cpp
@@ -20,7 +20,7 @@
 #include <QIcon>
 
 #define FRAMESPEED 60 //帧与帧之间的间隔时间(ms)
-#define ALLTIME 10*1000 //等待动画持续总时间
+#define ALLTIME 40*1000 //等待动画持续总时间
 
 //加载动画控件'loadingGif'
 LoadingDiv::LoadingDiv(QWidget *parent) : QWidget(parent)
diff --git a/src/main.cpp b/src/main.cpp
index c53cb619..8759f993 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
     QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 
     QApplication a(argc, argv);
-    //qInstallMessageHandler(messageOutput);
+    qInstallMessageHandler(messageOutput);
 
     qDebug()<<"Kylin Network Manager Is Already Launched";
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 23c47963..da7e4b4a 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1401,13 +1401,18 @@ void MainWindow::on_btnWifiList_clicked()
         btnAddNet->show();
         this->startLoading();
         if (isHuaWeiPC) {
+            qDebug() << "11111111111111111111111111110";
             QtConcurrent::run([=]() {
+                qDebug() << "11111111111111111111111111111";
                 if (m_connected_by_self) {
+                    qDebug() << "11111111111111111111111111112";
                     m_connected_by_self = false;
                 } else {
                     if (this->isRadioWifiTurningOn) {
+                        qDebug() << "11111111111111111111111111113";
                         qDebug() << "Turning wifi switch on now, stop to load wifi list";
                     } else {
+                        qDebug() << "11111111111111111111111111114";
                         objKyDBus->requestScanWifi(); //要求后台扫描AP
                         sleep(2);
                         qDebug() << "scan finished, will load wifi list";
@@ -1848,7 +1853,7 @@ void MainWindow::getWifiListDone(QStringList slist)
                         qDebug()<<"Reconnect finished, cmd = "<<reconnectWifiCmd<<". res = "<<con_res;
 
                         if (con_res == 0) {
-                            m_connected_by_self = true;
+                            m_connected_by_self = false;
                             //回连成功，停止
                             this->stopLoading();
                             is_stop_check_net_state = 0;
@@ -3785,7 +3790,9 @@ void MainWindow::onExternalWifiChange()
 //        //QString txt(tr("WiFi already connected external"));
 //        //objKyDBus->showDesktopNotify(txt);
 //    }
+    qDebug() << "1111111111111111111111111111115";
     if (m_connected_by_self) {
+        qDebug() << "1111111111111111111111111111116";
         m_connected_by_self = false;
         return;
     }