diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index 0447ef0..5954455 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -182,10 +182,16 @@ void DeviceManager::initDevice() //reconHttpThread mReconHttpThread = new QThread(this); QTimer* reconConnectionTimer = new QTimer(this); - reconConnectionTimer->start(CHECK_RECON_CONNECTION_TIME); ReconManager::getInstance()->moveToThread(mReconHttpThread); + connect(EventCenter::Default(), &EventCenter::LoginSuccess, [reconConnectionTimer, this]() + { + emit checkReconConnection(); + if(!reconConnectionTimer->isActive()) + { + reconConnectionTimer->start(CHECK_RECON_CONNECTION_TIME); + } + }); connect(ReconManager::getInstance(), &ReconManager::reconStateResponsed, UsctStateManager::getInstance(), &UsctStateManager::updateReconState); - connect(EventCenter::Default(), &EventCenter::LoginSuccess, ReconManager::getInstance(), &ReconManager::checkReconConnection); connect(this, &DeviceManager::checkReconConnection, ReconManager::getInstance(), &ReconManager::checkReconConnection); connect(reconConnectionTimer, &QTimer::timeout, this, &DeviceManager::prepareCheckReconConnection); connect(this, &DeviceManager::createEmptyScanToRecon, ReconManager::getInstance(), &ReconManager::createEmptyScan); diff --git a/src/device/UsctStateManager.cpp b/src/device/UsctStateManager.cpp index 771e098..a7a8ebe 100644 --- a/src/device/UsctStateManager.cpp +++ b/src/device/UsctStateManager.cpp @@ -2,6 +2,7 @@ #include "event/EventCenter.h" #include "log/SystemOperationLog.h" +#include "appvals/AppGlobalValues.h" UsctStateManager* UsctStateManager::getInstance() { @@ -76,6 +77,10 @@ QString UsctStateManager::getStateErrorMessage(int aStateCode) void UsctStateManager::updateReconState(bool aIsConnected,int aState) { + if(AppGlobalValues::InProcessing().toBool()) + { + return; + } setState(ReconConnectionState, aIsConnected); for (int i = 0; i < 5; ++i) {