From 8baf618438b59cfd79ea5f67f1374f24b3d92c07 Mon Sep 17 00:00:00 2001 From: fyf Date: Mon, 18 Dec 2023 14:49:58 +0800 Subject: [PATCH] 4 --- .../business/ExecuteTheRecipe.java | 2 +- .../home/fragment/mode/add_qupenren.java | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java index 1b391200..12925f2e 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java +++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java @@ -48,7 +48,7 @@ public class ExecuteTheRecipe { * 等待超时时间 */ //public static int whileTime = 40; - public static int whileTime = 2; + public static int whileTime = 40; /** * 监听变量值 diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_qupenren.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_qupenren.java index 66fa84da..e3d0dabd 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_qupenren.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_qupenren.java @@ -146,17 +146,17 @@ public class add_qupenren extends LinearLayout { quzhizuo.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { -// if (!ConfigName.getInstance().PlcIsConnect) { -// ToastUtils.warning("PLC未准备就绪!!!"); -// return; -// } -// -// Object chushiover = ExecuteTheRecipe.getListingValue("初始化完成"); -// //Object jiting = ExecuteTheRecipe.getListingValue("设备急停"); -// if (chushiover == null || !(boolean) chushiover) { -// ToastUtils.warning("设备未初始化,请先手动初始化设备!!!"); -// return; -// } + if (!ConfigName.getInstance().PlcIsConnect) { + ToastUtils.warning("PLC未准备就绪!!!"); + return; + } + + Object chushiover = ExecuteTheRecipe.getListingValue("初始化完成"); + //Object jiting = ExecuteTheRecipe.getListingValue("设备急停"); + if (chushiover == null || !(boolean) chushiover) { + ToastUtils.warning("设备未初始化,请先手动初始化设备!!!"); + return; + } if (mListener != null) { mListener.clickListenerNew(view, 5, mode); }