增加深度清洁

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

@@ -601,6 +601,12 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转-去3号位", "M16.5", 0, 1));
         add(new Res_PLCADDRESS("翻转-去4号位", "M16.6", 0, 1));
 
+        add(new Res_PLCADDRESS("翻转-去1号吸料位", "M16.6", 0, 1));
+        add(new Res_PLCADDRESS("翻转-去2号吸料位", "M70.5", 0, 1));
+        add(new Res_PLCADDRESS("翻转-去3号吸料位", "M70.6", 0, 1));
+        add(new Res_PLCADDRESS("翻转-去4号吸料位", "M70.7", 0, 1));
+
+
         add(new Res_PLCADDRESS("翻转-1号位置值", "VD276", 1, 1));
         add(new Res_PLCADDRESS("翻转-1#位置设定", "M17.0", 0, 1));
         add(new Res_PLCADDRESS("翻转-2号位置值", "VD280", 1, 1));
@@ -609,6 +615,15 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转-3#位置设定", "M17.2", 0, 1));
         add(new Res_PLCADDRESS("翻转-4号位置值", "VD288", 1, 1));
         add(new Res_PLCADDRESS("翻转-4#位置设定", "M17.3", 0, 1));
+        add(new Res_PLCADDRESS("翻转-1号吸料位置值", "VD288", 1, 1));
+        add(new Res_PLCADDRESS("翻转-1#吸料位置设定", "M17.3", 0, 1));
+        add(new Res_PLCADDRESS("翻转-2号吸料位置值", "VD138", 1, 1));
+        add(new Res_PLCADDRESS("翻转-2#吸料位置设定", "M70.0", 0, 1));
+        add(new Res_PLCADDRESS("翻转-3号吸料位置值", "VD142", 1, 1));
+        add(new Res_PLCADDRESS("翻转-3#吸料位置设定", "M70.1", 0, 1));
+        add(new Res_PLCADDRESS("翻转-4号吸料位置值", "VD146", 1, 1));
+        add(new Res_PLCADDRESS("翻转-4#吸料位置设定", "M70.2", 0, 1));
+
         add(new Res_PLCADDRESS("倒菜启动", "M17.4", 0, 1));
         add(new Res_PLCADDRESS("磁铁吸合", "M17.5", 0, 1));
 
@@ -639,6 +654,11 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转轴在2号位", "M44.1", 1, 0));
         add(new Res_PLCADDRESS("翻转轴在3号位", "M44.2", 1, 0));
         add(new Res_PLCADDRESS("翻转轴在4号位", "M44.3", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在1号吸料位", "M44.3", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在2号吸料位", "M72.0", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在3号吸料位", "M72.1", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在4号吸料位", "M72.2", 1, 0));
+
         add(new Res_PLCADDRESS("倒菜完成", "M44.4", 1, 0));
         add(new Res_PLCADDRESS("心跳位", "VW1000", 0, 1));
 
@@ -844,6 +864,12 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转-去3号位", "M16.5", 0, 1));
         add(new Res_PLCADDRESS("翻转-去4号位", "M16.6", 0, 1));
 
+        add(new Res_PLCADDRESS("翻转-去1号吸料位", "M16.6", 0, 1));
+        add(new Res_PLCADDRESS("翻转-去2号吸料位", "M70.5", 0, 1));
+        add(new Res_PLCADDRESS("翻转-去3号吸料位", "M70.6", 0, 1));
+        add(new Res_PLCADDRESS("翻转-去4号吸料位", "M70.7", 0, 1));
+
+
         add(new Res_PLCADDRESS("翻转-1号位置值", "VD276", 1, 1));
         add(new Res_PLCADDRESS("翻转-1#位置设定", "M17.0", 0, 1));
         add(new Res_PLCADDRESS("翻转-2号位置值", "VD280", 1, 1));
@@ -852,25 +878,18 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转-3#位置设定", "M17.2", 0, 1));
         add(new Res_PLCADDRESS("翻转-4号位置值", "VD288", 1, 1));
         add(new Res_PLCADDRESS("翻转-4#位置设定", "M17.3", 0, 1));
