release V1.2 更新说明文档

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 87258c7..8468bfc 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -31,20 +31,22 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 \r
 }\r
 \r
-void MainWindow::ui_show_result(QString msg,bool success)\r
+void MainWindow::ui_show_result1(QString msg,bool success)\r
 {\r
     ui->label_runtime_status1->setText(msg);\r
     if (success)\r
     {\r
         this->write_success_count1++;\r
         ui->label_result_success1->setText(QString::fromLocal8Bit("成功%1").arg(write_success_count1));\r
+        waiting_cmd1=false;\r
     }else{\r
         this->write_fail_count1++;\r
         ui->label_result_fail1->setText(QString::fromLocal8Bit("失败%1").arg(write_fail_count1));\r
+        poweroff_watch1();\r
     }\r
     if (spp_timer_handle1->isActive())\r
         spp_timer_handle1->stop();\r
-    waiting_cmd1=false;\r
+\r
 }\r
 \r
 void MainWindow::readData1()\r
@@ -84,6 +86,11 @@ void MainWindow::readData1()
             {\r
                 if (spp_timer_handle1->isActive())\r
                     spp_timer_handle1->stop();\r
+\r
+                if (uart_rx_buff_array1.indexOf("power off device") >= 0 )\r
+                {\r
+                    ui_display1(QString::fromLocal8Bit("关机成功\r\n"),LOG_DIRECT_IN);\r
+                }\r
                 return;\r
             }\r
             cmd_index_1 ++; //开始执行下一指令\r
@@ -190,6 +197,11 @@ MainWindow::~MainWindow()
     delete result_thread4;\r
     delete ui;\r
 }\r
+void MainWindow::poweroff_watch1()\r
+{\r
+//    cmd_index_1 = 4; //直接执行关机\r
+    this->uart_send_data1(ATCMD_POWEROFF);\r
+}\r
 \r
 void MainWindow::ui_display1(QString str,bool inOrOut)\r
 {\r
@@ -327,9 +339,10 @@ void MainWindow::uart_process1()
              if (mac_used)\r
              {\r
                 ui_display1(QString::fromLocal8Bit("手表地址")+unit+QString::fromLocal8Bit("已占用\r\n"),LOG_DIRECT_OUT);\r
-                ui_show_result(QString::fromLocal8Bit("Mac地址已占用"),false);\r
+                ui_show_result1(QString::fromLocal8Bit("Mac地址已占用"),false);\r
                 cmd_index_1 = -1;\r
 \r
+\r
              }else{\r
                 ui_display1(QString::fromLocal8Bit("手表地址")+unit+QString::fromLocal8Bit(" 可用！\r\n"),LOG_DIRECT_IN);\r
              }\r
@@ -337,7 +350,7 @@ void MainWindow::uart_process1()
         }else{\r
              ui_display1(QString::fromLocal8Bit("查询手表Mac失败!\r\n"),LOG_DIRECT_OUT);\r
              cmd_index_1 = -1;\r
-             ui_show_result(QString::fromLocal8Bit("查询手表Mac失败"),false);\r
+             ui_show_result1(QString::fromLocal8Bit("查询手表Mac失败"),false);\r
         }\r
 \r
     }\r
@@ -361,13 +374,13 @@ void MainWindow::uart_process1()
              }else{\r
                 ui_display1(QString::fromLocal8Bit("设置Mac")+unit_watch+QString::fromLocal8Bit("失败\r\n"),LOG_DIRECT_OUT);\r
                 cmd_index_1 = -2;\r
-                ui_show_result(QString::fromLocal8Bit("Mac地址已占用"),false);\r
+                ui_show_result1(QString::fromLocal8Bit("Mac地址已占用"),false);\r
              }\r
 \r
         }else{\r
              ui_display1(QString::fromLocal8Bit("设置Mac")+unit+QString::fromLocal8Bit("失败\r\n"),LOG_DIRECT_OUT);\r
              cmd_index_1 = -3;\r
-             ui_show_result(QString::fromLocal8Bit("查询手表Mac失败"),false);\r
+             ui_show_result1(QString::fromLocal8Bit("查询手表Mac失败"),false);\r
         }\r
 \r
     }\r
@@ -388,14 +401,14 @@ void MainWindow::uart_process1()
                       ui->textBrowser_result->setText(settings::getInstance().getmacStatusFull());\r
                       ui_display1(QString::fromLocal8Bit("设置mac成功\r\n"),LOG_DIRECT_IN);\r
                   }else{\r
-                      ui_show_result(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);\r
+                      ui_show_result1(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);\r
                   }                  \r
                 }\r
 \r
             }else{\r
                  ui_display1(QString::fromLocal8Bit("获取cpuid失败\r\n"),LOG_DIRECT_OUT);\r
                  cmd_index_1 = -4;\r
-                 ui_show_result(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);\r
+                 ui_show_result1(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);\r
             }\r
         }\r
     }\r
@@ -406,11 +419,10 @@ void MainWindow::uart_process1()
         if (ret >= 0 )\r
         {\r
             ui_display1(QString::fromLocal8Bit("关机成功\r\n"),LOG_DIRECT_IN);\r
-//            waiting_cmd1 = false;\r
         }else{\r
             ui_display1(QString::fromLocal8Bit("关机失败\r\n"),LOG_DIRECT_OUT);\r
         }\r
-        ui_show_result(QString::fromLocal8Bit("设置mac成功\r\n"),true);\r
+        ui_show_result1(QString::fromLocal8Bit("设置mac成功\r\n"),true);\r
 \r
     }\r
         break;\r

diff --git a/mainwindow.h b/mainwindow.h
index e0ac41a..3884225 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -62,7 +62,8 @@ private:
     bool working_state_1=false; //true 说明写号执行过程中，false说明写号结束\r
     bool waiting_cmd1 = false;//发现开机后，等待下达cmd指令\r
     void ui_display1(QString str,bool inOrOut);\r
-    void ui_show_result(QString msg,bool success);\r
+    void ui_show_result1(QString msg,bool success);\r
+    void poweroff_watch1();\r
 \r
     /*----------写地址任务相关变量---end------------*/\r
 \r
@@ -108,6 +109,8 @@ private:
     void uart_send_data4(QString cmd);\r
     /* ------------------------end------------------------------ */\r
 \r
+\r
+\r
 private slots:\r
     /* --------------------------UI------------------------------ */\r
     void ui_save_windows();\r

diff --git a/releasePackage/HiBTMacWriteToolV1.2.zip b/releasePackage/HiBTMacWriteToolV1.2.zip
new file mode 100644 (file)
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 (file)
index 0000000..7f4ea47
Binary files /dev/null and b/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteTool.exe differ

diff --git a/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteToolV1.2 使用说明.docx b/releasePackage/HiBTMacWriteToolV1.2/HiBTMacWriteToolV1.2 使用说明.docx
new file mode 100644 (file)
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 (file)
index 0000000..af6be01
--- /dev/null
+++ b/releasePackage/HiBTMacWriteToolV1.2/Setting.ini
@@ -0,0 +1,3 @@
+[Uart_setting]\r
+uart_com=COM222\r
+uart_baud=11\r

diff --git a/releasePackage/HiBTMacWriteToolV1.2/mac_address.db b/releasePackage/HiBTMacWriteToolV1.2/mac_address.db
new file mode 100644 (file)
index 0000000..aa7f8d4
Binary files /dev/null and b/releasePackage/HiBTMacWriteToolV1.2/mac_address.db differ