From dc2004506bff38d738f45770834a5b65da903ddb Mon Sep 17 00:00:00 2001
From: Byons <buyongshi15@163.com>
Date: Wed, 9 Sep 2026 15:11:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=85=B3=E9=97=AD=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9C=BA=E3=80=81=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InkJetPrinter.cpp |  8 ++++++++
 mainwidget.cpp    | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/InkJetPrinter.cpp b/InkJetPrinter.cpp
index 5cdd6ec..54e8ae3 100644
--- a/InkJetPrinter.cpp
+++ b/InkJetPrinter.cpp
@@ -2749,6 +2749,14 @@ void InkJetPrinter::detectAndcontrolReclaimTank(){
         // 不知道为什么会有rate为0，且 sysPara->status.reclaimTankstatus == 2 ，也就是 关的状态。 回收槽位置在0处，而状态却是 关 ，很奇怪
         if(sysPara->status.reclaimTankstatus != 2 && rate != 0) {
             m_MainWidget->setReclaimStatus(sysPara->status.reclaimTankstatus == 1, rate);
+
+            #ifdef QT_DEBUG
+            if(rate == 100) {
+                m_MainWidget->enablePrintButton(true);
+                m_MainWidget->stopFlashReclaimOpenBtn();
+                sysPara->status.reclaimTankstatus = 5;
+            }
+            #endif
         }
 
         m_MainWidget->setReclaimOpenBtnStatus(sysPara->status.reclaimTankstatus == 2);
diff --git a/mainwidget.cpp b/mainwidget.cpp
index 2845d4a..6cda026 100644
--- a/mainwidget.cpp
+++ b/mainwidget.cpp
@@ -954,9 +954,9 @@ void MainWidget::on_m_StartBtn_clicked()
 //        sysPara->status.isPrinting=false;
         auto mgr = PrinterStateManager::instance();
 #if !defined(FPGA_TEST) && !defined(QT_DEBUG)
-        if (mgr && mgr->canStopPrint()) {
-            mgr->requestTransition(PrinterEvent::StopPrint);
-        } else {return;}
+        // if (mgr && mgr->canStopPrint()) {
+        //     mgr->requestTransition(PrinterEvent::StopPrint);
+        // } else {return;}
 #endif
 
         // SendPrintDataToFpga(0);  // 0－－正常打印，1－－打印交替部分信息1; 2－－打印交替部分信息2,
@@ -997,11 +997,11 @@ void MainWidget::on_m_StopBtn_clicked()
 //        sysPara->status.isPrinting=false;// 打印状态交给状态机修改
         auto mgr = PrinterStateManager::instance();
 #if !defined(FPGA_TEST) && !defined(QT_DEBUG)
-        if (mgr && mgr->canStopPrint()) {
-            mgr->requestTransition(PrinterEvent::StopPrint);
-        } else {
-            return;
-        }
+        // if (mgr && mgr->canStopPrint()) {
+        //     mgr->requestTransition(PrinterEvent::StopPrint);
+        // } else {
+        //     return;
+        // }
 #endif
 
         sysPara->devOp->printCtrl2(1);
@@ -1127,6 +1127,9 @@ void MainWidget::flashReclaimOpenBtn()
 
 void MainWidget::stopFlashReclaimOpenBtn()
 {
+    if(!m_reclaimOpenBtnFlashTimer->isActive())
+        return;
+
     // 如果电机运行时间为0 就不暂停
     if (sysPara == nullptr
             ||sysPara->status.curr_reclaimTankTime == 0