From 362505b9d28f500b46114c92652f3f2d968a782c Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Tue, 10 Sep 2024 15:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=AA=E8=8F=9C=E5=93=81=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=98=BE=E7=A4=BA=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bnframework/business/ExecuteTheRecipe.java      |  2 +-
 .../bnframework/common/constant/ConfigName.java     |  2 +-
 .../newui/fragment/main/HomeOrderFragment.java      | 13 +++++++++++++
 .../main/res/layout/new/layout/activity_cook_h.xml  |  6 +++---
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
index d0eeacb1..029986b6 100644
--- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
+++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
@@ -1411,7 +1411,7 @@ public class ExecuteTheRecipe {
         RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅-ThreadDelay-"+"延迟等待"+delay+"秒");
         int AtPresentTime = delay;
         long startTime = System.currentTimeMillis();
-        while ((System.currentTimeMillis() - startTime) <= (delay * 1000) && !ConfigName.IsForcedEnd[deviceNum-1] &&!ConfigName.IsPause[deviceNum-1]&&!ConfigName.TEST) {
+        while ((System.currentTimeMillis() - startTime) <= (delay * 1000) && !ConfigName.IsForcedEnd[deviceNum-1] &&!ConfigName.IsPause[deviceNum-1]) {
             try {
                 Thread.sleep(100);
                 int mmmm = delay - (int) ((System.currentTimeMillis() - startTime) / 1000);
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 fdcb7eec..b1ffb045 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
@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class ConfigName {
     //是否是测试模式
-    public final static boolean TEST = true;
+    public final static boolean TEST = false;
     //崩溃重启
     public final static boolean ERROR_ROOT = false;
     //日志打印
diff --git a/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java b/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java
index 21f87167..5d3b2e72 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java
@@ -296,6 +296,19 @@ public class HomeOrderFragment extends BaseFragment {
         //刷新右侧配料信息
         foodInfoList.clear();
         List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(orderDetail.groupId);
+        if(orderDetail.status!=0){
+            if(orderDetail.type == 1){
+                if(!ConfigName.goodsProcess1.isEmpty()){
+                    details.clear();
+                    details.addAll(ConfigName.goodsProcess1);
+                }
+            }else if(orderDetail.type==2){
+                if(!ConfigName.goodsProcess2.isEmpty()){
+                    details.clear();
+                    details.addAll(ConfigName.goodsProcess2);
+                }
+            }
+        }
         for(BPA_GOODS_PROCESS_DETAIL detail:details){
             foodInfoList.add(detail.processname+"："+ ProcessValueUtil.getProcessSms(detail.processvalue));
         }
diff --git a/app/src/main/res/layout/new/layout/activity_cook_h.xml b/app/src/main/res/layout/new/layout/activity_cook_h.xml
index 672a9c87..0808a4a1 100644
--- a/app/src/main/res/layout/new/layout/activity_cook_h.xml
+++ b/app/src/main/res/layout/new/layout/activity_cook_h.xml
@@ -40,7 +40,7 @@
             android:layout_width="800dp"
             android:layout_marginTop="60dp"
             android:background="@color/main_color1"
-            android:layout_height="440dp"/>
+            android:layout_height="410dp"/>
         <TextView
             android:layout_width="800dp"
             android:layout_height="50dp"
@@ -48,7 +48,7 @@
             android:text="2号炒锅"
             android:textColor="@color/white"
             android:layout_gravity="bottom|end"
-            android:layout_marginBottom="440dp"
+            android:layout_marginBottom="410dp"
             android:gravity="center"
             android:layout_marginTop="770dp"
             android:background="@color/main_title_color1"
@@ -59,7 +59,7 @@
             android:layout_gravity="bottom|end"
             android:layout_width="800dp"
             android:background="@color/main_color1"
-            android:layout_height="440dp"/>
+            android:layout_height="410dp"/>
     </FrameLayout>
 
     <com.qmuiteam.qmui.widget.QMUITopBarLayout