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

fix: Error code when dms init failed.

Browse Source
This commit is contained in:
sunwen
2025-06-27 10:36:06 +08:00
parent 00d4852c81
commit 5559515c3d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/device/DeviceManager.cpp
View File

@@ -238,7 +238,7 @@ void DeviceManager::initDevice()
mCheckInitStatusTimer = startTimer(500);
}
void DeviceManager::initGUI(bool aIsInitSucceed, int aCode)
void DeviceManager::initGUI(bool aIsInitSucceed, const QString& aInfo)
{
if(!AppGlobalValues::DBconnected().toBool())
{
@@ -275,7 +275,7 @@ void DeviceManager::initGUI(bool aIsInitSucceed, int aCode)
else
{
UsctStateManager::getInstance()->setState(DmsState, false);
QString msg = tr("Initialize Failed.") + tr("\nError: ") + QString::number(aCode);
QString msg = tr("Initialize Failed.") + tr("\nError: ") + aInfo;
THROW_ERROR(msg);
emit initializeProgress("33");
QThread::msleep(500);
@@ -605,7 +605,7 @@ void DeviceManager::checkInitStatus()
killTimer(mCheckInitStatusTimer);
mCheckInitStatusTimer = -1;
}
initGUI(false, 454);
initGUI(false, "454");
return;
}
@@ -617,7 +617,7 @@ void DeviceManager::checkInitStatus()
killTimer(mCheckInitStatusTimer);
mCheckInitStatusTimer = -1;
}
initGUI(true, 0);
initGUI(true);
}
else if(jsonObj["code"].toInt() == 2)
{
@@ -626,7 +626,7 @@ void DeviceManager::checkInitStatus()
killTimer(mCheckInitStatusTimer);
mCheckInitStatusTimer = -1;
}
initGUI(false, jsonObj["info"].toInt());
initGUI(false, jsonObj["info"].toString());
}
}

2
src/device/DeviceManager.h
View File

@@ -112,7 +112,7 @@ private:
void checkInitStatus();
bool startAutoLocate();
void stopAutoLocate();
void initGUI(bool aIsInitSucceed, int aCode);
void initGUI(bool aIsInitSucceed, const QString& aInfo = "");
void checkDataQuality();
void processScanProgress(const QString& aProgress);