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] =?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"