feat: Add show initialize failed message in initialize progress.
This commit is contained in:
@@ -239,6 +239,8 @@ void DeviceManager::initGUI(bool aIsInitSucceed)
|
||||
else
|
||||
{
|
||||
UsctStateManager::getInstance()->setState(DmsState, false);
|
||||
QString msg = tr("Initialize Failed.");
|
||||
THROW_ERROR(msg);
|
||||
emit initializeProgress("33");
|
||||
QThread::msleep(500);
|
||||
emit initializeProgress("66");
|
||||
@@ -254,7 +256,7 @@ void DeviceManager::initGUI(bool aIsInitSucceed)
|
||||
QDate date = QDate::currentDate().addDays(-JsonObject::Instance()->getPatientListExpireDays());
|
||||
SQLHelper::exec(QString("DELETE FROM Patient WHERE AddDate <= %1").arg(date.toString("yyyy-MM-dd")));
|
||||
|
||||
//mGetSoftwareVersionAction->execute();
|
||||
mGetSoftwareVersionAction->execute();
|
||||
}
|
||||
|
||||
void DeviceManager::processInitializeProgress(const QString& aProgress)
|
||||
@@ -554,8 +556,6 @@ void DeviceManager::checkInitStatus()
|
||||
killTimer(mCheckInitStatusTimer);
|
||||
mCheckInitStatusTimer = -1;
|
||||
}
|
||||
QString msg = tr("Initialize Failed.");
|
||||
THROW_ERROR(msg);
|
||||
initGUI(false);
|
||||
return;
|
||||
}
|
||||
@@ -858,8 +858,10 @@ bool DeviceManager::startCEScan()
|
||||
QJsonObject jsonObj = toJsonObject(result.mData);
|
||||
if(jsonObj.contains("code") && jsonObj["code"].toInt() != 0)
|
||||
{
|
||||
QString msg = jsonObj["info"].toString();
|
||||
QString msg = tr("Initialize Failed.");
|
||||
THROW_ERROR(msg);
|
||||
msg = tr("Start CE Scan Failed.");
|
||||
EventCenter::Default()->triggerEvent(WarningMessageRaise, nullptr, (QObject*)&msg);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user