feat: merge the UserOperationLog and SystemOperationLog in LogManager.

src/device/DeviceManager.cpp

@@ -24,7 +24,7 @@
 #include "dialogs/MultyMessageDialog.h"
 #include "UsctStateManager.h"
 #include "utilities/ScanProcessSequence.h"
-#include "log/SystemOperationLog.h"
+#include "log/LogManager.h"
 
 #define TRIGGER_EVENT EventCenter::Default()->triggerEvent
 
@@ -468,6 +468,7 @@ void DeviceManager::stopFullScan()
     if(!result.mIsSucessful)
     {
         THROW_ERROR(result.mData);
+        prepareFinishScan(false, "");
         return;
     }
 
@@ -646,6 +647,7 @@ QString DeviceManager::getSoftwareVersion()
 void DeviceManager::processReceiveDMSInfoResult(int aServerID, int aActionID, const QString& aContents)
 {
     qDebug()<<"processReceiveDMSInfoResult " <<aServerID << aActionID << aContents;
+    LOG_SYS_OPERATION(QString("DMS -> GUI : %1-%2, Message:%3").arg(aServerID).arg(aActionID).arg(aContents));
     switch(aServerID)
     {
     case USRV_SCAN :
@@ -772,7 +774,6 @@ void DeviceManager::processAlarm(const QString& aAlarm)
     int alarmCode = jsonObj["code"].toInt();
     QString alarm = tr("Error: ") + QString::number(alarmCode);
     qDebug()<<"processAlarm : "<<alarmCode;
-    LOG_SYS_OPERATION("Dms alarm reported. code: " + alarm)
     if(alarmCode >= 400 && alarmCode < 500)
     {
         if(mIsScanning)
@@ -807,7 +808,7 @@ void DeviceManager::processGetSoftwareVersion(const QString& aSoftwareVersion)
 
 void DeviceManager::scanTimeout()
 {
-    prepareFinishScan(false, "Dms connection timeout!");
+    prepareFinishScan(false, tr("DMS connection error"));
 }
 
 DeviceStatus DeviceManager::getDeviceStatus()
@@ -860,7 +861,6 @@ bool DeviceManager::startFullScan(const QString& aPatientInfo)
         return false;
     }
     mCurrentScanMeasurementID = jsonObj["measurement id"].toString();
-    //LOG_SYS_OPERATION("Start full scan succeed.")
     return true;
 }
 
@@ -1341,7 +1341,6 @@ bool DeviceManager::startAutoLocate()
             emit startAutoLocateResult(true);
             mEffectivePositionCount = 0;
             mGetAutoLocatePositionTimer = startTimer(1000);
-            //LOG_SYS_OPERATION("Start auto locate succeed.")
             return true;
         }
     }

src/device/DmsSyncAction.cpp

@@ -1,5 +1,6 @@
 #include "DmsSyncAction.h"
 #include "dms_mq.h"
+#include "log/LogManager.h"
 
 #include <QEventLoop>
 #include <QTimer>
@@ -45,6 +46,7 @@ DmsSyncActionResult DmsSyncAction::execute()
         DmsSyncActionResult result(false, "mq error");
         return result;
     }
+    LOG_SYS_OPERATION(QString("GUI -> DMS : %1-%2, Message:%3").arg(mServerId).arg(mActionId).arg(mSendData));
     if(!waitUntilSignalReceived())
     {
         DmsSyncActionResult result(false, "time out");

src/device/UsctStateManager.cpp

@@ -1,7 +1,7 @@
 #include "UsctStateManager.h"
 
 #include "event/EventCenter.h"
-#include "log/SystemOperationLog.h"
+#include "log/LogManager.h"
 #include "appvals/AppGlobalValues.h"
 
 UsctStateManager* UsctStateManager::getInstance()