增加投票重复

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

diff --git a/mainwindow.h b/mainwindow.h
index 3884225..bd39ea7 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -35,6 +35,7 @@ class MainWindow : public QMainWindow {
 public:\r
     MainWindow(QWidget *parent = nullptr);\r
     ~MainWindow();\r
+    QString G_cmd;\r
 \r
 private:\r
     Ui::MainWindow *ui;\r