From 7f1899e74146f7e9f6cf03f2ac1a2f140c58eed5 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Tue, 8 Aug 2023 18:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=EF=BC=8C?=
 =?UTF-8?q?=E5=86=8D=E6=A0=B9=E6=8D=AEjson=E8=AE=BE=E7=BD=AE=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E4=BC=91=E7=9C=A0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dialog_inputserialnum.cpp                 | 83 ++++++++++---------
 app/HGProductionTool/dialog_inputserialnum.h  |  2 +-
 code/base/test_base.cpp                       |  2 +-
 3 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/app/HGProductionTool/dialog_inputserialnum.cpp b/app/HGProductionTool/dialog_inputserialnum.cpp
index d9b5437..0389b5d 100644
--- a/app/HGProductionTool/dialog_inputserialnum.cpp
+++ b/app/HGProductionTool/dialog_inputserialnum.cpp
@@ -76,56 +76,63 @@ void Dialog_InputSerialNum::Invalid(const QString &devName)
     }
 }
 
-void Dialog_InputSerialNum::setSpeedAndSleep()
+void Dialog_InputSerialNum::setSpeedAndSleep(bool updateSleep)
 {
-    if (m_hg != nullptr)
+    if (m_hg == nullptr)
     {
-        HGChar cfgPath[512] = {0};
-        HGBase_GetConfigPath(cfgPath, 512);
-        HGBase_CreateDir(cfgPath);
-        strcat(cfgPath, m_devType.toStdString().c_str());
-        strcat(cfgPath, ".json");
+        return;
+    }
 
-        HGPdtToolDb_DownloadFile(m_pdtToolDbuserMgr, m_devType.toStdString().c_str(), cfgPath);
+    HGChar cfgPath[512] = {0};
+    HGBase_GetConfigPath(cfgPath, 512);
+    HGBase_CreateDir(cfgPath);
+    strcat(cfgPath, m_devType.toStdString().c_str());
+    strcat(cfgPath, ".json");
 
-        AnalysisJson analysisJson(QString::fromStdString(cfgPath));
-        AnalysisJson::json_global jsonGlobal = analysisJson.GetGlobal();
-        LPWRITECFG lp = new WRITECFG;
+    HGPdtToolDb_DownloadFile(m_pdtToolDbuserMgr, m_devType.toStdString().c_str(), cfgPath);
 
-        VIDPID vidpid;
-        vidpid.VID = jsonGlobal.vid_to;
-        vidpid.PID = jsonGlobal.pid_to;
-        int vidpidValue = vidpid.Value;
-        lp->cat = WRITE_CAT_VID_PID;
-        lp->val = (void*)&vidpidValue;
-        m_mainWnd->addTestingRef();
-        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
-
-
-        int speedMode = jsonGlobal.speed_mode ;
-        lp->cat = WRITE_CAT_SPEED;
-        lp->val = (void*)&speedMode;
-        m_mainWnd->addTestingRef();
-        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
+    AnalysisJson analysisJson(QString::fromStdString(cfgPath));
+    AnalysisJson::json_global jsonGlobal = analysisJson.GetGlobal();
+    LPWRITECFG lp = new WRITECFG;
 
+    if (updateSleep)
+    {
         int sleepTime = jsonGlobal.sleep_time;
         lp->cat = WRITE_CAT_SLEEP;
         lp->val = (void*)&sleepTime;
         m_mainWnd->addTestingRef();
         func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
 
-        QString device_model = jsonGlobal.device_model;
-        if (!device_model.isEmpty())
-        {
-            std::wstring devModel = device_model.toStdWString();
-            lp->cat = WRITE_CAT_DEVS_MODEL;
-            lp->val = (void*)devModel.c_str();
-            m_mainWnd->addTestingRef();
-            func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
-        }
-
         delete lp;
+        return;
     }
+
+    VIDPID vidpid;
+    vidpid.VID = jsonGlobal.vid_to;
+    vidpid.PID = jsonGlobal.pid_to;
+    int vidpidValue = vidpid.Value;
+    lp->cat = WRITE_CAT_VID_PID;
+    lp->val = (void*)&vidpidValue;
+    m_mainWnd->addTestingRef();
+    func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
+
+    int speedMode = jsonGlobal.speed_mode ;
+    lp->cat = WRITE_CAT_SPEED;
+    lp->val = (void*)&speedMode;
+    m_mainWnd->addTestingRef();
+    func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
+
+    QString device_model = jsonGlobal.device_model;
+    if (!device_model.isEmpty())
+    {
+        std::wstring devModel = device_model.toStdWString();
+        lp->cat = WRITE_CAT_DEVS_MODEL;
+        lp->val = (void*)devModel.c_str();
+        m_mainWnd->addTestingRef();
+        func_test_go(WRITE_CFG_NAME, (const wchar_t*)lp, m_hg);
+    }
+
+    delete lp;
 }
 
 void Dialog_InputSerialNum::on_testResult()
@@ -163,6 +170,8 @@ void Dialog_InputSerialNum::on_pbtn_ok_clicked()
         QMessageBox::information(this, tr("tips"), tr("The device is testing"));
         return;
     }
+
+    setSpeedAndSleep(true);
     accept();
 }
 
@@ -185,5 +194,5 @@ void Dialog_InputSerialNum::on_pbtn_setSn_clicked()
         QMessageBox::information(this, tr("tips"), tr("set sn succeed"));
     }
 
-    setSpeedAndSleep();
+    setSpeedAndSleep(false);
 }
diff --git a/app/HGProductionTool/dialog_inputserialnum.h b/app/HGProductionTool/dialog_inputserialnum.h
index 6ad0b0d..6e56577 100644
--- a/app/HGProductionTool/dialog_inputserialnum.h
+++ b/app/HGProductionTool/dialog_inputserialnum.h
@@ -22,7 +22,7 @@ public:
     QString GetSn();
     QString GetDevType();
     void Invalid(const QString &devName);
-    void setSpeedAndSleep();
+    void setSpeedAndSleep(bool updateSleep);
 
 signals:
     void testResult();
diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp
index 5d71997..35f7b5d 100644
--- a/code/base/test_base.cpp
+++ b/code/base/test_base.cpp
@@ -1,4 +1,4 @@
-#include"test_base.h"
+#include"test_base.h"
 #include<string>
 #include <stdio.h>
 #include <windows.h>