优化RFID流程逻辑、修改自检流程，关闭循环阀

MainInstruction.cpp

@@ -47,11 +47,13 @@ MainInstruction::MainInstruction(QWidget *parent) :
     //30s刷新一次总运行时间
     connect(RunTimeCtrl::instance(), &RunTimeCtrl::sig_saveRunTime
             , this, [=]() {
-        if (sysPara)
-            MTimeSetting->updateUI(sysPara->RFIDPara);
+        if (sysPara){
+            RFIDPara_t rfidPara = sysPara->RFIDPara;
+            rfidPara.runtimeMs = RunTimeCtrl::instance()->totalRuntimeMs();
+            MTimeSetting->updateUI(rfidPara);
+        }
     });
 
-
     applyStyleSheet();
 
     // 授权
@@ -142,7 +144,7 @@ void MainInstruction::ondialogAuthorizationAccepted(){
     {
 #ifdef __RFID_CARD
         /**********超级密码，除了维护时间的5个参数，其他参数清零*****************/
-        memset(&sysPara->RFIDPara,0,sizeof(sysPara->RFIDPara));
+        sysPara->RFIDPara = RFIDPara_t();
         RunTimeCtrl::instance()->authorizationAccepted(&sysPara->RFIDPara);
         sysPara->saveRFIDPara();
         QMessageBox::warning(0,tr("提示"),tr("RFID卡清零!") );
@@ -150,11 +152,15 @@ void MainInstruction::ondialogAuthorizationAccepted(){
         sysPara->para.flagOfInkWarning = false;
         sysPara->para.flagOfSolventWarning = false;
         sysPara->status.needMaintenanceRemind = false;
-        sysPara->RFIDPara.inkCardTimeOut = false; 
-        sysPara->RFIDPara.solventCardTimeOut = false;
+
+        // sysPara->RFIDPara.inkCardTimeOut = false; 
+        // sysPara->RFIDPara.solventCardTimeOut = false;
+        
         sysPara->RFIDPara.needMaintenance = false;
-        sysPara->RFIDPara.needInkCard = false;
-        sysPara->RFIDPara.needSolventCard = false;
+
+        // sysPara->RFIDPara.needInkCard = false;
+        // sysPara->RFIDPara.needSolventCard = false;
+
         QDate curDate = QDate::currentDate();
         int curdate = curDate.toString("yyMMdd").toInt();
         sysPara->RFIDPara.maintenanceDate = curdate;    // 维护日期
@@ -166,6 +172,8 @@ void MainInstruction::ondialogAuthorizationAccepted(){
         sysPara->para.solventWarnTime = 0;
         sysPara->saveParaToFile();
         sysPara->saveRFIDPara();
+
+        emit superJmAccepted();
 #endif
     }
     else if( dlgInputAddr->checkSupperJm(authString))