From 7ae8fe354a94070c228494f7133225a0acc100ff Mon Sep 17 00:00:00 2001 From: fyf <11621@LAPTOP-04QQU0AO> Date: Thu, 19 Oct 2023 15:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96444?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ExecuteTheRecipe.java | 14 ++++--- .../modules/home/adapter/wdsz_adapter.java | 17 +++++---- .../home/fragment/MakeGoodFragment.java | 2 +- .../from/fragment/JiaoYan_lsjy_fragment.java | 38 ++++++++++--------- 4 files changed, 41 insertions(+), 30 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 ea60cd97..bae939b1 100644 --- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java +++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java @@ -247,9 +247,11 @@ public class ExecuteTheRecipe { // ListeningValue.put(key, val); // } // } - ReadCode(); - ReadPLCStatus(); - + if(!IsMakeGood) + { + ReadCode(); + ReadPLCStatus(); + } } catch (Exception ex) { ToastUtils.error("异常信息:" + ex.getMessage()); } @@ -266,7 +268,10 @@ public class ExecuteTheRecipe { @Override public void Run() throws InterruptedException { try { - AutoJR(); + if(!IsMakeGood) + { + AutoJR(); + } } catch (Exception ex) { ToastUtils.error("异常信息:" + ex.getMessage()); } @@ -283,7 +288,6 @@ public class ExecuteTheRecipe { @Override public void Run() throws InterruptedException { try { - ChargeSignal(); } catch (Exception ex) { ToastUtils.error("异常信息:" + ex.getMessage()); diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wdsz_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wdsz_adapter.java index 4b2ed1eb..f07f9f53 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wdsz_adapter.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wdsz_adapter.java @@ -92,17 +92,20 @@ public class wdsz_adapter extends RecyclerView.Adapter new Thread(new Runnable() { @Override public void run() { - while (ConfigName.getInstance().PlcIsConnect) { + while(true) + { try { - Object obj= ExecuteTheRecipe.ReadPLC(goodsMake.name); - if(obj!=null) + if(ConfigName.getInstance().PlcIsConnect && !ExecuteTheRecipe.IsMakeGood) { - temp[0] =String.valueOf(obj); - mHandler.sendEmptyMessage(0); + Object obj= ExecuteTheRecipe.ReadPLC(goodsMake.name); + if(obj!=null) + { + temp[0] =String.valueOf(obj); + mHandler.sendEmptyMessage(0); + } } - Thread.sleep(100); + Thread.sleep(200); } catch (InterruptedException e) { - throw new RuntimeException(e); } } } diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java index e864dbb9..529a1ee0 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/MakeGoodFragment.java @@ -420,7 +420,7 @@ public class MakeGoodFragment extends BaseFragment { public void run() { while (true) { try { - if(ConfigName.getInstance().PlcIsConnect) + if(ConfigName.getInstance().PlcIsConnect && !ExecuteTheRecipe.IsMakeGood) { Object obj= ExecuteTheRecipe.ReadPLC("称当前重量"); if(obj!=null) diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java index cd20c9b1..a3adf315 100644 --- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java +++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/JiaoYan_lsjy_fragment.java @@ -395,29 +395,33 @@ public class JiaoYan_lsjy_fragment extends BaseFragment { new Thread(new Runnable() { @Override public void run() { - while (ConfigName.getInstance().PlcIsConnect) { + while(true) + { try { - Object obj= ExecuteTheRecipe.ReadPLC("称当前重量"); - Object obj1= ExecuteTheRecipe.ReadPLC("出料口检测"); - - if(obj!=null) + if(ConfigName.getInstance().PlcIsConnect && !ExecuteTheRecipe.IsMakeGood) { - zhongliangxianshi=(int)obj;// - mHandler.sendEmptyMessage(0); - } + Object obj= ExecuteTheRecipe.ReadPLC("称当前重量"); + Object obj1= ExecuteTheRecipe.ReadPLC("出料口检测"); + + if(obj!=null) + { + zhongliangxianshi=(int)obj;// + mHandler.sendEmptyMessage(0); + } - clk=obj1==null?false:(boolean) obj1; + clk=obj1==null?false:(boolean) obj1; - if (!ConfigName.getInstance().versionSelectionEnum.equals("配料吧台")) - { - Object obj2= ExecuteTheRecipe.ReadPLC("果糖左温度"); - Object obj3= ExecuteTheRecipe.ReadPLC("果糖右温度"); - gt1wd=obj2==null?0:(int)obj2; - gt2wd=obj3==null?0:(int)obj3; + if (!ConfigName.getInstance().versionSelectionEnum.equals("配料吧台")) + { + Object obj2= ExecuteTheRecipe.ReadPLC("果糖左温度"); + Object obj3= ExecuteTheRecipe.ReadPLC("果糖右温度"); + gt1wd=obj2==null?0:(int)obj2; + gt2wd=obj3==null?0:(int)obj3; + } } - Thread.sleep(200); + + Thread.sleep(100); } catch (InterruptedException e) { - throw new RuntimeException(e); } } }