sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add show initialize failed message in initialize progress.

Browse Source
This commit is contained in:
sunwen
2024-06-13 15:38:44 +08:00
parent 404ed6234b
commit e8c5031d93
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/device/DeviceManager.cpp
View File

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