From 8bd02df4fb2f954648680a48ed67a9c6884aeff3 Mon Sep 17 00:00:00 2001 From: fyf <11621@LAPTOP-04QQU0AO> Date: Wed, 11 Oct 2023 12:39:48 +0800 Subject: [PATCH] =?UTF-8?q?333=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ExecuteTheRecipe.java | 5 +- .../from/fragment/JiaoYan_zdqx_fragment.java | 135 +++++++++++------- 2 files changed, 83 insertions(+), 57 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 d4afd5e3..c6e81b1f 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java +++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java @@ -243,9 +243,8 @@ public class ExecuteTheRecipe { // ListeningValue.put(key, val); // } // } - ReadCode(); - //ReadPLCStatus(); + ReadPLCStatus(); } catch (Exception ex) { ToastUtils.error("异常信息:" + ex.getMessage()); @@ -267,7 +266,7 @@ public class ExecuteTheRecipe { } catch (Exception ex) { ToastUtils.error("异常信息:" + ex.getMessage()); } - Thread.sleep(3000); + Thread.sleep(5000); } @Override diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java index 0eb99b3a..843a2153 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_zdqx_fragment.java @@ -90,66 +90,86 @@ public class JiaoYan_zdqx_fragment extends BaseFragment { AlertDialogUtils.showDialog(context, title, message, new QMUIDialogAction.ActionListener() { @Override public void onClick(QMUIDialog dialog, int index) { - IsStart=false; - bt_start.setText("开始清洗"); - bt_start.setBackgroundResource(R.drawable.sz_bj); + + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + IsStart=false; + bt_start.setText("开始清洗"); + bt_start.setBackgroundResource(R.drawable.sz_bj); + + for (BPA_SUGAR item: + DataBus.getInstance().zdqx) { + item.exp=""; + } + DataBus.getInstance().zdqxchidAdapter.refresh(); + } + }); + dialog.dismiss(); } }); - ToastUtils.warning("正在清洗中,请勿重复点击！"); return; } ExecuteTheRecipe.WritePLC("清洗模式", true, new IWriteCallBack() { @Override public void onSuccess() { - IsStart=true; - bt_start.setText("正在清洗"); - bt_start.setBackgroundResource(R.drawable.cp_bj); - } - @Override - public void onFailure(String ErrorMsg) { - - } - }); - - - new Thread(new Runnable() { - @Override - public void run() { - try { - - for (BPA_SUGAR item: - DataBus.getInstance().zdqx) { - - item.exp="执行中"; - DataBus.getInstance().zdqxchidAdapter.refresh(); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + IsStart=true; + bt_start.setText("正在清洗"); + bt_start.setBackgroundResource(R.drawable.cp_bj); + } + }); - final boolean[] IsStop = {false}; - ExecuteTheRecipe.CleaningComplete=new IRun() { - @Override - public void Run() { - IsStop[0] =true; + new Thread(new Runnable() { + @Override + public void run() { + try { + ExecuteTheRecipe.WritePLC("管道自动排水完成",false,null); + + for (BPA_SUGAR item: + DataBus.getInstance().zdqx) { + ExecuteTheRecipe.WritePLC("自动清洗完成",false,null); + Thread.sleep(100);//10 *6 + item.exp="执行中"; + DataBus.getInstance().zdqxchidAdapter.refresh(); + + final boolean[] IsStop = {false}; + ExecuteTheRecipe.CleaningComplete=new IRun() { + @Override + public void Run() { + IsStop[0] =true; + } + }; + + long a = System.currentTimeMillis(); + while (IsStart && !IsStop[0]) { + if ((System.currentTimeMillis() - a) > 1000 * 500) { + break; + } + Thread.sleep(100);//10 *6 + } + item.exp="执行完成"; + DataBus.getInstance().zdqxchidAdapter.refresh(); } - }; - long a = System.currentTimeMillis(); - while (IsStart && !IsStop[0] && IsStart) { - if ((System.currentTimeMillis() - a) > 1000 * 500) { - break; + if(IsStart) + { + ExecuteTheRecipe.WritePLC("管道自动排水",true,null); } - Thread.sleep(100);//10 *6 - } - item.exp="执行完成"; - DataBus.getInstance().zdqxchidAdapter.refresh(); - } - - ExecuteTheRecipe.WritePLC("管道自动排水",true,null); - - } catch (Exception e) { - } + } catch (Exception e) { + } + } + }).start(); + } + @Override + public void onFailure(String ErrorMsg) { + ToastUtils.error("启动失败！"); } - }).start(); + }); break; } } @@ -187,15 +207,22 @@ public class JiaoYan_zdqx_fragment extends BaseFragment { ExecuteTheRecipe.AutoPaiShui=new IRun() { @Override public void Run() { - IsStart=false; - bt_start.setText("开始清洗"); - bt_start.setBackgroundResource(R.drawable.sz_bj); + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + ToastUtils.warning("清洗完成！"); + IsStart=false; + bt_start.setText("开始清洗"); + bt_start.setBackgroundResource(R.drawable.sz_bj); + + for (BPA_SUGAR item: + DataBus.getInstance().zdqx) { + item.exp=""; + } + DataBus.getInstance().zdqxchidAdapter.refresh(); + } + }); - for (BPA_SUGAR item: - DataBus.getInstance().zdqx) { - item.exp=""; - } - DataBus.getInstance().zdqxchidAdapter.refresh(); } };