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();//设置恢复强制结束 } } });