From 206ec99911cc5bb4670067bfe0b5b3ea16561cd7 Mon Sep 17 00:00:00 2001
From: liup <YFB@DESKTOP-5HA1RFM>
Date: Sat, 11 May 2024 09:54:09 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=B0=E9=87=8D?=
 =?UTF-8?q?=E6=A0=A1=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |  10 ++
 .idea/gradle.xml                              |   2 +-
 .idea/migrations.xml                          |  10 ++
 .idea/misc.xml                                |   1 -
 .../com/bonait/bnframework/HBL/Unity.java     |  14 +-
 .../business/ExecuteTheRecipe.java            |  27 +++-
 .../bonait/bnframework/business/PLCName.java  |   2 +-
 .../bnframework/common/base/BaseActivity.java |   1 +
 .../common/constant/ConfigName.java           |   1 +
 .../bnframework/common/helper/ActiveMax.java  |   5 +
 .../home/fragment/MakeGoodFragment.java       |  10 +-
 .../home/fragment/from/DzcjyActivity.java     |   2 +-
 .../home/fragment/mode/add_silos_ck.java      |  13 +-
 .../home/fragment/mode/silos_jiaoyan.java     | 132 +++++++++---------
 app/src/main/res/layout/fragment_gongneng.xml |  27 ++--
 .../item/layout/dialog_add_silos_ck.xml       |   9 +-
 .../item/layout/silos_jiaoyan_item_edit.xml   |  69 ++++++---
 app/src/main/res/mipmap-xxxhdpi/yxz.png       | Bin 0 -> 1731 bytes
 18 files changed, 225 insertions(+), 110 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/migrations.xml
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/yxz.png

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..b268ef36
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 804e304a..0897082f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-11" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 00000000..f8051a6f
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 60bc3cba..66ec7b08 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK" />
   <component name="VisualizationToolProject">
