From: hcj <1224667075@qq.com>
Date: Tue, 4 Mar 2025 09:14:46 +0000 (+0800)
Subject: 增加投票重复
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=5d87b9a1bf12f535e6e9ca3b91602155baf40614;p=mirrors%2Ffactory_tool.git

增加投票重复
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8468bfc..cbbe2e5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -56,8 +56,8 @@ void MainWindow::readData1()
     if(uart_rx_flag1)
         qDebug()<<data;
 
-    if (working_state_1 == false)
-    {
+if (working_state_1 == false)
+{
         qDebug()<<"写号结束，跳过读取串口";
         return;
     }
@@ -82,7 +82,7 @@ void MainWindow::readData1()
         {
             uart_rx_flag1 = false;
             uart_process1();//开始处理当前指令结果
-            if (cmd_index_1 <0)
+if (cmd_index_1 <0)
             {
                 if (spp_timer_handle1->isActive())
                     spp_timer_handle1->stop();
@@ -90,12 +90,12 @@ void MainWindow::readData1()
                 if (uart_rx_buff_array1.indexOf("power off device") >= 0 )
                 {
                     ui_display1(QString::fromLocal8Bit("关机成功\r\n"),LOG_DIRECT_IN);
-                }
+}
                 return;
             }
             cmd_index_1 ++; //开始执行下一指令
             qDebug()<<"next cmdindex "<<cmd_index_1;
-            switch(cmd_index_1){
+switch(cmd_index_1){
             case 0:
             {
 
@@ -402,7 +402,7 @@ void MainWindow::uart_process1()
                       ui_display1(QString::fromLocal8Bit("设置mac成功\r\n"),LOG_DIRECT_IN);
                   }else{
                       ui_show_result1(QString::fromLocal8Bit("获取cpuid失败\r\n"),false);
-                  }                  
+                  }
                 }
 
             }else{
@@ -478,6 +478,7 @@ void MainWindow::uart_send_data1(QString cmd)
     ret=serialport1->write(cmd.toUtf8());
     m_bytesToWrite1 = ret;
     qDebug()<<"uart_send_data1 "<<cmd << " ret "<<m_bytesToWrite1;
+    G_cmd=cmd;
     if (spp_timer_handle1->isActive())
         spp_timer_handle1->stop();
     spp_timer_handle1->start(1500);
@@ -623,9 +624,17 @@ void MainWindow::spp_timer_callback1()
 {
    uart_rx_flag1 = false;
 //   ui_display1(ui->cbox_uart_com_select_1->currentText()+QString::fromLocal8Bit("AT指令指令超时!\r\n"),false);
-   ui_display1(QString::fromLocal8Bit("AT指令指令超时!\r\n"),false);
-   if (spp_timer_handle1->isActive())
-       spp_timer_handle1->stop();
+   if(G_cmd==ATCMD_ADD_VOTE)
+   {
+       this->uart_send_data1(ATCMD_ADD_VOTE);
+   }
+   else
+   {
+       ui_display1(QString::fromLocal8Bit(G_cmd.toStdString().c_str()),false);
+       if (spp_timer_handle1->isActive())
+           spp_timer_handle1->stop();
+   }
+
 
 }
 
@@ -658,7 +667,7 @@ void MainWindow::spp_connect_1()
 
             connect(serialport1, &QSerialPort::readyRead, this, &MainWindow::readData1);
             connect(serialport1, &QSerialPort::bytesWritten, this, &MainWindow::handleBytesWritten1);
-            this->cmd_index_1 = 0;
+this->cmd_index_1 = 0;
 //            this->uart_send_data1(ATCMD_GET_MAC);
     //        serialport1->close();
     //        disconnect(serialport1, &QSerialPort::readyRead, this, &MainWindow::readData1);
@@ -678,7 +687,7 @@ void MainWindow::spp_connect_1()
         ui->label_result_fail1->setText(QString::fromLocal8Bit("失败%1").arg(write_fail_count1));
         ui->label_result_success1->setText(QString::fromLocal8Bit("成功%1").arg(write_success_count1));
         ui->pbtn_spp_reconnect_1->setText(QString::fromLocal8Bit("停止写地址"));
-        ui->label_runtime_status1->setText(QString::fromLocal8Bit("等待手表开机"));
+ui->label_runtime_status1->setText(QString::fromLocal8Bit("等待手表开机"));
 
 //        QString avalible_mac = settings::getInstance().getAvalibleMac();
 //        ui->ledit_spp_addr_1->setText(avalible_mac);
@@ -705,7 +714,7 @@ void MainWindow::spp_connect_1()
 
 
     }
-
+      
 
 //    this->serialport1->setBaudRate()
 //    ui_display1("connect com1 ",false);
diff --git a/mainwindow.h b/mainwindow.h
index 3884225..bd39ea7 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -35,6 +35,7 @@ class MainWindow : public QMainWindow {
 public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
+    QString G_cmd;
 
 private:
     Ui::MainWindow *ui;