New timer for device information query in DeviceManager

src/device/DeviceManager.cpp

@@ -5,6 +5,7 @@
 #include "DeviceManager.h"
 #include "../event/EventCenter.h"
 #include <QVariant>
+#include <QTimerEvent>
 
 #define TRIGGER_EVENT EventCenter::Default()->triggerEvent
 
@@ -17,6 +18,7 @@ std::string getJsonFromPatInf(QObject* obj)
 }
 
 void DeviceManager::initDevice() {
+    deviceInfTimerID = startTimer(1000);
     // empty scan
     connect(EventCenter::Default(),&EventCenter::RequestEmptyScan,[=](QObject* sender, QObject* detail){
         std::string json= getJsonFromPatInf(detail);
@@ -74,40 +76,46 @@ void DeviceManager::initDevice() {
 }
 
 void DeviceManager::timerEvent(QTimerEvent *event) {
-    StatusInfo inf = GetStatus();
+    if (event->timerId() !=deviceInfTimerID)
-    if (inf.status==SCANING)
     {
-        lastStatus = SCANING;
+        StatusInfo inf = GetStatus();
-        //normal scan
+        if (inf.status==SCANING)
-        if(!previewing)
         {
-            QVariant var(inf.progress);
+            lastStatus = SCANING;
-            TRIGGER_EVENT(GUIEvents::InvokeOperationProgress, nullptr, (QObject*)&var);
+            //normal scan
-        }
+            if(!previewing)
-        //preview scan
+            {
-        else{
+                QVariant var(inf.progress);
-            const char * data = GetPreviewData();
+                TRIGGER_EVENT(GUIEvents::InvokeOperationProgress, nullptr, (QObject*)&var);
-            QByteArray bytes =QByteArray::fromRawData(data,40000);
+            }
-            TRIGGER_EVENT(GUIEvents::ResponsePreviewData, nullptr, (QObject*)(&bytes));
+                //preview scan
-            delete [] data;
+            else{
-        }
+                const char * data = GetPreviewData();
+                QByteArray bytes =QByteArray::fromRawData(data,40000);
+                TRIGGER_EVENT(GUIEvents::ResponsePreviewData, nullptr, (QObject*)(&bytes));
+                delete [] data;
+            }
 
+        } else{
+            if (lastStatus == SCANING && !errorOccured)
+            {
+                QVariant var(true);
+                TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, (QObject*)&var);
+                lastStatus = -1;
+                previewing = false;
+            }
+                //内部错误，导致Scan停止
+            else if (lastStatus == SCANING && errorOccured)
+            {
+                //正常情况下，设备应该已经调用的错误callback，然后会回归Ready状态，清理lastStatus即可
+                lastStatus = -1;
+                previewing = false;
+            }
+            killTimer(timerID);
+        }
     } else{
-        if (lastStatus == SCANING && !errorOccured)
+        QString temp = QString(GetDeviceInf(MEAN_TEMPERATURE));
-        {
+        TRIGGER_EVENT(GUIEvents::ResponseDeviceTemperature, nullptr, (QObject*)&temp);
-            QVariant var(true);
-            TRIGGER_EVENT(GUIEvents::InvokeOperationEnd, nullptr, (QObject*)&var);
-            lastStatus = -1;
-            previewing = false;
-        }
-        //内部错误，导致Scan停止
-        else if (lastStatus == SCANING && errorOccured)
-        {
-            //正常情况下，设备应该已经调用的错误callback，然后会回归Ready状态，清理lastStatus即可
-            lastStatus = -1;
-            previewing = false;
-        }
-        killTimer(timerID);
     }
 }
 

src/device/DeviceManager.h

@@ -23,6 +23,7 @@ protected:
 private:
     void processScan(const char * json);
     int timerID = -1;
+    int deviceInfTimerID = -1;
     int lastStatus=-1;
     bool previewing = false;
     bool errorOccured = false;