Fix dms init failed start ce scan problem.

This commit is contained in:
sunwen
2023-12-11 10:54:43 +08:00
parent 9059f9e76b
commit fc98971904
2 changed files with 32 additions and 11 deletions

View File

@@ -181,7 +181,9 @@ void DeviceManager::initDevice()
mCheckInitStatusTimer = startTimer(500); mCheckInitStatusTimer = startTimer(500);
} }
void DeviceManager::initGUI() void DeviceManager::initGUI(bool aIsInitSucceed)
{
if(aIsInitSucceed)
{ {
if(getDeviceStatus() != DeviceStatus::Rready) if(getDeviceStatus() != DeviceStatus::Rready)
{ {
@@ -201,6 +203,16 @@ void DeviceManager::initGUI()
emit initializeProgress("100"); emit initializeProgress("100");
emit initializeFinished(); emit initializeFinished();
} }
}
else
{
emit initializeProgress("33");
QThread::msleep(500);
emit initializeProgress("66");
QThread::msleep(500);
emit initializeProgress("100");
emit initializeFinished();
}
startTransfer(); startTransfer();
initEmptyScanMeasurementID(); initEmptyScanMeasurementID();
@@ -496,7 +508,7 @@ void DeviceManager::checkInitStatus()
} }
QString msg = tr("Initialize Failed."); QString msg = tr("Initialize Failed.");
THROW_ERROR(msg); THROW_ERROR(msg);
initGUI(); initGUI(false);
return; return;
} }
@@ -508,7 +520,16 @@ void DeviceManager::checkInitStatus()
killTimer(mCheckInitStatusTimer); killTimer(mCheckInitStatusTimer);
mCheckInitStatusTimer = -1; mCheckInitStatusTimer = -1;
} }
initGUI(); initGUI(true);
}
else if(jsonObj["code"].toInt() == 2)
{
if(mCheckInitStatusTimer != -1)
{
killTimer(mCheckInitStatusTimer);
mCheckInitStatusTimer = -1;
}
initGUI(false);
} }
} }

View File

@@ -107,7 +107,7 @@ private:
void initEmptyScanMeasurementID(); void initEmptyScanMeasurementID();
void controlDrainage(const QString& aCode); void controlDrainage(const QString& aCode);
void checkInitStatus(); void checkInitStatus();
void initGUI(); void initGUI(bool aIsInitSucceed);
void processScanProgress(const QString& aProgress); void processScanProgress(const QString& aProgress);
void processInitializeProgress(const QString& aProgress); void processInitializeProgress(const QString& aProgress);