fix: Make check recon connection after login.
This commit is contained in:
@@ -182,10 +182,16 @@ void DeviceManager::initDevice()
|
|||||||
//reconHttpThread
|
//reconHttpThread
|
||||||
mReconHttpThread = new QThread(this);
|
mReconHttpThread = new QThread(this);
|
||||||
QTimer* reconConnectionTimer = new QTimer(this);
|
QTimer* reconConnectionTimer = new QTimer(this);
|
||||||
reconConnectionTimer->start(CHECK_RECON_CONNECTION_TIME);
|
|
||||||
ReconManager::getInstance()->moveToThread(mReconHttpThread);
|
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(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(this, &DeviceManager::checkReconConnection, ReconManager::getInstance(), &ReconManager::checkReconConnection);
|
||||||
connect(reconConnectionTimer, &QTimer::timeout, this, &DeviceManager::prepareCheckReconConnection);
|
connect(reconConnectionTimer, &QTimer::timeout, this, &DeviceManager::prepareCheckReconConnection);
|
||||||
connect(this, &DeviceManager::createEmptyScanToRecon, ReconManager::getInstance(), &ReconManager::createEmptyScan);
|
connect(this, &DeviceManager::createEmptyScanToRecon, ReconManager::getInstance(), &ReconManager::createEmptyScan);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#include "event/EventCenter.h"
|
#include "event/EventCenter.h"
|
||||||
#include "log/SystemOperationLog.h"
|
#include "log/SystemOperationLog.h"
|
||||||
|
#include "appvals/AppGlobalValues.h"
|
||||||
|
|
||||||
UsctStateManager* UsctStateManager::getInstance()
|
UsctStateManager* UsctStateManager::getInstance()
|
||||||
{
|
{
|
||||||
@@ -76,6 +77,10 @@ QString UsctStateManager::getStateErrorMessage(int aStateCode)
|
|||||||
|
|
||||||
void UsctStateManager::updateReconState(bool aIsConnected,int aState)
|
void UsctStateManager::updateReconState(bool aIsConnected,int aState)
|
||||||
{
|
{
|
||||||
|
if(AppGlobalValues::InProcessing().toBool())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
setState(ReconConnectionState, aIsConnected);
|
setState(ReconConnectionState, aIsConnected);
|
||||||
for (int i = 0; i < 5; ++i)
|
for (int i = 0; i < 5; ++i)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user