From 124ec5ee7f9038192a478282d30783a5e39a81c2 Mon Sep 17 00:00:00 2001
From: fyf <11621@LAPTOP-04QQU0AO>
Date: Tue, 19 Dec 2023 13:06:37 +0800
Subject: [PATCH] 555

---
 .../modules/home/fragment/Home1Fragment.java  |  4 +-
 .../from/fragment/WokSetGKCXFragment.java     | 18 ++---
 app/src/main/res/layout/fragment_home1.xml    | 76 ++++---------------
 3 files changed, 27 insertions(+), 71 deletions(-)

diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java
index 28f20ccf..7e63c2cb 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/Home1Fragment.java
@@ -101,9 +101,9 @@ public class Home1Fragment extends BaseFragment {
     @BindView(R.id.startbutton)
     ImageView startbutton;//启动安
     @BindView(R.id.choushui_control)
-    LinearLayout choushui_control;//抽水
+    Button choushui_control;//抽水
     @BindView(R.id.fangshui_control)
-    LinearLayout fangshui_control;//防水
+    Button fangshui_control;//防水
     @BindView(R.id.chaoguo_wendu)
     QMUILinkTextView chaoguo_wendu;//
     @BindView(R.id.chaoguo_weizhi)
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/WokSetGKCXFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/WokSetGKCXFragment.java
index ac37916b..5ca961ea 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/WokSetGKCXFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/WokSetGKCXFragment.java
@@ -154,9 +154,9 @@ public class WokSetGKCXFragment extends BaseFragment {
                         SetShowValue("洗锅位置",edit_xgw1,edit_xgw2);
                         SetShowValue("倒菜位置",edit_ccw1,edit_ccw2);
                         SetShowValue("抽调料位置",edit_ctl1,edit_ctl2);
-                        SetShowValue("1#炒制位置",edit_czw11,edit_czw11);
-                        SetShowValue("2#炒制位置",edit_czw21,edit_czw21);
-                        SetShowValue("3#炒制位置",edit_czw31,edit_czw31);
+                        SetShowValue("1#炒制位置",edit_czw11,edit_czw12);
+                        SetShowValue("2#炒制位置",edit_czw21,edit_czw22);
+                        SetShowValue("3#炒制位置",edit_czw31,edit_czw32);
                         SetShowValue("炒锅工作范围",edit_gzfw1,edit_gzfw2);
                     }
                 });
@@ -223,22 +223,22 @@ public class WokSetGKCXFragment extends BaseFragment {
                                 if(o1!=null) { ydw_status.setBackgroundResource((boolean)o1?R.mipmap.status_z:R.mipmap.status_y); }
                                 else {ydw_status.setBackgroundResource(R.mipmap.status_y); }
 
-                                if(o2!=null) { xgw_status.setBackgroundResource((boolean)o1?R.mipmap.status_z:R.mipmap.status_y); }
+                                if(o2!=null) { xgw_status.setBackgroundResource((boolean)o2?R.mipmap.status_z:R.mipmap.status_y); }
                                 else {xgw_status.setBackgroundResource(R.mipmap.status_y); }
 
-                                if(o3!=null) { ccw_status.setBackgroundResource((boolean)o1?R.mipmap.status_z:R.mipmap.status_y); }
+                                if(o3!=null) { ccw_status.setBackgroundResource((boolean)o3?R.mipmap.status_z:R.mipmap.status_y); }
                                 else {ccw_status.setBackgroundResource(R.mipmap.status_y); }
 
-                                if(o4!=null) { ctl_status.setBackgroundResource((boolean)o1?R.mipmap.status_z:R.mipmap.status_y); }
+                                if(o4!=null) { ctl_status.setBackgroundResource((boolean)o4?R.mipmap.status_z:R.mipmap.status_y); }
                                 else {ctl_status.setBackgroundResource(R.mipmap.status_y); }
 
-                                if(o5!=null) { czw1_status.setBackgroundResource((boolean)o1?R.mipmap.status_z:R.mipmap.status_y); }
+                                if(o5!=null) { czw1_status.setBackgroundResource((boolean)o5?R.mipmap.status_z:R.mipmap.status_y); }
                                 else {czw1_status.setBackgroundResource(R.mipmap.status_y); }
 
-                                if(o6!=null) { czw2_status.setBackgroundResource((boolean)o1?R.mipmap.status_z:R.mipmap.status_y); }
+                                if(o6!=null) { czw2_status.setBackgroundResource((boolean)o6?R.mipmap.status_z:R.mipmap.status_y); }
                                 else {czw2_status.setBackgroundResource(R.mipmap.status_y); }
 
-                                if(o7!=null) { czw3_status.setBackgroundResource((boolean)o1?R.mipmap.status_z:R.mipmap.status_y); }
+                                if(o7!=null) { czw3_status.setBackgroundResource((boolean)o7?R.mipmap.status_z:R.mipmap.status_y); }
                                 else {czw3_status.setBackgroundResource(R.mipmap.status_y); }
                             }
                         });
diff --git a/app/src/main/res/layout/fragment_home1.xml b/app/src/main/res/layout/fragment_home1.xml
index 630c0764..45358e84 100644
--- a/app/src/main/res/layout/fragment_home1.xml
+++ b/app/src/main/res/layout/fragment_home1.xml
@@ -475,37 +475,15 @@
                                 android:background="@color/activity_background" />
                         </RelativeLayout>
 
-                        <LinearLayout
+                        <Button
                             android:id="@+id/choushui_control"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent">
-
-                            <RelativeLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_marginLeft="@dimen/dp_10">
-
-                                <ImageView
-                                    android:layout_width="40dp"
-                                    android:layout_height="40dp"
-                                    android:layout_centerInParent="true"
-                                    android:scaleType="fitXY"
-                                    android:src="@mipmap/ks_cs" />
-                            </RelativeLayout>
-
-                            <RelativeLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_centerVertical="true"
-                                    android:layout_marginLeft="@dimen/dp_4"
-                                    android:text="炒锅抽水" />
-                            </RelativeLayout>
-                        </LinearLayout>
-
+                            android:layout_width="80dp"
+                            android:layout_height="match_parent"
+                            android:layout_centerVertical="true"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="炒锅抽水"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
                         <!--边框分割细线-->
                         <RelativeLayout
                             android:layout_width="wrap_content"
@@ -520,37 +498,15 @@
                                 android:background="@color/activity_background" />
                         </RelativeLayout>
 
-                        <LinearLayout
+                        <Button
                             android:id="@+id/fangshui_control"
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent">
-
-                            <RelativeLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent"
-                                android:layout_marginLeft="@dimen/dp_10">
-
-                                <ImageView
-                                    android:layout_width="40dp"
-                                    android:layout_height="40dp"
-                                    android:layout_centerInParent="true"
-                                    android:scaleType="fitXY"
-                                    android:src="@mipmap/ks_cs" />
-                            </RelativeLayout>
-
-                            <RelativeLayout
-                                android:layout_width="wrap_content"
-                                android:layout_height="match_parent">
-
-                                <TextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_centerVertical="true"
-                                    android:layout_marginLeft="@dimen/dp_4"
-                                    android:text="洗锅水枪" />
-                            </RelativeLayout>
-                        </LinearLayout>
-
+                            android:layout_width="80dp"
+                            android:layout_height="match_parent"
+                            android:layout_centerVertical="true"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="洗锅水枪"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
                     </LinearLayout>
                 </LinearLayout>