+        add(new Res_PLCADDRESS("翻转-1号吸料位置值", "VD288", 1, 1));
+        add(new Res_PLCADDRESS("翻转-1#吸料位置设定", "M17.3", 0, 1));
+        add(new Res_PLCADDRESS("翻转-2号吸料位置值", "VD138", 1, 1));
+        add(new Res_PLCADDRESS("翻转-2#吸料位置设定", "M70.0", 0, 1));
+        add(new Res_PLCADDRESS("翻转-3号吸料位置值", "VD142", 1, 1));
+        add(new Res_PLCADDRESS("翻转-3#吸料位置设定", "M70.1", 0, 1));
+        add(new Res_PLCADDRESS("翻转-4号吸料位置值", "VD146", 1, 1));
+        add(new Res_PLCADDRESS("翻转-4#吸料位置设定", "M70.2", 0, 1));
+
         add(new Res_PLCADDRESS("倒菜启动", "M17.4", 0, 1));
         add(new Res_PLCADDRESS("磁铁吸合", "M17.5", 0, 1));
 
-        add(new Res_PLCADDRESS("温度模拟输入量", "-------------", 0, 0));
-        add(new Res_PLCADDRESS("温度模拟量上限", "VW1050", 1, 1));
-        add(new Res_PLCADDRESS("温度模拟量下限", "VW1052", 1, 1));
-        add(new Res_PLCADDRESS("温度模拟量", "VW1054", 1, 1));
-        add(new Res_PLCADDRESS("温度量程上限", "VD1060", 1, 1));
-        add(new Res_PLCADDRESS("温度量程下限", "VD1056", 1, 1));
-
-        add(new Res_PLCADDRESS("电流模拟输入量", "-------------", 0, 0));
-        add(new Res_PLCADDRESS("电流模拟量上限", "VW1070", 1, 1));
-        add(new Res_PLCADDRESS("电流模拟量下限", "VW1072", 1, 1));
-        add(new Res_PLCADDRESS("电流模拟量", "VW1074", 1, 1));
-        add(new Res_PLCADDRESS("电流量程上限", "VD1080", 1, 1));
-        add(new Res_PLCADDRESS("电流量程下限", "VD1076", 1, 1));
-        add(new Res_PLCADDRESS("电流报警设置", "VW1092", 1, 1));
-        add(new Res_PLCADDRESS("异常加热故障信息", "M42.1", 1, 1));
-
         //反馈信号
         add(new Res_PLCADDRESS("反馈信号", "-------------", 0, 0));
         add(new Res_PLCADDRESS("初始化完成", "M40.0", 1, 0));
