122121212

app/src/main/AndroidManifest.xml

@@ -33,6 +33,9 @@
         tools:ignore="GoogleAppIndexingWarning"
         tools:node="merge"
         tools:replace="android:icon">
+        <activity
+            android:name=".modules.home.fragment.from.DiyMemoryActivity"
+            android:exported="false" />
         <activity
             android:name=".modules.home.fragment.from.fragment.SystemCsPLCFragment"
             android:exported="false"

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

@@ -132,7 +132,7 @@ public class ExecuteTheRecipe {
      *
      * @param text
      */
-    private static void ExecuteMaterialIssuance(String text) {
+    public static void ExecuteMaterialIssuance(String text) {
         try {
             ToastUtils.info("准备下料！！！");
 
@@ -205,7 +205,7 @@ public class ExecuteTheRecipe {
      *
      * @param text
      */
-    private static void ExecuteOperationSteps(String processname, String text) {
+    public static void ExecuteOperationSteps(String processname, String text) {
         try {
             if (!text.isEmpty() && !processname.isEmpty()) {
                 //工序名称和值

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

@@ -6,6 +6,7 @@ import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.db.QueryDB;
 import com.bonait.bnframework.common.db.mode.BPA_ALERTLOG;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS;
+import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPE;
 import com.bonait.bnframework.common.db.mode.BPA_LOG;
 import com.bonait.bnframework.common.db.mode.BPA_MATERIAL;
 import com.bonait.bnframework.common.db.mode.BPA_SILOS;
@@ -273,4 +274,12 @@ public class DataBus {
      */
     public OrderA OrderSM = new OrderA();
     //endregion
+
+    //region DIY
+    /**
+     * 工序步骤
+     */
+    public ArrayList<BPA_GOODSRECIPE> bpa_goodsrecipes = new ArrayList<>();
+    public int TimeOut=0;
+    //endregion
 }

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

@@ -21,4 +21,5 @@ public interface MessageName {
 
     String ClickImage="ClickImage";//点击图标
 
+    String DIY="DIY";//点击图标
 }

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

@@ -180,6 +180,23 @@ public class DiyActivity extends BaseActivity {
                 }
             }
         });
+
+        //图标选择
+        MessageManager.getInstance().registerMessageReceiver(this, MessageName.DIY, new MessageLooper.OnMessageListener() {
+            @Override
+            public void onMessage(Object msg) {
+                if (msg != null) {
+                    bpa_goodsrecipes.clear();
+                    for(BPA_GOODSRECIPE item:DataBus.getInstance().bpa_goodsrecipes)
+                    {
+                        bpa_goodsrecipes.add(item);
+                    }
+                    zzsc.setText(DataBus.getInstance().TimeOut+"");
+                    gxbz_adapter.notifyDataSetChanged();
+                }
+            }
+        });
+
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
     }
 
@@ -449,8 +466,10 @@ public class DiyActivity extends BaseActivity {
                     ToastUtils.info("已经最底部！");
                 }
                 break;
-            case R.id.caozuomoshi://操作模式
-                ToastUtils.info("操作模式");
+            case R.id.caozuomoshi://操作模式，打开自动记忆模式
+                Intent intent1 = new Intent(getContext(), DiyMemoryActivity.class);
+                intent1.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent1);
                 break;
             case R.id.shengchengcaipu://生成菜谱
                 String name = edittext.getText().toString();

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

@@ -0,0 +1,657 @@
+package com.bonait.bnframework.modules.home.fragment.from;
+
+import static com.bonait.bnframework.MainApplication.getContext;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.os.SystemClock;
+import android.view.View;
+import android.widget.Chronometer;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.bonait.bnframework.R;
+import com.bonait.bnframework.business.ExecuteTheRecipe;
+import com.bonait.bnframework.common.base.BaseActivity;
+import com.bonait.bnframework.common.constant.DataBus;
+import com.bonait.bnframework.common.constant.MessageName;
+import com.bonait.bnframework.common.db.QueryDB;
+import com.bonait.bnframework.common.db.mode.BPA_GOODS;
+import com.bonait.bnframework.common.db.mode.BPA_GOODSRECIPE;
+import com.bonait.bnframework.common.db.mode.BPA_MATERIAL;
+import com.bonait.bnframework.common.db.mode.BPA_PROCESSModel;
+import com.bonait.bnframework.common.helper.I.IWriteCallBack;
+import com.bonait.bnframework.common.helper.I.MyClickListener;
+import com.bonait.bnframework.common.message.MessageManager;
+import com.bonait.bnframework.common.utils.AlertDialogUtils;
+import com.bonait.bnframework.common.utils.ToastUtils;
+import com.bonait.bnframework.modules.home.fragment.mode.fragment_gx;
+import com.bonait.bnframework.modules.home.fragment.mode.huoli_control;
+import com.bonait.bnframework.modules.home.fragment.mode.item_gx;
+import com.litao.slider.NiftySlider;
+import com.qmuiteam.qmui.widget.QMUITopBarLayout;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
+import com.qmuiteam.qmui.widget.textview.QMUILinkTextView;
+
+import java.util.ArrayList;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class DiyMemoryActivity extends BaseActivity {
+
+    @BindView(R.id.topbar)
+    QMUITopBarLayout mTopBar;
+
+    @BindView(R.id.gxchid)
+    LinearLayout gxchid;//工序子集
+
+    @BindView(R.id.start_bj)
+    LinearLayout start_bj;//背景
+
+    @BindView(R.id.startbutton)
+    ImageView startbutton;//启动停止
+
+    public boolean isRun = false;
+
+    @BindView(R.id.runtime)
+    Chronometer runtime;//运行时间
+
+    @BindView(R.id.huoli)
+    huoli_control huoli;//火力 控件
+
+    @BindView(R.id.nifty_slider2)
+    NiftySlider nifty_slider2;//搅拌挡位
+
+    @BindView(R.id.nifty_slider3)
+    NiftySlider nifty_slider3;//移动挡位
+
+    private Context context;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_diy_memory);
+        ButterKnife.bind(this);
+        initTopBar();
+        initData();
+    }
+
+    /**
+     * 初始化数据
+     */
+    private void initData() {
+        try {
+            gxchid.removeAllViews();
+            ArrayList<BPA_MATERIAL> materials = QueryDB.GetMaterialALL();
+            for (BPA_MATERIAL item2 : materials) {
+                item_gx gx = new item_gx();
+                gx.datatype = 0;//液体料都是数字
+                gx.name = item2.name;
+                gx.IsWL = true;
+                fragment_gx gongxu = new fragment_gx(this, null, gx);
+                gxchid.addView(gongxu);
+            }
+        } catch (Exception ex) {
+        }
+    }
+
+    private void initTopBar() {
+        mTopBar.setTitle("手动操作模式");
+        mTopBar.addLeftImageButton(R.mipmap.fanhui, R.id.topbar).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (isRun) {
+                    ToastUtils.warning("请先结束烹饪！！！");
+                }else
+                {
+                   finish();
+                }
+            }
+        });
+        //为Chronomter绑定事件监听器,超过一小时自动日内告知
+        runtime.setOnChronometerTickListener(new Chronometer.OnChronometerTickListener() {
+            @Override
+            public void onChronometerTick(Chronometer chronometer) {
+                //如果计时到现在超过了一小时秒
+                if (SystemClock.elapsedRealtime() - runtime.getBase() > 3600 * 1000) {
+                    runtime.stop();
+                }
+            }
+        });
+
+        nifty_slider2.setOnValueChangeListener(new NiftySlider.OnValueChangeListener() {
+            @Override
+            public void onValueChange(@NonNull NiftySlider niftySlider, float v, boolean b) {
+                nifty_slider2.setThumbText((int) v + "");
+            }
+        });
+
+        nifty_slider3.setOnValueChangeListener(new NiftySlider.OnValueChangeListener() {
+            @Override
+            public void onValueChange(@NonNull NiftySlider niftySlider, float v, boolean b) {
+                nifty_slider3.setThumbText((int) v + "");
+            }
+        });
+        nifty_slider2.setValue(0, true);
+        nifty_slider3.setValue(0, true);
+
+        huoli.mListener = new MyClickListener() {
+            @Override
+            public void clickListener(View v, Object data) {
+                if(isRunClick())
+                {
+                    long elapsedMillis = SystemClock.elapsedRealtime() - runtime.getBase();
+                    int time = (int) (elapsedMillis / 1000);//当前点击多少秒
+                    int time_c=time-ClikTime;
+
+                    if(time_c>0)//如果大于0，那么加一个延迟
+                    {
+                       DataBus.getInstance().bpa_goodsrecipes.add(Get延迟(time_c));
+                    }
+
+                    String sdstr= Get挡位((int) data);
+                    BPA_GOODSRECIPE data1=Get加热(sdstr);
+                    DataBus.getInstance().bpa_goodsrecipes.add(data1);
+                    ClikTime=time;
+                    ExecuteTheRecipe.Write_PLC_HuoLI((int) data);
+                }
+
+            }
+
+            @Override
+            public void clickListenerNew(View v, int k, Object data) {
+
+            }
+        };
+    }
+
+
+    public int TimeOut=0;//当前运行总时长
+    public int ClikTime=0;//上一次点击时间
+
+    @OnClick({R.id.startbutton, R.id.querendangwei,
+            R.id.chuliao, R.id.touliao1,R.id.touliao0,
+            R.id.touliao2, R.id.touliao3,
+            R.id.touliao4
+            , R.id.ydw, R.id.dcw, R.id.clw
+            , R.id.qxw, R.id.ccw1, R.id.ccw2, R.id.ccw3
+            ,R.id.zidongchucan})
+    public void onViewClicked(View view) {
+        long elapsedMillis = SystemClock.elapsedRealtime() - runtime.getBase();
+        int time = (int) (elapsedMillis / 1000);//当前点击多少秒
+        int time_c=time-ClikTime;
+
+        switch (view.getId()) {
+            case R.id.startbutton://启动 停止
+                if (isRun) {
+                    String title = "停止操作提示！";
+                    String message = "请问客官确定要停止制作吗,小菠萝会生气的,啊啊啊啊啊啊啊...我的饭饭？";
+                    AlertDialogUtils.showDialog(view.getContext(), title, message, new QMUIDialogAction.ActionListener() {
+                        @Override
+                        public void onClick(QMUIDialog dialog, int index) {
+                            StopTime();
+                            dialog.dismiss();
+                        }
+                    });
+                } else {
+
+                    String title = "开始操作提示！";
+                    String message = "请问客官确定要开始制作吗,小菠萝好开心呀,马上就有好吃的耶？";
+                    AlertDialogUtils.showDialog(view.getContext(), title, message, new QMUIDialogAction.ActionListener() {
+                        @Override
+                        public void onClick(QMUIDialog dialog, int index) {
+                            StartTime();
+                            dialog.dismiss();
+                        }
+                    });
+                }
+                break;
+            case R.id.querendangwei://确认搅拌挡位
+                if(isRunClick())
+                {
+                    if(time_c>0)//如果大于0，那么加一个延迟
+                    {
+                        DataBus.getInstance().bpa_goodsrecipes.add(Get延迟(time_c));
+                    }
+
+                    int sd = (int) nifty_slider2.getValue();
+                    String sdstr= Get速度(sd);
+                    BPA_GOODSRECIPE data=Get搅拌(sdstr);
+                    DataBus.getInstance().bpa_goodsrecipes.add(data);
+                    ExecuteTheRecipe.WritePLC("搅拌速度", sd, new IWriteCallBack() {
+                        @Override
+                        public void onSuccess() {
+                            if (sd == 0) {
+                                ExecuteTheRecipe.WritePLC("搅拌", false, null);
+                            } else {
+                                ExecuteTheRecipe.WritePLC("搅拌", true, null);
+                            }
+                        }
+                        @Override
+                        public void onFailure(String ErrorMsg) {
+                        }
+                    });
+                    ClikTime=time;
+                }
+                break;
+            case R.id.chuliao://出料
+                if(isRunClick())
+                {
+                    BPA_GOODSRECIPE data = GetSelectItemFromValue();
+                    if (data != null) {
+                        DataBus.getInstance().bpa_goodsrecipes.add(data);
+                        MakeRecipe(data);
+                        ClikTime=time;
+                    }
+                }
+                break;
+            case R.id.touliao0://主料1
+                if(isRunClick())
+                {
+                    ExecuteTheRecipe.BottomClick("平移-去1号位");
+                }
+                break;
+            case R.id.touliao1://主料1
+                ClickZL(time,time_c,1);
+                break;
+            case R.id.touliao2://主料2
+                ClickZL(time,time_c,2);
+                break;
+            case R.id.touliao3://主料3
+                ClickZL(time,time_c,3);
+                break;
+            case R.id.touliao4://主料4
+                ClickZL(time,time_c,4);
+                break;
+            case R.id.ydw://原点位
+                ClickWZ(time,time_c,"原点位");
+                break;
+            case R.id.dcw://到菜位
+                ClickWZ(time,time_c,"倒菜位");
+                break;
+            case R.id.clw://出料位置
+                ClickWZ(time,time_c,"抽料位");
+                break;
+            case R.id.qxw://清洗位置
+                ClickWZ(time,time_c,"清洗位");
+                break;
+            case R.id.ccw1://炒菜位1
+                ClickWZ(time,time_c,"炒菜位1");
+                break;
+            case R.id.ccw2://炒菜位2
+                ClickWZ(time,time_c,"炒菜位2");
+                break;
+            case R.id.ccw3://炒菜位3
+                ClickWZ(time,time_c,"炒菜位3");
+                break;
+            case R.id.zidongchucan://自动出餐
+                if(isRunClick())
+                {
+                    if(time_c>0)//如果大于0，那么加一个延迟
+                    {
+                        DataBus.getInstance().bpa_goodsrecipes.add(Get延迟(time_c));
+                    }
+
+                    BPA_GOODSRECIPE data1=Get出菜();
+                    DataBus.getInstance().bpa_goodsrecipes.add(data1);
+                    MakeRecipe(data1);
+                    ClikTime=time;
+                }
+                break;
+        }
+    }
+
+    //region 常用函数
+
+    /**
+     * 是否运行
+     * @return
+     */
+    public boolean isRunClick()
+    {
+        if (!isRun) {
+            ToastUtils.warning("请先开始计时器！！！");
+            return false;
+        }
+
+        if (isMake) {
+            ToastUtils.warning("请等待上一步骤结束！！！");
+            return false;
+        }
+
+
+//        if (!isRun) {
+//            ToastUtils.info("请先开始计时器！！！");
+//            return false;
+//        }
+
+        return true;
+    }
+    public void ClickZL(int time,int time_c,int num)
+    {
+        if(isRunClick())
+        {
+            if(time_c>0)//如果大于0，那么加一个延迟
+            {
+                DataBus.getInstance().bpa_goodsrecipes.add(Get延迟(time_c));
+            }
+            BPA_GOODSRECIPE data=Get主料(num);
+            DataBus.getInstance().bpa_goodsrecipes.add(data);
+            MakeRecipe(data);
+            ClikTime=time;
+        }
+    }
+    public void ClickWZ(int time,int time_c,String name)
+    {
+        if(isRunClick())
+        {
+            if(time_c>0)//如果大于0，那么加一个延迟
+            {
+                DataBus.getInstance().bpa_goodsrecipes.add(Get延迟(time_c));
+            }
+
+            int sd = (int) nifty_slider3.getValue();
+            String sdstr= Get速度(sd);
+            BPA_GOODSRECIPE data=Get位置(sdstr,name);
+            DataBus.getInstance().bpa_goodsrecipes.add(data);
+            MakeRecipe(data);
+            ClikTime=time;
+        }
+    }
+
+    public boolean isMake=false;
+    public void MakeRecipe(BPA_GOODSRECIPE recipe)
+    {
+        isMake=true;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                if (recipe.materialType == 0)//正常物料
+                {
+
+                    ExecuteTheRecipe.ExecuteMaterialIssuance(recipe.processvalue);
+                } else if (recipe.materialType == 1)//工序模型
+                {
+                    ExecuteTheRecipe.ExecuteOperationSteps(recipe.processname,recipe.processvalue);
+                }
+                isMake=false;
+            }
+        }).start();
+    }
+
+    /**
+     * 获取选中行的变量
+     *
+     * @return
+     */
+    public BPA_GOODSRECIPE GetSelectItemFromValue() {
+        BPA_GOODSRECIPE pf = new BPA_GOODSRECIPE();
+        try {
+            boolean IsVerify = true;
+            String description = "";
+            //  延迟,100|延迟,100|延迟,100|延迟,100|
+            String data = "";
+            String desc = "";
+
+            pf.materialType = 0;
+            for (int i = 0; i < gxchid.getChildCount(); i++) {
+                fragment_gx gongxu = (fragment_gx) gxchid.getChildAt(i);
+                String values = gongxu.GetValues();
+                if (!values.isEmpty()) {
+                    data += gongxu.model.name + "," + values + "|";
+                    desc += values + ",";
+                }
+            }
+
+            if (data.isEmpty()) {
+                IsVerify = false;
+                description += "物料-不能为空,请勾选一个物料\n";
+            }
+
+
+            if (IsVerify) {
+                pf.processname = "液体料";
+                pf.processms = "液体料" + "(" + desc.substring(0, desc.length() - 1) + ")";
+                pf.processvalue = data.substring(0, data.length() - 1);
+                return pf;
+            } else {
+                ToastUtils.error("数据验证失败,原因:" + description);
+                return null;
+            }
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取延迟
+     * @param time
+     * @return
+     */
+    public BPA_GOODSRECIPE Get延迟(int time)
+    {
+        BPA_GOODSRECIPE pf = new BPA_GOODSRECIPE();
+        pf.materialType=1;
+        pf.processname="延迟";
+        pf.processms="延迟("+time+")";
+        pf.processvalue="延迟(秒),"+time;
+        return pf;
+    }
+
+    /**
+     * 获取主料
+     * @param wz
+     * @return
+     */
+    public BPA_GOODSRECIPE Get主料(int wz)
+    {
+        BPA_GOODSRECIPE pf = new BPA_GOODSRECIPE();
+        pf.materialType=1;
+        pf.processname="主料";
+        pf.processms="主料(未知,"+wz+"号位,0,直接投出,0)";
+        pf.processvalue="主料名称,未知|主料位置,"+wz+"号位|主料重量,0|投料动作,直接投出|烹饪(秒),0";
+        return pf;
+    }
+
+    /**
+     * 获取位置
+     * @param sd
+     * @return
+     */
+    public BPA_GOODSRECIPE Get位置(String sd,String name)
+    {
+        BPA_GOODSRECIPE pf = new BPA_GOODSRECIPE();
+        pf.materialType=1;
+        pf.processname="位置";
+        pf.processms="位置("+sd+","+name+",0)";
+        pf.processvalue="转动速度,"+sd+"|位置动作,"+name+"|延迟(秒),0";
+        return pf;
+    }
+
+    /**
+     * 获取搅拌
+     * @param sd
+     * @return
+     */
+    public BPA_GOODSRECIPE Get搅拌(String sd)
+    {
+        BPA_GOODSRECIPE pf = new BPA_GOODSRECIPE();
+        pf.materialType=1;
+        pf.processname="搅拌";
+        pf.processms="搅拌("+sd+",0)";
+        pf.processvalue="搅拌速度,"+sd+"|延迟(秒),0";
+        return pf;
+    }
+
+    /**
+     * 获取加热
+     * @param sd
+     * @return
+     */
+    public BPA_GOODSRECIPE Get加热(String sd)
+    {
+        BPA_GOODSRECIPE pf = new BPA_GOODSRECIPE();
+        pf.materialType=1;
+        pf.processname="加热";
+        pf.processms="加热("+sd+",0)";
+        pf.processvalue="加热功率,"+sd+"|延迟(秒),0";
+        return pf;
+    }
+
+    /**
+     * 获取出菜
+     * @return
+     */
+    public BPA_GOODSRECIPE Get出菜()
+    {
+        BPA_GOODSRECIPE pf = new BPA_GOODSRECIPE();
+        pf.materialType=1;
+        pf.processname="出菜";
+        pf.processms="出菜(0)";
+        pf.processvalue="延迟(秒),0";
+        return pf;
+    }
+
+    /**
+     * 获取速度
+     * @return
+     */
+    public String Get速度(int speed)
+    {
+        if(speed>=0 && speed<5)
+        {
+            return "停止";
+        }else if(speed>=5 && speed<15)
+        {
+            return "最低";
+        }else if(speed>=15 && speed<25)
+        {
+            return "低速";
+        }else if(speed>=25 && speed<35)
+        {
+            return "中速";
+        }else if(speed>=35 && speed<45)
+        {
+            return "高速";
+        }else if(speed>=45 && speed<55)
+        {
+            return "最高";
+        }else
+        {
+            return "极高";
+        }
+    }
+
+    /**
+     * 获取挡位
+     * @return
+     */
+    public String Get挡位(int speed)
+    {
+        if(speed==0)
+        {
+            return "停止";
+        }else if(speed==1)
+        {
+            return "一档";
+        }else if(speed==2)
+        {
+            return "二档";
+        }else if(speed==3)
+        {
+            return "三档";
+        }else if(speed==4)
+        {
+            return "四档";
+        }else if(speed==5)
+        {
+            return "五档";
+        }else if(speed==6)
+        {
+            return "六档";
+        }else if(speed==7)
+        {
+            return "七档";
+        }else
+        {
+            return "八档";
+        }
+    }
+
+    /**
+     * 启动定时器
+     */
+    public void StartTime() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                //设置开始计时时间
+                runtime.setBase(SystemClock.elapsedRealtime());
+                //启动计时器
+                runtime.start();
+                isRun = true;
+                startbutton.setImageResource(R.mipmap.stop_js);
+                //5700FF22
+                //25FF9800
+                start_bj.setBackgroundColor(Color.parseColor("#5700FF22"));
+
+                DataBus.getInstance().bpa_goodsrecipes.clear();//清空所有工序
+                TimeOut=0;
+                ClikTime=0;
+            }
+        });
+
+    }
+
+    /**
+     * 停止定时器
+     */
+    public void StopTime() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                //启动计时器
+                runtime.stop();
+                isRun = false;
+                startbutton.setImageResource(R.mipmap.start_js);
+
+                start_bj.setBackgroundColor(Color.parseColor("#25FF9800"));
+
+                long elapsedMillis = SystemClock.elapsedRealtime() - runtime.getBase();
+                TimeOut = (int) (elapsedMillis / 1000);//当前点击多少秒
+                DataBus.getInstance().TimeOut=TimeOut;
+                if(DataBus.getInstance().bpa_goodsrecipes.size()>=0)
+                {
+                    MessageManager.getInstance().sendMessage(MessageName.DIY,"DIY");
+                }
+
+                ExecuteTheRecipe.WritePLC("搅拌", false, null);
+                ExecuteTheRecipe.WritePLC("加热", false, null);
+                ExecuteTheRecipe.BottomClick("平移-去1号位");
+            }
+        });
+
+    }
+    //endregion
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        StopTime();
+    }
+
+    @Override
+    protected boolean canDragBack() {
+        return false;
+    }
+}

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

