From 424238085b03f9dc99579b89a1dcd6f3240ed5e7 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 30 Dec 2022 10:43:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGProductionTool/form_maininterface.cpp |  8 ++++++-
 app/HGProductionTool/hgscanner.cpp          | 25 ++++++++++++---------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index dab538f..d28e969 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -12,6 +12,7 @@
 #include "hgscanner.h"
 #include "mainwindow.h"
 #include "dialog_excepdesc.h"
+#include "huagao/hgscanner_error.h"
 
 typedef struct
 {
@@ -507,11 +508,16 @@ void Form_mainInterface::on_pbtn_start_clicked()
     QString title = item->text();
     QString name = m_map_title_name.value(title).name;
     int ret = func_test_go(name.toStdWString().c_str(), L"null", m_hg);
-    if (ret == 0)
+    if (SCANNER_ERR_OK == ret)
     {
         updateUiEnabled(false);
         m_isTesting = true;
     }
+    else
+    {
+        updateUiEnabled(true);
+        m_isTesting = false;
+    }
 }
 
 void Form_mainInterface::on_pbtn_showImg_clicked()
diff --git a/app/HGProductionTool/hgscanner.cpp b/app/HGProductionTool/hgscanner.cpp
index 8d330e0..f9da967 100644
--- a/app/HGProductionTool/hgscanner.cpp
+++ b/app/HGProductionTool/hgscanner.cpp
@@ -43,10 +43,12 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
     }
     else if (ev == TEST_EVENT_IO_FAIL)
     {
-        QString info = QString::fromStdWString((const wchar_t*)data);
-        info = QObject::tr("failed: ") + info;
-
-        emit m_interface->testResult(info);
+        if (data != nullptr)
+        {
+            QString info = QString::fromStdWString((const wchar_t*)data);
+            info = QObject::tr("failed: ") + info;
+            emit m_interface->testResult(info);
+        }
         emit m_interface->testFinish();
     }
     else if (ev == TEST_EVENT_MANUAL_CONFIRMATION)
@@ -57,13 +59,16 @@ void hgscanner::test_callback(const wchar_t* name, test_event ev, void* data, si
     }
     else if (ev == TEST_EVENT_RESULT)
     {
-        QString info = QString::fromStdWString((const wchar_t*)data);
-        if (flag)
-            info = QObject::tr("success: ") + info;
-        else
-            info = QObject::tr("failed: ") + info;
+        if (data != nullptr)
+        {
+            QString info = QString::fromStdWString((const wchar_t*)data);
+            if (flag)
+                info = QObject::tr("success: ") + info;
+            else
+                info = QObject::tr("failed: ") + info;
 
-        emit m_interface->testResult(info);
+            emit m_interface->testResult(info);
+        }
         emit m_interface->testFinish();
     }
     else if (ev == TEST_EVENT_DISTORTION)