diff --git a/nmqrc.qrc b/nmqrc.qrc index 8612698c..aff44923 100644 --- a/nmqrc.qrc +++ b/nmqrc.qrc @@ -1,17 +1,5 @@ - res/s/conning-b/1.png - res/s/conning-b/2.png - res/s/conning-b/3.png - res/s/conning-b/4.png - res/s/conning-b/5.png - res/s/conning-b/6.png - res/s/conning-b/7.png - res/s/conning-b/8.png - res/s/conning-b/9.png - res/s/conning-b/10.png - res/s/conning-b/11.png - res/s/conning-b/12.png res/g/down_arrow.png res/s/rescan/1.png res/s/rescan/2.png @@ -129,5 +117,17 @@ res/hw/wifi6+-medium.png res/hw/wifi6+-none-pwd.png res/hw/wifi6+-none.png + res/s/conning-b/1.png + res/s/conning-b/2.png + res/s/conning-b/3.png + res/s/conning-b/4.png + res/s/conning-b/5.png + res/s/conning-b/6.png + res/s/conning-b/7.png + res/s/conning-b/8.png + res/s/conning-b/9.png + res/s/conning-b/10.png + res/s/conning-b/11.png + res/s/conning-b/12.png diff --git a/res/s/conning-b/1.png b/res/s/conning-b/1.png index 6255abf9..31773e94 100644 Binary files a/res/s/conning-b/1.png and b/res/s/conning-b/1.png differ diff --git a/res/s/conning-b/10.png b/res/s/conning-b/10.png index 37e465bd..41e3c140 100644 Binary files a/res/s/conning-b/10.png and b/res/s/conning-b/10.png differ diff --git a/res/s/conning-b/11.png b/res/s/conning-b/11.png index d4f8d0e9..18920478 100644 Binary files a/res/s/conning-b/11.png and b/res/s/conning-b/11.png differ diff --git a/res/s/conning-b/12.png b/res/s/conning-b/12.png index 1fa952b6..f5515e95 100644 Binary files a/res/s/conning-b/12.png and b/res/s/conning-b/12.png differ diff --git a/res/s/conning-b/2.png b/res/s/conning-b/2.png index a226b696..e227bb8c 100644 Binary files a/res/s/conning-b/2.png and b/res/s/conning-b/2.png differ diff --git a/res/s/conning-b/3.png b/res/s/conning-b/3.png index 31b1b89c..a1ad1bb1 100644 Binary files a/res/s/conning-b/3.png and b/res/s/conning-b/3.png differ diff --git a/res/s/conning-b/4.png b/res/s/conning-b/4.png index eddd9a82..db16b0d2 100644 Binary files a/res/s/conning-b/4.png and b/res/s/conning-b/4.png differ diff --git a/res/s/conning-b/5.png b/res/s/conning-b/5.png index b0a7062c..02dceb2e 100644 Binary files a/res/s/conning-b/5.png and b/res/s/conning-b/5.png differ diff --git a/res/s/conning-b/6.png b/res/s/conning-b/6.png index a9704900..05de12c3 100644 Binary files a/res/s/conning-b/6.png and b/res/s/conning-b/6.png differ diff --git a/res/s/conning-b/7.png b/res/s/conning-b/7.png index c58bde11..9f5e23fe 100644 Binary files a/res/s/conning-b/7.png and b/res/s/conning-b/7.png differ diff --git a/res/s/conning-b/8.png b/res/s/conning-b/8.png index f3980b37..429fa4a5 100644 Binary files a/res/s/conning-b/8.png and b/res/s/conning-b/8.png differ diff --git a/res/s/conning-b/9.png b/res/s/conning-b/9.png index 80a8f7ec..95bf53e8 100644 Binary files a/res/s/conning-b/9.png and b/res/s/conning-b/9.png differ diff --git a/src/loadingdiv.cpp b/src/loadingdiv.cpp index fe339ad9..ddaeef31 100644 --- a/src/loadingdiv.cpp +++ b/src/loadingdiv.cpp @@ -50,10 +50,10 @@ void LoadingDiv::switchAnimStep() loadingGif->setProperty("useIconHighlightEffect", true); loadingGif->setProperty("iconHighlightEffectMode", true); - this->currentPage ++; + this->currentPage --; - if (this->currentPage > 12) { - this->currentPage = 1; //循环播放 + if (this->currentPage < 1) { + this->currentPage = 12; //循环播放 } this->countCurrentTime += FRAMESPEED; if (this->countCurrentTime >= ALLTIME) { @@ -64,7 +64,7 @@ void LoadingDiv::switchAnimStep() //开始播放动画 void LoadingDiv::startLoading() { - this->currentPage = 1; + this->currentPage = 12; this->countCurrentTime = 0; this->switchTimer->start(FRAMESPEED); this->show(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c87e8eae..89e9252a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1278,7 +1278,6 @@ void MainWindow::onBtnWifiClicked(int flag) void MainWindow::onBtnNetListClicked(int flag) { - qDebug() << Q_FUNC_INFO <<" --------------> 0000004"; this->is_btnLanList_clicked = 1; this->is_btnWifiList_clicked = 0; end_rcv_rates = 0; @@ -3496,7 +3495,6 @@ void MainWindow::timeIntervalToConnectWifi() //处理外界对网络的连接与断开 void MainWindow::onExternalConnectionChange(QString type, bool isConnUp) { - qDebug() << Q_FUNC_INFO <<" --------------> 0000000-0"; isReconnectingWifi = false; if ( (type == "802-11-wireless" || type == "wifi") && !isConnUp ){ @@ -3506,7 +3504,6 @@ void MainWindow::onExternalConnectionChange(QString type, bool isConnUp) addNumberForWifi += 1; } - qDebug() << Q_FUNC_INFO <<" --------------> 0000000-1"; if (addNumberForWifi == 2) { //断开一个wifi的时候,如果存在回连,可能接连发出两个信号 //当连续发出wifi断开与连接的信号时,短时间内addNumberForWifi值为2 @@ -3526,7 +3523,6 @@ void MainWindow::onExternalConnectionChange(QString type, bool isConnUp) return; } - qDebug() << Q_FUNC_INFO <<" --------------> 0000000-2 type = " << type; if ( (type == "802-11-wireless" || type == "wifi") && isConnUp ){ addNumberForWifi = 0; } @@ -3538,8 +3534,6 @@ void MainWindow::onExternalConnectionChange(QString type, bool isConnUp) return; } - - qDebug() << Q_FUNC_INFO <<" --------------> 0000000-3"; if (isToSetLanValue) { if (type == "802-3-ethernet" || type == "ethernet") { isLanBeConnUp = true; @@ -3554,20 +3548,16 @@ void MainWindow::onExternalConnectionChange(QString type, bool isConnUp) } } - qDebug() << Q_FUNC_INFO <<" --------------> 0000000"; if (!is_connect_hide_wifi && !is_stop_check_net_state) { - qDebug() << Q_FUNC_INFO <<" --------------> 0000001"; is_stop_check_net_state = 1; if (type == "802-3-ethernet" || type == "ethernet") { - qDebug() << Q_FUNC_INFO <<" --------------> 0000002"; if (is_connect_net_failed) { qDebug()<<"debug: connect wired network failed, no need to refresh wired interface"; is_connect_net_failed = 0; is_stop_check_net_state = 0; } else { isToSetLanValue = false; - qDebug() << Q_FUNC_INFO <<" --------------> 0000003"; QTimer::singleShot(2*1000, this, SLOT(onExternalLanChange() )); } }