@@ -21,6 +21,7 @@ import android.widget.Spinner;
 
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.base.BaseActivity;
+import com.bonait.bnframework.common.constant.DataBus;
 import com.bonait.bnframework.common.constant.MessageName;
 import com.bonait.bnframework.common.db.QueryDB;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS;
@@ -173,6 +174,22 @@ public class DiyUpdateActivity extends BaseActivity {
                 }
             }
         });
+
+        //图标选择
+        MessageManager.getInstance().registerMessageReceiver(this, MessageName.DIY, new MessageLooper.OnMessageListener() {
+            @Override
+            public void onMessage(Object msg) {
+                if (msg != null) {
+                    bpa_goodsrecipes.clear();
+                    for(BPA_GOODSRECIPE item: DataBus.getInstance().bpa_goodsrecipes)
+                    {
+                        bpa_goodsrecipes.add(item);
+                    }
+                    zzsc.setText(DataBus.getInstance().TimeOut+"");
+                    gxbz_adapter.notifyDataSetChanged();
+                }
+            }
+        });
     }
 
 	/**
@@ -501,7 +518,9 @@ public class DiyUpdateActivity extends BaseActivity {
                 }
                 break;
             case R.id.caozuomoshi://操作模式
-                ToastUtils.info("操作模式");
+                Intent intent1 = new Intent(getContext(), DiyMemoryActivity.class);
+                intent1.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                startActivity(intent1);
                 break;
             case R.id.shengchengnewcaipu:
                 String name1=edittext.getText().toString();

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

@@ -1,12 +1,18 @@
 package com.bonait.bnframework.modules.home.fragment.from;
 
 import androidx.annotation.NonNull;
+
+import com.bonait.bnframework.common.constant.ConfigName;
+import com.bonait.bnframework.common.utils.ToastUtils;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import androidx.viewpager.widget.ViewPager;
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
 
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.base.BaseActivity;
@@ -29,6 +35,14 @@ public class SzActivity extends BaseActivity {
     BottomNavigationView bottomNavigationView;
     @BindView(R.id.viewpager)
     QMUIViewPager viewPager;
+
+    @BindView(R.id.quanxian)
+    RelativeLayout quanxian;//权限显示
+    @BindView(R.id.edittext_quanxian)
+    EditText edittext_quanxian;//权限密码
+    @BindView(R.id.quanxianmima)
+    Button quanxianmima;//权限密码
+
     private MenuItem menuItem;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -51,6 +65,27 @@ public class SzActivity extends BaseActivity {
                 finish();
             }
         });
+
+        quanxianmima.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String s=edittext_quanxian.getText().toString();
+                if (s==null ||s.isEmpty())
+                {
+                    ToastUtils.warning("权限密码不能为空！");
+                }else
+                {
+                    if(s.equals(ConfigName.getInstance().user.pass))
+                    {
+                        quanxian.setVisibility(View.GONE);
+                        viewPager.setVisibility(View.VISIBLE);
+                    }else
+                    {
+                        ToastUtils.warning("权限密码不正确！");
+                    }
+                }
+            }
+        });
     }
 
     /**

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

@@ -2,6 +2,8 @@ package com.bonait.bnframework.modules.home.fragment.from;
 
 import androidx.annotation.NonNull;
 
+import com.bonait.bnframework.common.constant.ConfigName;
+import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.modules.home.fragment.from.fragment.SystemCsPLCFragment;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
@@ -10,6 +12,9 @@ import androidx.viewpager.widget.ViewPager;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.RelativeLayout;
 
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.base.BaseActivity;
@@ -31,6 +36,14 @@ public class WhActivity extends BaseActivity {
     BottomNavigationView bottomNavigationView;
     @BindView(R.id.viewpager)
     QMUIViewPager viewPager;
+
+    @BindView(R.id.quanxian)
+    RelativeLayout quanxian;//权限显示
+    @BindView(R.id.edittext_quanxian)
+    EditText edittext_quanxian;//权限密码
+    @BindView(R.id.quanxianmima)
+    Button quanxianmima;//权限密码
+
     private MenuItem menuItem;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -59,6 +72,27 @@ public class WhActivity extends BaseActivity {
                 finish();
             }
         });
+
+        quanxianmima.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String s=edittext_quanxian.getText().toString();
+                if (s==null ||s.isEmpty())
+                {
+                    ToastUtils.warning("权限密码不能为空！");
+                }else
+                {
+                    if(s.equals(ConfigName.getInstance().user.pass))
+                    {
+                        quanxian.setVisibility(View.GONE);
+                        viewPager.setVisibility(View.VISIBLE);
+                    }else
+                    {
+                        ToastUtils.warning("权限密码不正确！");
+                    }
+                }
+            }
+        });
     }
     FragmentAdapter fragmentAdapter=null;
     /**

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

@@ -172,7 +172,6 @@
                         </LinearLayout>
 
                         <Button
-                            android:visibility="gone"
                             android:id="@+id/caozuomoshi"
                             android:layout_centerHorizontal="true"
                             android:layout_alignParentBottom="true"

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

@@ -0,0 +1,582 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.qmuiteam.qmui.widget.QMUIWindowInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".modules.home.fragment.from.DiyMemoryActivity"
+    android:orientation="vertical"
+    android:background="@color/app_color_blue"
+    android:fitsSystemWindows="true"
+    app:qmui_skin_background="?attr/app_skin_common_background">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="?attr/qmui_topbar_height"
+        android:background="@color/activity_background">
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <!-- 开始启动 -->
+                <LinearLayout
+                    android:id="@+id/start_bj"
+                    android:layout_width="match_parent"
+                    android:layout_height="100dp"
+                    android:layout_marginTop="2dp"
+                    android:background="#25FF9800"
+                    android:padding="5dp">
+                    <RelativeLayout
+                        android:layout_marginLeft="20dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <ImageView
+                            android:id="@+id/startbutton"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true"
+                            android:src="@mipmap/start_js" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_marginLeft="@dimen/dp_40"
+                            android:layout_centerVertical="true"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
+                            <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="运行时间: "
+                                android:textColor="@color/gray_deep"
+                                android:textSize="28dp" />
+                            <Chronometer
+                                android:id="@+id/runtime"
+                                android:textSize="40dp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/purple_primary"
+                                android:textStyle="bold|italic"/>
+                            <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text=" 秒"
+                                android:textColor="@color/gray_deep"
+                                android:textSize="28dp" />
+                        </LinearLayout>
+
+                        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="温馨提示:\n    ①点击开始烹饪\n    ②烹饪菜品,自动记忆工序\n    ③点击结束烹饪,保存工序\n    ④退出界面查看工序"
+                            android:textColor="@color/colorAccent"
+                            android:textSize="12dp"
+                            android:layout_centerVertical="true"
+                            android:layout_marginRight="@dimen/dp_10"
+                            android:layout_alignParentRight="true"/>
+
+<!--                        <ImageView-->
+<!--                            android:layout_alignParentRight="true"-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:src="@mipmap/weikaishi" />-->
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <!-- 火力选择 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/qmui_config_color_white"
+                    android:padding="5dp">
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="烹饪火力"
+                            android:textSize="16dp" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <com.bonait.bnframework.modules.home.fragment.mode.huoli_control
+                            android:id="@+id/huoli"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerInParent="true" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <!-- 搅拌 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/qmui_config_color_white"
+                    android:padding="5dp">
+
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="翻炒速度"
+                            android:textSize="16dp" />
+                    </RelativeLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/dp_10">
+
+                        <RelativeLayout
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1">
+
+                            <com.litao.slider.NiftySlider
+                                android:id="@+id/nifty_slider2"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:hapticFeedbackEnabled="true"
+                                android:stepSize="1"
+                                android:value="22"
+                                android:valueFrom="0"
+                                android:valueTo="60"
+                                app:enableDrawHalo="false"
+                                app:thumbColor="@color/we_read_thumb_color"
+                                app:thumbRadius="13dp"
+                                app:thumbText="22"
+                                app:thumbTextBold="true"
+                                app:thumbTextColor="@color/we_read_theme_color"
+                                app:thumbTextSize="12sp"
+                                app:thumbWithinTrackBounds="true"
+                                app:trackColor="@color/pro1"
+                                app:trackColorInactive="@color/pro2"
+                                app:trackHeight="26dp" />
+
+                        </RelativeLayout>
+
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginRight="@dimen/dp_10">
+
+                            <Button
+                                android:id="@+id/querendangwei"
+                                android:layout_width="100dp"
+                                android:layout_height="30dp"
+                                android:layout_centerInParent="true"
+                                android:background="@drawable/button1"
+                                android:text="确认"
+                                android:textColor="@color/black"
+                                android:textSize="14dp" />
+                        </RelativeLayout>
+                    </LinearLayout>
+                </LinearLayout>
+
+                <!-- 液料出料 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/qmui_config_color_white"
+                    android:padding="5dp"
+                    android:orientation="horizontal">
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="@dimen/dp_10">
+                        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="液料控制"
+                            android:textSize="16dp" />
+                    </RelativeLayout>
+                    <ScrollView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+                        <LinearLayout
+                            android:id="@+id/gxchid"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical">
+                        </LinearLayout>
+                    </ScrollView>
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_marginRight="@dimen/dp_10">
+
+                        <Button
+                            android:id="@+id/chuliao"
+                            android:layout_width="100dp"
+                            android:layout_height="46dp"
+                            android:layout_centerInParent="true"
+                            android:background="@drawable/button1"
+                            android:text="点击出料"
+                            android:textColor="@color/black"
+                            android:textSize="14dp" />
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <!-- 主料投料 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/qmui_config_color_white"
+                    android:padding="5dp">
+
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+
+                        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="主料投料"
+                            android:textSize="16dp" />
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/dp_10">
+                        <LinearLayout
+                            android:layout_centerVertical="true"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <Button
+                                android:id="@+id/touliao0"
+                                android:layout_width="80dp"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/button1"
+                                android:text="回原点"
+                                android:textColor="@color/black"
+                                android:textSize="14dp"/>
+                            <Button
+                                android:layout_marginLeft="@dimen/dp_10"
+                                android:id="@+id/touliao1"
+                                android:layout_width="80dp"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/button1"
+                                android:text="一号投料"
+                                android:textColor="@color/black"
+                                android:textSize="14dp"/>
+                            <Button
+                                android:layout_marginLeft="@dimen/dp_10"
+                                android:id="@+id/touliao2"
+                                android:layout_width="80dp"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/button1"
+                                android:text="二号投料"
+                                android:textColor="@color/black"
+                                android:textSize="14dp"/>
+                            <Button
+                                android:layout_marginLeft="@dimen/dp_10"
+                                android:id="@+id/touliao3"
+                                android:layout_width="80dp"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/button1"
+                                android:text="三号投料"
+                                android:textColor="@color/black"
+                                android:textSize="14dp"/>
+                            <Button
+                                android:layout_marginLeft="@dimen/dp_10"
+                                android:id="@+id/touliao4"
+                                android:layout_width="80dp"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/button1"
+                                android:text="四号投料"
+                                android:textColor="@color/black"
+                                android:textSize="14dp"/>
+                        </LinearLayout>
+                    </RelativeLayout>
+                </LinearLayout>
+
+                <!-- 炒锅位置 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/qmui_config_color_white"
+                    android:padding="5dp">
+
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+                        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="锅口位置"
+                            android:textSize="16dp" />
+                    </RelativeLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/dp_10">
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1">
+
+                            <com.litao.slider.NiftySlider
+                                android:id="@+id/nifty_slider3"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:hapticFeedbackEnabled="true"
+                                android:stepSize="1"
+                                android:value="22"
+                                android:valueFrom="0"
+                                android:valueTo="60"
+                                app:enableDrawHalo="false"
+                                app:thumbColor="@color/we_read_thumb_color"
+                                app:thumbRadius="13dp"
+                                app:thumbText="22"
+                                app:thumbTextBold="true"
+                                app:thumbTextColor="@color/we_read_theme_color"
+                                app:thumbTextSize="12sp"
+                                app:thumbWithinTrackBounds="true"
+                                app:trackColor="@color/pro1"
+                                app:trackColorInactive="@color/pro2"
+                                app:trackHeight="26dp" />
+                        </RelativeLayout>
+                    </LinearLayout>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:background="@color/qmui_config_color_white"
+                    android:padding="5dp">
+
+                    <LinearLayout
+                        android:layout_marginLeft="0dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_alignParentLeft="true">
+                        <Button
+                            android:id="@+id/ydw"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginRight="5dp"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="原点位"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
+                        <!--边框分割细线-->
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="2dp"
+                            android:layout_marginRight="2dp">
+                            <LinearLayout
+                                android:layout_width="1dp"
+                                android:layout_height="30dp"
+                                android:layout_centerInParent="true"
+                                android:background="@color/activity_background" />
+                        </RelativeLayout>
+                        <Button
+                            android:id="@+id/dcw"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="倒菜位"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
+                        <!--边框分割细线-->
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="2dp"
+                            android:layout_marginRight="2dp">
+
+                            <LinearLayout
+                                android:layout_width="1dp"
+                                android:layout_height="30dp"
+                                android:layout_centerInParent="true"
+                                android:background="@color/activity_background" />
+                        </RelativeLayout>
+                        <Button
+                            android:id="@+id/clw"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="抽料位"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
+                        <!--边框分割细线-->
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="2dp"
+                            android:layout_marginRight="2dp">
+
+                            <LinearLayout
+                                android:layout_width="1dp"
+                                android:layout_height="30dp"
+                                android:layout_centerInParent="true"
+                                android:background="@color/activity_background" />
+                        </RelativeLayout>
+                        <Button
+                            android:id="@+id/qxw"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="清洗位"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
+                        <!--边框分割细线-->
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="2dp"
+                            android:layout_marginRight="2dp">
+
+                            <LinearLayout
+                                android:layout_width="1dp"
+                                android:layout_height="30dp"
+                                android:layout_centerInParent="true"
+                                android:background="@color/activity_background" />
+                        </RelativeLayout>
+                        <Button
+                            android:id="@+id/ccw1"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="炒菜位1"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
+                        <!--边框分割细线-->
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="2dp"
+                            android:layout_marginRight="2dp">
+
+                            <LinearLayout
+                                android:layout_width="1dp"
+                                android:layout_height="30dp"
+                                android:layout_centerInParent="true"
+                                android:background="@color/activity_background" />
+                        </RelativeLayout>
+                        <Button
+                            android:id="@+id/ccw2"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="5dp"
+                            android:layout_marginRight="5dp"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="炒菜位2"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
+                        <!--边框分割细线-->
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="2dp"
+                            android:layout_marginRight="2dp">
+
+                            <LinearLayout
+                                android:layout_width="1dp"
+                                android:layout_height="30dp"
+                                android:layout_centerInParent="true"
+                                android:background="@color/activity_background" />
+                        </RelativeLayout>
+                        <Button
+                            android:id="@+id/ccw3"
+                            android:layout_width="60dp"
+                            android:layout_height="match_parent"
+                            android:layout_marginLeft="5dp"
+                            android:background="@drawable/bg_btn_login_selected"
+                            android:text="炒菜位3"
+                            android:textColor="@color/white"
+                            android:textSize="16dp" />
+                    </LinearLayout>
+                </LinearLayout>
+
+                <!-- 出菜 -->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="60dp"
+                    android:layout_marginTop="2dp"
+                    android:background="@color/qmui_config_color_white"
+                    android:padding="5dp">
+
+                    <RelativeLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent">
+                        <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:text="其他控制"
+                            android:textSize="16dp" />
+                    </RelativeLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/dp_10">
+                        <RelativeLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1">
+                            <Button
+                                android:id="@+id/zidongchucan"
+                                android:layout_width="80dp"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/button1"
+                                android:text="自动出餐"
+                                android:textColor="@color/black"
+                                android:textSize="14dp" />
+                        </RelativeLayout>
+                    </LinearLayout>
+                </LinearLayout>
+
+            </LinearLayout>
+        </ScrollView>
+    </RelativeLayout>
+
+    <com.qmuiteam.qmui.widget.QMUITopBarLayout
+        android:id="@+id/topbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/app_color_blue"/>
+</com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -170,7 +170,6 @@
                         </LinearLayout>
 
                         <Button
-                            android:visibility="gone"
                             android:id="@+id/caozuomoshi"
                             android:layout_centerHorizontal="true"
                             android:layout_alignParentBottom="true"

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

@@ -27,8 +27,62 @@
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:visibility="gone"
         android:background="?attr/app_content_bg_color" />
 
+    <RelativeLayout
+        android:id="@+id/quanxian"
+        android:layout_marginTop="54dp"
+        android:layout_gravity="top"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        android:background="#65000000">
+        <LinearLayout
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <EditText
+                android:id="@+id/edittext_quanxian"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/input_bj"
+                android:hint="请输入权限密码"
+                android:inputType="text"
+                android:maxLines="1"
+                android:padding="3dp"
+                android:textSize="12dp" />
+            <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                android:layout_width="wrap_content"
+                android:visibility="gone"
+                android:layout_height="wrap_content"
+                android:text="密码提示:12****"
+                android:textColor="@color/colorAccent"
+                android:textSize="8dp"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_alignParentRight="true"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <Button
+                    android:id="@+id/quanxianmima"
+                    android:layout_width="100dp"
+                    android:layout_height="26dp"
+                    android:layout_marginTop="20dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/button1"
+                    android:text="确认"
+                    android:textColor="@color/black"
+                    android:textSize="14dp" />
+            </RelativeLayout>
+
+        </LinearLayout>
+
+
+    </RelativeLayout>
+
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"

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

@@ -26,8 +26,62 @@
         android:layout_marginTop="90dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:visibility="gone"
         android:background="?attr/app_content_bg_color" />
 
+    <RelativeLayout
+        android:id="@+id/quanxian"
+        android:layout_marginTop="54dp"
+        android:layout_gravity="top"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fitsSystemWindows="true"
+        android:background="#65000000">
+        <LinearLayout
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <EditText
+                android:id="@+id/edittext_quanxian"
+                android:layout_width="200dp"
+                android:layout_height="wrap_content"
+                android:background="@drawable/input_bj"
+                android:hint="请输入权限密码"
+                android:inputType="text"
+                android:maxLines="1"
+                android:padding="3dp"
+                android:textSize="12dp" />
+            <com.qmuiteam.qmui.widget.textview.QMUILinkTextView
+                android:layout_width="wrap_content"
+                android:visibility="gone"
+                android:layout_height="wrap_content"
+                android:text="密码提示:12****"
+                android:textColor="@color/colorAccent"
+                android:textSize="8dp"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/dp_10"
+                android:layout_alignParentRight="true"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <Button
+                    android:id="@+id/quanxianmima"
+                    android:layout_width="100dp"
+                    android:layout_height="26dp"
+                    android:layout_marginTop="20dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/button1"
+                    android:text="确认"
+                    android:textColor="@color/black"
+                    android:textSize="14dp" />
+            </RelativeLayout>
+
+        </LinearLayout>
+
+
+    </RelativeLayout>
+
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"

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

@@ -37,8 +37,8 @@
                             android:layout_height="wrap_content">
 
                             <ImageView
-                                android:layout_width="30dp"
-                                android:layout_height="30dp"
+                                android:layout_width="wrap_content"
+                                android:layout_height="35dp"
                                 android:clickable="false"
                                 android:src="@mipmap/stcp" />
 
@@ -51,7 +51,8 @@
                                     android:layout_height="wrap_content"
                                     android:layout_centerInParent="true"
                                     android:clickable="false"
-                                    android:text="选择菜谱" />
+                                    android:text="选择菜谱"
+                                    android:textSize="16dp"/>
                             </RelativeLayout>
 
                         </LinearLayout>
@@ -137,7 +138,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:text="火力选择"
+                            android:text="烹饪火力"
                             android:textSize="16dp" />
                     </RelativeLayout>
 
@@ -182,7 +183,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:text="搅拌挡位"
+                            android:text="翻炒速度"
                             android:textSize="16dp" />
                     </RelativeLayout>
 
@@ -260,7 +261,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:text="转动挡位"
+                            android:text="锅口朝向"
                             android:textSize="16dp" />
                     </RelativeLayout>
 
@@ -315,7 +316,7 @@
                                     android:layout_centerVertical="true"
                                     android:layout_marginBottom="10dp"
                                     android:background="@drawable/bg_btn_login_selected"
-                                    android:text="正转"
+                                    android:text="正向"
                                     android:textColor="@color/white"
                                     android:textSize="16dp" />
                             </RelativeLayout>
@@ -347,7 +348,7 @@
                                     android:layout_centerVertical="true"
                                     android:layout_marginBottom="10dp"
                                     android:background="@drawable/bg_btn_login_selected"
-                                    android:text="反转"
+                                    android:text="反向"
                                     android:textColor="@color/white"
                                     android:textSize="16dp" />
                             </RelativeLayout>