From 6165d95337149532d431533bd0b41aac0e30734f Mon Sep 17 00:00:00 2001 From: fyf Date: Fri, 5 Jan 2024 09:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E7=BB=93=E6=9D=9F=E5=90=8E?= =?UTF-8?q?=20=E6=81=A2=E5=A4=8D=E5=BC=BA=E5=88=B6=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/home/activity/BottomNavigationNewActivity.java | 1 + .../bonait/bnframework/modules/home/fragment/Home1Fragment.java | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java index 9df02fd0..a6327423 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationNewActivity.java @@ -420,6 +420,7 @@ public class BottomNavigationNewActivity extends BaseActivity { { ExecuteTheRecipe.WriteMainPLC("强制结束任务完成", true, null);//复位 } + ExecuteTheRecipe.StopForcedEnd();//设置恢复强制结束 } } }); diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java index 9015fda7..c4414cab 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java @@ -627,6 +627,7 @@ public class Home1Fragment extends BaseFragment { { ExecuteTheRecipe.WriteMainPLC("强制结束任务完成", true, null);//复位 } + ExecuteTheRecipe.StopForcedEnd();//设置恢复强制结束 } } });