diff --git a/app/src/main/java/com/bonait/bnframework/HBL/Unity.java b/app/src/main/java/com/bonait/bnframework/HBL/Unity.java
index a531fc87..de19b6d9 100644
--- a/app/src/main/java/com/bonait/bnframework/HBL/Unity.java
+++ b/app/src/main/java/com/bonait/bnframework/HBL/Unity.java
@@ -25,11 +25,12 @@ public class Unity {
         if(func==null) return OperateResult.CreateFailed("条件为空");
         boolean tag=false;
         while(!tag){
+            Delay(100);
             tag=func.Run();
             Delay(100);
             if(timeOut>0&&(System.currentTimeMillis()-startTime)>timeOut) break;
         }
-       if(!tag) MessageLog.ShowInfo("任务超时，超时时间："+String.valueOf(timeOut)+"/"+String.valueOf(System.currentTimeMillis()-startTime));
+        if(!tag) MessageLog.ShowInfo("任务超时，超时时间："+String.valueOf(timeOut)+"/"+String.valueOf(System.currentTimeMillis()-startTime));
 
 //           System.out.println("任务超时，超时时间："+String.valueOf(timeOut)+"/"+String.valueOf(System.currentTimeMillis()-startTime));
         return tag?OperateResult.CreateSuccess():OperateResult.CreateFailed("任务超时");
@@ -87,7 +88,18 @@ public class Unity {
      */
     public static float Scale( float InputValue, float InputMax, float InputMin, float OutMax, float OutMin)
     {
+        MessageLog.ShowInfo("AnalogConvert measureCookTime InputValue="+InputValue+" InputMax="+InputMax+";InputMin="+InputMin+";OutMax="+OutMax+";OutMin="+OutMin);
+
+        if(InputValue<=0|| InputMax<=0||InputMin<=0){
+            return 0;
+        }
+        if(((InputMax - InputMin) + OutMin)==0){
+            return 0;
+        }
         float value = ((OutMax - OutMin) * (InputValue - InputMin)) / (InputMax - InputMin) + OutMin;
+        if(value<=0){
+            value = 0;
+        }
         String formattedNum = String.format("%.2f", value);
         return Float.parseFloat(formattedNum);
     }
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 2a17f693..61c274ef 100644
--- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
+++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
@@ -40,6 +40,7 @@ import com.bonait.bnframework.common.helper.ThreadManager;
 import com.bonait.bnframework.common.modbus.ModbusTcpServer;
 import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.ToastUtils;
+import com.http.utils.LogUtils;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 
@@ -520,9 +521,12 @@ public class ExecuteTheRecipe {
      * @param value
      */
     public static void WritePLC(String name, Object value, IWriteCallBack callback) {
+        MessageLog.ShowInfo("WritePLC  name="+name +";value="+value.toString());
         try {
             if (ConfigName.getInstance().PLC_Address.containsKey(name)) {
                 BPA_PLCADDRESS plcaddress = ConfigName.getInstance().PLC_Address.get(name);
+                MessageLog.ShowInfo("WritePLC  name="+name + ";plcaddress.address="+plcaddress.address.toString()+";value="+value.toString());
+
                 if (!plcaddress.address.isEmpty() && ConfigName.getInstance().PlcIsConnect) {
                     if (plcaddress.address.toUpperCase().startsWith("VD"))//int
                     {
@@ -563,6 +567,7 @@ public class ExecuteTheRecipe {
     }
 
     public static void Write(Object plcName,Object value,IWriteCallBack callBack){
+        MessageLog.ShowInfo("WritePLC  plcName=" +plcName.toString() +";value="+value.toString());
         WritePLC(plcName.toString(),value,callBack);
     }
 
@@ -573,10 +578,12 @@ public class ExecuteTheRecipe {
      * @return
      */
     public static Object ReadPLC(String name) {
+
         final Object[] ReturnsVariable = {null};
         try {
             if (ConfigName.getInstance().PLC_Address.containsKey(name)) {
                 BPA_PLCADDRESS plcaddress = ConfigName.getInstance().PLC_Address.get(name);
+                MessageLog.ShowInfo("ReadPLC  name=" +name +"  plcaddress="+plcaddress.address.toString());
                 if (!plcaddress.address.isEmpty() && ConfigName.getInstance().PlcIsConnect) {
                     if (plcaddress.address.toUpperCase().startsWith("VD"))//int
                     {
@@ -611,16 +618,23 @@ public class ExecuteTheRecipe {
                             ReturnsVariable[0] = val[0];
                         });
                     }
+                    if ((plcaddress.address.toUpperCase().equals("VW82"))){
+                        MessageLog.ShowInfo("ReadPLC  称当前重量  name=" +name+" ReturnsVariable[0]="+ReturnsVariable[0] );
+                        OutletWeigh = (short)ReturnsVariable[0];
+
+                    }
                 }
             }
         } catch (Exception ex) {
             ToastUtils.error("异常信息:" + ex.getMessage());
         } finally {
+            MessageLog.ShowInfo("ReadPLC  name=" +name+" ReturnsVariable[0]="+ReturnsVariable[0] );
             return ReturnsVariable[0];
         }
     }
 
     public static boolean ReadBool(Object plcName){
+        MessageLog.ShowInfo("ReadBool  plcName=" +plcName.toString() );
         try{
             if(ListeningValue.containsKey(plcName)){
                 return Boolean.parseBoolean(ListeningValue.get(plcName).toString());
@@ -633,11 +647,16 @@ public class ExecuteTheRecipe {
     }
 
     public static short ReadShort(Object plcName){
+        MessageLog.ShowInfo("ReadShort "+plcName.toString());
         try{
             if(ListeningValue.containsKey(plcName)){
-                return Short.parseShort(ListeningValue.get(plcName).toString());
+                short result = Short.parseShort(ListeningValue.get(plcName).toString());
+                MessageLog.ShowInfo(plcName.toString()+"   result="+result);
+                return result;
             }else{
-                return Short.parseShort(ReadPLC(plcName.toString()).toString());
+                short result = Short.parseShort(ReadPLC(plcName.toString()).toString());
+                MessageLog.ShowInfo(plcName.toString()+"   result="+result);
+                return result;
             }
         }catch(Exception e){
             return 0;
@@ -956,7 +975,7 @@ public class ExecuteTheRecipe {
         final boolean[] issucess3 = {false};
 
         //写校准模式
-        WritePLC("砝码校准模式", true, new IWriteCallBack() {
+        WritePLC("校准模式", true, new IWriteCallBack() {
             @Override
             public void onSuccess() {
                 issucess1[0] =true;
@@ -1000,7 +1019,7 @@ public class ExecuteTheRecipe {
         final boolean[] issucess2 = {false};
 
         //写校准模式
-        WritePLC("砝码校准模式", false, new IWriteCallBack() {
+        WritePLC("校准模式", false, new IWriteCallBack() {
             @Override
             public void onSuccess() {
                 issucess1[0] =true;
diff --git a/app/src/main/java/com/bonait/bnframework/business/PLCName.java b/app/src/main/java/com/bonait/bnframework/business/PLCName.java
index b09e4750..67cd67a1 100644
--- a/app/src/main/java/com/bonait/bnframework/business/PLCName.java
+++ b/app/src/main/java/com/bonait/bnframework/business/PLCName.java
@@ -2,7 +2,7 @@ package com.bonait.bnframework.business;
 
 public enum PLCName {
    重量清零,
-    当前重量,
+ 称当前重量,
     外置仓1出料时间,
     外置仓2出料时间,
     外置仓3出料时间,
diff --git a/app/src/main/java/com/bonait/bnframework/common/base/BaseActivity.java b/app/src/main/java/com/bonait/bnframework/common/base/BaseActivity.java
index e046252f..a61bb95a 100644
--- a/app/src/main/java/com/bonait/bnframework/common/base/BaseActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/common/base/BaseActivity.java
@@ -52,6 +52,7 @@ public class BaseActivity extends QMUIActivity implements EasyPermissions.Permis
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        ActiveMax.destroy(this);
         /*LocalCacheUtils.Get().ClearBitmapFile();*/
     }
 
diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
index ebb9e31e..c4e82d87 100644
--- a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
+++ b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
@@ -46,6 +46,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * 配置文件
  */
 public class ConfigName {
+    public static final boolean TEST = true;
     //region 单例模式
     private static ConfigName mInstance; //实例变量设置私有，防止直接通过类名访问
 
diff --git a/app/src/main/java/com/bonait/bnframework/common/helper/ActiveMax.java b/app/src/main/java/com/bonait/bnframework/common/helper/ActiveMax.java
index 0ef76f41..2cbf6659 100644
--- a/app/src/main/java/com/bonait/bnframework/common/helper/ActiveMax.java
+++ b/app/src/main/java/com/bonait/bnframework/common/helper/ActiveMax.java
@@ -49,6 +49,11 @@ public class ActiveMax {
         // activity.getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(setOnSystemUiVisibilityChangeListener);
     }
 
+    public static void destroy(Activity activity){
+        activities.remove(activity);
+        activity.getWindow().getDecorView().getViewTreeObserver().removeOnGlobalLayoutListener(keyboardVisibilityListener);
+    }
+
     /**
      * 状态栏变化后事件
      */
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 03a26a28..308e5457 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
@@ -477,6 +477,7 @@ public class MakeGoodFragment extends BaseFragment {
                     @Override
                     public void onSuccess() {
                         ToastUtils.info("清零成功！");
+                        mHandler.sendEmptyMessage(0);
                     }
 
                     @Override
@@ -505,6 +506,7 @@ public class MakeGoodFragment extends BaseFragment {
                     plc_status.setText(ConfigName.getInstance().PlcIsConnect ? "正常" : "异常");
                     plc_status.setTextColor(ConfigName.getInstance().PlcIsConnect ? Color.parseColor("#4CAF50") : Color.parseColor("#D32F2F"));
                     wendu1.setText(ExecuteTheRecipe.WaterTemp + "°C");
+                    MessageLog.ShowInfo("重量 ExecuteTheRecipe.OutletWeigh="+ExecuteTheRecipe.OutletWeigh);
                     dianzichen.setText(String.valueOf((int) ExecuteTheRecipe.OutletWeigh / 10.0) + " g");
                     break;
                 case 1:
@@ -666,11 +668,12 @@ public class MakeGoodFragment extends BaseFragment {
         //接收扫码信息
         ExecuteTheRecipe.OnScanTheCodeInformationT = new IRunT<String>() {
             @Override
-            public void Run(String msg) {
+            public void Run(String msg2) {
 
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
+                        String msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | ";
                         if ((msg != null) && (((String) msg).length() > 2) && ((String) msg).contains("|")) {
                             //拿到扫码数据
                             //例如 ORD001|P0003|A001,M002,T001|2
@@ -712,8 +715,11 @@ public class MakeGoodFragment extends BaseFragment {
                                     }
                                 } catch (Exception ex) {
                                 }
-
                                 BPA_GOODS good = QueryDB.GetGoodsforeignKeyId(goodid);
+                                ConfigName.getInstance();
+                                if(ConfigName.TEST){
+                                    good = QueryDB.GetGoodsId(goodid);
+                                }
                                 if (good == null) {
                                     message = "没有查询到该商品!";
                                     mHandler.sendEmptyMessage(1);
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DzcjyActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DzcjyActivity.java
index 4a31dcdf..52bc7372 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DzcjyActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DzcjyActivity.java
@@ -83,7 +83,7 @@ public class DzcjyActivity extends BaseActivity {
 
                 String outres = edittext_zl.getText().toString().trim();
                 if (!outres.equals("")) {
-                    ExecuteTheRecipe.WritePLC("砝码值", Short.parseShort(outres), new IWriteCallBack() {
+                    ExecuteTheRecipe.WritePLC("砝码值", Short.parseShort(outres)*10, new IWriteCallBack() {
                         @Override
                         public void onSuccess() {
                             ExecuteTheRecipe.WritePLC("砝码值写入",true,null);
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck.java
index 3cc51239..8320ada5 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_silos_ck.java
@@ -48,6 +48,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Delayed;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -347,11 +348,21 @@ public class add_silos_ck extends LinearLayout {
             if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
                 Log.e("鼠标", "按下:2222 ");
                 ExecuteTheRecipe.WritePLC("清洗模式", true,null);
+                try {
+                    Thread.sleep(100L);//避免启动的时候还是按时间出料
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
                 ExecuteTheRecipe.WritePLC(name, true, null);
             } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
                 Log.e("鼠标", "松开:33333 ");
-                ExecuteTheRecipe.WritePLC("清洗模式", false,null);
                 ExecuteTheRecipe.WritePLC(name, false, null);
+                try {
+                    Thread.sleep(100L);//避免启动的时候还是按时间出料
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+                ExecuteTheRecipe.WritePLC("清洗模式", false,null);
             }
             return false;
         });
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
index e004aacc..17b91096 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
@@ -1,30 +1,18 @@
 package com.bonait.bnframework.modules.home.fragment.mode;
 
 import android.app.Activity;
-import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Color;
 import android.os.Handler;
 import android.os.Message;
-import android.os.SystemClock;
-import android.provider.ContactsContract;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
-import android.view.MotionEvent;
 import android.view.View;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.Chronometer;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.Spinner;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 
@@ -32,38 +20,18 @@ import com.bonait.bnframework.HBL.Dialog.AlertDialogButton;
 import com.bonait.bnframework.HBL.Dialog.DialogManager;
 import com.bonait.bnframework.HBL.Dialog.WaitDialog;
 import com.bonait.bnframework.HBL.Executor;
-import com.bonait.bnframework.HBL.Interface.IFunc;
 import com.bonait.bnframework.HBL.Trig.TTrig;
 import com.bonait.bnframework.HBL.Unity;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.business.PLCName;
-import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.QueryDB;
-import com.bonait.bnframework.common.db.mode.BPA_MATERIAL;
-import com.bonait.bnframework.common.db.mode.BPA_SILOS;
-import com.bonait.bnframework.common.db.mode.BPA_SILOSANDMATERIAL;
 import com.bonait.bnframework.common.db.mode.BPA_SILOS_CALIBRATE;
 import com.bonait.bnframework.common.db.res.lcMode;
 import com.bonait.bnframework.common.helper.I.IRun;
-import com.bonait.bnframework.common.helper.I.IWriteCallBack;
 import com.bonait.bnframework.common.helper.I.MyClickListener;
-import com.bonait.bnframework.common.model.mode.ResMenuLeft;
+import com.bonait.bnframework.common.helper.MessageLog;
 import com.bonait.bnframework.common.utils.ToastUtils;
-import com.bonait.bnframework.modules.home.fragment.from.SilosNewActivity;
-import com.qmuiteam.qmui.arch.QMUIFragment;
-import com.qmuiteam.qmui.arch.QMUIFragmentPagerAdapter;
-import com.qmuiteam.qmui.widget.QMUIViewPager;
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
-import com.qmuiteam.qmui.widget.tab.QMUIBasicTabSegment;
-import com.qmuiteam.qmui.widget.tab.QMUITabSegment;
-import com.suke.widget.SwitchButton;
-
-import java.io.Console;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -90,19 +58,21 @@ public class silos_jiaoyan extends LinearLayout {
     private View root;
 
     @BindView(R.id.min_time)
-     EditText min_time;
+    EditText min_time;
 
     @BindView(R.id.min_weight)
-     EditText min_weight;
+    EditText min_weight;
 
     @BindView(R.id.max_time)
-     EditText max_time;
+    EditText max_time;
 
     @BindView(R.id.max_weight)
-     EditText max_weight;
+    EditText max_weight;
 
     @BindView(R.id.sim_discharge_weight)
     EditText sim_discharge_weight;
+    @BindView(R.id.tv_discharge_result)
+    TextView tv_discharge_result;
 
 //    @BindView(R.id.controlStatus)
 //    TextView controlStatus;
@@ -297,29 +267,44 @@ public class silos_jiaoyan extends LinearLayout {
                 if(time<0) return;
                 DialogManager.showWarn(activity,"校准前请确认是否准备就绪？\r\n是否开始校准?", AlertDialogButton.YesNo,s->{
                     if(s){
-                        WaitDialog.Show("最小校准","开始校准",getContext(),activity);
+                        WaitDialog.Show(view.getId()==R.id.min_time?"最小校准":"最大校准","开始校准",getContext(),activity);
                         Executor.get().runThread(()->{
 
                             WaitDialog.AddText("电子秤清零");
                             ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                            ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                            ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
 
                             WaitDialog.AddText("等待清零完成");
                             //等待清零完成
-                            Unity.Wait(()->{return ExecuteTheRecipe.ReadShort(PLCName.当前重量)==0;},3000).OnSource(()->{
+                            Unity.Wait(()->{return ExecuteTheRecipe.ReadShort(PLCName.称当前重量)>-20&&ExecuteTheRecipe.ReadShort(PLCName.称当前重量)<=20;},3000).OnSource(()->{
 
                                 WaitDialog.AddText("下发参数，开始校准");
-                                ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"出料时间",time,null);//下发出料时间
+                                ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"出料时间",((int) time)*100,null);//下发出料时间
+                                long startTime = System.currentTimeMillis();
+                                MessageLog.ShowInfo("下发参数，开始校准 当前时间："+startTime +" 出料时间"+((int) time)*100);
                                 ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"启停控制",true,null);//下发启动信号
 
+
                                 WaitDialog.AddText("等待校准完成");
                                 String name = lcMode.name+lcMode.num+"启停控制";
                                 //等待出料完成
-                                Unity.Wait(()->{return TTrig.get(name).Start(ExecuteTheRecipe.ReadBool(name));},(int)(time+2000)).OnSource(()->{
+                                Unity.Wait(()->{return TTrig.get(name).Start(ExecuteTheRecipe.ReadBool(name));},(int)(time*1000+2000)).OnSource(()->{
                                     //获取电子秤重量,并填充到对应位置
+                                    try {
+                                        Thread.sleep(500);
+                                    } catch (InterruptedException e) {
+                                        throw new RuntimeException(e);
+                                    }
+                                    MessageLog.ShowInfo("下发参数，结束校准 结束时间："+(System.currentTimeMillis()-startTime) +" 读取启停控制 false");
+
                                     activity.runOnUiThread(()->{
-                                       if(view.getId()==R.id.min_time) min_time.setText(ExecuteTheRecipe.ReadShort(PLCName.当前重量));
-                                       else max_time.setText(ExecuteTheRecipe.ReadShort(PLCName.当前重量));
+                                        float weight = (float) (ExecuteTheRecipe.ReadShort(PLCName.称当前重量)/10.0);
+                                        MessageLog.ShowInfo("下发参数，结束校准 校准重量："+weight);
+                                        if(view.getId()==R.id.btn_min_standard) min_weight.setText(weight+"");
+                                        else max_weight.setText(weight+"");
                                     });
+                                    WaitDialog.Dismiss();
                                     DialogManager.showInfo(activity,"校准完成",AlertDialogButton.OK,null);
                                 }).OnFailed(msg->{WaitDialog.TimeOut("等待校准完成超时，请退出后重试！");});
                                 TTrig.Remove(name);
@@ -333,15 +318,15 @@ public class silos_jiaoyan extends LinearLayout {
                     float minWeight = Float.parseFloat(min_weight.getText().toString());
                     float weight = Float.parseFloat(sim_discharge_weight.getText().toString());
                     float maxweight = Float.parseFloat(max_weight.getText().toString());
-                    if(weight<minWeight){
-                        DialogManager.showError(activity,"模拟出料重量小于最小出料重量，请重新输入模拟出料重量",AlertDialogButton.OK,null);
-                        return;
-                    }
-
-                    if(weight>maxweight){
-                        DialogManager.showError(activity,"模拟出料重量大于最大出料重量，请重新输入模拟出料重量",AlertDialogButton.OK,null);
-                        return;
-                    }
+//                    if(weight<minWeight){
+//                        DialogManager.showError(activity,"模拟出料重量小于最小出料重量，请重新输入模拟出料重量",AlertDialogButton.OK,null);
+//                        return;
+//                    }
+//
+//                    if(weight>maxweight){
+//                        DialogManager.showError(activity,"模拟出料重量大于最大出料重量，请重新输入模拟出料重量",AlertDialogButton.OK,null);
+//                        return;
+//                    }
 
                 }catch(Exception e){}
 
@@ -351,19 +336,36 @@ public class silos_jiaoyan extends LinearLayout {
                             float weight = Float.parseFloat(sim_discharge_weight.getText().toString());
                             BPA_SILOS_CALIBRATE res = QueryDB.GetSilosCalibrateByNum(lcMode.num);
                             if(res!=null){
-                                float outValue = Unity.Scale(weight,res.inputWightMax,res.inputWightMin,res.outputTimeMax,res.outputTimeMin);
-                                WaitDialog.Show("模拟出料","启动模拟出料",getContext(),activity);
-                                Executor.get().runThread(()->{
-                                    ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"出料时间",(short)(outValue*100),null);//下发出料时间
-                                    ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"启停控制",true,null);//下发启动信号
-                                    WaitDialog.AddText("等待出料完成");
-                                    String name = lcMode.name+lcMode.num+"启停控制";
-                                    Unity.Wait(()->{return TTrig.get(name).Start(ExecuteTheRecipe.ReadBool(name));},(int)(outValue*1000)+2000).OnSource(()->{
-                                        WaitDialog.Dismiss();
-                                    }).OnFailed(msg->{WaitDialog.TimeOut("等待出料完成超时，请退出后重试！");});
-                                    TTrig.Remove(name);
-                                });
-
+                                WaitDialog.AddText("电子秤清零");
+                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                WaitDialog.AddText("等待清零完成");
+                                //等待清零完成
+                                Unity.Wait(()->{return ExecuteTheRecipe.ReadShort(PLCName.称当前重量)>-20&&ExecuteTheRecipe.ReadShort(PLCName.称当前重量)<=20;},3000).OnSource(()->{
+                                    float outValue = Unity.Scale(weight,res.inputWightMax,res.inputWightMin,res.outputTimeMax,res.outputTimeMin);
+                                    WaitDialog.Show("模拟出料","启动模拟出料",getContext(),activity);
+                                    Executor.get().runThread(()->{
+                                        ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"出料时间",(short)(outValue*100),null);//下发出料时间
+                                        ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"启停控制",true,null);//下发启动信号
+                                        WaitDialog.AddText("等待出料完成");
+                                        String name = lcMode.name+lcMode.num+"启停控制";
+                                        Unity.Wait(()->{return TTrig.get(name).Start(ExecuteTheRecipe.ReadBool(name));},(int)(outValue*1000)+2000).OnSource(()->{
+                                            try {
+                                                Thread.sleep(500);
+                                            } catch (InterruptedException e) {
+                                                throw new RuntimeException(e);
+                                            }
+                                            WaitDialog.Dismiss();
+
+                                            activity.runOnUiThread(()->{
+                                                float resultWeight = (float) (ExecuteTheRecipe.ReadShort(PLCName.称当前重量)/10.0);
+                                                tv_discharge_result.setText(resultWeight+"g");
+                                            });
+                                        }).OnFailed(msg->{WaitDialog.TimeOut("等待出料完成超时，请退出后重试！");});
+                                        TTrig.Remove(name);
+                                    });
+                                }).OnFailed((msg)->{WaitDialog.TimeOut("等待清零超时，请退出后重试！");});
                             }else{
                                 DialogManager.showWarn(activity,"料仓参数未校准，请校准后再试！",AlertDialogButton.OK,null);
                             }
diff --git a/app/src/main/res/layout/fragment_gongneng.xml b/app/src/main/res/layout/fragment_gongneng.xml
index 9fbdfecf..a6a02b87 100644
--- a/app/src/main/res/layout/fragment_gongneng.xml
+++ b/app/src/main/res/layout/fragment_gongneng.xml
@@ -133,7 +133,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:fontFamily="sans-serif-condensed-medium"
-                                        android:text="饮料配方管理"
+                                        android:text="配方管理"
                                         android:textColor="@color/white"
                                         android:textSize="26dp"
                                         android:focusable="false"/>
@@ -243,13 +243,24 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/app_color_blue" >
-        <Button
-            android:id="@+id/btn_sync"
+        <FrameLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:background="@mipmap/yxz"
-            android:textSize="16sp"
-            android:layout_centerHorizontal="true"/>
+            android:layout_height="wrap_content">
+            <Button
+                android:id="@+id/btn_sync"
+                android:layout_width="100dp"
+                android:layout_height="match_parent"
+                android:background="null"
+                android:textSize="16sp"
+                android:layout_centerHorizontal="true"/>
+            <ImageView
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:src="@mipmap/yxz"
+                android:layout_gravity="center"
+                android:scaleType="fitXY"
+                />
+        </FrameLayout>
+
     </com.qmuiteam.qmui.widget.QMUITopBarLayout>
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
index df33e1d0..bf98061f 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
@@ -22,12 +22,11 @@
         </RelativeLayout>
         <Button
             android:id="@+id/close_from"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_alignParentRight="true"
             android:layout_alignParentTop="true"
             android:layout_marginRight="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_10"
             android:background="@mipmap/newdelete"
             android:textSize="14dp"
             android:textColor="@color/white"/>
@@ -139,7 +138,7 @@
                         android:orientation="vertical">
                         <Button
                             android:id="@+id/control_switch_shoudong"
-                            android:layout_width="60dp"
+                            android:layout_width="80dp"
                             android:layout_height="40dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
@@ -150,7 +149,7 @@
                         <Button
                             android:layout_marginTop="@dimen/dp_10"
                             android:id="@+id/control_huishou"
-                            android:layout_width="60dp"
+                            android:layout_width="80dp"
                             android:layout_height="40dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
diff --git a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
index 2a2b77b7..5c12afb8 100644
--- a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
+++ b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
@@ -238,6 +238,22 @@
 
                             </LinearLayout>
 
+                            <View
+                                android:layout_width="650dp"
+                                android:layout_height="1dp"
+                                android:layout_marginTop="20dp"
+                                android:background="@color/gray"/>
+
+                            <Button
+                                android:layout_marginTop="30dp"
+                                android:id="@+id/btn_save"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/bg_btn_login_selected"
+                                android:text="保存参数"
+                                android:textColor="@color/white"
+                                android:textSize="25sp" />
+
                             <View
                                 android:layout_width="650dp"
                                 android:layout_height="1dp"
@@ -288,28 +304,41 @@
 
                             </LinearLayout>
 
-                            <View
-                                android:layout_width="650dp"
-                                android:layout_height="1dp"
-                                android:layout_marginTop="20dp"
-                                android:background="@color/gray"/>
-
-                            <Button
-                                android:layout_marginTop="30dp"
-                                android:id="@+id/btn_save"
+                            <LinearLayout
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:background="@drawable/bg_btn_login_selected"
-                                android:text="保存参数"
-                                android:textColor="@color/white"
-                                android:textSize="25sp" />
+                                android:layout_height="match_parent"
+                                android:layout_marginTop="30dp"
+                                android:orientation="horizontal">
+
+                                <LinearLayout
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal">
+                                    <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text="实际出料重量："
+                                        android:textSize="25sp"/>
+
+                                    <TextView
+                                        android:id="@+id/tv_discharge_result"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:text=""
+                                        android:textSize="25sp"/>
+
+                                </LinearLayout>
+
+                            </LinearLayout>
+
+
 
-<!--                            <TextView-->
-<!--                                android:id="@+id/controlStatus"-->
-<!--                                android:layout_width="match_parent"-->
-<!--                                android:layout_height="match_parent"-->
-<!--                                android:text="控制状态："-->
-<!--                                android:textSize="20sp"/>-->
+                            <!--                            <TextView-->
+                            <!--                                android:id="@+id/controlStatus"-->
+                            <!--                                android:layout_width="match_parent"-->
+                            <!--                                android:layout_height="match_parent"-->
+                            <!--                                android:text="控制状态："-->
+                            <!--                                android:textSize="20sp"/>-->
 
                         </LinearLayout>
 
diff --git a/app/src/main/res/mipmap-xxxhdpi/yxz.png b/app/src/main/res/mipmap-xxxhdpi/yxz.png
new file mode 100644
index 0000000000000000000000000000000000000000..7913e4704dd221328e6c9f86aaf907876d75a55a
GIT binary patch
literal 1731
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
Z_y>Q<f|=v*8=L?D002ovPDHLkV1jp3EUy3n

literal 0
HcmV?d00001


From 128befe2e6ef7fd6b6edf1fcc5e73c5d41ba4413 Mon Sep 17 00:00:00 2001
From: liup <YFB@DESKTOP-5HA1RFM>
Date: Sat, 11 May 2024 10:39:24 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=87=8A=E6=94=BE=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/view/AddGoodDialog.java            |   6 ++++++
 .../home/fragment/MakeGoodFragment.java       |   8 +-------
 .../fragment/from/GoodPeiFangActivity.java    |   3 +++
 .../home/fragment/from/SilosNewActivity.java  |   1 +
 .../fragment/mode/Silos_item_fragment.java    |   1 +
 .../home/fragment/mode/add_good_control.java  |   4 ++++
 .../home/fragment/mode/add_pf_control.java    |   7 +++++++
 app/src/main/res/layout/fragment_gongneng.xml |  12 ++++++------
 app/src/main/res/mipmap-xxxhdpi/yxz.png       | Bin 1731 -> 11425 bytes
 9 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/bonait/bnframework/common/view/AddGoodDialog.java b/app/src/main/java/com/bonait/bnframework/common/view/AddGoodDialog.java
index a2283f6a..cc3414e6 100644
--- a/app/src/main/java/com/bonait/bnframework/common/view/AddGoodDialog.java
+++ b/app/src/main/java/com/bonait/bnframework/common/view/AddGoodDialog.java
@@ -397,4 +397,10 @@ public class AddGoodDialog extends Dialog {
                             | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
         }
     };
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        MessageManager.getInstance().unRegisterMessageReceiver(activity_ma);
+    }
 }
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 308e5457..7cbf1e9a 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
@@ -81,15 +81,8 @@ import com.bonait.bnframework.common.message.MessageManager;
 import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.modules.home.adapter.loadinggood_adapter;
-import com.bonait.bnframework.modules.home.adapter.wl_adapter;
-import com.bonait.bnframework.modules.home.fragment.mode.SerialInter;
-import com.bonait.bnframework.modules.home.fragment.mode.SerialManage;
-import com.bonait.bnframework.modules.home.fragment.mode.SerialPortRead;
-import com.bonait.bnframework.modules.home.fragment.mode.ShaoMaSave;
-//import com.bonait.bnframework.modules.home.fragment.mode.ShaomaTest;
 import com.bonait.bnframework.modules.home.fragment.mode.add_makegood_control;
 import com.bonait.bnframework.modules.home.fragment.mode.add_manguan_control;
-import com.bonait.bnframework.modules.home.fragment.mode.add_pf_control;
 import com.bumptech.glide.Glide;
 import com.litao.slider.NiftySlider;
 import com.orhanobut.logger.Logger;
@@ -822,6 +815,7 @@ public class MakeGoodFragment extends BaseFragment {
 
         rv_right.setAdapter(null);
         Glide.get(getContext()).clearMemory();
+        MessageManager.getInstance().unRegisterMessageReceiver(getActivity());
     }
 
     /**
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java
index e9f1fc6e..93138ce9 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/GoodPeiFangActivity.java
@@ -420,9 +420,12 @@ public class GoodPeiFangActivity extends BaseActivity {
 
     @Override
     public void onDestroy() {
+        add_pf.destroy();
+        add_good.destroy();
         super.onDestroy();
         rv_right.setAdapter(null);
         Glide.get(this).clearMemory();
+        MessageManager.getInstance().unRegisterMessageReceiver(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
index f534b920..7ee4f431 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
@@ -228,6 +228,7 @@ public class SilosNewActivity extends BaseActivity {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        MessageManager.getInstance().unRegisterMessageReceiver(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_fragment.java
index c62f99d1..80b1a6ba 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_fragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_fragment.java
@@ -114,6 +114,7 @@ public class Silos_item_fragment extends BaseFragment {
     public void onDestroy() {
         super.onDestroy();
         Logger.d("我的fragment销毁");
+        MessageManager.getInstance().unRegisterMessageReceiver(getActivity());
     }
 
     /**
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_good_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_good_control.java
index d29a1a5d..574d0bf9 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_good_control.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_good_control.java
@@ -227,6 +227,10 @@ public class add_good_control extends LinearLayout {
         });
     }
 
+    public void destroy(){
+        MessageManager.getInstance().unRegisterMessageReceiver(activity_ma);
+    }
+
     public String ids="";
     /**
      * 数据验证
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
index 3b4a9924..3ba9e9ae 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
@@ -317,6 +317,13 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
         }
     }
 
+    public void destroy(){
+        Activity activity = findActivity(acontext);
+        if (activity != null) {
+            MessageManager.getInstance().unRegisterMessageReceiver(activity);
+        }
+    }
+
     /**
      * 保存数据
      */
diff --git a/app/src/main/res/layout/fragment_gongneng.xml b/app/src/main/res/layout/fragment_gongneng.xml
index a6a02b87..3a9443c6 100644
--- a/app/src/main/res/layout/fragment_gongneng.xml
+++ b/app/src/main/res/layout/fragment_gongneng.xml
@@ -245,20 +245,20 @@
         android:background="@color/app_color_blue" >
         <FrameLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="?attr/qmui_topbar_height">
             <Button
                 android:id="@+id/btn_sync"
                 android:layout_width="100dp"
-                android:layout_height="match_parent"
-                android:background="null"
+                android:layout_height="?attr/qmui_topbar_height"
+                android:background="#00000000"
                 android:textSize="16sp"
                 android:layout_centerHorizontal="true"/>
             <ImageView
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="wrap_content"
+                android:layout_height="?attr/qmui_topbar_height"
                 android:src="@mipmap/yxz"
                 android:layout_gravity="center"
-                android:scaleType="fitXY"
+                android:scaleType="fitCenter"
                 />
         </FrameLayout>
 
diff --git a/app/src/main/res/mipmap-xxxhdpi/yxz.png b/app/src/main/res/mipmap-xxxhdpi/yxz.png
index 7913e4704dd221328e6c9f86aaf907876d75a55a..bceb80e25a680562e4e125cf5d308a6d56054783 100644
GIT binary patch
literal 11425
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%0Ap2$W
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
T*%Tl6<`_^{c?>UALZSZ;R$WoM

literal 1731
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
Z_y>Q<f|=v*8=L?D002ovPDHLkV1jp3EUy3n


From e20ca95947bf2c7314c8b6bff085050134d88c53 Mon Sep 17 00:00:00 2001
From: liup <YFB@DESKTOP-5HA1RFM>
Date: Sat, 11 May 2024 11:27:02 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonait/bnframework/business/ConfigData.java |  1 +
 .../bnframework/business/ExecuteTheRecipe.java      |  8 +++++++-
 .../home/activity/BottomNavigationMainActivity.java |  4 ++++
 app/src/main/res/layout/fragment_make_good.xml      |  7 ++++---
 .../res/layout/item/layout/dialog_add_silos_ck.xml  |  4 ++--
 .../res/layout/item/layout/loadinggood_item.xml     | 13 ++++++-------
 app/src/main/res/layout/item/layout/newmakegood.xml |  1 +
 7 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java
index edbc7a47..a4fa2c2b 100644
--- a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java
+++ b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java
@@ -997,6 +997,7 @@ public class ConfigData {
 
 
     }
+
     //endregion
 }
 
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 61c274ef..104bee13 100644
--- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
+++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
@@ -296,7 +296,7 @@ public class ExecuteTheRecipe {
                 } catch (Exception ex) {
                     ToastUtils.error("PLC设备数据监听异常:" + ex.getMessage());
                 }
-                Thread.sleep(1);
+                Thread.sleep(50);
             }
 
             @Override
@@ -510,6 +510,12 @@ public class ExecuteTheRecipe {
             }
         });
     }
+
+    public static void releaseListening(){
+        ThreadManager.Get().Stop("PLC设备数据监听");
+        ThreadManager.Get().Stop("PLC设备数据监听-信号检测");
+        ThreadManager.Get().Stop("商品制作线程");
+    }
     //endregion
 
     //region PLC基础控制类
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java
index 14f5855e..a6db02ee 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/activity/BottomNavigationMainActivity.java
@@ -20,6 +20,7 @@ import android.widget.RelativeLayout;
 
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.ConfigData;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.business.OrderServer;
 import com.bonait.bnframework.common.base.BaseActivity;
 import com.bonait.bnframework.common.constant.ConfigName;
@@ -140,6 +141,9 @@ public class BottomNavigationMainActivity extends BaseActivity{
         ConfigData.getInstance().ColsePLC();
         MediaPlayerHelper.getInstance().Release();
         MQTT.get().ConnMqttBroken(false);//释放mqtt
+        ThreadManager.Get().Stop("PLC断线重连线程");
+        ThreadManager.Get().Stop("心跳服务");
+        ExecuteTheRecipe.releaseListening();
         super.onDestroy();
 
         Glide.get(this).clearMemory();
diff --git a/app/src/main/res/layout/fragment_make_good.xml b/app/src/main/res/layout/fragment_make_good.xml
index dd1115fd..5aa8614a 100644
--- a/app/src/main/res/layout/fragment_make_good.xml
+++ b/app/src/main/res/layout/fragment_make_good.xml
@@ -18,7 +18,7 @@
             android:layout_weight="1"
             android:orientation="horizontal">
             <LinearLayout
-                android:layout_width="90dp"
+                android:layout_width="100dp"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="35dp"
                 android:background="@color/white"
@@ -66,13 +66,14 @@
                         android:id="@+id/rv_right"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:layout_marginRight="360dp"
                         android:orientation="vertical"
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
                     <LinearLayout
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="@dimen/dp_10"
-                        android:layout_width="200dp"
+                        android:layout_width="350dp"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
                         <ImageView
@@ -84,7 +85,7 @@
                         <RelativeLayout
                             android:id="@+id/loadgoodliebiao"
                             android:layout_marginTop="@dimen/dp_10"
-                            android:layout_width="200dp"
+                            android:layout_width="350dp"
                             android:layout_height="match_parent">
                             <ScrollView
                                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
index bf98061f..87d48d9d 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
@@ -139,7 +139,7 @@
                         <Button
                             android:id="@+id/control_switch_shoudong"
                             android:layout_width="80dp"
-                            android:layout_height="40dp"
+                            android:layout_height="50dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
                             android:text="出料"
@@ -150,7 +150,7 @@
                             android:layout_marginTop="@dimen/dp_10"
                             android:id="@+id/control_huishou"
                             android:layout_width="80dp"
-                            android:layout_height="40dp"
+                            android:layout_height="50dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
                             android:text="回收"
diff --git a/app/src/main/res/layout/item/layout/loadinggood_item.xml b/app/src/main/res/layout/item/layout/loadinggood_item.xml
index 46ba02f7..50aa712b 100644
--- a/app/src/main/res/layout/item/layout/loadinggood_item.xml
+++ b/app/src/main/res/layout/item/layout/loadinggood_item.xml
@@ -10,7 +10,7 @@
     <RelativeLayout
         android:id="@+id/loading_main"
         android:layout_width="match_parent"
-        android:layout_height="70dp">
+        android:layout_height="100dp">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -78,17 +78,16 @@
             <TextView
                 android:id="@+id/loading_status"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="10dp"
                 android:layout_marginRight="10dp"
-                android:layout_marginBottom="30dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_width="100dp"
+                android:layout_height="50dp"
                 android:text="制作中"></TextView>
             <Button
                 android:layout_alignParentBottom="true"
                 android:id="@+id/quxiaozhizuo"
-                android:layout_width="50dp"
-                android:layout_height="30dp"
+                android:layout_width="100dp"
+                android:layout_height="50dp"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="5dp"
                 android:layout_alignParentRight="true"
diff --git a/app/src/main/res/layout/item/layout/newmakegood.xml b/app/src/main/res/layout/item/layout/newmakegood.xml
index 4b01441e..333110a2 100644
--- a/app/src/main/res/layout/item/layout/newmakegood.xml
+++ b/app/src/main/res/layout/item/layout/newmakegood.xml
@@ -8,6 +8,7 @@
     <LinearLayout
         android:layout_marginTop="@dimen/dp_10"
         android:layout_marginLeft="5dp"
+        android:layout_marginRight="10dp"
         android:layout_marginBottom="@dimen/dp_10"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

From 00a95d712628c6006886a1510ad074029484a775 Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Mon, 13 May 2024 11:10:02 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonait/bnframework/business/MainInit.java |  2 +-
 .../modules/home/adapter/goodpf_apapter.java  |  5 +-
 .../home/fragment/MakeGoodFragment.java       |  6 +-
 .../home/fragment/mode/GoodInformation.java   |  4 +-
 .../home/fragment/mode/add_pf_control.java    |  2 +-
 .../res/layout/datatab/layout/wl_item.xml     |  6 +-
 .../main/res/layout/fragment_make_good.xml    |  9 +--
 .../item/layout/dialog_add_silos_ck.xml       | 10 +--
 .../layout/item/layout/loadinggood_item.xml   | 15 +++--
 .../res/layout/item/layout/newmakegood.xml    |  2 +-
 .../item/layout/silos_jiaoyan_item_edit.xml   | 62 ++++++++++++-------
 11 files changed, 75 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/com/bonait/bnframework/business/MainInit.java b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
index d7f8af17..e17d262c 100644
--- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java
+++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
@@ -82,7 +82,7 @@ public class MainInit {
         MainNotification.initNotificationChannel(app);
 
         // 内存泄漏检测
-        initLeakCanary(true,app);
+        initLeakCanary(BuildConfig.DEBUG,app);
 
         // Log日志打印框架
         initLogCat();
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java
index 85f3c696..016a070e 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/goodpf_apapter.java
@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -43,8 +44,8 @@ public class goodpf_apapter extends ArrayAdapter<BPA_GOODSRECIPENAME> {
         View view = LayoutInflater.from(getContext()).inflate(resource1, parent, false);
         //分别获取 image view 和 textview 的实例
         TextView name = view.findViewById(R.id.name);
-        ImageView button = view.findViewById(R.id.button_item);
-        ImageView button_update = view.findViewById(R.id.button_update);
+        RelativeLayout button = view.findViewById(R.id.button_item);
+        RelativeLayout button_update = view.findViewById(R.id.button_update);
 
         // 设置要显示的图片和文字
         name.setText(bpa_goodsrecipename.name);
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 7cbf1e9a..7ed5bb5b 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
@@ -666,7 +666,11 @@ public class MakeGoodFragment extends BaseFragment {
                 activity.runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        String msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | ";
+                        String msg = msg2;
+
+                        if(ConfigName.TEST){
+                            msg = " |03cb1364-8b85-446a-b00b-d3657de1a19f| | ";
+                        }
                         if ((msg != null) && (((String) msg).length() > 2) && ((String) msg).contains("|")) {
                             //拿到扫码数据
                             //例如 ORD001|P0003|A001,M002,T001|2
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java
index 3345122c..5ccb8a2b 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/GoodInformation.java
@@ -469,7 +469,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener {
                         {
                             BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id);
                             if (goodsrecipename != null) {
-                                ToastUtils.warning("已有改做法配方,不能在新增了!");
+                                ToastUtils.warning("已有该做法配方,不能再新增了!");
                                 return;
                             }
                         }
@@ -538,7 +538,7 @@ public class GoodInformation extends LinearLayout implements MyClickListener {
                     //判断配方是否有相同规格的了
                     BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids, Data.id);
                     if (goodsrecipename != null) {
-                        ToastUtils.warning("已有改做法配方,不能在新增了!");
+                        ToastUtils.warning("已有该做法配方,不能再新增了!");
                         return;
                     }
                     //新增配方名称
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
index 3ba9e9ae..dd9a92bb 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/add_pf_control.java
@@ -446,7 +446,7 @@ public class add_pf_control extends LinearLayout implements MyClickListener {
         {
             BPA_GOODSRECIPENAME goodsrecipename = QueryDB.GetGoodsRecipeNameDesignId(ggids,Good.id);
             if (goodsrecipename != null) {
-                ToastUtils.warning("已有改做法配方,不能在新增了!");
+                ToastUtils.warning("已有该做法配方,不能再新增了!");
                 return isSuceess;
             }
         }
diff --git a/app/src/main/res/layout/datatab/layout/wl_item.xml b/app/src/main/res/layout/datatab/layout/wl_item.xml
index fbce4ddc..27d92d20 100644
--- a/app/src/main/res/layout/datatab/layout/wl_item.xml
+++ b/app/src/main/res/layout/datatab/layout/wl_item.xml
@@ -57,25 +57,25 @@
                 android:layout_weight="1"
                 android:background="@drawable/border">
                 <RelativeLayout
+                    android:id="@+id/button_update"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1">
 
                     <ImageView
-                        android:id="@+id/button_update"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
                         android:src="@mipmap/new_update" />
                 </RelativeLayout>
                 <RelativeLayout
+                    android:id="@+id/button_item"
                     android:layout_width="0dp"
-                    android:layout_height="30dp"
+                    android:layout_height="50dp"
                     android:layout_weight="1"
                     android:background="@drawable/border">
                     <ImageView
                         android:layout_centerInParent="true"
-                        android:id="@+id/button_item"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:src="@mipmap/new_delete"/>
diff --git a/app/src/main/res/layout/fragment_make_good.xml b/app/src/main/res/layout/fragment_make_good.xml
index 5aa8614a..1bdc158b 100644
--- a/app/src/main/res/layout/fragment_make_good.xml
+++ b/app/src/main/res/layout/fragment_make_good.xml
@@ -18,7 +18,7 @@
             android:layout_weight="1"
             android:orientation="horizontal">
             <LinearLayout
-                android:layout_width="100dp"
+                android:layout_width="90dp"
                 android:layout_height="match_parent"
                 android:layout_marginBottom="35dp"
                 android:background="@color/white"
@@ -66,14 +66,14 @@
                         android:id="@+id/rv_right"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginRight="360dp"
+                        android:layout_marginRight="250dp"
                         android:orientation="vertical"
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
 
                     <LinearLayout
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="@dimen/dp_10"
-                        android:layout_width="350dp"
+                        android:layout_width="250dp"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
                         <ImageView
@@ -85,7 +85,7 @@
                         <RelativeLayout
                             android:id="@+id/loadgoodliebiao"
                             android:layout_marginTop="@dimen/dp_10"
-                            android:layout_width="350dp"
+                            android:layout_width="match_parent"
                             android:layout_height="match_parent">
                             <ScrollView
                                 android:layout_width="match_parent"
@@ -165,6 +165,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:text="称(单击清零):"
+                android:paddingTop="15dp"
                 android:textSize="@dimen/TitleSize" />
 
             <TextView
diff --git a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
index 87d48d9d..c8fbb91e 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
@@ -11,7 +11,7 @@
     <RelativeLayout
         android:layout_centerInParent="true"
         android:layout_margin="20dp"
-        android:layout_width="400dp"
+        android:layout_width="500dp"
         android:layout_height="400dp"
         android:background="@drawable/common_bg_with_radius_and_border">
 
@@ -138,8 +138,8 @@
                         android:orientation="vertical">
                         <Button
                             android:id="@+id/control_switch_shoudong"
-                            android:layout_width="80dp"
-                            android:layout_height="50dp"
+                            android:layout_width="120dp"
+                            android:layout_height="70dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
                             android:text="出料"
@@ -149,8 +149,8 @@
                         <Button
                             android:layout_marginTop="@dimen/dp_10"
                             android:id="@+id/control_huishou"
-                            android:layout_width="80dp"
-                            android:layout_height="50dp"
+                            android:layout_width="120dp"
+                            android:layout_height="70dp"
                             android:layout_centerHorizontal="true"
                             android:background="@drawable/silosbuttonbj"
                             android:text="回收"
diff --git a/app/src/main/res/layout/item/layout/loadinggood_item.xml b/app/src/main/res/layout/item/layout/loadinggood_item.xml
index 50aa712b..7d436089 100644
--- a/app/src/main/res/layout/item/layout/loadinggood_item.xml
+++ b/app/src/main/res/layout/item/layout/loadinggood_item.xml
@@ -36,11 +36,12 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:layout_marginLeft="10dp"
+                    android:textSize="16sp"
                     android:text="01"></TextView>
             </RelativeLayout>
 
             <RelativeLayout
-                android:layout_marginRight="60dp"
+                android:layout_marginRight="100dp"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
                 <LinearLayout
@@ -54,6 +55,7 @@
                         android:layout_height="wrap_content"
                         android:text="金牡丹菠萝奶茶茶饮"
                         android:textAlignment="center"
+                        android:textSize="16sp"
                         />
 
                     <TextView
@@ -61,6 +63,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="中杯/去冰/无糖"
+                        android:textSize="16sp"
                         android:textAlignment="center" />
                     <TextView
                         android:visibility="gone"
@@ -73,7 +76,9 @@
         </LinearLayout>
 
         <RelativeLayout
-            android:layout_width="match_parent"
+            android:layout_width="100dp"
+            android:gravity="right"
+            android:layout_alignParentRight="true"
             android:layout_height="match_parent">
             <TextView
                 android:id="@+id/loading_status"
@@ -81,20 +86,22 @@
                 android:layout_marginRight="10dp"
                 android:gravity="center"
                 android:layout_width="100dp"
+                android:textSize="16sp"
                 android:layout_height="50dp"
                 android:text="制作中"></TextView>
             <Button
                 android:layout_alignParentBottom="true"
                 android:id="@+id/quxiaozhizuo"
                 android:layout_width="100dp"
-                android:layout_height="50dp"
+                android:layout_height="40dp"
                 android:layout_marginRight="10dp"
                 android:layout_marginBottom="5dp"
                 android:layout_alignParentRight="true"
                 android:background="@drawable/bg_btn_login_selected"
                 android:text="取消"
+                android:textSize="16sp"
                 android:textColor="@color/white"
-                android:textSize="14sp"/>
+                />
         </RelativeLayout>
         <RelativeLayout
             android:layout_alignParentBottom="true"
diff --git a/app/src/main/res/layout/item/layout/newmakegood.xml b/app/src/main/res/layout/item/layout/newmakegood.xml
index 333110a2..776665a1 100644
--- a/app/src/main/res/layout/item/layout/newmakegood.xml
+++ b/app/src/main/res/layout/item/layout/newmakegood.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="220dp"
+    android:layout_width="205dp"
     android:layout_height="180dp">
 
 
diff --git a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
index 5c12afb8..9ad54c98 100644
--- a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
+++ b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
@@ -26,6 +26,20 @@
                 android:text="通道校准"
                 android:textSize="20dp"
                 android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="60dp"
+                android:text="当前重量："
+                android:textSize="20sp"/>
+
+            <TextView
+                android:id="@+id/current_weight"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="实际出料重量："
+                android:textSize="20sp"/>
         </LinearLayout>
 
         <Button
@@ -45,7 +59,7 @@
             android:id="@+id/title_bc"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dp"
+            android:layout_marginLeft="20dp"
             android:layout_marginTop="15dp"
             android:text="11 豆瓣酱"
             android:textAlignment="center"
@@ -107,7 +121,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最小出料时间："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/min_time"
@@ -121,20 +135,20 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <LinearLayout
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:orientation="horizontal">
                                         <TextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最小出料重量："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/min_weight"
@@ -148,19 +162,19 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <Button
                                         android:id="@+id/btn_min_standard"
                                         android:layout_width="match_parent"
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:layout_height="wrap_content"
                                         android:background="@drawable/bg_btn_login_selected"
                                         android:text="最小校准"
                                         android:textColor="@color/white"
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
                                 </LinearLayout>
 
                                 <LinearLayout
@@ -179,7 +193,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最大出料时间："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/max_time"
@@ -193,20 +207,20 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <LinearLayout
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:orientation="horizontal">
                                         <TextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="最大出料重量："
-                                            android:textSize="25sp"/>
+                                            android:textSize="20sp"/>
 
                                         <EditText
                                             android:id="@+id/max_weight"
@@ -220,19 +234,19 @@
                                             android:maxLines="1"
                                             android:padding="3dp"
                                             android:text="2"
-                                            android:textSize="25dp"/>
+                                            android:textSize="20sp"/>
 
                                     </LinearLayout>
 
                                     <Button
-                                        android:layout_marginTop="30dp"
+                                        android:layout_marginTop="20dp"
                                         android:id="@+id/btn_max_standard"
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:background="@drawable/bg_btn_login_selected"
                                         android:text="最大校准"
                                         android:textColor="@color/white"
-                                        android:textSize="25sp" />
+                                        android:textSize="20sp" />
 
                                 </LinearLayout>
 
@@ -245,14 +259,14 @@
                                 android:background="@color/gray"/>
 
                             <Button
-                                android:layout_marginTop="30dp"
+                                android:layout_marginTop="20dp"
                                 android:id="@+id/btn_save"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:background="@drawable/bg_btn_login_selected"
                                 android:text="保存参数"
                                 android:textColor="@color/white"
-                                android:textSize="25sp" />
+                                android:textSize="20sp" />
 
                             <View
                                 android:layout_width="650dp"
@@ -263,7 +277,7 @@
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:layout_marginTop="30dp"
+                                android:layout_marginTop="20dp"
                                 android:orientation="horizontal">
 
                                 <LinearLayout
@@ -274,7 +288,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="模拟出料重量："
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
 
                                     <EditText
                                         android:id="@+id/sim_discharge_weight"
@@ -288,7 +302,7 @@
                                         android:maxLines="1"
                                         android:padding="3dp"
                                         android:text="2"
-                                        android:textSize="25dp"/>
+                                        android:textSize="20sp"/>
 
                                 </LinearLayout>
 
@@ -300,14 +314,14 @@
                                     android:background="@drawable/bg_btn_login_selected"
                                     android:text="模拟出料"
                                     android:textColor="@color/white"
-                                    android:textSize="25sp" />
+                                    android:textSize="20sp" />
 
                             </LinearLayout>
 
                             <LinearLayout
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
-                                android:layout_marginTop="30dp"
+                                android:layout_marginTop="20dp"
                                 android:orientation="horizontal">
 
                                 <LinearLayout
@@ -318,14 +332,14 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="实际出料重量："
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
 
                                     <TextView
                                         android:id="@+id/tv_discharge_result"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text=""
-                                        android:textSize="25sp"/>
+                                        android:textSize="20sp"/>
 
                                 </LinearLayout>
 

From 24e7a66afcfaed8ab59c83695557a77fa97e5b6b Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Mon, 13 May 2024 17:36:16 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E9=94=99=E4=B9=B1=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=A1=E5=87=86=E5=BC=B9=E7=AA=97=E5=86=85=E5=AD=98=E6=B3=84?=
 =?UTF-8?q?=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  13 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../bnframework/HBL/Dialog/WaitDialog.java    |  61 +++++--
 .../com/bonait/bnframework/HBL/Unity.java     |   1 -
 .../bonait/bnframework/business/MainInit.java |   2 +-
 .../common/helper/CrashHandler.java           |   5 +
 .../bnframework/common/utils/ToastUtils.java  |  42 +++--
 .../common/utils/UpdateAppUtils.java          |  15 +-
 .../home/adapter/loadinggood_adapter.java     |  36 ++--
 .../modules/home/adapter/wdsz_adapter.java    |   5 +
 .../modules/home/adapter/wl_adapter.java      |   5 +-
 .../home/fragment/MakeGoodFragment.java       |  24 ++-
 .../modules/home/fragment/SheZhifragment.java |   2 +-
 .../home/fragment/from/SilosNewActivity.java  |   5 +-
 .../home/fragment/mode/silos_jiaoyan.java     | 171 +++++++++++-------
 .../main/res/layout/fragment_make_good.xml    |   2 +
 app/src/main/res/layout/fragment_she_zhi.xml  |   9 +
 .../item/layout/silos_jiaoyan_item_edit.xml   |  36 +---
 .../main/res/layout/item/layout/wdsz_item.xml |   1 +
 build.gradle                                  |   4 +-
 gradle.properties                             |   2 +-
 21 files changed, 269 insertions(+), 173 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 127cfff1..680d8662 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,6 +1,12 @@
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+
 apply plugin: 'com.android.application'
 //apply plugin: 'com.jakewharton.butterknife'
-
+def releaseTime() {
+    DateFormat df = new SimpleDateFormat("yyyyMMddHHmm")
+    return df.format(Calendar.getInstance(Locale.CHINA).getTime())
+}
 
 android {
     compileSdk rootProject.ext.compileSdkVersion
@@ -51,6 +57,11 @@ android {
 
         }
     }
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "boluobatai-v${defaultConfig.versionCode}-${releaseTime()}"+"-unsigned-${variant.name}.apk"
+        }
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e3f47563..686eed94 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -146,6 +146,7 @@
         <activity
             android:name=".modules.home.activity.BottomNavigationMainActivity"
             android:exported="false"
+            android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden"
           />
         <activity
diff --git a/app/src/main/java/com/bonait/bnframework/HBL/Dialog/WaitDialog.java b/app/src/main/java/com/bonait/bnframework/HBL/Dialog/WaitDialog.java
index 994ae53a..2f19d647 100644
--- a/app/src/main/java/com/bonait/bnframework/HBL/Dialog/WaitDialog.java
+++ b/app/src/main/java/com/bonait/bnframework/HBL/Dialog/WaitDialog.java
@@ -6,41 +6,66 @@ import android.content.Context;
 import android.content.DialogInterface;
 
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.DataBus;
+
+import java.lang.ref.WeakReference;
 
 public class WaitDialog {
 
-    static Context context;
-    static Activity activity;
-   static ProgressDialog progressDialog;
+    private WeakReference<Activity> activityWeakReference;
+    private WeakReference<Context> contextWeakReference;
+    private ProgressDialog progressDialog;
+    private static WaitDialog mInstance; //实例变量设置私有，防止直接通过类名访问
+
+    private WaitDialog() {
+        //默认构造函数私有，防止类外直接new创建对象
+    }
 
-    public static void Show(String title,String msg,Context _context,Activity _activity){
-        context=_context;
-        activity=_activity;
-       if(context==null) return;
-        progressDialog = new ProgressDialog(context);
+    public static synchronized WaitDialog getInstance() { //静态同步方法作为唯一的实例对象获取方式
+        if (mInstance==null) {
+            synchronized (WaitDialog.class ){
+                if(mInstance==null){
+                    mInstance = new WaitDialog();
+                }
+            }
+        }
+        return mInstance;
+    }
+    //end
+
+    public void Show(String title,String msg,Context _context,Activity _activity){
+        contextWeakReference=new WeakReference<>(_context);
+        activityWeakReference = new WeakReference<>(_activity);
+       if(_context==null) return;
+       if(progressDialog!=null){
+           progressDialog.dismiss();
+       }
+        progressDialog = new ProgressDialog(_context);
         progressDialog.setTitle(title);
         progressDialog.setCancelable(false);
         progressDialog.setMessage(msg);
         progressDialog.show();
     }
 
-    public static void AddText(String info){
-        if(context==null) return;
-        if(activity==null) return;
+    public void AddText(String info){
+        if(contextWeakReference.get()==null) return;
+        if(activityWeakReference.get()==null) return;
         if(progressDialog==null) return;
-        activity.runOnUiThread(()->{ progressDialog.setMessage(info);});
+        activityWeakReference.get().runOnUiThread(()->{ progressDialog.setMessage(info);});
     }
 
-    public static void Dismiss(){
-        if(activity==null) return;
+    public void Dismiss(){
+        if(activityWeakReference.get()==null) return;
         if(progressDialog==null) return;
-        activity.runOnUiThread(()->{ progressDialog.dismiss();});
+        activityWeakReference.get().runOnUiThread(()->{ progressDialog.dismiss();});
     }
 
-    public static void TimeOut(String info){
-        if(activity==null) return;
+    public void TimeOut(String info){
+        if(activityWeakReference.get()==null) return;
         if(progressDialog==null) return;
         Dismiss();
-        DialogManager.showError(activity,info,AlertDialogButton.OK,null);
+        DialogManager.showError(activityWeakReference.get(),info,AlertDialogButton.OK,null);
     }
+
+
 }
diff --git a/app/src/main/java/com/bonait/bnframework/HBL/Unity.java b/app/src/main/java/com/bonait/bnframework/HBL/Unity.java
index de19b6d9..8580885a 100644
--- a/app/src/main/java/com/bonait/bnframework/HBL/Unity.java
+++ b/app/src/main/java/com/bonait/bnframework/HBL/Unity.java
@@ -25,7 +25,6 @@ public class Unity {
         if(func==null) return OperateResult.CreateFailed("条件为空");
         boolean tag=false;
         while(!tag){
-            Delay(100);
             tag=func.Run();
             Delay(100);
             if(timeOut>0&&(System.currentTimeMillis()-startTime)>timeOut) break;
diff --git a/app/src/main/java/com/bonait/bnframework/business/MainInit.java b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
index e17d262c..d7f8af17 100644
--- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java
+++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
@@ -82,7 +82,7 @@ public class MainInit {
         MainNotification.initNotificationChannel(app);
 
         // 内存泄漏检测
-        initLeakCanary(BuildConfig.DEBUG,app);
+        initLeakCanary(true,app);
 
         // Log日志打印框架
         initLogCat();
diff --git a/app/src/main/java/com/bonait/bnframework/common/helper/CrashHandler.java b/app/src/main/java/com/bonait/bnframework/common/helper/CrashHandler.java
index f33a8f4b..2d22b2d6 100644
--- a/app/src/main/java/com/bonait/bnframework/common/helper/CrashHandler.java
+++ b/app/src/main/java/com/bonait/bnframework/common/helper/CrashHandler.java
@@ -13,6 +13,8 @@ import android.os.SystemClock;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.bonait.bnframework.common.constant.ConfigName;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
@@ -85,6 +87,9 @@ public class CrashHandler implements UncaughtExceptionHandler {
      * @return true:��������˸��쳣��Ϣ; ���򷵻�false.
      */
     private boolean handleException(Throwable ex) {
+        if(ConfigName.TEST){
+            return false;
+        }
         if (ex == null)
             return false;
 
diff --git a/app/src/main/java/com/bonait/bnframework/common/utils/ToastUtils.java b/app/src/main/java/com/bonait/bnframework/common/utils/ToastUtils.java
index 346fb654..3680c408 100644
--- a/app/src/main/java/com/bonait/bnframework/common/utils/ToastUtils.java
+++ b/app/src/main/java/com/bonait/bnframework/common/utils/ToastUtils.java
@@ -45,25 +45,26 @@ public class ToastUtils {
 
     private static final String TOAST_TYPEFACE = "sans-serif-condensed";
 
+    private static Toast currentToastThread;
     private static Toast currentToast;
 
     //***********************普通 使用ApplicationContext 方法*********************//
     private static long mExitTime;
 
     public static void normal(@NonNull String message) {
-        normal(MainApplication.getContext(), message, Toast.LENGTH_SHORT, null, false).show();
+        normal(MainApplication.getContext(), message, Toast.LENGTH_SHORT, null, false);//.show();
     }
 
     public static void normal(@NonNull String message, Drawable icon) {
-        normal(MainApplication.getContext(), message, Toast.LENGTH_SHORT, icon, true).show();
+        normal(MainApplication.getContext(), message, Toast.LENGTH_SHORT, icon, true);//.show();
     }
 
     public static void normal(@NonNull String message, int duration) {
-        normal(MainApplication.getContext(), message, duration, null, false).show();
+        normal(MainApplication.getContext(), message, duration, null, false);//.show();
     }
 
     public static void normal(@NonNull String message, int duration, Drawable icon) {
-        normal(MainApplication.getContext(), message, duration, icon, true).show();
+        normal(MainApplication.getContext(), message, duration, icon, true);//.show();
     }
 
     public static Toast normal(@NonNull String message, int duration, Drawable icon, boolean withIcon) {
@@ -71,11 +72,11 @@ public class ToastUtils {
     }
 
     public static void warning(@NonNull String message) {
-        warning(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true).show();
+        warning(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true);//.show();
     }
 
     public static void warning(@NonNull String message, int duration) {
-        warning(MainApplication.getContext(), message, duration, true).show();
+        warning(MainApplication.getContext(), message, duration, true);//.show();
     }
 
     public static Toast warning(@NonNull String message, int duration, boolean withIcon) {
@@ -83,11 +84,11 @@ public class ToastUtils {
     }
 
     public static void info(@NonNull String message) {
-        info(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true).show();
+        info(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true);//.show();
     }
 
     public static void info(@NonNull String message, int duration) {
-        info(MainApplication.getContext(), message, duration, true).show();
+        info(MainApplication.getContext(), message, duration, true);//.show();
     }
 
     public static Toast info(@NonNull String message, int duration, boolean withIcon) {
@@ -95,26 +96,27 @@ public class ToastUtils {
     }
 
     public static void success(@NonNull String message) {
-        success(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true).show();
+        success(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true);//.show();
     }
 
     public static void success(@NonNull String message, int duration) {
-        success(MainApplication.getContext(), message, duration, true).show();
+        success(MainApplication.getContext(), message, duration, true);//.show();
     }
 
     public static Toast success(@NonNull String message, int duration, boolean withIcon) {
         return custom(MainApplication.getContext(), message, getDrawable(MainApplication.getContext(), R.mipmap.ic_check_white_48dp), DEFAULT_TEXT_COLOR, SUCCESS_COLOR, duration, withIcon, true);
     }
 
+    //***********************//
     public static void error(@NonNull String message) {
-        error(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true).show();
+        error(MainApplication.getContext(), message, Toast.LENGTH_SHORT, true);//.show();
     }
     //===========================================使用ApplicationContext 方法=========================
 
     //*******************************************常规方法********************************************
 
     public static void error(@NonNull String message, int duration) {
-        error(MainApplication.getContext(), message, duration, true).show();
+        error(MainApplication.getContext(), message, duration, true);//.show();
     }
 
     public static Toast error(@NonNull String message, int duration, boolean withIcon) {
@@ -259,14 +261,14 @@ public class ToastUtils {
 //            currentToast.setGravity(Gravity.RIGHT | Gravity.TOP, 0, 0);//右上角
 //            currentToast.setGravity(Gravity.LEFT | Gravity.BOTTOM, 0, 0);//左下角
            // currentToast.setGravity(Gravity.RIGHT | Gravity.BOTTOM, 0, 100);//右下角
-
+            currentToast.show();
             return currentToast;
         } else {
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {
-                    if (currentToast == null) {
-                        currentToast = new Toast(context);
+                    if (currentToastThread == null) {
+                        currentToastThread = new Toast(context);
                     }
                     final View toastLayout = ((LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.toast_layout, null);
                     final ImageView toastIcon =  toastLayout.findViewById(R.id.toast_icon);
@@ -293,11 +295,11 @@ public class ToastUtils {
                     toastTextView.setText(message);
                     toastTextView.setTypeface(Typeface.create(TOAST_TYPEFACE, Typeface.NORMAL));
 
-                    currentToast.setView(toastLayout);
-                    currentToast.setDuration(duration);
-
-                    currentToast.setGravity(Gravity.TOP,0,100);
+                    currentToastThread.setView(toastLayout);
+                    currentToastThread.setDuration(duration);
 
+                    currentToastThread.setGravity(Gravity.TOP,0,100);
+                    currentToastThread.show();
                     //            currentToast.setGravity(Gravity.LEFT | Gravity.TOP, 0, 0);//左上角
 //            currentToast.setGravity(Gravity.RIGHT | Gravity.TOP, 0, 0);//右上角
 //            currentToast.setGravity(Gravity.LEFT | Gravity.BOTTOM, 0, 0);//左下角
@@ -307,7 +309,7 @@ public class ToastUtils {
         }
 
 
-        return currentToast;
+        return null;
     }
 
     public static final Drawable tint9PatchDrawableFrame(@NonNull Context context, @ColorInt int tintColor) {
diff --git a/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java b/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
index d1328c9a..9b12ed31 100644
--- a/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
+++ b/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java
@@ -43,7 +43,7 @@ public class UpdateAppUtils {
     /**
      * 当前版本号
      */
-    private static String myVersionCode = "1.0";
+    private static String myVersionCode = "1.2";
     /**
      * 服务器的版本号
      */
@@ -99,10 +99,15 @@ public class UpdateAppUtils {
             mode.branchCode="1712279450412756993";
         }else
         {
-            mode.productCode="1679307017135329280";
-            mode.moduleCode="newtwbt";
-            mode.serverCode="1680767784879656960";//服务器
-            mode.branchCode="1712279534630187009";
+//            mode.productCode="1679307017135329280";
+//            mode.moduleCode="newtwbt";
+//            mode.serverCode="1680767784879656960";//服务器
+//            mode.branchCode="1712279534630187009";
+
+            mode.productCode="1769564215952125952";
+            mode.moduleCode="desktopplbt";
+            mode.serverCode="1769564338190921728";//服务器
+            mode.branchCode="1789857238682284033";
         }
 
         //调味吧台
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java
index 7d36479f..6bc8b18e 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/loadinggood_adapter.java
@@ -1,9 +1,11 @@
 package com.bonait.bnframework.modules.home.adapter;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.media.MediaPlayer;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,6 +20,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.bonait.bnframework.MainApplication;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.common.constant.DataBus;
@@ -30,6 +33,7 @@ import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.helper.MediaPlayerHelper;
 import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.ToastUtils;
+import com.http.utils.LogUtils;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
 import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 
@@ -46,15 +50,16 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
     private MyClickListener mListener;
     private ArrayList<ResGoodsMake> datas= DataBus.getInstance().GoodsMake;
     int resource1;
-    public Context conmain;
-    public Activity activity;
+//    public Context conmain;
+//    public Activity activity;
 
     private final LayoutInflater mLayoutInflater;
+    Handler handler = new Handler();
 
 
-    public loadinggood_adapter(Context context,MyClickListener myClickListener,Activity ac) {
-        this.conmain = context;
-        activity=ac;
+    public loadinggood_adapter(Context context,MyClickListener myClickListener) {
+//        this.conmain = context;
+//        activity=ac;
         mListener=myClickListener;
         mLayoutInflater = LayoutInflater.from(context);
     }
@@ -86,7 +91,7 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
                     break;
                 case "制作中":
                    // myViewHolder.quxiaozhizuo.setVisibility(View.VISIBLE);//取消制作
-                    myViewHolder.loading_status.setTextColor(conmain.getResources().getColor(R.color.green_primary_dark));
+                    myViewHolder.loading_status.setTextColor(myViewHolder.loading_status.getContext().getResources().getColor(R.color.green_primary_dark));
                     break;
                 case "制作完成":
                    // myViewHolder.quxiaozhizuo.setVisibility(View.VISIBLE);//取消制作
@@ -105,7 +110,7 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
                 public void onClick(View view) {
                     String title = "温馨提示！";
                     String message = "客官确定要取消制作【"+goodsMake.good.name+"】吗？";
-                    AlertDialogUtils.showDialog(conmain, title, message, new QMUIDialogAction.ActionListener() {
+                    AlertDialogUtils.showDialog(MainApplication.getContext(), title, message, new QMUIDialogAction.ActionListener() {
                         @Override
                         public void onClick(QMUIDialog dialog, int index) {
                             DataBus.getInstance().DeleteGoodsMake(goodsMake.subOrder.id);
@@ -134,16 +139,17 @@ public class loadinggood_adapter extends RecyclerView.Adapter<RecyclerView.ViewH
      * @param
      */
     public void refresh() {
-        activity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                try {
+        if(handler!=null){
+            handler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    datas= DataBus.getInstance().GoodsMake;
                     notifyDataSetChanged();
-                } catch (Exception e) {
-
+                    LogUtils.error("****","刷新 size="+datas.size());
                 }
-            }
-        });
+            },500);
+        }
+
     }
 
     /**
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 a213a4b5..47556a51 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
@@ -67,6 +67,7 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
                 myViewHolder.control_switch_bs.setChecked(false);
                 if(goodsMake.name.equals("水池温度"))
                 {
+
                     myViewHolder.zdbs1.setVisibility(View.VISIBLE);
                     myViewHolder.zdbs2.setVisibility(View.VISIBLE);
 
@@ -322,6 +323,10 @@ public class wdsz_adapter  extends RecyclerView.Adapter<RecyclerView.ViewHolder>
          * 保存值
          */
         Button save_value;
+        /**
+         * 父容器
+         */
+        RelativeLayout root;
 
         RelativeLayout zdbs1,zdbs2,zdbs3,show_wdsz,show_wd;
         public WDSZViewHolder(View view) {
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wl_adapter.java b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wl_adapter.java
index 0eec817c..87f7c853 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wl_adapter.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/adapter/wl_adapter.java
@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -43,8 +44,8 @@ public class wl_adapter extends ArrayAdapter<BPA_MATERIAL> {
         View view = LayoutInflater.from(getContext()).inflate(resource1, parent, false);
         //分别获取 image view 和 textview 的实例
         TextView name = view.findViewById(R.id.name);
-        ImageView button = view.findViewById(R.id.button_item);
-        ImageView button_update = view.findViewById(R.id.button_update);
+        RelativeLayout button = view.findViewById(R.id.button_item);
+        RelativeLayout button_update = view.findViewById(R.id.button_update);
 
         // 设置要显示的图片和文字
         name.setText(bpa_material.name);
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 7ed5bb5b..9d676aa4 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
@@ -16,6 +16,7 @@ import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.os.ResultReceiver;
 import android.text.Editable;
@@ -164,7 +165,16 @@ public class MakeGoodFragment extends BaseFragment {
     RelativeLayout loadgoodliebiao;
 
 
-
+    private Handler handler = new Handler(Looper.getMainLooper()){
+        @Override
+        public void handleMessage(@NonNull Message msg) {
+            super.handleMessage(msg);
+            if(msg.what == 1){
+                DataBus.getInstance().loadinggoodAdapter = new loadinggood_adapter(context, myClickListener);
+                datatab_paiduishangping.setAdapter(DataBus.getInstance().loadinggoodAdapter);
+            }
+        }
+    };
 
     private Context context;
 
@@ -302,10 +312,12 @@ public class MakeGoodFragment extends BaseFragment {
 //        LinearLayoutManager layoutManager = new LinearLayoutManager(context);
 //        layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
 //        datatab_paiduishangping.setLayoutManager(layoutManager);
-        datatab_paiduishangping.setLayoutManager(new WrapContentLinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL,false));
 
-        DataBus.getInstance().loadinggoodAdapter = new loadinggood_adapter(context, myClickListener, getActivity());
-        datatab_paiduishangping.setAdapter(DataBus.getInstance().loadinggoodAdapter);
+
+        handler.removeMessages(1);
+        handler.sendEmptyMessageDelayed(1,200);
+
+
     }
 
 
@@ -457,6 +469,8 @@ public class MakeGoodFragment extends BaseFragment {
                 }
             }
         };
+        datatab_paiduishangping.setLayoutManager(new WrapContentLinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL,false));
+
     }
 
     @OnClick({R.id.good_gengxin, R.id.cheng_clear, R.id.loadgood})
@@ -498,7 +512,7 @@ public class MakeGoodFragment extends BaseFragment {
                 case 0:
                     plc_status.setText(ConfigName.getInstance().PlcIsConnect ? "正常" : "异常");
                     plc_status.setTextColor(ConfigName.getInstance().PlcIsConnect ? Color.parseColor("#4CAF50") : Color.parseColor("#D32F2F"));
-                    wendu1.setText(ExecuteTheRecipe.WaterTemp + "°C");
+//                    wendu1.setText(ExecuteTheRecipe.WaterTemp + "°C");
                     MessageLog.ShowInfo("重量 ExecuteTheRecipe.OutletWeigh="+ExecuteTheRecipe.OutletWeigh);
                     dianzichen.setText(String.valueOf((int) ExecuteTheRecipe.OutletWeigh / 10.0) + " g");
                     break;
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/SheZhifragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/SheZhifragment.java
index 40072e60..2218a1d3 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/SheZhifragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/SheZhifragment.java
@@ -75,7 +75,7 @@ public class SheZhifragment extends BaseFragment {
                 skipToActivity(DzcjyActivity.class);
                 break;
             case R.id.wdsz://温度设置
-                skipToActivity(WdszActivity.class);
+//                skipToActivity(WdszActivity.class);
                 break;
         }
     }
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
index 7ee4f431..e9045b4b 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/SilosNewActivity.java
@@ -144,7 +144,7 @@ public class SilosNewActivity extends BaseActivity {
                 } else if (k == 4) {
                     //校准
                     silos_jz.SetData((lcMode) data, activity);
-                    silos_jz.setVisibility(View.VISIBLE);
+                    silos_jz.show();
                 } else if (k == 5) {
                     //
                 } else if (k == 6) {
@@ -162,7 +162,7 @@ public class SilosNewActivity extends BaseActivity {
             @Override
             public void clickListenerNew(View v, int k, Object data) {
                 if (k == 0) {
-                    silos_jz.setVisibility(View.GONE);
+                    silos_jz.close();
                 }
             }
         };
@@ -228,6 +228,7 @@ public class SilosNewActivity extends BaseActivity {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        silos_jz.close();
         MessageManager.getInstance().unRegisterMessageReceiver(this);
     }
 
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
index 17b91096..2772df16 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
@@ -33,6 +33,9 @@ import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.helper.MessageLog;
 import com.bonait.bnframework.common.utils.ToastUtils;
 
+import java.util.Timer;
+import java.util.TimerTask;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -71,8 +74,9 @@ public class silos_jiaoyan extends LinearLayout {
 
     @BindView(R.id.sim_discharge_weight)
     EditText sim_discharge_weight;
-    @BindView(R.id.tv_discharge_result)
-    TextView tv_discharge_result;
+
+    @BindView(R.id.current_weight)
+    TextView current_weight;
 
 //    @BindView(R.id.controlStatus)
 //    TextView controlStatus;
@@ -139,11 +143,11 @@ public class silos_jiaoyan extends LinearLayout {
         if(res!=null){
             min_time.setText(String.valueOf(res.outputTimeMin));
             max_time.setText(String.valueOf(res.outputTimeMax));
-            min_weight.setText(String.valueOf(res.inputWightMin));
-            max_weight.setText(String.valueOf(res.inputWightMax));
+            min_weight.setText(res.inputWightMin+"");
+            max_weight.setText(res.inputWightMax+"");
         }else{
             min_time.setText("2");
-            max_time.setText("2");
+            max_time.setText("5");
             min_weight.setText("0");
             max_weight.setText("0");
         }
@@ -180,34 +184,22 @@ public class silos_jiaoyan extends LinearLayout {
             public void Run() {
                 final int kkk = lcMode.num;
                 try {
-                    if(activity!=null)
-                    {
-                        activity.runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                try {
-                                    new Handler().postDelayed(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            // 在2秒后执行按钮操作
-                                            int zhongliangxianshi = ExecuteTheRecipe.OutletWeigh;
-                                            ExecuteTheRecipe.WritePLC("校准值" + kkk, (short) zhongliangxianshi, null);
-                                            String s = String.valueOf(zhongliangxianshi);
-                                            String zll = String.format("%.1f", (Double.parseDouble(s) / 10));
+                    mHandler.postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            // 在2秒后执行按钮操作
+                            int zhongliangxianshi = ExecuteTheRecipe.OutletWeigh;
+                            ExecuteTheRecipe.WritePLC("校准值" + kkk, (short) zhongliangxianshi, null);
+                            String s = String.valueOf(zhongliangxianshi);
+                            String zll = String.format("%.1f", (Double.parseDouble(s) / 10));
 //                                            wljz3.setText(zll + "");
-                                            lcMode.jValue = zll;
-                                            QueryDB.UpdateJYZ(lcMode.id, zll);
-                                            ToastUtils.warning("通道校准完成！");
-                                        }
-                                    }, 2000);
-                                } catch (Exception e) {
-                                    ToastUtils.error("重量解析显示异常！" + e.getMessage());
-                                }
-                            }
-                        });
-                    }
-                } catch (Exception ex) {
-                    Log.d("dsds", "Run: " + ex.getMessage());
+                            lcMode.jValue = zll;
+                            QueryDB.UpdateJYZ(lcMode.id, zll);
+                            ToastUtils.warning("通道校准完成！");
+                        }
+                    }, 2000);
+                } catch (Exception e) {
+                    ToastUtils.error("重量解析显示异常！" + e.getMessage());
                 }
             }
         };
@@ -234,11 +226,42 @@ public class silos_jiaoyan extends LinearLayout {
      */
     private Handler mHandler = new Handler() {
         public void handleMessage(Message msg) {
-
+            if(msg.what == 1){
+            }
         }
     };
     //endregion
 
+    private Timer timer;
+    private TimerTask timerTask;
+
+    public void show(){
+        close();
+        setVisibility(VISIBLE);
+        timer = new Timer();
+        timerTask = new TimerTask() {
+            @Override
+            public void run() {
+                activity.runOnUiThread(()->{
+                    float resultWeight = (float) (ExecuteTheRecipe.ReadShort(PLCName.称当前重量)/10.0);
+                    current_weight.setText(resultWeight+"g");
+                });
+            }
+        };
+        timer.schedule(timerTask,500,500);
+    }
+
+    public void close(){
+        setVisibility(GONE);
+        if(timer!=null){
+            timer.cancel();
+            timer = null;
+        }
+        if(timerTask!=null){
+            timerTask.cancel();
+            timerTask = null;
+        }
+    }
 
 
     private float EditTextValidate(EditText et,String info){
@@ -267,26 +290,33 @@ public class silos_jiaoyan extends LinearLayout {
                 if(time<0) return;
                 DialogManager.showWarn(activity,"校准前请确认是否准备就绪？\r\n是否开始校准?", AlertDialogButton.YesNo,s->{
                     if(s){
-                        WaitDialog.Show(view.getId()==R.id.min_time?"最小校准":"最大校准","开始校准",getContext(),activity);
+                        WaitDialog.getInstance().Show(view.getId()==R.id.min_time?"最小校准":"最大校准","开始校准",getContext(),activity);
                         Executor.get().runThread(()->{
 
-                            WaitDialog.AddText("电子秤清零");
-                            ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
-                            ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
-                            ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
-
-                            WaitDialog.AddText("等待清零完成");
+                            WaitDialog.getInstance().AddText("电子秤清零");
+                            try {
+                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                Thread.sleep(100);
+                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                Thread.sleep(100);
+                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                Thread.sleep(100);
+                            } catch (InterruptedException e) {
+                                throw new RuntimeException(e);
+                            }
+                            WaitDialog.getInstance().AddText("等待清零完成");
                             //等待清零完成
-                            Unity.Wait(()->{return ExecuteTheRecipe.ReadShort(PLCName.称当前重量)>-20&&ExecuteTheRecipe.ReadShort(PLCName.称当前重量)<=20;},3000).OnSource(()->{
+                            Unity.Wait(()->{
+                                return ExecuteTheRecipe.ReadShort(PLCName.称当前重量)>-20&&ExecuteTheRecipe.ReadShort(PLCName.称当前重量)<=20;},3000).OnSource(()->{
 
-                                WaitDialog.AddText("下发参数，开始校准");
+                                WaitDialog.getInstance().AddText("下发参数，开始校准");
                                 ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"出料时间",((int) time)*100,null);//下发出料时间
                                 long startTime = System.currentTimeMillis();
                                 MessageLog.ShowInfo("下发参数，开始校准 当前时间："+startTime +" 出料时间"+((int) time)*100);
                                 ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"启停控制",true,null);//下发启动信号
 
 
-                                WaitDialog.AddText("等待校准完成");
+                                WaitDialog.getInstance().AddText("等待校准完成");
                                 String name = lcMode.name+lcMode.num+"启停控制";
                                 //等待出料完成
                                 Unity.Wait(()->{return TTrig.get(name).Start(ExecuteTheRecipe.ReadBool(name));},(int)(time*1000+2000)).OnSource(()->{
@@ -304,11 +334,11 @@ public class silos_jiaoyan extends LinearLayout {
                                         if(view.getId()==R.id.btn_min_standard) min_weight.setText(weight+"");
                                         else max_weight.setText(weight+"");
                                     });
-                                    WaitDialog.Dismiss();
+                                    WaitDialog.getInstance().Dismiss();
                                     DialogManager.showInfo(activity,"校准完成",AlertDialogButton.OK,null);
-                                }).OnFailed(msg->{WaitDialog.TimeOut("等待校准完成超时，请退出后重试！");});
+                                }).OnFailed(msg->{WaitDialog.getInstance().TimeOut("等待校准完成超时，请退出后重试！");});
                                 TTrig.Remove(name);
-                            }).OnFailed((msg)->{WaitDialog.TimeOut("等待清零超时，请退出后重试！");});
+                            }).OnFailed((msg)->{WaitDialog.getInstance().TimeOut("等待清零超时，请退出后重试！");});
                         });
                     }
                 });
@@ -329,49 +359,52 @@ public class silos_jiaoyan extends LinearLayout {
 //                    }
 
                 }catch(Exception e){}
-
+                WaitDialog.getInstance().Show("模拟","模拟出料",getContext(),activity);
                 DialogManager.showWarn(activity,"模拟出料前请将容器放入指定位置！\r\n请问是否继续",AlertDialogButton.YesNo,(s->{
                     if(s){
                         try{
                             float weight = Float.parseFloat(sim_discharge_weight.getText().toString());
                             BPA_SILOS_CALIBRATE res = QueryDB.GetSilosCalibrateByNum(lcMode.num);
                             if(res!=null){
-                                WaitDialog.AddText("电子秤清零");
-                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
-                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
-                                ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
-                                WaitDialog.AddText("等待清零完成");
+                                WaitDialog.getInstance().AddText("电子秤清零");
+                                try {
+                                    ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                    Thread.sleep(100);
+                                    ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                    Thread.sleep(100);
+                                    ExecuteTheRecipe.Write(PLCName.重量清零, true, null);//电子秤重量清零
+                                    Thread.sleep(100);
+                                } catch (InterruptedException e) {
+                                    throw new RuntimeException(e);
+                                }
+                                WaitDialog.getInstance().AddText("等待清零完成");
                                 //等待清零完成
-                                Unity.Wait(()->{return ExecuteTheRecipe.ReadShort(PLCName.称当前重量)>-20&&ExecuteTheRecipe.ReadShort(PLCName.称当前重量)<=20;},3000).OnSource(()->{
+                                Unity.Wait(()->{
+                                    return ExecuteTheRecipe.ReadShort(PLCName.称当前重量)>-20&&ExecuteTheRecipe.ReadShort(PLCName.称当前重量)<=20;},2000).OnSource(()->{
                                     float outValue = Unity.Scale(weight,res.inputWightMax,res.inputWightMin,res.outputTimeMax,res.outputTimeMin);
-                                    WaitDialog.Show("模拟出料","启动模拟出料",getContext(),activity);
+                                    WaitDialog.getInstance().Show("模拟出料","启动模拟出料",getContext(),activity);
                                     Executor.get().runThread(()->{
                                         ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"出料时间",(short)(outValue*100),null);//下发出料时间
                                         ExecuteTheRecipe.Write(lcMode.name+lcMode.num+"启停控制",true,null);//下发启动信号
-                                        WaitDialog.AddText("等待出料完成");
+                                        WaitDialog.getInstance().AddText("等待出料完成");
                                         String name = lcMode.name+lcMode.num+"启停控制";
-                                        Unity.Wait(()->{return TTrig.get(name).Start(ExecuteTheRecipe.ReadBool(name));},(int)(outValue*1000)+2000).OnSource(()->{
-                                            try {
-                                                Thread.sleep(500);
-                                            } catch (InterruptedException e) {
-                                                throw new RuntimeException(e);
-                                            }
-                                            WaitDialog.Dismiss();
-
-                                            activity.runOnUiThread(()->{
-                                                float resultWeight = (float) (ExecuteTheRecipe.ReadShort(PLCName.称当前重量)/10.0);
-                                                tv_discharge_result.setText(resultWeight+"g");
-                                            });
-                                        }).OnFailed(msg->{WaitDialog.TimeOut("等待出料完成超时，请退出后重试！");});
+                                        try {
+                                            Thread.sleep((int)(outValue*1000)+500);
+                                        } catch (InterruptedException e) {
+                                            throw new RuntimeException(e);
+                                        }
+                                        WaitDialog.getInstance().Dismiss();
                                         TTrig.Remove(name);
                                     });
-                                }).OnFailed((msg)->{WaitDialog.TimeOut("等待清零超时，请退出后重试！");});
+                                }).OnFailed((msg)->{WaitDialog.getInstance().TimeOut("等待清零超时，请退出后重试！");});
                             }else{
                                 DialogManager.showWarn(activity,"料仓参数未校准，请校准后再试！",AlertDialogButton.OK,null);
                             }
                         }catch(Exception e){
                             DialogManager.showError(activity,"模拟出料失败，"+e.getMessage(),AlertDialogButton.OK,null);
                         }
+                    }else {
+                        WaitDialog.getInstance().Dismiss();
                     }
                 }));
                 break;
diff --git a/app/src/main/res/layout/fragment_make_good.xml b/app/src/main/res/layout/fragment_make_good.xml
index 1bdc158b..79689e9c 100644
--- a/app/src/main/res/layout/fragment_make_good.xml
+++ b/app/src/main/res/layout/fragment_make_good.xml
@@ -148,6 +148,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:text="水箱:"
+                android:visibility="gone"
                 android:textSize="@dimen/TitleSize" />
 
             <TextView
@@ -155,6 +156,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
+                android:visibility="gone"
                 android:text="89.9°C"
                 android:textColor="@color/green_primary"
                 android:textSize="@dimen/TitleSize" />
diff --git a/app/src/main/res/layout/fragment_she_zhi.xml b/app/src/main/res/layout/fragment_she_zhi.xml
index 16e80bc8..6ba95f1f 100644
--- a/app/src/main/res/layout/fragment_she_zhi.xml
+++ b/app/src/main/res/layout/fragment_she_zhi.xml
@@ -78,6 +78,7 @@
                             android:layout_height="match_parent"
                             android:layout_margin="20dp"
                             android:layout_weight="1"
+                            android:visibility="gone"
                             android:orientation="vertical">
 
                             <LinearLayout
@@ -157,6 +158,14 @@
                                     android:textSize="26dp" />
                             </LinearLayout>
                         </RelativeLayout>
+
+                        <RelativeLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_margin="20dp"
+                            android:layout_weight="1"
+                            android:orientation="vertical"/>
+
                     </LinearLayout>
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
index 9ad54c98..8c0c1bb7 100644
--- a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
+++ b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:clickable="true"
     android:focusable="true"
     android:background="@color/black">
@@ -38,7 +39,7 @@
                 android:id="@+id/current_weight"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="实际出料重量："
+                tools:text="实际出料重量："
                 android:textSize="20sp"/>
         </LinearLayout>
 
@@ -156,7 +157,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_centerInParent="true"
                                             android:background="@drawable/edit_bord"
-                                            android:digits="0123456789"
+                                            android:digits="0123456789."
                                             android:hint="请输入"
                                             android:inputType="numberDecimal|number"
                                             android:maxLines="1"
@@ -228,7 +229,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_centerInParent="true"
                                             android:background="@drawable/edit_bord"
-                                            android:digits="0123456789"
+                                            android:digits="0123456789."
                                             android:hint="请输入"
                                             android:inputType="numberDecimal|number"
                                             android:maxLines="1"
@@ -296,12 +297,12 @@
                                         android:layout_height="wrap_content"
                                         android:layout_centerInParent="true"
                                         android:background="@drawable/edit_bord"
-                                        android:digits="0123456789"
+                                        android:digits="0123456789."
                                         android:hint="请输入"
                                         android:inputType="number|numberDecimal"
                                         android:maxLines="1"
                                         android:padding="3dp"
-                                        android:text="2"
+                                        android:text="10"
                                         android:textSize="20sp"/>
 
                                 </LinearLayout>
@@ -318,32 +319,7 @@
 
                             </LinearLayout>
 
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="match_parent"
-                                android:layout_marginTop="20dp"
-                                android:orientation="horizontal">
-
-                                <LinearLayout
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-                                    <TextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="实际出料重量："
-                                        android:textSize="20sp"/>
-
-                                    <TextView
-                                        android:id="@+id/tv_discharge_result"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=""
-                                        android:textSize="20sp"/>
-
-                                </LinearLayout>
 
-                            </LinearLayout>
 
 
 
diff --git a/app/src/main/res/layout/item/layout/wdsz_item.xml b/app/src/main/res/layout/item/layout/wdsz_item.xml
index d5ec11f3..c405bc53 100644
--- a/app/src/main/res/layout/item/layout/wdsz_item.xml
+++ b/app/src/main/res/layout/item/layout/wdsz_item.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
+    android:id="@+id/root"
     android:layout_height="match_parent">
 
 
diff --git a/build.gradle b/build.gradle
index d33ce3df..bb47f2fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,8 +35,8 @@ task clean(type: Delete) {
 
 ext { // 统一版本入口
     //App版本号
-    versionCode = 1
-    versionName = "1.0.0"
+    versionCode = 12
+    versionName = "1.2.0"
 
     // 支持Android版本
     buildToolsVersion = "33.0.0"
diff --git a/gradle.properties b/gradle.properties
index 5cd40bd4..3fabf948 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

From ff1cee63f1a5031bdb7170c3c64bb3b9779d54d5 Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Mon, 20 May 2024 09:19:03 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                              | 2 +-
 .../com/bonait/bnframework/common/constant/ConfigName.java    | 2 +-
 app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml   | 1 +
 .../main/res/layout/item/layout/silos_jiaoyan_item_edit.xml   | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 680d8662..2f64a3ec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,7 +129,7 @@ dependencies {
 
 
     //leak 内存泄漏检测   
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-3'
+//    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-3'
 
     //Modbus
     implementation 'com.github.licheedev:Modbus4Android:2.0.2'
diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
index c4e82d87..6f39a7d3 100644
--- a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
+++ b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
@@ -598,7 +598,7 @@ public class ConfigName {
         add(new Res_PLCADDRESS("电子秤", "-------------", 0, 0));
         add(new Res_PLCADDRESS("称当前重量", "VW82", 1, 0));
         add(new Res_PLCADDRESS("砝码值", "VW86", 1, 1));
-        add(new Res_PLCADDRESS("重量清零", "M20.2", 0, 1));
+        add(new Res_PLCADDRESS("重量清零", "M20.0", 0, 1));
         add(new Res_PLCADDRESS("校准模式", "M20.1", 0, 1));
         add(new Res_PLCADDRESS("关闭写保护", "M20.2", 0, 1));
         add(new Res_PLCADDRESS("零点校准", "M20.3", 0, 1));
diff --git a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
index c8fbb91e..d62cb3ad 100644
--- a/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
+++ b/app/src/main/res/layout/item/layout/dialog_add_silos_ck.xml
@@ -210,6 +210,7 @@
                                 android:layout_centerHorizontal="true"
                                 android:background="@drawable/bg"
                                 android:text="满管"
+                                android:visibility="gone"
                                 android:textColor="@color/white"
                                 android:textSize="18sp"/>
 
diff --git a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
index 8c0c1bb7..8cc3a2d0 100644
--- a/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
+++ b/app/src/main/res/layout/item/layout/silos_jiaoyan_item_edit.xml
@@ -130,7 +130,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_centerInParent="true"
                                             android:background="@drawable/edit_bord"
-                                            android:digits="0123456789"
+                                            android:digits="0123456789."
                                             android:hint="请输入"
                                             android:inputType="numberDecimal|number"
                                             android:maxLines="1"
@@ -202,7 +202,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_centerInParent="true"
                                             android:background="@drawable/edit_bord"
-                                            android:digits="0123456789"
+                                            android:digits="0123456789."
                                             android:hint="请输入"
                                             android:inputType="numberDecimal|number"
                                             android:maxLines="1"

From be23228a35ca4f48c87761a249c6e72db7f69335 Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Mon, 20 May 2024 09:27:48 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/git_toolbox_prj.xml                     | 15 ++++++
 .../mode/Silos_item_jiaoyan_fragment.java     | 22 +++++++--
 .../home/fragment/mode/silos_jiaoyan.java     | 47 ++++++++++++-------
 3 files changed, 62 insertions(+), 22 deletions(-)
 create mode 100644 .idea/git_toolbox_prj.xml

diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
new file mode 100644
index 00000000..02b915b8
--- /dev/null
+++ b/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_jiaoyan_fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_jiaoyan_fragment.java
index 9e65f861..955e78bc 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_jiaoyan_fragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/Silos_item_jiaoyan_fragment.java
@@ -207,11 +207,14 @@ public class Silos_item_jiaoyan_fragment extends LinearLayout {
         ExecuteTheRecipe.WeighComplete = new IRun() {
             @Override
             public void Run() {
-                mHandler.sendEmptyMessage(0);
-                if (ExecuteTheRecipe.OutletWeigh >= (zl[0] + 2))//当前重量大于2g
-                {
-                    mHandler.sendEmptyMessage(1);
+                if(mHandler!=null){
+                    mHandler.sendEmptyMessage(0);
+                    if (ExecuteTheRecipe.OutletWeigh >= (zl[0] + 2))//当前重量大于2g
+                    {
+                        mHandler.sendEmptyMessage(1);
+                    }
                 }
+
             }
         };
         //通道校准完成
@@ -285,6 +288,17 @@ public class Silos_item_jiaoyan_fragment extends LinearLayout {
         }).start();
 
     }
+
+    public void destroy(){
+        if(mHandler!=null){
+            mHandler = null;
+        }
+        if(activity!=null){
+            activity = null;
+        }
+        ExecuteTheRecipe.OnChargeMixtureComNotPar = null;
+        ExecuteTheRecipe.WeighComplete = null;
+    }
     //endregion
 
     //region 刷新界面
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
index 2772df16..7885cb2c 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/silos_jiaoyan.java
@@ -175,31 +175,36 @@ public class silos_jiaoyan extends LinearLayout {
         ExecuteTheRecipe.WeighComplete = new IRun() {
             @Override
             public void Run() {
-                mHandler.sendEmptyMessage(0);
+                if(mHandler!=null){
+                    mHandler.sendEmptyMessage(0);
+                }
             }
         };
         //通道校准完成
         ExecuteTheRecipe.OnChargeMixtureComNotPar = new IRun() {
             @Override
             public void Run() {
-                final int kkk = lcMode.num;
-                try {
-                    mHandler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            // 在2秒后执行按钮操作
-                            int zhongliangxianshi = ExecuteTheRecipe.OutletWeigh;
-                            ExecuteTheRecipe.WritePLC("校准值" + kkk, (short) zhongliangxianshi, null);
-                            String s = String.valueOf(zhongliangxianshi);
-                            String zll = String.format("%.1f", (Double.parseDouble(s) / 10));
+                if(mHandler!=null){
+                    final int kkk = lcMode.num;
+                    try {
+
+                        mHandler.postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                // 在2秒后执行按钮操作
+                                int zhongliangxianshi = ExecuteTheRecipe.OutletWeigh;
+                                ExecuteTheRecipe.WritePLC("校准值" + kkk, (short) zhongliangxianshi, null);
+                                String s = String.valueOf(zhongliangxianshi);
+                                String zll = String.format("%.1f", (Double.parseDouble(s) / 10));
 //                                            wljz3.setText(zll + "");
-                            lcMode.jValue = zll;
-                            QueryDB.UpdateJYZ(lcMode.id, zll);
-                            ToastUtils.warning("通道校准完成！");
-                        }
-                    }, 2000);
-                } catch (Exception e) {
-                    ToastUtils.error("重量解析显示异常！" + e.getMessage());
+                                lcMode.jValue = zll;
+                                QueryDB.UpdateJYZ(lcMode.id, zll);
+                                ToastUtils.warning("通道校准完成！");
+                            }
+                        }, 2000);
+                    } catch (Exception e) {
+                        ToastUtils.error("重量解析显示异常！" + e.getMessage());
+                    }
                 }
             }
         };
@@ -253,6 +258,12 @@ public class silos_jiaoyan extends LinearLayout {
 
     public void close(){
         setVisibility(GONE);
+        if(mHandler!=null){
+            mHandler.removeCallbacksAndMessages(null);
+            mHandler = null;
+        }
+        ExecuteTheRecipe.WeighComplete = null;
+        ExecuteTheRecipe.OnChargeMixtureComNotPar = null;
         if(timer!=null){
             timer.cancel();
             timer = null;