From: SnickerSun <snickersun@163.com>
Date: Fri, 22 Nov 2024 08:29:04 +0000 (+0800)
Subject: release V1.2 更新说明文档
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=refs%2Fheads%2Fautoota;p=mirrors%2Ffactory_tool.git

release V1.2 更新说明文档
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 87258c7..8468bfc 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -31,20 +31,22 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 
 }
 
-void MainWindow::ui_show_result(QString msg,bool success)
+void MainWindow::ui_show_result1(QString msg,bool success)
 {
     ui->label_runtime_status1->setText(msg);
     if (success)
     {
         this->write_success_count1++;
         ui->label_result_success1->setText(QString::fromLocal8Bit("成功%1").arg(write_success_count1));
+        waiting_cmd1=false;
     }else{
         this->write_fail_count1++;
         ui->label_result_fail1->setText(QString::fromLocal8Bit("失败%1").arg(write_fail_count1));
+        poweroff_watch1();
     }
     if (spp_timer_handle1->isActive())
         spp_timer_handle1->stop();
-    waiting_cmd1=false;
+
 }
 
 void MainWindow::readData1()
@@ -84,6 +86,11 @@ void MainWindow::readData1()
             {
                 if (spp_timer_handle1->isActive())
                     spp_timer_handle1->stop();
+
+                if (uart_rx_buff_array1.indexOf("power off device") >= 0 )
+                {
+                    ui_display1(QString::fromLocal8Bit("关机成功\r\n"),LOG_DIRECT_IN);
+                }
                 return;
             }
             cmd_index_1 ++; //开始执行下一指令
@@ -190,6 +197,11 @@ MainWindow::~MainWindow()
     delete result_thread4;
     delete ui;
 }
+void MainWindow::poweroff_watch1()
+{
+//    cmd_index_1 = 4; //直接执行关机
+    this->uart_send_data1(ATCMD_POWEROFF);
+}
 
 void MainWindow::ui_display1(QString str,bool inOrOut)
 {
@@ -327,9 +339,10 @@ void MainWindow::uart_process1()
              if (mac_used)
              {
                 ui_display1(QString::fromLocal8Bit("手表地址")+unit+QString::fromLocal8Bit("已占用\r\n"),LOG_DIRECT_OUT);
-                ui_show_result(QString::fromLocal8Bit("Mac地址已占用"),false);
+                ui_show_result1(QString::fromLocal8Bit("Mac地址已占用"),false);
                 cmd_index_1 = -1;
 
+
              }else{
                 ui_display1(QString::fromLocal8Bit("手表地址")+unit+QString::fromLocal8Bit(" 可用！\r\n"),LOG_DIRECT_IN);
              }
@@ -337,7 +350,7 @@ void MainWindow::uart_process1()
         }else{
              ui_display1(QString::fromLocal8Bit("查询手表Mac失败!\r\n"),LOG_DIRECT_OUT);
              cmd_index_1 = -1;
-             ui_show_result(QString::fromLocal8Bit("查询手表Mac失败"),false);
+             ui_show_result1(QString::fromLocal8Bit("查询手表Mac失败"),false);
         }
 
     }
@@ -361,13 +374,13 @@ void MainWindow::uart_process1()
              }else{
                 ui_display1(QString::fromLocal8Bit("设置Mac")+unit_watch+QString::fromLocal8Bit("失败\r\n"),LOG_DIRECT_OUT);
                 cmd_index_1 = -2;
-                ui_show_result(QString::fromLocal8Bit("Mac地址已占用"),false);
+                ui_show_result1(QString::fromLocal8Bit("Mac地址已占用"),false);
              }
 
         }else{
              ui_display1(QString::fromLocal8Bit("设置Mac")+unit+QString::fromLocal8Bit("失败\r\n"),LOG_DIRECT_OUT);
              cmd_index_1 = -3;
-             ui_show_result(QString::fromLocal8Bit("查询手表Mac失败"),false);
+             ui_show_result1(QString::fromLocal8Bit("查询手表Mac失败"),false);
         }
 
     }
@@ -388,14 +401,14 @@ void MainWindow::uart_process1()
                       ui->textBrowser_result->setText(settings::getInstance().getmacStatusFull());
                       ui_display1(QString::fromLocal8Bit("设置mac成功\r\n"),LOG_DIRECT_IN);
                   }else{
-                      ui_show_result(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);
+                      ui_show_result1(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);
                   }                  
                 }
 
             }else{
                  ui_display1(QString::fromLocal8Bit("获取cpuid失败\r\n"),LOG_DIRECT_OUT);
                  cmd_index_1 = -4;
-                 ui_show_result(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);
+                 ui_show_result1(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);
             }
         }
     }
@@ -406,11 +419,10 @@ void MainWindow::uart_process1()
         if (ret >= 0 )
         {
             ui_display1(QString::fromLocal8Bit("关机成功\r\n"),LOG_DIRECT_IN);
-//            waiting_cmd1 = false;
         }else{
             ui_display1(QString::fromLocal8Bit("关机失败\r\n"),LOG_DIRECT_OUT);
         }
-        ui_show_result(QString::fromLocal8Bit("设置mac成功\r\n"),true);
+        ui_show_result1(QString::fromLocal8Bit("设置mac成功\r\n"),true);
 
     }
         break;
diff --git a/mainwindow.h b/mainwindow.h
index e0ac41a..3884225 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -62,7 +62,8 @@ private:
     bool working_state_1=false; //true 说明写号执行过程中，false说明写号结束
     bool waiting_cmd1 = false;//发现开机后，等待下达cmd指令
     void ui_display1(QString str,bool inOrOut);
-    void ui_show_result(QString msg,bool success);
+    void ui_show_result1(QString msg,bool success);
+    void poweroff_watch1();
 
     /*----------写地址任务相关变量---end------------*/
 
@@ -108,6 +109,8 @@ private:
     void uart_send_data4(QString cmd);
     /* ------------------------end------------------------------ */
 
+
+
 private slots:
     /* --------------------------UI------------------------------ */
     void ui_save_windows();
diff --git a/releasePackage/HiBTMacWriteToolV1.2.zip b/releasePackage/HiBTMacWriteToolV1.2.zip
new file mode 100644
index 0000000..ec671d8
Binary files /dev/null and b/releasePackage/HiBTMacWriteToolV1.2.zip differ
diff --git a/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteTool.exe b/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteTool.exe
new file mode 100644
index 0000000..7f4ea47
Binary files /dev/null and b/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteTool.exe differ
diff --git "a/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteToolV1.2 \344\275\277\347\224\250\350\257\264\346\230\216.docx" "b/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteToolV1.2 \344\275\277\347\224\250\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..da0de78
Binary files /dev/null and "b/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteToolV1.2 \344\275\277\347\224\250\350\257\264\346\230\216.docx" differ
diff --git a/releasePackage/HiBTMacWriteToolV1.2/Setting.ini b/releasePackage/HiBTMacWriteToolV1.2/Setting.ini
new file mode 100644
index 0000000..af6be01
--- /dev/null
+++ b/releasePackage/HiBTMacWriteToolV1.2/Setting.ini
@@ -0,0 +1,3 @@
+[Uart_setting]
+uart_com=COM222
+uart_baud=11
diff --git a/releasePackage/HiBTMacWriteToolV1.2/mac_address.db b/releasePackage/HiBTMacWriteToolV1.2/mac_address.db
new file mode 100644
index 0000000..aa7f8d4
Binary files /dev/null and b/releasePackage/HiBTMacWriteToolV1.2/mac_address.db differ