@@ -898,9 +917,30 @@ public class ConfigName {
         add(new Res_PLCADDRESS("翻转轴在2号位", "M44.1", 1, 0));
         add(new Res_PLCADDRESS("翻转轴在3号位", "M44.2", 1, 0));
         add(new Res_PLCADDRESS("翻转轴在4号位", "M44.3", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在1号吸料位", "M44.3", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在2号吸料位", "M72.0", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在3号吸料位", "M72.1", 1, 0));
+        add(new Res_PLCADDRESS("翻转轴在4号吸料位", "M72.2", 1, 0));
+
         add(new Res_PLCADDRESS("倒菜完成", "M44.4", 1, 0));
         add(new Res_PLCADDRESS("心跳位", "VW1000", 0, 1));
 
+        add(new Res_PLCADDRESS("温度模拟输入量", "-------------", 0, 0));
+        add(new Res_PLCADDRESS("温度模拟量上限", "VW1050", 1, 1));
+        add(new Res_PLCADDRESS("温度模拟量下限", "VW1052", 1, 1));
+        add(new Res_PLCADDRESS("温度模拟量", "VW1054", 1, 1));
+        add(new Res_PLCADDRESS("温度量程上限", "VD1060", 1, 1));
+        add(new Res_PLCADDRESS("温度量程下限", "VD1056", 1, 1));
+
+        add(new Res_PLCADDRESS("电流模拟输入量", "-------------", 0, 0));
+        add(new Res_PLCADDRESS("电流模拟量上限", "VW1070", 1, 1));
+        add(new Res_PLCADDRESS("电流模拟量下限", "VW1072", 1, 1));
+        add(new Res_PLCADDRESS("电流模拟量", "VW1074", 1, 1));
+        add(new Res_PLCADDRESS("电流量程上限", "VD1080", 1, 1));
+        add(new Res_PLCADDRESS("电流量程下限", "VD1076", 1, 1));
+        add(new Res_PLCADDRESS("电流报警设置", "VW1092", 1, 1));
+        add(new Res_PLCADDRESS("异常加热故障信息", "M42.1", 1, 1));
+
         //检测信号
         add(new Res_PLCADDRESS("监测信号", "-------------", 0, 0));
         add(new Res_PLCADDRESS("当前锅底温度", "VD300", 1, 0));

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

@@ -18,6 +18,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import android.os.CountDownTimer;
 import android.os.Handler;
+import android.text.InputType;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -1002,7 +1003,7 @@ public class Home1Fragment extends BaseFragment {
      *
      * @param view
      */
-    @OnClick({R.id.xzcp, R.id.startbutton, R.id.qdjb
+    @OnClick({R.id.xzcp, R.id.startbutton, R.id.qdjb,R.id.sdqx
             , R.id.yaoqian, R.id.tingyao
             , R.id.ydw, R.id.dcw, R.id.clw, R.id.qxw, R.id.ccw1, R.id.ccw2, R.id.ccw3
             , R.id.chushihua, R.id.jiting})
@@ -1063,6 +1064,50 @@ public class Home1Fragment extends BaseFragment {
                 }
                 ExecuteTheRecipe.BottomClick("炒锅清洗");
                 break;
+            case R.id.sdqx://开始深度清洗
+                if (!IsMake(true)) {
+                    return;
+                }
+
+                final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(context);
+                builder.setTitle("深度清洗抽水用量")
+                        .setPlaceholder("在此输入您的用量")
+                        .setInputType(InputType.TYPE_CLASS_NUMBER)
+                        .setDefaultText("500")
+                        .addAction("取消", new QMUIDialogAction.ActionListener() {
+                            @Override
+                            public void onClick(QMUIDialog dialog, int index) {
+                                dialog.dismiss();
+                            }
+                        })
+                        .addAction("确定", new QMUIDialogAction.ActionListener() {
+                            @Override
+                            public void onClick(QMUIDialog dialog, int index) {
+                                CharSequence text = builder.getEditText().getText();
+                                if (text != null && text.length() > 0) {
+                                    String t = text.toString();
+                                    int val=1000;
+                                    try {
+                                        val=Integer.parseInt(t);
+                                    } catch (Exception ex) {
+                                        ToastUtils.warning("输入格式出错！");
+                                        return;
+                                    }
+                                    ExecuteTheRecipe.WritePLC("清洗抽水量", val, null);
+                                    try {
+                                        Thread.sleep(500);//等待写入成功
+                                    } catch (InterruptedException e) {
+
+                                    }
+                                    ExecuteTheRecipe.BottomClick("深度清洗");
+                                    dialog.dismiss();
+                                } else {
+                                    ToastUtils.warning("用量不能为空！");
+                                }
+                            }
+                        })
+                        .show();
+                break;
             case R.id.yaoqian:
                 if (!IsMake(true)) {
                     return;

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

@@ -7,6 +7,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.text.InputType;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -35,6 +36,8 @@ import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3;
 import com.bonait.bnframework.modules.home.fragment.mode.newhuoli_control;
 import com.orhanobut.logger.Logger;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -374,8 +377,47 @@ public class HomeFragmentSBKZ extends BaseFragment {
                 ToastUtils.warning("初始化");
                 break;
             case R.id.zidongqingxi://自动清洗
-                ExecuteTheRecipe.BottomClick("炒锅清洗");
-                ToastUtils.warning("自动清洗");
+//                ExecuteTheRecipe.BottomClick("炒锅清洗");
+//                ToastUtils.warning("自动清洗");
+                final QMUIDialog.EditTextDialogBuilder builder = new QMUIDialog.EditTextDialogBuilder(context);
+                builder.setTitle("深度清洗抽水用量")
+                        .setPlaceholder("在此输入您的用量")
+                        .setInputType(InputType.TYPE_CLASS_NUMBER)
+                        .setDefaultText("500")
+                        .addAction("取消", new QMUIDialogAction.ActionListener() {
+                            @Override
+                            public void onClick(QMUIDialog dialog, int index) {
+                                dialog.dismiss();
+                            }
+                        })
+                        .addAction("确定", new QMUIDialogAction.ActionListener() {
+                            @Override
+                            public void onClick(QMUIDialog dialog, int index) {
+                                CharSequence text = builder.getEditText().getText();
+                                if (text != null && text.length() > 0) {
+                                    String t = text.toString();
+                                    int val=1000;
+                                    try {
+                                        val=Integer.parseInt(t);
+                                    } catch (Exception ex) {
+                                        ToastUtils.warning("输入格式出错！");
+                                        return;
+                                    }
+                                    ExecuteTheRecipe.WritePLC("清洗抽水量", val, null);
+                                    try {
+                                        Thread.sleep(500);//等待写入成功
+                                    } catch (InterruptedException e) {
+
+                                    }
+                                    ExecuteTheRecipe.BottomClick("深度清洗");
+                                    ToastUtils.warning("自动清洗");
+                                    dialog.dismiss();
+                                } else {
+                                    ToastUtils.warning("用量不能为空！");
+                                }
+                            }
+                        })
+                        .show();
                 break;
         }
     }

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

@@ -79,8 +79,17 @@ public class WokSetTLZZFragment extends BaseFragment {
     TextView edit_fzz_wz2;
     @BindView(R.id.edit_fzz_wz3)
     TextView edit_fzz_wz3;
-    @BindView(R.id.edit_fzz_wz4)
-    TextView edit_fzz_wz4;
+//    @BindView(R.id.edit_fzz_wz4)
+//    TextView edit_fzz_wz4;
+
+    @BindView(R.id.edit_fzz_xl1)
+    TextView edit_fzz_xl1;
+    @BindView(R.id.edit_fzz_xl2)
+    TextView edit_fzz_xl2;
+    @BindView(R.id.edit_fzz_xl3)
+    TextView edit_fzz_xl3;
+    @BindView(R.id.edit_fzz_xl4)
+    TextView edit_fzz_xl4;
     //endregion
 
     //region 界面
@@ -205,6 +214,11 @@ public class WokSetTLZZFragment extends BaseFragment {
                         Object m3 = ExecuteTheRecipe.ReadPLC("翻转-3号位置值");
                         Object m4 = ExecuteTheRecipe.ReadPLC("翻转-4号位置值");
 
+
+                        Object m5 = ExecuteTheRecipe.ReadPLC("翻转-1号吸料位置值");
+                        Object m6 = ExecuteTheRecipe.ReadPLC("翻转-2号吸料位置值");
+                        Object m7 = ExecuteTheRecipe.ReadPLC("翻转-3号吸料位置值");
+                        Object m8 = ExecuteTheRecipe.ReadPLC("翻转-4号吸料位置值");
                         getActivity().runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
@@ -254,11 +268,35 @@ public class WokSetTLZZFragment extends BaseFragment {
                                 } else {
                                     edit_fzz_wz3.setText("未知");
                                 }
-                                if (m4 != null) {
-                                    edit_fzz_wz4.setText(m4 + "");
+//                                if (m4 != null) {
+//                                    edit_fzz_wz4.setText(m4 + "");
+//                                } else {
+//                                    edit_fzz_wz4.setText("未知");
+//                                }
+                                if (m5 != null) {
+                                    edit_fzz_xl1.setText(m5 + "");
+                                } else {
+                                    edit_fzz_xl1.setText("未知");
+                                }
+
+                                if (m6 != null) {
+                                    edit_fzz_xl2.setText(m6 + "");
+                                } else {
+                                    edit_fzz_xl2.setText("未知");
+                                }
+
+                                if (m7 != null) {
+                                    edit_fzz_xl3.setText(m7 + "");
+                                } else {
+                                    edit_fzz_xl3.setText("未知");
+                                }
+
+                                if (m8 != null) {
+                                    edit_fzz_xl4.setText(m8 + "");
                                 } else {
-                                    edit_fzz_wz4.setText("未知");
+                                    edit_fzz_xl4.setText("未知");
                                 }
+
                             }
                         });
                         Thread.sleep(500);
@@ -280,8 +318,8 @@ public class WokSetTLZZFragment extends BaseFragment {
             R.id.pyz_qu1, R.id.pyz_qu2, R.id.pyz_qu3, R.id.pyz_qu4,
 
             R.id.fzz_hl,
-            R.id.fzz_wzsz1, R.id.fzz_wzsz2, R.id.fzz_wzsz3, R.id.fzz_wzsz4,
-            R.id.fzz_qu1, R.id.fzz_qu2, R.id.fzz_qu3, R.id.fzz_qu4,
+            R.id.fzz_wzsz1, R.id.fzz_wzsz2, R.id.fzz_wzsz3,  R.id.fzz_wzsz_xl1,R.id.fzz_wzsz_xl2,R.id.fzz_wzsz_xl3,R.id.fzz_wzsz_xl4,
+            R.id.fzz_qu1, R.id.fzz_qu2, R.id.fzz_qu3,     R.id.fzz_qu5,R.id.fzz_qu6,R.id.fzz_qu7,R.id.fzz_qu8,
 
             R.id.dcqd_button,
 
@@ -329,8 +367,20 @@ public class WokSetTLZZFragment extends BaseFragment {
             case R.id.fzz_wzsz3:
                 ButtomZhiWeiZhi("翻转-3#位置设定");
                 break;
-            case R.id.fzz_wzsz4:
-                ButtomZhiWeiZhi("翻转-4#位置设定");
+//            case R.id.fzz_wzsz4:
+//                ButtomZhiWeiZhi("翻转-4#位置设定");
+//                break;
+            case R.id.fzz_wzsz_xl1:
+                ButtomZhiWeiZhi("翻转-1#吸料位置设定");
+                break;
+            case R.id.fzz_wzsz_xl2:
+                ButtomZhiWeiZhi("翻转-2#吸料位置设定");
+                break;
+            case R.id.fzz_wzsz_xl3:
+                ButtomZhiWeiZhi("翻转-3#吸料位置设定");
+                break;
+            case R.id.fzz_wzsz_xl4:
+                ButtomZhiWeiZhi("翻转-4#吸料位置设定");
                 break;
             case R.id.fzz_qu1:
                 ButtomZhiWeiZhi("翻转-去1号位");
@@ -341,9 +391,23 @@ public class WokSetTLZZFragment extends BaseFragment {
             case R.id.fzz_qu3:
                 ButtomZhiWeiZhi("翻转-去3号位");
                 break;
-            case R.id.fzz_qu4:
-                ButtomZhiWeiZhi("翻转-去4号位");
+//            case R.id.fzz_qu4:
+//                ButtomZhiWeiZhi("翻转-去4号位");
+//                break;
+            case R.id.fzz_qu5:
+                ButtomZhiWeiZhi("翻转-去1号吸料位");
+                break;
+            case R.id.fzz_qu6:
+                ButtomZhiWeiZhi("翻转-去2号吸料位");
                 break;
+            case R.id.fzz_qu7:
+                ButtomZhiWeiZhi("翻转-去3号吸料位");
+                break;
+            case R.id.fzz_qu8:
+                ButtomZhiWeiZhi("翻转-去4号吸料位");
+                break;
+
+
             case R.id.dcqd_button:
                 ButtomZhiWeiZhi("主料");
                 break;

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

@@ -605,7 +605,24 @@
                                         android:layout_centerInParent="true"
                                         android:layout_marginBottom="10dp"
                                         android:background="@drawable/bg_btn_login_selected"
-                                        android:text="自动清洗"
+                                        android:text="普通清洁"
+                                        android:textColor="@color/white"
+                                        android:textSize="16dp" />
+                                </RelativeLayout>
+
+                                <RelativeLayout
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginRight="10dp">
+
+                                    <Button
+                                        android:id="@+id/sdqx"
+                                        android:layout_width="100dp"
+                                        android:layout_height="match_parent"
+                                        android:layout_centerInParent="true"
+                                        android:layout_marginBottom="10dp"
+                                        android:background="@drawable/bg_btn_login_selected"
+                                        android:text="深度清洁"
                                         android:textColor="@color/white"
                                         android:textSize="16dp" />
                                 </RelativeLayout>

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

@@ -696,6 +696,41 @@
                         android:textStyle="bold" />
                 </LinearLayout>
 
+<!--                <LinearLayout-->
+<!--                    android:layout_width="0dp"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_marginLeft="20dp"-->
+<!--                    android:layout_weight="1">-->
+
+<!--                    <Button-->
+<!--                        android:id="@+id/fzz_wzsz4"-->
+<!--                        android:layout_width="80dp"-->
+<!--                        android:layout_height="26dp"-->
+<!--                        android:layout_centerInParent="true"-->
+<!--                        android:layout_marginRight="@dimen/dp_10"-->
+<!--                        android:background="@drawable/button2"-->
+<!--                        android:text="4#位设定"-->
+<!--                        android:textSize="14dp" />-->
+
+<!--                    <TextView-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_alignParentRight="true"-->
+<!--                        android:layout_centerVertical="true"-->
+<!--                        android:layout_marginLeft="@dimen/dp_10"-->
+<!--                        android:minWidth="60dp"-->
+<!--                        android:text="4#位值" />-->
+<!--                    <TextView-->
+<!--                        android:id="@+id/edit_fzz_wz4"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_marginLeft="5dp"-->
+<!--                        android:text="0"-->
+<!--                        android:textColor="@color/deep_orange_primary"-->
+<!--                        android:textSize="12dp"-->
+<!--                        android:textStyle="bold" />-->
+<!--                </LinearLayout>-->
+
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -703,13 +738,13 @@
                     android:layout_weight="1">
 
                     <Button
-                        android:id="@+id/fzz_wzsz4"
+                        android:id="@+id/fzz_wzsz_xl1"
                         android:layout_width="80dp"
                         android:layout_height="26dp"
                         android:layout_centerInParent="true"
                         android:layout_marginRight="@dimen/dp_10"
                         android:background="@drawable/button2"
-                        android:text="4#位设定"
+                        android:text="1#吸料设定"
                         android:textSize="14dp" />
 
                     <TextView
@@ -719,9 +754,150 @@
                         android:layout_centerVertical="true"
                         android:layout_marginLeft="@dimen/dp_10"
                         android:minWidth="60dp"
-                        android:text="4#位值" />
+                        android:text="1#吸料位值" />
+                    <TextView
+                        android:id="@+id/edit_fzz_xl1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="0"
+                        android:textColor="@color/deep_orange_primary"
+                        android:textSize="12dp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:layout_weight="1">
+
+                    <Button
+                        android:id="@+id/fzz_wzsz_xl2"
+                        android:layout_width="80dp"
+                        android:layout_height="26dp"
+                        android:layout_centerInParent="true"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:background="@drawable/button2"
+                        android:text="2#吸料设定"
+                        android:textSize="14dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:minWidth="60dp"
+                        android:text="2#吸料位值" />
+                    <TextView
+                        android:id="@+id/edit_fzz_xl2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="0"
+                        android:textColor="@color/deep_orange_primary"
+                        android:textSize="12dp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:layout_weight="1">
+
+                    <Button
+                        android:id="@+id/fzz_wzsz_xl3"
+                        android:layout_width="80dp"
+                        android:layout_height="26dp"
+                        android:layout_centerInParent="true"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:background="@drawable/button2"
+                        android:text="3#吸料设定"
+                        android:textSize="14dp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:minWidth="60dp"
+                        android:text="3#吸料位值" />
+                    <TextView
+                        android:id="@+id/edit_fzz_xl3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:text="0"
+                        android:textColor="@color/deep_orange_primary"
+                        android:textSize="12dp"
+                        android:textStyle="bold" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp">
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="20dp"
+                    android:layout_weight="1">
+
+                    <Button
+                        android:id="@+id/fzz_wzsz_xl4"
+                        android:layout_width="80dp"
+                        android:layout_height="26dp"
+                        android:layout_centerInParent="true"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:background="@drawable/button2"
+                        android:text="4#吸料设定"
+                        android:textSize="14dp" />
+
                     <TextView
-                        android:id="@+id/edit_fzz_wz4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:minWidth="60dp"
+                        android:text="4#吸料位值" />
+                    <TextView
+                        android:id="@+id/edit_fzz_xl4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
@@ -762,14 +938,15 @@
                         android:textSize="14dp" />
                 </RelativeLayout>
 
-                <RelativeLayout
+                <LinearLayout
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1">
 
                     <Button
                         android:id="@+id/fzz_qu1"
-                        android:layout_width="120dp"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="40dp"
                         android:layout_marginRight="@dimen/dp_10"
                         android:background="@drawable/bg_btn_login_selected"
@@ -778,14 +955,24 @@
 
                     <Button
                         android:id="@+id/fzz_qu2"
-                        android:layout_width="120dp"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
                         android:layout_height="40dp"
-                        android:layout_alignParentRight="true"
                         android:layout_marginRight="@dimen/dp_10"
                         android:background="@drawable/bg_btn_login_selected"
                         android:text="去2#位"
                         android:textSize="14dp" />
-                </RelativeLayout>
+
+                    <Button
+                        android:id="@+id/fzz_qu3"
+                        android:layout_width="0dp"
+                        android:layout_weight="1"
+                        android:layout_height="40dp"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:background="@drawable/bg_btn_login_selected"
+                        android:text="去3#位"
+                        android:textSize="14dp" />
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
@@ -824,22 +1011,59 @@
                     android:layout_weight="1">
 
                     <Button
-                        android:id="@+id/fzz_qu3"
+                        android:id="@+id/fzz_qu5"
                         android:layout_width="120dp"
                         android:layout_height="40dp"
                         android:layout_marginRight="@dimen/dp_10"
                         android:background="@drawable/bg_btn_login_selected"
-                        android:text="去3#位"
+                        android:text="去1#吸料位"
                         android:textSize="14dp" />
 
                     <Button
-                        android:id="@+id/fzz_qu4"
+                        android:id="@+id/fzz_qu6"
                         android:layout_width="120dp"
                         android:layout_height="40dp"
                         android:layout_alignParentRight="true"
                         android:layout_marginRight="@dimen/dp_10"
                         android:background="@drawable/bg_btn_login_selected"
-                        android:text="去4#位"
+                        android:text="去2#吸料位"
+                        android:textSize="14dp" />
+                </RelativeLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp">
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+                </RelativeLayout>
+
+                <RelativeLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1">
+
+                    <Button
+                        android:id="@+id/fzz_qu7"
+                        android:layout_width="120dp"
+                        android:layout_height="40dp"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:background="@drawable/bg_btn_login_selected"
+                        android:text="去3#吸料位"
+                        android:textSize="14dp" />
+
+                    <Button
+                        android:id="@+id/fzz_qu8"
+                        android:layout_width="120dp"
+                        android:layout_height="40dp"
+                        android:layout_alignParentRight="true"
+                        android:layout_marginRight="@dimen/dp_10"
+                        android:background="@drawable/bg_btn_login_selected"
+                        android:text="去4#吸料位"
                         android:textSize="14dp" />
                 </RelativeLayout>
             </LinearLayout>