添加排挤流程日志

InkJetPrinter.cpp

@@ -2699,13 +2699,15 @@ void InkJetPrinter::detectAndcontrolReclaimTank(){
         }
 
     }
-    else  if(sysPara->status.reclaimTankstatus == 5 )//7 故障，6 关完成，5开完成，4 保持， 3 停止， 2 关， 1 开，0-无操作
+    else  if(sysPara->status.reclaimTankstatus == 5)//7 故障，6 关完成，5开完成，4 保持， 3 停止， 2 关， 1 开，0-无操作
     {
         if(sysPara->devOp->isReclaimTankOpenEnable())
             sysPara->devOp->controlReclaimTankOpen(false);		//到头，关闭
         sysPara->status.reclainTankReachEnd = true;
         /*应要求去掉多余到信息 LogInfo::setRunStatusText(tr("回收槽到头"));*/
-        ui->tabMainWindow->setRunStatus(tr("回收槽到头"));
+        if(sysPara->status.currReclaimTankPos != 0)
+            ui->tabMainWindow->setRunStatus(tr("回收槽到头"));
+            
         ui->tabMainWindow->enablePrintButton(true);			//仅仅在此时能使能打印按钮
         ui->tabMainWindow->resetReclaimCtrlButtonText();
         // sysPara->devOp->highVoltageCtrl(1);

mainwindow.cpp

@@ -2065,11 +2065,16 @@ void MainWindow::airPushingProcess()
             // 延迟 半秒后才开回收槽，正式结束排气阶段
             if(sysPara->status.airPushingOnTime >= sysPara->para.airPushDurationSec * 1000 + 500){
                 //qDebug()<< "start stop";
+
+                setRunStatus(tr("排气结束, 打开回收槽."));
+                LogInfo::setRunStatusText(tr("排气结束, 打开回收槽."));
+
                 reclaimTanOpen();
                 sysPara->status.airPushingDone = 1;
                 sysPara->status.airPushing = 0;
                 sysPara->status.airPushingOnTime = 0;
                 airPushTimer->stop();
+
                 return;
             }
 
@@ -2080,6 +2085,8 @@ void MainWindow::airPushingProcess()
                 if(!sysPara->devOp->isReclaimPumpOpen())
                     sysPara->devOp->controlReclaimPump(true, false);
 
+                setRunStatus(tr("排气结束, 准备打开回收槽."));
+                LogInfo::setRunStatusText(tr("排气结束, 准备打开回收槽."));
                 return;
             }
         }