Preview error handle.5

src/device/DeviceManager.cpp

@@ -53,7 +53,7 @@ void DeviceManager::emitErrorCallback(const char *msg) {
 void DeviceManager::initDevice() {
 	InitLib(ErrorCallback);
 
-	deviceInfTimerID = startTimer(1000);
+	deviceInfTimerID = startTimer(10000);
 
 	// empty scan
 	connect(EventCenter::Default(), &EventCenter::RequestEmptyScan, [=](QObject* sender, QObject* detail) {
@@ -207,6 +207,7 @@ void DeviceManager::timerEvent(QTimerEvent* event) {
     //scanning progress timer
     //error exit,  callback error
     if (errorOccurred) {
+        timerID = event->timerId();
         exitScanTimer();
         return;
     }
@@ -225,14 +226,14 @@ void DeviceManager::timerEvent(QTimerEvent* event) {
             return;
         } else {
             //未发生错误并且，之前状态是扫描，代表正常扫描完成
-            if (lastStatus == SCANNING) {
+            if (lastStatus == SCANNING ) {
                 prepareFinishScan();
             }
             //一般不会出现其他情况
-            else {
-                QString msg("Unknown error in scanning progress timer");
-                THROW_ERROR(msg);
-            }
+//            else {
+//                QString msg("Unknown error in scanning progress timer");
+//                THROW_ERROR(msg);
+//            }
         }
     }
     exitScanTimer();
@@ -280,7 +281,7 @@ void DeviceManager::scanProcess(int sProgress) {
 
 void DeviceManager::exitScanTimer() {
     qDebug() << "Scanning progress Timer exit";
-    killTimer(timerID);
+    if (timerID>0)killTimer(timerID);
     timerID = -1;
     lastStatus = -1;
     previewing = false;
@@ -358,7 +359,7 @@ void DeviceManager::postScanCommand() {
         previewing = false;
         scanPhase = 1;
         qDebug() << "Start progress timer";
-        timerID = startTimer(500);
+        timerID = startTimer(2500);
         return;
     }
     //ScanControl fail