23

app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java

@@ -934,8 +934,10 @@ public class ExecuteTheRecipe {
 
                     if (ConfigName.getInstance().PlcIsConnect) {
                         TempControl();
-
                         ReadPLCStatus();
+
+                        //心跳
+                        WritePLC("心跳位",false,null);
                     }
 
                 } catch (Exception ex) {

app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java

@@ -290,6 +290,8 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2校准值", "VW116", 1, 1));
         add(new Res_PLCADDRESS("料仓3校准开关", "M12.5", 0, 1));
         add(new Res_PLCADDRESS("料仓3校准值", "VW118", 1, 1));
+        add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
+        add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
         add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));
 
         add(new Res_PLCADDRESS("料仓自动", "-------------", 0, 0));
@@ -299,12 +301,14 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2下料", "M11.2", 0, 1));
         add(new Res_PLCADDRESS("料仓3需求值", "VW110", 1, 1));
         add(new Res_PLCADDRESS("料仓3下料", "M11.3", 0, 1));
+        add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
+        add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));
 
         add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
         add(new Res_PLCADDRESS("料仓2手动开关", "M13.2", 1, 1));
         add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
-
+        add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));
         //上下限
         add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
         add(new Res_PLCADDRESS("原点位置下限", "VD150", 1, 1));
@@ -339,9 +343,12 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓1下料完成", "M41.2", 1, 0));
         add(new Res_PLCADDRESS("料仓2下料完成", "M41.3", 1, 0));
         add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
+        add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
         add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
         add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
         add(new Res_PLCADDRESS("炒锅倒菜减速位", "M41.7", 1, 0));
+        add(new Res_PLCADDRESS("心跳位", "M43.0", 1, 0));
+
 
         //检测信号
         add(new Res_PLCADDRESS("监测信号", "-------------", 0, 0));
@@ -376,7 +383,6 @@ public class ConfigName {
         add(new ProcessT("加热", Arrays.asList("加热功率", "延迟(秒)")));
         add(new ProcessT("主料", Arrays.asList("主料名称", "主料重量")));
         add(new ProcessT("液体料", new ArrayList<>()));
-        add(new ProcessT("加水", Arrays.asList("时长(秒)")));
         add(new ProcessT("延迟", Arrays.asList("延迟(秒)")));
         add(new ProcessT("出菜", Arrays.asList("等待(秒)")));
     }};
@@ -442,6 +448,8 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2校准值", "VW116", 1, 1));
         add(new Res_PLCADDRESS("料仓3校准开关", "M12.5", 0, 1));
         add(new Res_PLCADDRESS("料仓3校准值", "VW118", 1, 1));
+        add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
+        add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
         add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));
 
         add(new Res_PLCADDRESS("料仓自动", "-------------", 0, 0));
@@ -451,11 +459,14 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2下料", "M11.2", 0, 1));
         add(new Res_PLCADDRESS("料仓3需求值", "VW110", 1, 1));
         add(new Res_PLCADDRESS("料仓3下料", "M11.3", 0, 1));
+        add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
+        add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));
 
         add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
         add(new Res_PLCADDRESS("料仓2手动开关", "M13.2", 1, 1));
         add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
+        add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));
 
         //上下限
         add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
@@ -541,6 +552,7 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓1下料完成", "M41.2", 1, 0));
         add(new Res_PLCADDRESS("料仓2下料完成", "M41.3", 1, 0));
         add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
+        add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
         add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
         add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
         add(new Res_PLCADDRESS("炒锅倒菜减速位", "M41.7", 1, 0));
@@ -553,6 +565,8 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转轴在3号位", "M44.2", 1, 0));
         add(new Res_PLCADDRESS("翻转轴在4号位", "M44.3", 1, 0));
         add(new Res_PLCADDRESS("倒菜完成", "M44.4", 1, 0));
+        add(new Res_PLCADDRESS("心跳位", "M43.0", 1, 0));
+
 
         //检测信号
         add(new Res_PLCADDRESS("监测信号", "-------------", 0, 0));
