Fix bug the icon rotates in the opposite direction

This commit is contained in:
chenlelin 2021-05-15 16:23:35 +08:00
parent cfa57c141a
commit bcd2eb5432
15 changed files with 16 additions and 26 deletions

View File

@ -1,17 +1,5 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>res/s/conning-b/1.png</file>
<file>res/s/conning-b/2.png</file>
<file>res/s/conning-b/3.png</file>
<file>res/s/conning-b/4.png</file>
<file>res/s/conning-b/5.png</file>
<file>res/s/conning-b/6.png</file>
<file>res/s/conning-b/7.png</file>
<file>res/s/conning-b/8.png</file>
<file>res/s/conning-b/9.png</file>
<file>res/s/conning-b/10.png</file>
<file>res/s/conning-b/11.png</file>
<file>res/s/conning-b/12.png</file>
<file>res/g/down_arrow.png</file> <file>res/g/down_arrow.png</file>
<file>res/s/rescan/1.png</file> <file>res/s/rescan/1.png</file>
<file>res/s/rescan/2.png</file> <file>res/s/rescan/2.png</file>
@ -129,5 +117,17 @@
<file>res/hw/wifi6+-medium.png</file> <file>res/hw/wifi6+-medium.png</file>
<file>res/hw/wifi6+-none-pwd.png</file> <file>res/hw/wifi6+-none-pwd.png</file>
<file>res/hw/wifi6+-none.png</file> <file>res/hw/wifi6+-none.png</file>
<file>res/s/conning-b/1.png</file>
<file>res/s/conning-b/2.png</file>
<file>res/s/conning-b/3.png</file>
<file>res/s/conning-b/4.png</file>
<file>res/s/conning-b/5.png</file>
<file>res/s/conning-b/6.png</file>
<file>res/s/conning-b/7.png</file>
<file>res/s/conning-b/8.png</file>
<file>res/s/conning-b/9.png</file>
<file>res/s/conning-b/10.png</file>
<file>res/s/conning-b/11.png</file>
<file>res/s/conning-b/12.png</file>
</qresource> </qresource>
</RCC> </RCC>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

View File

@ -50,10 +50,10 @@ void LoadingDiv::switchAnimStep()
loadingGif->setProperty("useIconHighlightEffect", true); loadingGif->setProperty("useIconHighlightEffect", true);
loadingGif->setProperty("iconHighlightEffectMode", true); loadingGif->setProperty("iconHighlightEffectMode", true);
this->currentPage ++; this->currentPage --;
if (this->currentPage > 12) { if (this->currentPage < 1) {
this->currentPage = 1; //循环播放 this->currentPage = 12; //循环播放
} }
this->countCurrentTime += FRAMESPEED; this->countCurrentTime += FRAMESPEED;
if (this->countCurrentTime >= ALLTIME) { if (this->countCurrentTime >= ALLTIME) {
@ -64,7 +64,7 @@ void LoadingDiv::switchAnimStep()
//开始播放动画 //开始播放动画
void LoadingDiv::startLoading() void LoadingDiv::startLoading()
{ {
this->currentPage = 1; this->currentPage = 12;
this->countCurrentTime = 0; this->countCurrentTime = 0;
this->switchTimer->start(FRAMESPEED); this->switchTimer->start(FRAMESPEED);
this->show(); this->show();

View File

@ -1278,7 +1278,6 @@ void MainWindow::onBtnWifiClicked(int flag)
void MainWindow::onBtnNetListClicked(int flag) void MainWindow::onBtnNetListClicked(int flag)
{ {
qDebug() << Q_FUNC_INFO <<" --------------> 0000004";
this->is_btnLanList_clicked = 1; this->is_btnLanList_clicked = 1;
this->is_btnWifiList_clicked = 0; this->is_btnWifiList_clicked = 0;
end_rcv_rates = 0; end_rcv_rates = 0;
@ -3496,7 +3495,6 @@ void MainWindow::timeIntervalToConnectWifi()
//处理外界对网络的连接与断开 //处理外界对网络的连接与断开
void MainWindow::onExternalConnectionChange(QString type, bool isConnUp) void MainWindow::onExternalConnectionChange(QString type, bool isConnUp)
{ {
qDebug() << Q_FUNC_INFO <<" --------------> 0000000-0";
isReconnectingWifi = false; isReconnectingWifi = false;
if ( (type == "802-11-wireless" || type == "wifi") && !isConnUp ){ if ( (type == "802-11-wireless" || type == "wifi") && !isConnUp ){
@ -3506,7 +3504,6 @@ void MainWindow::onExternalConnectionChange(QString type, bool isConnUp)
addNumberForWifi += 1; addNumberForWifi += 1;
} }
qDebug() << Q_FUNC_INFO <<" --------------> 0000000-1";
if (addNumberForWifi == 2) { if (addNumberForWifi == 2) {
//断开一个wifi的时候如果存在回连可能接连发出两个信号 //断开一个wifi的时候如果存在回连可能接连发出两个信号
//当连续发出wifi断开与连接的信号时短时间内addNumberForWifi值为2 //当连续发出wifi断开与连接的信号时短时间内addNumberForWifi值为2
@ -3526,7 +3523,6 @@ void MainWindow::onExternalConnectionChange(QString type, bool isConnUp)
return; return;
} }
qDebug() << Q_FUNC_INFO <<" --------------> 0000000-2 type = " << type;
if ( (type == "802-11-wireless" || type == "wifi") && isConnUp ){ if ( (type == "802-11-wireless" || type == "wifi") && isConnUp ){
addNumberForWifi = 0; addNumberForWifi = 0;
} }
@ -3538,8 +3534,6 @@ void MainWindow::onExternalConnectionChange(QString type, bool isConnUp)
return; return;
} }
qDebug() << Q_FUNC_INFO <<" --------------> 0000000-3";
if (isToSetLanValue) { if (isToSetLanValue) {
if (type == "802-3-ethernet" || type == "ethernet") { if (type == "802-3-ethernet" || type == "ethernet") {
isLanBeConnUp = true; 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) { if (!is_connect_hide_wifi && !is_stop_check_net_state) {
qDebug() << Q_FUNC_INFO <<" --------------> 0000001";
is_stop_check_net_state = 1; is_stop_check_net_state = 1;
if (type == "802-3-ethernet" || type == "ethernet") { if (type == "802-3-ethernet" || type == "ethernet") {
qDebug() << Q_FUNC_INFO <<" --------------> 0000002";
if (is_connect_net_failed) { if (is_connect_net_failed) {
qDebug()<<"debug: connect wired network failed, no need to refresh wired interface"; qDebug()<<"debug: connect wired network failed, no need to refresh wired interface";
is_connect_net_failed = 0; is_connect_net_failed = 0;
is_stop_check_net_state = 0; is_stop_check_net_state = 0;
} else { } else {
isToSetLanValue = false; isToSetLanValue = false;
qDebug() << Q_FUNC_INFO <<" --------------> 0000003";
QTimer::singleShot(2*1000, this, SLOT(onExternalLanChange() )); QTimer::singleShot(2*1000, this, SLOT(onExternalLanChange() ));
} }
} }