diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index 376d5a4..3a464a1 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -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()); } } diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h index eae7d10..1b1ed61 100644 --- a/src/device/DeviceManager.h +++ b/src/device/DeviceManager.h @@ -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);