@@ -588,7 +602,6 @@ public class ConfigName {
         add(new ProcessT("加热", Arrays.asList("加热功率", "延迟(秒)")));
         add(new ProcessT("主料", Arrays.asList("主料名称", "主料位置", "主料重量", "投料动作","烹饪(秒)")));
         add(new ProcessT("液体料", new ArrayList<>()));
-        add(new ProcessT("加水", Arrays.asList("时长(秒)")));
         add(new ProcessT("延迟", Arrays.asList("延迟(秒)")));
         add(new ProcessT("出菜", Arrays.asList("等待(秒)")));
     }};
@@ -653,6 +666,8 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2校准值", "VW116", 1, 1));
         add(new Res_PLCADDRESS("料仓3校准开关", "M12.5", 0, 1));
         add(new Res_PLCADDRESS("料仓3校准值", "VW118", 1, 1));
+        add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
+        add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
         add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));
 
         add(new Res_PLCADDRESS("料仓自动", "-------------", 0, 0));
@@ -662,11 +677,14 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2下料", "M11.2", 0, 1));
         add(new Res_PLCADDRESS("料仓3需求值", "VW110", 1, 1));
         add(new Res_PLCADDRESS("料仓3下料", "M11.3", 0, 1));
+        add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
+        add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));
 
         add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
         add(new Res_PLCADDRESS("料仓2手动开关", "M13.2", 1, 1));
         add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
+        add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));
 
         //上下限
         add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
@@ -752,6 +770,7 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓1下料完成", "M41.2", 1, 0));
         add(new Res_PLCADDRESS("料仓2下料完成", "M41.3", 1, 0));
         add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
+        add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
         add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
         add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
         add(new Res_PLCADDRESS("炒锅倒菜减速位", "M41.7", 1, 0));
@@ -764,6 +783,7 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转轴在3号位", "M44.2", 1, 0));
         add(new Res_PLCADDRESS("翻转轴在4号位", "M44.3", 1, 0));
         add(new Res_PLCADDRESS("倒菜完成", "M44.4", 1, 0));
+        add(new Res_PLCADDRESS("心跳位", "M43.0", 1, 0));
 
         //检测信号
         add(new Res_PLCADDRESS("监测信号", "-------------", 0, 0));
@@ -799,7 +819,6 @@ public class ConfigName {
         add(new ProcessT("加热", Arrays.asList("加热功率", "延迟(秒)")));
         add(new ProcessT("主料", Arrays.asList("主料名称", "主料位置", "主料重量", "投料动作","烹饪(秒)")));
         add(new ProcessT("液体料", new ArrayList<>()));
-        add(new ProcessT("加水", Arrays.asList("时长(秒)")));
         add(new ProcessT("延迟", Arrays.asList("延迟(秒)")));
         add(new ProcessT("出菜", Arrays.asList("等待(秒)")));
     }};
@@ -1024,6 +1043,7 @@ public class ConfigName {
         put(1, "未设置");
         put(2, "未设置");
         put(3, "未设置");
+        put(4, "未设置");
     }};
     //endregion
 }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java

