解决报错时没有继续扫描弹窗的问题，扫描结束由回调改为通过startscan返回值判断

app/scanner2/mainwindow.cpp

@@ -1,4 +1,4 @@
-#include "mainwindow.h"
+#include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include <QDockWidget>
 #include <QFileDialog>
@@ -677,6 +677,10 @@ void MainWindow::on_AcquireInto2()
     if (nullptr != m_devUser)
     {
         ret = m_devUser->StartScan();
+        if (HGBASE_ERR_OK != ret)
+        {
+            on_scanFinishEvent();
+        }
     }
 }
 
@@ -1376,10 +1380,17 @@ void MainWindow::on_scanFinishEvent()
     {
         if (m_devUser != nullptr)
         {
+            HGResult ret = HGBASE_ERR_FAIL;
             if (ScanType_SingleScanToCache == m_scanType)
-                m_devUser->StartSingleScan();
+                ret = m_devUser->StartSingleScan();
             else
-                m_devUser->StartScan();
+            {
+                ret = m_devUser->StartScan();
+                if (HGBASE_ERR_OK != ret)
+                {
+                    on_scanFinishEvent();
+                }
+            }  
         }
     }
     else
@@ -3372,6 +3383,10 @@ void MainWindow::on_act_acquire_triggered()
     if (nullptr != m_devUser)
     {
         ret = m_devUser->StartScan();
+        if (HGBASE_ERR_OK != ret)
+        {
+            on_scanFinishEvent();
+        }
     }
 }
 
@@ -3456,6 +3471,10 @@ void MainWindow::on_act_acquireInto_triggered()
         if (nullptr != m_devUser)
         {
             ret = m_devUser->StartScan();
+            if (HGBASE_ERR_OK != ret)
+            {
+                on_scanFinishEvent();
+            }
         }
     }
 }
@@ -3521,6 +3540,10 @@ void MainWindow::on_act_insertFromScanner_triggered()
         if (nullptr != m_devUser)
         {
             ret = m_devUser->StartScan();
+            if (HGBASE_ERR_OK != ret)
+            {
+                on_scanFinishEvent();
+            }
         }
     }
 }