last week

SystemManage.cpp

@@ -20,6 +20,7 @@
 #include <unistd.h>
 //#include "LogInfo.h"
 #include <QDirIterator>
+#include "LogInfo.h"
 
 #define RECLAIN_TANK_TEST_MAX_COUNT     10
 enum ReclainTankTestEnum{ReclainTankTest_eNotStart,ReclainTankTest_eOpenning,ReclainTankTest_eOpened,ReclainTankTest_eClosing,ReclainTankTest_Closed};
@@ -250,7 +251,7 @@ void SystemManage::setPumpValveBottonEnable(bool enable){
 
     ui->pushButtonViscosityPump->setEnabled(enable);
     //ui->pushButtonCleanUP->setEnabled(enable);
-    ui->pushButtonAutoClean->setEnabled(enable);
+    // ui->pushButtonAutoClean->setEnabled(enable);
 //    ui->pushButtonMotorTest->setEnabled(enable);
     ui->pushButtonPushAir->setEnabled(enable);
     if(sysPara)
@@ -1187,34 +1188,16 @@ void SystemManage::onAutoCleanStart(void)
 
 void SystemManage::on_pushButtonAutoClean_pressed()
 {
-    sysPara->saveParaToFile();					// 关机前将相关配置保存
-    sysPara->saveRFIDPara();
-    MySleep(200);
-    system("sync");//缓存同步
-    QCoreApplication::quit();
-    /*
-    QMessageBox::StandardButton ret;
-    ret = QMessageBox::information(this, tr("警告"),
-                           tr("是否确认启动自动清洗?"),
-                           QMessageBox::Ok | QMessageBox::Cancel);
-    if (ret == QMessageBox::Ok){
-        ret = QMessageBox::information(this, tr("警告"),
-                               tr("是否确认墨水排除，加入清洗剂?"),
+    QMessageBox::StandardButton ret = QMessageBox::Ok;
+    ret = QMessageBox::warning(this, tr("警告"),
+                               tr("是否确认重启?"),
                                QMessageBox::Ok | QMessageBox::Cancel);
-        if (ret == QMessageBox::Ok) {
-            dialogAutoClean = new QProgressDialog(this);
-            dialogAutoClean->setWindowModality(Qt::WindowModal);
-            dialogAutoClean->setMinimumDuration(2);
-            dialogAutoClean->setCancelButtonText(tr("Cancel"));
-            dialogAutoClean->setWindowTitle(tr("(1/3) Cleaning"));
-            dialogAutoClean->setRange(0, AUTOCLEAN_STATUS_STEP1_TIME);
-            dialogAutoClean->setAutoClose(true);
-            dialogAutoClean->setAutoReset(true);
-            emit autoCleanStart();
-            autoCleanTimer->start(1000); // 1000 ms
-            dialogAutoClean->show();
-        }
-    }*/
+    if (ret != QMessageBox::Ok){
+        LogInfo::setRunStatusText("The user canceled the reboot operation.");
+        return;
+    }
+
+    emit rebootAppAcquired();
 }
 
 void SystemManage::on_pushButtonMotorTest_pressed()
@@ -1335,7 +1318,7 @@ void SystemManage::on_pushButtonProgamFPGA_clicked()
 void SystemManage::programFPGAProcess(){
     QMessageBox::StandardButton ret = QMessageBox::information(this, tr("提示"),
                            tr("确定要升级FPGA软件吗?"),
-                           QMessageBox::Ok);
+                           QMessageBox::Ok | QMessageBox::Cancel);
     if (ret == QMessageBox::Ok) {
         QFile FpgaFile("/home/plg/FPGAFile.rbf");
         if(FpgaFile.exists())