@@ -461,7 +461,8 @@ public class HomeFragmentSBKZ extends BaseFragment {
     public void SetIDTouch(int id, boolean ismode) {
         switch (id) {
             case R.id.chushui:
-                PumpWater(ismode);
+                //PumpWater(ismode);
+                Pumping(4, ismode);
                 Log.e("锅内加水", ismode ? "按下" : "松开");
                 break;
             case R.id.xiguoshui:

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/BunkerSetupActivity.java

@@ -45,6 +45,9 @@ public class BunkerSetupActivity extends BaseActivity {
     @BindView(R.id.silos3)
     jingdutiao1 silos3;
 
+    @BindView(R.id.silos4)
+    jingdutiao1 silos4;
+
     @BindView(R.id.quanchangqingxi)
     imagebuttom quanchangqingxi;
 
@@ -130,6 +133,8 @@ public class BunkerSetupActivity extends BaseActivity {
                 silos2.SetValue(item, myClickListener);
             } else if (item.num == 3) {
                 silos3.SetValue(item, myClickListener);
+            }else if (item.num == 4) {
+                silos4.SetValue(item, myClickListener);
             }
         }
     }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingActivity.java

@@ -98,8 +98,8 @@ public class CookingActivity extends LinearLayout {
     @BindView(R.id.guokoucaoxiang)
     imagebuttom3 guokoucaoxiang;
 
-    @BindView(R.id.chushui)
-    imagebuttom3 chushui;
+//    @BindView(R.id.chushui)
+//    imagebuttom3 chushui;
 
     @BindView(R.id.touliao1)
     imagebuttom3 touliao1;
@@ -119,6 +119,8 @@ public class CookingActivity extends LinearLayout {
     imagebuttom3 yeliao2;
     @BindView(R.id.yeliao3)
     imagebuttom3 yeliao3;
+    @BindView(R.id.yeliao4)
+    imagebuttom3 yeliao4;
 
     private Context contextMian;
     private View root;
@@ -156,6 +158,9 @@ public class CookingActivity extends LinearLayout {
         yeliao3.setTag(ConfigName.getInstance().SilosDisplayMaterial.get(3)+"");
         yeliao3.Init();
 
+        yeliao4.setTag(ConfigName.getInstance().SilosDisplayMaterial.get(4)+"");
+        yeliao4.Init();
+
         ConcurrentHashMap<Integer,String> resultData= DataBus.getInstance().GetMainDisplayText(goods.id);
         touliao1.setTag(resultData.get(1)+"-按钮");
         touliao1.Init();
@@ -391,8 +396,8 @@ public class CookingActivity extends LinearLayout {
                                             flicker_buttom.SetStatusKK(true);
                                             break;
                                         case "加水":
-                                            flicker_buttom=chushui;
-                                            flicker_buttom.SetStatusKK(true);
+//                                            flicker_buttom=chushui;
+//                                            flicker_buttom.SetStatusKK(true);
                                             break;
                                         case "液体料":
                                             if(val.equals("1"))
@@ -407,6 +412,10 @@ public class CookingActivity extends LinearLayout {
                                             {
                                                 flicker_buttom=yeliao3;
                                                 flicker_buttom.SetStatusKK(true);
+                                            }else if(val.equals("4"))
+                                            {
+                                                flicker_buttom=yeliao4;
+                                                flicker_buttom.SetStatusKK(true);
                                             }
                                             break;
                                     }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java

@@ -87,8 +87,8 @@ public class CookingSimulatedActivity extends BaseActivity {
     @BindView(R.id.guokoucaoxiang)
     imagebuttom3 guokoucaoxiang;
 
-    @BindView(R.id.chushui)
-    imagebuttom3 chushui;
+//    @BindView(R.id.chushui)
+//    imagebuttom3 chushui;
 
     @BindView(R.id.touliao1)
     imagebuttom3 touliao1;
@@ -109,6 +109,9 @@ public class CookingSimulatedActivity extends BaseActivity {
     @BindView(R.id.yeliao3)
     imagebuttom3 yeliao3;
 
+    @BindView(R.id.yeliao4)
+    imagebuttom3 yeliao4;
+
     @BindView(R.id.showbuttomtop)
     RelativeLayout showbuttomtop;
 
@@ -164,6 +167,9 @@ public class CookingSimulatedActivity extends BaseActivity {
         yeliao3.setTag(ConfigName.getInstance().SilosDisplayMaterial.get(3) + "");
         yeliao3.Init();
 
+        yeliao4.setTag(ConfigName.getInstance().SilosDisplayMaterial.get(4) + "");
+        yeliao4.Init();
+
         ConcurrentHashMap<Integer, String> resultData = DataBus.getInstance().GetMainDisplayText(goods.id);
         touliao1.setTag(resultData.get(1) + "-按钮");
         touliao1.Init();
@@ -599,8 +605,8 @@ public class CookingSimulatedActivity extends BaseActivity {
                         flicker_buttom.SetStatusKK(true);
                         break;
                     case "加水":
-                        flicker_buttom = chushui;
-                        flicker_buttom.SetStatusKK(true);
+//                        flicker_buttom = chushui;
+//                        flicker_buttom.SetStatusKK(true);
                         break;
                     case "液体料":
                         if (val.equals("1")) {
@@ -612,6 +618,9 @@ public class CookingSimulatedActivity extends BaseActivity {
                         } else if (val.equals("3")) {
                             flicker_buttom = yeliao3;
                             flicker_buttom.SetStatusKK(true);
+                        }else if (val.equals("4")) {
+                            flicker_buttom = yeliao4;
+                            flicker_buttom.SetStatusKK(true);
                         }
                         break;
                 }

app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DishTestActivity.java

@@ -101,8 +101,8 @@ public class DishTestActivity extends BaseActivity {
     @BindView(R.id.fanchaoshudu_t)
     imagebuttom3 fanchaoshudu_t;
 
-    @BindView(R.id.chushui)
-    imagebuttom3 chushui;
+//    @BindView(R.id.chushui)
+//    imagebuttom3 chushui;
 
     @BindView(R.id.touliao1)
     imagebuttom3 touliao1;
@@ -123,6 +123,9 @@ public class DishTestActivity extends BaseActivity {
     @BindView(R.id.yeliao3)
     imagebuttom3 yeliao3;
 
+    @BindView(R.id.yeliao4)
+    imagebuttom3 yeliao4;
+
     @BindView(R.id.huoli)
     newhuoli_control huoli;
 
@@ -240,7 +243,7 @@ public class DishTestActivity extends BaseActivity {
         fanchaoshudu_m.mListener = myClickListener;
         fanchaoshudu_t.mListener = myClickListener;
 
-        chushui.mListener = myClickListener;
+        //chushui.mListener = myClickListener;
 
         touliao1.mListener = myClickListener;
         touliao2.mListener = myClickListener;
@@ -250,6 +253,7 @@ public class DishTestActivity extends BaseActivity {
         yeliao1.mListener = myClickListener;
         yeliao2.mListener = myClickListener;
         yeliao3.mListener = myClickListener;
+        yeliao4.mListener = myClickListener;
 
         huoli.mListener = myClickListener;
 
@@ -286,6 +290,9 @@ public class DishTestActivity extends BaseActivity {
         yeliao3.setTag(ConfigName.getInstance().SilosDisplayMaterial.get(3) + "-按钮");
         yeliao3.Init();
 
+        yeliao4.setTag(ConfigName.getInstance().SilosDisplayMaterial.get(4) + "-按钮");
+        yeliao4.Init();
+
         ShowIndex = 0;
         SetShowNameData(ShowIndex);
         gongyibuzhoujilu.setVisibility(View.GONE);
@@ -398,6 +405,9 @@ public class DishTestActivity extends BaseActivity {
                 case R.id.yeliao3:
                     EditTextDialogBuilder(3);
                     break;
+                case R.id.yeliao4:
+                    EditTextDialogBuilder(4);
+                    break;
                 case R.id.huoli:
                     SetFire(hl);
                     break;

app/src/main/java/com/bonait/bnframework/modules/home/fragment/mode/jingdutiao1.java

@@ -127,6 +127,15 @@ public class jingdutiao1 extends LinearLayout {
         }else if(num==3)
         {
             return "③";
+        }else if(num==4)
+        {
+            return "④(水阀)";
+        }else if(num==5)
+        {
+            return "⑤";
+        }else if(num==6)
+        {
+            return "⑥";
         }else
         {
             return "①";

app/src/main/res/layout/activity_bunkersetup.xml

@@ -93,7 +93,6 @@
                                             android:layout_height="80dp"
                                             android:background="@mipmap/silos_bottom"
                                             />
-
                                         <RelativeLayout
                                             android:layout_width="100dp"
                                             android:layout_height="80dp"
@@ -134,23 +133,30 @@
                             android:id="@+id/silos1"
                             android:layout_marginTop="0dp"
                             android:layout_width="match_parent"
-                            android:layout_height="200dp"
+                            android:layout_height="160dp"
                             android:contentDescription="①"
                             android:tag="调和油"/>
                         <com.bonait.bnframework.modules.home.fragment.mode.jingdutiao1
                             android:id="@+id/silos2"
-                            android:layout_marginTop="40dp"
+                            android:layout_marginTop="10dp"
                             android:layout_width="match_parent"
-                            android:layout_height="200dp"
+                            android:layout_height="160dp"
                             android:contentDescription="②"
                             android:tag="复合料"/>
                         <com.bonait.bnframework.modules.home.fragment.mode.jingdutiao1
                             android:id="@+id/silos3"
-                            android:layout_marginTop="40dp"
+                            android:layout_marginTop="10dp"
                             android:layout_width="match_parent"
-                            android:layout_height="200dp"
+                            android:layout_height="160dp"
                             android:contentDescription="③"
                             android:tag="酱油"/>
+                        <com.bonait.bnframework.modules.home.fragment.mode.jingdutiao1
+                            android:id="@+id/silos4"
+                            android:layout_marginTop="10dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="160dp"
+                            android:contentDescription="④(水阀)"
+                            android:tag="水"/>
                     </LinearLayout>
                 </RelativeLayout>
 

app/src/main/res/layout/activity_cooking.xml

@@ -312,14 +312,23 @@
                     android:orientation="vertical">
 
                     <com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
-                        android:id="@+id/chushui"
+                        android:id="@+id/yeliao4"
                         android:layout_width="100dp"
                         android:layout_height="60dp"
                         android:contentDescription="false"
-                        android:tag="锅内加水"
+                        android:tag="液料"
                         app:imagesrc_ks="@mipmap/sb1"
                         app:imagesrc_qt="@mipmap/sb2"
                         app:imagesrc_tz="@mipmap/sb3" />
+<!--                    <com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3-->
+<!--                        android:id="@+id/chushui"-->
+<!--                        android:layout_width="100dp"-->
+<!--                        android:layout_height="60dp"-->
+<!--                        android:contentDescription="false"-->
+<!--                        android:tag="锅内加水"-->
+<!--                        app:imagesrc_ks="@mipmap/sb1"-->
+<!--                        app:imagesrc_qt="@mipmap/sb2"-->
+<!--                        app:imagesrc_tz="@mipmap/sb3" />-->
                 </LinearLayout>
 
                 <!-- 锅口朝向 -->

app/src/main/res/layout/activity_cookingsimulated.xml

@@ -295,12 +295,21 @@
                     android:layout_marginRight="30dp"
                     android:orientation="vertical">
 
+<!--                    <com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3-->
+<!--                        android:id="@+id/chushui"-->
+<!--                        android:layout_width="100dp"-->
+<!--                        android:layout_height="60dp"-->
+<!--                        android:contentDescription="false"-->
+<!--                        android:tag="锅内加水"-->
+<!--                        app:imagesrc_ks="@mipmap/sb1"-->
+<!--                        app:imagesrc_qt="@mipmap/sb2"-->
+<!--                        app:imagesrc_tz="@mipmap/sb3" />-->
                     <com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
-                        android:id="@+id/chushui"
+                        android:id="@+id/yeliao4"
                         android:layout_width="100dp"
                         android:layout_height="60dp"
                         android:contentDescription="false"
-                        android:tag="锅内加水"
+                        android:tag="液料"
                         app:imagesrc_ks="@mipmap/sb1"
                         app:imagesrc_qt="@mipmap/sb2"
                         app:imagesrc_tz="@mipmap/sb3" />

app/src/main/res/layout/activity_dishtest.xml

@@ -370,12 +370,21 @@
                             android:layout_marginRight="30dp"
                             android:orientation="vertical">
 
+<!--                            <com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3-->
+<!--                                android:id="@+id/chushui"-->
+<!--                                android:layout_width="140dp"-->
+<!--                                android:layout_height="80dp"-->
+<!--                                android:contentDescription=""-->
+<!--                                android:tag="水-按钮"-->
+<!--                                app:imagesrc_ks="@mipmap/sb1"-->
+<!--                                app:imagesrc_qt="@mipmap/sb2"-->
+<!--                                app:imagesrc_tz="@mipmap/sb3" />-->
                             <com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
-                                android:id="@+id/chushui"
+                                android:id="@+id/yeliao4"
                                 android:layout_width="140dp"
                                 android:layout_height="80dp"
                                 android:contentDescription=""
-                                android:tag="水-按钮"
+                                android:tag="液料"
                                 app:imagesrc_ks="@mipmap/sb1"
                                 app:imagesrc_qt="@mipmap/sb2"
                                 app:imagesrc_tz="@mipmap/sb3" />