优化修改

app/src/main/java/com/bonait/bnframework/newui/activity/MainHActivity.java

@@ -42,6 +42,7 @@ import com.bonait.bnframework.modbus.WokModbusTcpServer;
 import com.bonait.bnframework.newui.adapter.GuidePageAdapter;
 import com.bonait.bnframework.newui.adapter.TabAdapter;
 import com.bonait.bnframework.newui.dialog.FoodCheckDialog;
+import com.bonait.bnframework.newui.dialog.RootTipDialog;
 import com.bonait.bnframework.newui.fragment.HomeDevicesFragment;
 import com.bonait.bnframework.newui.fragment.HomeGoodsFragment;
 import com.bonait.bnframework.newui.fragment.HomeMainsFragment;
@@ -70,30 +71,6 @@ public class MainHActivity extends BaseActivity {
                 try {
                     changeStatus();
                     freshView();
-                    Object object1 = ModbusCenter.getListingValue("出料空盆检测有无");
-                    Object object2  = ModbusCenter.getListingValue("补盆工位检测有无");
-                    Object object3  = ModbusCenter.getListingValue("输送线");
-                    Object object4  = ModbusCenter.getListingValue("出餐工位检测有无");
-                    if(object1 instanceof Boolean){
-                        viewBinding.tvChuliaoBox.setText("出料盆位检测:"+(((Boolean)object1)?"有盆":"无盆"));
-                    }else {
-                        viewBinding.tvChuliaoBox.setText("出料盆位检测:异常");
-                    }
-                    if(object2 instanceof Boolean){
-                        viewBinding.tvBuliaoBox.setText("补盆位检测:"+(((Boolean)object2)?"有盆":"无盆"));
-                    }else {
-                        viewBinding.tvBuliaoBox.setText("补盆位检测:异常");
-                    }
-                    if(object3 instanceof Boolean){
-                        viewBinding.tvShusongxian.setText("输送线状态:"+(((Boolean)object3)?"启动":"停止"));
-                    }else {
-                        viewBinding.tvShusongxian.setText("输送线状态:异常");
-                    }
-                    if(object4 instanceof Boolean){
-                        viewBinding.tvChucaiBox.setText("出餐工位检测:"+(((Boolean)object4)?"有盆":"无盆"));
-                    }else {
-                        viewBinding.tvChucaiBox.setText("出餐工位检测:异常");
-                    }
                 }catch (Exception ignored){
                 }
                 BPA_ORDER_DETAIL detail1 = OrderDetailUtil.getByMaking(0);
@@ -201,28 +178,64 @@ public class MainHActivity extends BaseActivity {
             FoodCheckDialog dialog = new FoodCheckDialog();
             dialog.show(getSupportFragmentManager(),"料盒检测");
         });
+        viewBinding.btnBoxCheck.setOnClickListener(v->{
+            FoodCheckDialog dialog = new FoodCheckDialog();
+            dialog.show(getSupportFragmentManager(),"料盒检测");
+        });
     }
 
     private void changeStatus(){
-
-        String content = "炒锅状态:"+(WokModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
+        String content = "炒锅:"+(WokModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
         SpannableStringBuilder spannable = new SpannableStringBuilder(content);
         spannable.setSpan(new ForegroundColorSpan(WokModbusTcpServer.get().plcIsConnect? Color.parseColor("#567722"):Color.parseColor("#DA5A17"))
                 , content.length()-3, content.length(),
                 Spannable.SPAN_EXCLUSIVE_INCLUSIVE);//SPAN_EXCLUSIVE_INCLUSIVE前面不包括后面包括
         viewBinding.deviceStatusWok.setText(spannable);
 
-        String content2 = "烤箱状态:"+(OvenModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
+        String content2 = "烤箱:"+(OvenModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
         SpannableStringBuilder spannable2 = new SpannableStringBuilder(content2);
         spannable2.setSpan(new ForegroundColorSpan(OvenModbusTcpServer.get().plcIsConnect?Color.parseColor("#567722"):Color.parseColor("#DA5A17")), content2.length()-3, content2.length(),
                 Spannable.SPAN_EXCLUSIVE_INCLUSIVE);//SPAN_EXCLUSIVE_INCLUSIVE前面不包括后面包括
         viewBinding.deviceStatusOven.setText(spannable2);
 
-        String content3 = "机器人状态:"+(RobotModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
+        String content3 = "机器人:"+(RobotModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
         SpannableStringBuilder spannable3 = new SpannableStringBuilder(content3);
         spannable3.setSpan(new ForegroundColorSpan(RobotModbusTcpServer.get().plcIsConnect?Color.parseColor("#567722"):Color.parseColor("#DA5A17")), content3.length()-3, content3.length(),
                 Spannable.SPAN_EXCLUSIVE_INCLUSIVE);//SPAN_EXCLUSIVE_INCLUSIVE前面不包括后面包括
         viewBinding.deviceStatusRobot.setText(spannable3);
+
+        Object object1 = ModbusCenter.getListingValue("出料空盆检测有无");
+        Object object2  = ModbusCenter.getListingValue("补盆工位检测有无");
+        Object object3  = ModbusCenter.getListingValue("输送线");
+        Object object4  = ModbusCenter.getListingValue("出餐工位检测有无");
+        if(object1 instanceof Boolean){
+            changeTextView(viewBinding.tvChuliaoBox,"出料盆位:",(((Boolean)object1)?"有盆":"无盆"));
+        }else {
+            changeTextView(viewBinding.tvChuliaoBox,"出料盆位:","异常");
+        }
+        if(object2 instanceof Boolean){
+            changeTextView(viewBinding.tvBuliaoBox,"补盆位:",(((Boolean)object2)?"有盆":"无盆"));
+        }else {
+            changeTextView(viewBinding.tvBuliaoBox,"补盆位:","异常");
+        }
+        if(object3 instanceof Boolean){
+            changeTextView(viewBinding.tvShusongxian,"输送线:",(((Boolean)object3)?"启动":"停止"));
+        }else {
+            changeTextView(viewBinding.tvShusongxian,"输送线:","异常");
+        }
+        if(object4 instanceof Boolean){
+            changeTextView(viewBinding.tvChucaiBox,"出餐工位:",(((Boolean)object4)?"有盆":"无盆"));
+        }else {
+            changeTextView(viewBinding.tvChucaiBox,"出餐工位:","异常");
+        }
+    }
+
+    private void changeTextView(TextView textView,String content1,String content2){
+        String content3 = content1+content2;
+        SpannableStringBuilder spannable3 = new SpannableStringBuilder(content3);
+        spannable3.setSpan(new ForegroundColorSpan((content2.contains("异常"))?Color.parseColor("#DA5A17"):Color.parseColor("#567722")), content1.length(), content2.length(),
+                Spannable.SPAN_EXCLUSIVE_INCLUSIVE);//SPAN_EXCLUSIVE_INCLUSIVE前面不包括后面包括
+        textView.setText(spannable3);
     }
 
     private void freshView(){
@@ -336,12 +349,18 @@ public class MainHActivity extends BaseActivity {
         return super.onKeyDown(keyCode, event);
     }
 
+    private boolean isFirst = true;
     @Override
     protected void onResume() {
         super.onResume();
         if(handler!=null){
             handler.sendEmptyMessage(1);
         }
+        if(isFirst){
+            isFirst = false;
+            RootTipDialog dialog = new RootTipDialog();
+            dialog.show(getSupportFragmentManager(),"开机自检");
+        }
     }
 
     @Override

app/src/main/java/com/bonait/bnframework/newui/adapter/FoodInfoAdapter.java

@@ -31,6 +31,8 @@ public class FoodInfoAdapter extends BaseAdapter<String, FoodInfoAdapter.ViewHol
         if(holder.binding.sort.getTextSize()>DisplayManager.getScale(26)+2||holder.binding.sort.getTextSize()<DisplayManager.getScale(26)-2){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
+        holder.binding.line1.setVisibility(position==0?View.VISIBLE:View.GONE);
+
         holder.binding.sort.setText((position+1)+".");
         holder.binding.desc.setText(mData.get(position)+"");
     }

app/src/main/java/com/bonait/bnframework/newui/adapter/OrderInfoAdapter.java

@@ -81,6 +81,7 @@ public abstract class OrderInfoAdapter extends BaseAdapter<BPA_ORDER_DETAIL,Orde
         holder.binding.making.setOnClickListener(v->{
             onMakingClick(v,position);
         });
+        holder.binding.cancel.setVisibility(View.VISIBLE);
         switch (bean.status){
             case 0:
                 holder.binding.making.setText("制作");
@@ -93,6 +94,7 @@ public abstract class OrderInfoAdapter extends BaseAdapter<BPA_ORDER_DETAIL,Orde
             case 2:
                 holder.binding.making.setText("确认完成");
                 holder.binding.cancel.setText("删除");
+                holder.binding.cancel.setVisibility(View.GONE);
                 break;
             case 3:
                 holder.binding.making.setText("确认异常");

app/src/main/java/com/bonait/bnframework/newui/adapter/OrderNameAdapter.java

@@ -1,7 +1,6 @@
 package com.bonait.bnframework.newui.adapter;
 
 import android.annotation.SuppressLint;
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,11 +33,12 @@ public class OrderNameAdapter extends BaseAdapter<BPA_ORDER_DETAIL, OrderNameAda
         if(holder.binding.sort.getTextSize()>DisplayManager.getScale(26)+2||holder.binding.sort.getTextSize()<DisplayManager.getScale(26)-2){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
-        if(bean.type == 0){
-            holder.binding.contentBg.setBackgroundColor(Color.parseColor("#80567722"));
-        }else {
-            holder.binding.contentBg.setBackgroundColor(Color.parseColor("#80DA5A17"));
-        }
+//        if(bean.type == 0){
+//            holder.binding.contentBg.setBackgroundColor(Color.parseColor("#80567722"));
+//        }else {
+//            holder.binding.contentBg.setBackgroundColor(Color.parseColor("#80DA5A17"));
+//        }
+        holder.binding.line1.setVisibility(position==0?View.VISIBLE:View.GONE);
         holder.binding.sort.setText((position+1)+"");
         holder.binding.goodsName.setText(bean.goodsName+"");
         holder.binding.groupName.setText(bean.groupName==null?"":bean.groupName);

app/src/main/java/com/bonait/bnframework/newui/dialog/AddOrderDialog.java

@@ -31,12 +31,9 @@ import com.bonait.bnframework.common.db.util.SubAttributeGroupDBUtil;
 import com.bonait.bnframework.common.utils.AdbCommandUtil;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogAddOrderBinding;
-import com.bonait.bnframework.event.FreshOrderEvent;
+import com.bonait.bnframework.newui.widget.NewToastUtil;
 import com.bonait.bnframework.ui.adapter.classify.ClassifySpinnerAdapter;
 import com.bonait.bnframework.ui.adapter.classify.SelectAttributeListAdapter;
-import com.bonait.bnframework.newui.widget.NewToastUtil;
-
-import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -175,7 +172,6 @@ public class AddOrderDialog extends DialogFragment {
     private void addOrder(){
         if(OrderDetailUtil.add(subattributeGroup)){
             NewToastUtil.getInstance().showToast("添加订单成功");
-            EventBus.getDefault().post(new FreshOrderEvent());
             dismiss();
         }else {
             NewToastUtil.getInstance().showToastError("添加订单失败");
@@ -215,6 +211,19 @@ public class AddOrderDialog extends DialogFragment {
         viewBinding.layoutAttribute.btnClose2.setOnClickListener(v->{
             dismiss();
         });
+
+        if(attributeList.isEmpty()){
+            viewBinding.layoutAttribute.getRoot().setVisibility(View.GONE);
+            viewBinding.layoutAttribute2.getRoot().setVisibility(View.VISIBLE);
+
+            subattributeGroup = SubAttributeGroupDBUtil.getByGoodIdAndListId(goodId,goodId);//没有属性时会把商品iD作为分组id创建工序  所有查商品id
+            if(subattributeGroup !=null && !GoodsProcessDetailDBUtil.getByGroupId(subattributeGroup.id).isEmpty()){
+                viewBinding.layoutAttribute2.groupDesc.setVisibility(View.GONE);
+            }else {
+                viewBinding.layoutAttribute2.groupDesc.setText("该商品没有工艺请先编辑工艺");
+                viewBinding.layoutAttribute2.btnNext.setBackgroundResource(R.drawable.bg_round25_gray_btn);
+            }
+        }
     }
 
     /**
@@ -291,11 +300,7 @@ public class AddOrderDialog extends DialogFragment {
         });
         viewBinding.layoutAttribute.listAttribute.setAdapter(selectAttributeListAdapter);
 
-        if(attributeList.isEmpty()){
-            viewBinding.layoutAttribute.desc1.setVisibility(View.GONE);
-            viewBinding.layoutAttribute.groupDesc.setText("没有属性可选，可直接添加订单");
-            viewBinding.layoutAttribute.spinnerList.setVisibility(View.GONE);
-        }
+
     }
 
     private boolean isUserClicked = false;

app/src/main/java/com/bonait/bnframework/newui/dialog/FoodCheckDialog.java

@@ -54,6 +54,9 @@ public class FoodCheckDialog extends DialogFragment {
             super.handleMessage(msg);
             if(msg.what==1){
                 freshView();
+                if(handler.hasMessages(1)){
+                    handler.removeMessages(1);
+                }
                 handler.sendEmptyMessageDelayed(1,500);
             }
         }

app/src/main/java/com/bonait/bnframework/newui/dialog/FoodControlDialog.java

@@ -100,8 +100,12 @@ public class FoodControlDialog extends DialogFragment {
         viewBinding.btnClose1.setOnClickListener(v->{
             dismiss();
         });
-        viewBinding.btnWeihu.setOnClickListener(v->{
-
+        viewBinding.btnClose2.setOnClickListener(v->{
+            dismiss();
+        });
+        viewBinding.btnNext.setOnClickListener(v->{
+            viewBinding.clContent1.setVisibility(View.GONE);
+            viewBinding.clContent2.setVisibility(View.VISIBLE);
         });
     }
 

app/src/main/java/com/bonait/bnframework/newui/dialog/RootTipDialog.java

@@ -0,0 +1,367 @@
+package com.bonait.bnframework.newui.dialog;
+
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.style.ForegroundColorSpan;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+
+import com.bonait.bnframework.Model.CheckPositionBean;
+import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
+import com.bonait.bnframework.common.utils.AdbCommandUtil;
+import com.bonait.bnframework.common.utils.DisplayManager;
+import com.bonait.bnframework.databinding.DialogRootTipBinding;
+import com.bonait.bnframework.modbus.ModbusCenter;
+import com.bonait.bnframework.modbus.OvenModbusTcpServer;
+import com.bonait.bnframework.modbus.RobotModbusTcpServer;
+import com.bonait.bnframework.modbus.WokModbusTcpServer;
+
+import java.util.Map;
+
+import butterknife.ButterKnife;
+
+/**
+ * @author: liup
+ * @description: 机器人投料控制
+ * @date: 2024/6/3 17:59.
+ */
+public class RootTipDialog extends DialogFragment {
+    private String TAG = " RootTipDialog =>";
+    private DialogRootTipBinding viewBinding;
+
+    private Handler handler = new Handler(Looper.getMainLooper()){
+        @Override
+        public void handleMessage(@NonNull Message msg) {
+            super.handleMessage(msg);
+            if(msg.what==1){
+                changeStatus();
+                freshView();
+                if(handler.hasMessages(1)){
+                    handler.removeMessages(1);
+                }
+                handler.sendEmptyMessageDelayed(1,500);
+            }
+        }
+    };
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setStyle(STYLE_NORMAL, R.style.DialogScale);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        viewBinding = DialogRootTipBinding.inflate(inflater, container, false);
+        DisplayManager.scaleViewGroup(viewBinding.getRoot());
+        ButterKnife.bind(this, viewBinding.getRoot());
+        return viewBinding.getRoot();
+    }
+    private void fullScreen(Window window){
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                // 全屏显示，隐藏状态栏和导航栏，拉出状态栏和导航栏显示一会儿后消失。
+                // 启动游戏模式，设置状态栏和导航栏中的图标变小，变模糊或者弱化其效果
+                window.getDecorView().setSystemUiVisibility(
+                        View.SYSTEM_UI_FLAG_LOW_PROFILE
+                                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                                | View.SYSTEM_UI_FLAG_FULLSCREEN
+                                | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+            } else {
+                // 全屏显示，隐藏状态栏
+                window.getDecorView().setSystemUiVisibility(View.INVISIBLE);
+            }
+        }
+    }
+    @Override
+    public void onStart() {
+        super.onStart();
+        if (getDialog() != null) {
+            Window window = getDialog().getWindow();
+            assert window != null;
+            fullScreen(window);
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.gravity = Gravity.CENTER;
+            params.width = ViewGroup.LayoutParams.WRAP_CONTENT;
+            params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+            window.setAttributes(params);
+        }
+        AdbCommandUtil.hideStatusBar(true);
+        setCancelable(false);
+
+        initView();
+    }
+
+    private void initView(){
+        viewBinding.content0.btnNext.setOnClickListener(v->{
+            changeView(1);
+        });
+        viewBinding.content1.btnNext.setOnClickListener(v->{
+            changeView(2);
+        });
+        viewBinding.content2.btnNext.setOnClickListener(v->{
+            changeView(3);
+        });
+        viewBinding.content3.btnNext.setOnClickListener(v->{
+            dismiss();
+        });
+        viewBinding.content1.btnLast.setOnClickListener(v->{
+            changeView(0);
+        });
+        viewBinding.content2.btnLast.setOnClickListener(v->{
+            changeView(1);
+        });
+        viewBinding.content3.btnLast.setOnClickListener(v->{
+            changeView(2);
+        });
+        handler.sendEmptyMessage(1);
+    }
+
+    private void freshView(){
+        for (Map.Entry<String, CheckPositionBean> entry : ConfigName.getInstance().positionList.entrySet()) {
+            String key = entry.getKey();
+            CheckPositionBean value = entry.getValue();
+            TextView view;
+            switch (key){
+                case "辅料位置1号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.top1.setText("有盒");
+                        }else {
+                            viewBinding.content2.top1.setText("有盒/未补料");
+                        }
+                        viewBinding.content2.top1.setSelected(true);
+                    }else {
+                        viewBinding.content2.top1.setText("无盒");
+                        viewBinding.content2.top1.setSelected(false);
+                    }
+                    break;
+                case "辅料位置2号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.top2.setText("有盒");
+                        }else {
+                            viewBinding.content2.top2.setText("有盒/未补料");
+                        }
+                        viewBinding.content2.top2.setSelected(true);
+                    }else {
+                        viewBinding.content2.top2.setText("无盒");
+                        viewBinding.content2.top2.setSelected(false);
+                    }
+                    break;
+                case "辅料位置3号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.top3.setText("有盒");
+                        }else {
+                            viewBinding.content2.top3.setText("有盒/未补料");
+                        }
+                        viewBinding.content2.top3.setSelected(true);
+                    }else {
+                        viewBinding.content2.top3.setText("无盒");
+                        viewBinding.content2.top3.setSelected(false);
+                    }
+                    break;
+                case "辅料位置4号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.top4.setText("有盒");
+                        }else {
+                            viewBinding.content2.top4.setText("有盒/未补料");
+                        }
+                        viewBinding.content2.top4.setSelected(true);
+                    }else {
+                        viewBinding.content2.top4.setText("无盒");
+                        viewBinding.content2.top4.setSelected(false);
+                    }
+                    break;
+                case "主料位置1号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.right1.setText("有盆");
+                        }else {
+                            viewBinding.content2.right1.setText("有盆/未补料");
+                        }
+                        viewBinding.content2.right1.setSelected(true);
+                    }else {
+                        viewBinding.content2.right1.setText("无盆");
+                        viewBinding.content2.right1.setSelected(false);
+                    }
+                    break;
+                case "主料位置2号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.right2.setText("有盆");
+                        }else {
+                            viewBinding.content2.right2.setText("有盆/未补料");
+                        }
+                        viewBinding.content2.right2.setSelected(true);
+                    }else {
+                        viewBinding.content2.right2.setText("无盆");
+                        viewBinding.content2.right2.setSelected(false);
+                    }
+                    break;
+                case "主料位置3号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.right3.setText("有盆");
+                        }else {
+                            viewBinding.content2.right3.setText("有盆/未补料");
+                        }
+                        viewBinding.content2.right3.setSelected(true);
+                    }else {
+                        viewBinding.content2.right3.setText("无盆");
+                        viewBinding.content2.right3.setSelected(false);
+                    }
+                    break;
+                case "主料位置4号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.right4.setText("有盆");
+                        }else {
+                            viewBinding.content2.right4.setText("有盆/未补料");
+                        }
+                        viewBinding.content2.right4.setSelected(true);
+                    }else {
+                        viewBinding.content2.right4.setText("无盆");
+                        viewBinding.content2.right4.setSelected(false);
+                    }
+                    break;
+                case "主料位置5号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.right5.setText("有盆");
+                        }else {
+                            viewBinding.content2.right5.setText("有盆/未补料");
+                        }
+                        viewBinding.content2.right5.setSelected(true);
+                    }else {
+                        viewBinding.content2.right5.setText("无盆");
+                        viewBinding.content2.right5.setSelected(false);
+                    }
+                    break;
+                case "主料位置6号位":
+                    if(value.exist){
+                        if(value.number%2==0){
+                            viewBinding.content2.right6.setText("有盆");
+                        }else {
+                            viewBinding.content2.right6.setText("有盆/未补料");
+                        }
+                        viewBinding.content2.right6.setSelected(true);
+                    }else {
+                        viewBinding.content2.right6.setText("无盆");
+                        viewBinding.content2.right6.setSelected(false);
+                    }
+                    break;
+                case "烤盘位置1号位":
+                    view = viewBinding.content2.left1;
+                    if(value.exist){
+                        view.setText("有盆");
+                        view.setSelected(true);
+                    }else {
+                        view.setText("无盆");
+                        view.setSelected(false);
+                    }
+                    break;
+                case "烤盘位置2号位":
+                    view = viewBinding.content2.left2;
+                    if(value.exist){
+                        view.setText("有盆");
+                        view.setSelected(true);
+                    }else {
+                        view.setText("无盆");
+                        view.setSelected(false);
+                    }
+                    break;
+            }
+        }
+        try {
+            Object object1 = ModbusCenter.getListingValue("出料空盆检测有无");
+            Object object2  = ModbusCenter.getListingValue("补盆工位检测有无");
+            Object object4  = ModbusCenter.getListingValue("出餐工位检测有无");
+            if(object1 instanceof Boolean){
+                viewBinding.content2.tvChuliaoBox.setText("出料盆位检测:"+(((Boolean)object1)?"有盆":"无盆"));
+            }else {
+                viewBinding.content2.tvChuliaoBox.setText("出料盆位检测:异常");
+            }
+            if(object2 instanceof Boolean){
+                viewBinding.content2.tvBuliaoBox.setText("补盆位检测:"+(((Boolean)object2)?"有盆":"无盆"));
+            }else {
+                viewBinding.content2.tvBuliaoBox.setText("补盆位检测:异常");
+            }
+            if(object4 instanceof Boolean){
+                viewBinding.content2.tvChucaiBox.setText("出餐工位检测:"+(((Boolean)object4)?"有盆":"无盆"));
+            }else {
+                viewBinding.content2.tvChucaiBox.setText("出餐工位检测:异常");
+            }
+        }catch (Exception ignored){
+        }
+    }
+
+    private void changeStatus(){
+        String content = "炒锅:"+(WokModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
+        SpannableStringBuilder spannable = new SpannableStringBuilder(content);
+        spannable.setSpan(new ForegroundColorSpan(WokModbusTcpServer.get().plcIsConnect? Color.parseColor("#567722"):Color.parseColor("#DA5A17"))
+                , content.length()-3, content.length(),
+                Spannable.SPAN_EXCLUSIVE_INCLUSIVE);//SPAN_EXCLUSIVE_INCLUSIVE前面不包括后面包括
+        viewBinding.content0.deviceStatusWok.setText(spannable);
+
+        String content2 = "烤箱:"+(OvenModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
+        SpannableStringBuilder spannable2 = new SpannableStringBuilder(content2);
+        spannable2.setSpan(new ForegroundColorSpan(OvenModbusTcpServer.get().plcIsConnect?Color.parseColor("#567722"):Color.parseColor("#DA5A17")), content2.length()-3, content2.length(),
+                Spannable.SPAN_EXCLUSIVE_INCLUSIVE);//SPAN_EXCLUSIVE_INCLUSIVE前面不包括后面包括
+        viewBinding.content0.deviceStatusOven.setText(spannable2);
+
+        String content3 = "机器人:"+(RobotModbusTcpServer.get().plcIsConnect?"已连接":"未连接");
+        SpannableStringBuilder spannable3 = new SpannableStringBuilder(content3);
+        spannable3.setSpan(new ForegroundColorSpan(RobotModbusTcpServer.get().plcIsConnect?Color.parseColor("#567722"):Color.parseColor("#DA5A17")), content3.length()-3, content3.length(),
+                Spannable.SPAN_EXCLUSIVE_INCLUSIVE);//SPAN_EXCLUSIVE_INCLUSIVE前面不包括后面包括
+        viewBinding.content0.deviceStatusRobot.setText(spannable3);
+    }
+
+    private void changeView(int type){
+        viewBinding.content0.getRoot().setVisibility(type==0?View.VISIBLE:View.GONE);
+        viewBinding.content1.getRoot().setVisibility(type==1?View.VISIBLE:View.GONE);
+        viewBinding.content2.getRoot().setVisibility(type==2?View.VISIBLE:View.GONE);
+        viewBinding.content3.getRoot().setVisibility(type==3?View.VISIBLE:View.GONE);
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        if(handler!=null){
+            handler.removeCallbacksAndMessages(null);
+            handler = null;
+        }
+    }
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if(handler!=null){
+            handler.removeCallbacksAndMessages(null);
+            handler = null;
+        }
+    }
+}

app/src/main/java/com/bonait/bnframework/newui/fragment/HomeOrderFragment.java

@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -54,8 +53,8 @@ public class HomeOrderFragment extends BaseFragment {
 
     private String TAG = "HomeOrderFragment==>";
     private FragmentHomeOrderBinding viewBinding;
-    private OrderInfoAdapter orderAdapter;
-    private FoodInfoAdapter foodInfoAdapter;
+    private OrderInfoAdapter orderAdapter1,orderAdapter2;//订单列表
+    private FoodInfoAdapter foodInfoAdapter;// 订单右边的配料信息
     private List<BPA_ORDER_DETAIL> orderChaoDetails;
     private List<BPA_ORDER_DETAIL> orderKaoDetails;
     private List<String> foodInfoList = new ArrayList<>();
@@ -89,56 +88,20 @@ public class HomeOrderFragment extends BaseFragment {
         foodInfoAdapter.setNewData(foodInfoList);
         viewBinding.recyclerNameList.setAdapter(foodInfoAdapter);
         foodInfoList.clear();
-        orderAdapter = new OrderInfoAdapter(){
+        orderAdapter1 = new OrderInfoAdapter(){
             @Override
             protected void onItemClick(View v, int position) {
-                orderDetail = mData.get(position);
-                viewBinding.orderName.setText(orderDetail.goodsName+(orderDetail.groupName==null?"":("\n"+orderDetail.groupName)));
-                //刷新右侧配料信息
-                foodInfoList.clear();
-                List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(orderDetail.groupId);
-                for(BPA_GOODS_PROCESS_DETAIL detail:details){
-                    if(detail.processname.equals("主料")||detail.processname.equals("辅料")){
-                        if(!detail.processvalue.isEmpty()){
-                            List<String> data = new ArrayList<>();
-                            if (detail.processvalue.contains("|")) {
-                                String[] res = detail.processvalue.split("[|]");
-                                data.addAll(Arrays.asList(res));
-                            } else {
-                                data.add(detail.processvalue);
-                            }
-                            String foodName = "";
-                            String foodPos = "";
-                            for (String item : data) {
-                                if (item.contains(",")) {
-                                    String[] wl = item.split("[,]");
-                                    if (wl.length == 2) {
-                                        String name = wl[0];
-                                        String val = wl[1];
-                                        if(name.equals("主料名称")||name.equals("辅料名称")||name.equals("烤菜名称")){
-                                            foodName = val;
-                                        }else if(name.equals("主料位置")||name.equals("辅料位置")||name.equals("菜盘位置")){
-                                            foodPos = val;
-                                        }
-                                    }
-                                }
-                            }
-                            foodInfoList.add(detail.processname+foodPos+"："+foodName);
-                        }
-                    }else if(detail.processname.equals("烤箱")){
-                        if(detail.processvalue.contains("|")){
-                            String[] res = detail.processvalue.split("\\|");
-                            foodInfoList.clear();
-                            foodInfoList.addAll(Arrays.asList(res));
-                        }
-                    }
-                }
-                foodInfoAdapter.notifyDataSetChanged();
+                type = 0;
+                orderClick(mData.get(position));
+                int last = orderAdapter2.getCurrentPosition();
+                orderAdapter2.setCurrentPosition(-1);
+                orderAdapter2.notifyItemChanged(last);
             }
 
             @Override
             protected void onCancelClick(View v, int position) {
-                if(ConfigName.getInstance().isFast2Click()){
+                type = 0;
+                if(ConfigName.getInstance().isFastClick()){
                     return;
                 }
                 cancelOrderDialog(mData.get(position).status,mData.get(position).goodsName,mData.get(position).groupName,position);
@@ -146,88 +109,69 @@ public class HomeOrderFragment extends BaseFragment {
 
             @Override
             protected void onMakingClick(View v, int position) {
-                if(ConfigName.getInstance().isFast2Click()){
-                    return;
-                }
-                if(!OvenModbusTcpServer.get().plcIsConnect||!WokModbusTcpServer.get().plcIsConnect||!RobotModbusTcpServer.get().plcIsConnect){
-                    NewToastUtil.getInstance().showToast("设备连接异常，请稍后重试");
-                    return;
-                }
-                String tv = ((TextView)v).getText().toString();
-                String name = mData.get(position).goodsName +"—"+ (mData.get(position).groupName==null?"":mData.get(position).groupName);
-                if(mData.get(position).status == 0){
-                    boolean robotNoWorking = false;
-                    Object object1 =  ModbusCenter.robotReadPlc("主任务读取");
-                    Object object2 =  ModbusCenter.robotReadPlc("机器人在原点");
-                    Object object3 =  ModbusCenter.robotReadPlc("机器人准备就绪");
-                    if (object1 != null && object2!=null  && object3!=null) {
-                        robotNoWorking = ((short) object1)==0 && (boolean) object2 &&(boolean) object3;
-                    }
-                    if(!robotNoWorking){
-                        NewToastUtil.getInstance().showToast("机器人正在工作，请稍后重试");
-                        return;
-                    }
-
-                    for(BPA_ORDER_DETAIL bean : mData){
-                        if(bean.status!=0){
-                            NewToastUtil.getInstance().showToast("请确认上一个订单已完成");
-                            return;
-                        }
-                    }
-                    Object object4 = ModbusCenter.getListingValue("出料空盆检测有无");
-                    if(object4!=null && !(boolean) object4){
-                        NewToastUtil.getInstance().showToast("出料空盆未放置，请补盆后重试");
-                        return;
-                    }
-                    Object object5 = ModbusCenter.getListingValue("出餐工位检测有无");
-                    if(object5!=null && (boolean) object5){
-                        NewToastUtil.getInstance().showToast("出餐工位有盆，请取走后重试");
-                        return;
-                    }
+                type = 0;
+                orderMaking(mData,position);
+            }
+        };
+        orderAdapter2 = new OrderInfoAdapter(){
+            @Override
+            protected void onItemClick(View v, int position) {
+                type = 1;
+                orderClick(mData.get(position));
+                int last = orderAdapter1.getCurrentPosition();
+                orderAdapter1.setCurrentPosition(-1);
+                orderAdapter1.notifyItemChanged(last);
+            }
 
-                    String error = checkPosition(mData.get(position));
-                    makingOrderDialog( mData.get(position),error.isEmpty()?0:-1,name,error,position);
-                    return;
-                }
-                if(mData.get(position).status==1){
-                    jumpToCook(mData.get(position));
+            @Override
+            protected void onCancelClick(View v, int position) {
+                type = 1;
+                if(ConfigName.getInstance().isFastClick()){
                     return;
                 }
-                makingOrderDialog(mData.get(position),mData.get(position).status,name,"",position);
+                cancelOrderDialog(mData.get(position).status,mData.get(position).goodsName,mData.get(position).groupName,position);
+            }
+
+            @Override
+            protected void onMakingClick(View v, int position) {
+                type = 1;
+                orderMaking(mData,position);
             }
         };
         orderChaoDetails.clear();
         orderKaoDetails.clear();
         orderChaoDetails.addAll(OrderDetailUtil.getAllByType(0));
         orderKaoDetails.addAll(OrderDetailUtil.getAllByType(1));
-        orderAdapter.setNewData(orderChaoDetails);
-        viewBinding.recyclerInfo.setAdapter(orderAdapter);
-
-        viewBinding.tvChaocai.setSelected(true);
-        viewBinding.tvKaoxiang.setSelected(false);
-        viewBinding.tvChaocai.setOnClickListener(v->{
-            viewBinding.tvChaocai.setSelected(true);
-            viewBinding.tvKaoxiang.setSelected(false);
-            type = 0;
-            orderAdapter.setCurrentPosition(-1);
-            orderAdapter.setNewData(orderChaoDetails);
-            foodInfoList.clear();
-            viewBinding.orderName.setText("");
-            foodInfoAdapter.notifyDataSetChanged();
-        });
-        viewBinding.tvKaoxiang.setOnClickListener(v->{
-            viewBinding.tvChaocai.setSelected(false);
-            viewBinding.tvKaoxiang.setSelected(true);
-            type = 1;
-            orderAdapter.setCurrentPosition(-1);
-            orderAdapter.setNewData(orderKaoDetails);
-            foodInfoList.clear();
-            viewBinding.orderName.setText("");
-            foodInfoAdapter.notifyDataSetChanged();
-        });
+        orderAdapter1.setNewData(orderChaoDetails);
+        orderAdapter2.setNewData(orderKaoDetails);
+        viewBinding.recyclerInfo.setAdapter(orderAdapter1);
+        viewBinding.recyclerInfo2.setAdapter(orderAdapter2);
+
+//        viewBinding.tvChaocai.setSelected(true);
+//        viewBinding.tvKaoxiang.setSelected(false);
+//        viewBinding.tvChaocai.setOnClickListener(v->{
+//            viewBinding.tvChaocai.setSelected(true);
+//            viewBinding.tvKaoxiang.setSelected(false);
+//            type = 0;
+//            orderAdapter.setCurrentPosition(-1);
+//            orderAdapter.setNewData(orderChaoDetails);
+//            foodInfoList.clear();
+//            viewBinding.orderName.setText("");
+//            foodInfoAdapter.notifyDataSetChanged();
+//        });
+//        viewBinding.tvKaoxiang.setOnClickListener(v->{
+//            viewBinding.tvChaocai.setSelected(false);
+//            viewBinding.tvKaoxiang.setSelected(true);
+//            type = 1;
+//            orderAdapter.setCurrentPosition(-1);
+//            orderAdapter.setNewData(orderKaoDetails);
+//            foodInfoList.clear();
+//            viewBinding.orderName.setText("");
+//            foodInfoAdapter.notifyDataSetChanged();
+//        });
 
         viewBinding.btnLocationInfo.setOnClickListener(v->{
-            if(ConfigName.getInstance().isFast2Click()){
+            if(ConfigName.getInstance().isFastClick()){
                 return;
             }
             if(foodInfoList.isEmpty()){
@@ -243,21 +187,125 @@ public class HomeOrderFragment extends BaseFragment {
         });
     }
 
-    private void updateOrderStatus(int type,int value){
-        if(type==this.type){
-            if(type == 0){
-                if(orderChaoDetails!=null&&!orderChaoDetails.isEmpty()){
-                    orderChaoDetails.clear();
-                    orderChaoDetails.addAll(OrderDetailUtil.getAllByType(0));
+    private void orderMaking(List<BPA_ORDER_DETAIL> mData,int position){
+        if(ConfigName.getInstance().isFastClick()){
+            return;
+        }
+        if(!OvenModbusTcpServer.get().plcIsConnect||!WokModbusTcpServer.get().plcIsConnect||!RobotModbusTcpServer.get().plcIsConnect){
+            NewToastUtil.getInstance().showToast("设备连接异常，请稍后重试");
+            return;
+        }
+        String name = mData.get(position).goodsName +"—"+ (mData.get(position).groupName==null?"":mData.get(position).groupName);
+        if(mData.get(position).status == 0){
+            boolean robotNoWorking = false;
+            Object object1 =  ModbusCenter.robotReadPlc("主任务读取");
+            Object object2 =  ModbusCenter.robotReadPlc("机器人在原点");
+            Object object3 =  ModbusCenter.robotReadPlc("机器人准备就绪");
+            if (object1 != null && object2!=null  && object3!=null) {
+                if(ConfigName.TEST){
+                    robotNoWorking = true;
+                }else {
+                    robotNoWorking = ((short) object1)==0 && (boolean) object2 &&(boolean) object3;
+                }
+            }
+            if(!robotNoWorking){
+                NewToastUtil.getInstance().showToast("机器人正在工作，请稍后重试");
+                return;
+            }
+
+            for(BPA_ORDER_DETAIL bean : mData){
+                if(bean.status!=0){
+                    NewToastUtil.getInstance().showToast("请确认上一个订单已完成");
+                    return;
                 }
-            }else {
-                if(orderKaoDetails!=null&&!orderKaoDetails.isEmpty()){
-                    orderKaoDetails.clear();
-                    orderKaoDetails.addAll(OrderDetailUtil.getAllByType(1));
+            }
+            Object object4 = ModbusCenter.getListingValue("出料空盆检测有无");
+            if(object4!=null && !(boolean) object4){
+                NewToastUtil.getInstance().showToast("出料空盆未放置，请补盆后重试");
+                return;
+            }
+            Object object5 = ModbusCenter.getListingValue("出餐工位检测有无");
+            if(object5!=null && (boolean) object5){
+                NewToastUtil.getInstance().showToast("出餐工位有盆，请取走后重试");
+                return;
+            }
+
+            String error = checkPosition(mData.get(position));
+            makingOrderDialog( mData.get(position),error.isEmpty()?0:-1,name,error,position);
+            return;
+        }
+        if(mData.get(position).status==1){
+            jumpToCook(mData.get(position));
+            return;
+        }
+        makingOrderDialog(mData.get(position),mData.get(position).status,name,"",position);
+    }
+
+    /**
+     * 点击订单  查看配料信息
+     * @param bean
+     */
+    private void orderClick(BPA_ORDER_DETAIL bean){
+        orderDetail = bean;
+        viewBinding.orderName.setText(orderDetail.goodsName+(orderDetail.groupName==null?"":("\n"+orderDetail.groupName)));
+        //刷新右侧配料信息
+        foodInfoList.clear();
+        List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(orderDetail.groupId);
+        for(BPA_GOODS_PROCESS_DETAIL detail:details){
+            if(detail.processname.equals("主料")||detail.processname.equals("辅料")){
+                if(!detail.processvalue.isEmpty()){
+                    List<String> data = new ArrayList<>();
+                    if (detail.processvalue.contains("|")) {
+                        String[] res = detail.processvalue.split("[|]");
+                        data.addAll(Arrays.asList(res));
+                    } else {
+                        data.add(detail.processvalue);
+                    }
+                    String foodName = "";
+                    String foodPos = "";
+                    for (String item : data) {
+                        if (item.contains(",")) {
+                            String[] wl = item.split("[,]");
+                            if (wl.length == 2) {
+                                String name = wl[0];
+                                String val = wl[1];
+                                if(name.equals("主料名称")||name.equals("辅料名称")||name.equals("烤菜名称")){
+                                    foodName = val;
+                                }else if(name.equals("主料位置")||name.equals("辅料位置")||name.equals("菜盘位置")){
+                                    foodPos = val;
+                                }
+                            }
+                        }
+                    }
+                    foodInfoList.add(detail.processname+foodPos+"："+foodName);
+                }
+            }else if(detail.processname.equals("烤箱")){
+                if(detail.processvalue.contains("|")){
+                    String[] res = detail.processvalue.split("\\|");
+                    foodInfoList.clear();
+                    foodInfoList.addAll(Arrays.asList(res));
                 }
             }
-            if(orderAdapter!=null){
-                orderAdapter.notifyItemChanged(0);
+        }
+        foodInfoAdapter.notifyDataSetChanged();
+    }
+
+    private void updateOrderStatus(int type,int value){
+        if(type == 0){
+            if(orderChaoDetails!=null&&!orderChaoDetails.isEmpty()){
+                orderChaoDetails.clear();
+                orderChaoDetails.addAll(OrderDetailUtil.getAllByType(0));
+            }
+            if(orderAdapter1!=null){
+                orderAdapter1.notifyItemChanged(0);
+            }
+        }else {
+            if(orderKaoDetails!=null&&!orderKaoDetails.isEmpty()){
+                orderKaoDetails.clear();
+                orderKaoDetails.addAll(OrderDetailUtil.getAllByType(1));
+            }
+            if(orderAdapter2!=null){
+                orderAdapter2.notifyItemChanged(0);
             }
         }
     }
@@ -300,13 +348,13 @@ public class HomeOrderFragment extends BaseFragment {
                 if(type == 0){
                     OrderDetailUtil.deleteById(orderChaoDetails.get(position).id);
                     orderChaoDetails.remove(position);
-                    orderAdapter.setCurrentPosition(-1);
-                    orderAdapter.notifyDataSetChanged();
+                    orderAdapter1.setCurrentPosition(-1);
+                    orderAdapter1.notifyDataSetChanged();
                 }else {
                     OrderDetailUtil.deleteById(orderKaoDetails.get(position).id);
                     orderKaoDetails.remove(position);
-                    orderAdapter.setCurrentPosition(-1);
-                    orderAdapter.notifyDataSetChanged();
+                    orderAdapter2.setCurrentPosition(-1);
+                    orderAdapter2.notifyDataSetChanged();
                 }
 
                 NewToastUtil.getInstance().showToast("删除成功");
@@ -380,14 +428,14 @@ public class HomeOrderFragment extends BaseFragment {
                             orderChaoDetails.get(position).status = 1;
                             BPA_ORDER_DETAIL bean = orderChaoDetails.get(position);
                             OrderDetailUtil.update(bean);
-                            orderAdapter.notifyItemChanged(position);
+                            orderAdapter1.notifyItemChanged(position);
                             startMakingThread(bean);
                             jumpToCook(orderChaoDetails.get(position));
                         }else {
                             orderKaoDetails.get(position).status = 1;
                             BPA_ORDER_DETAIL bean = orderKaoDetails.get(position);
                             OrderDetailUtil.update(bean);
-                            orderAdapter.notifyItemChanged(position);
+                            orderAdapter2.notifyItemChanged(position);
                             startMakingThread2(bean);
                             jumpToCook(orderKaoDetails.get(position));
                         }
@@ -396,19 +444,25 @@ public class HomeOrderFragment extends BaseFragment {
                         break;
                     case 2:
                     case 3:
-                        if(position == orderAdapter.getCurrentPosition()){
-                            orderAdapter.setCurrentPosition(-1);
-                            foodInfoList.clear();
-                            foodInfoAdapter.notifyDataSetChanged();
-                        }
                         if(type == 0){
+                            if(position == orderAdapter1.getCurrentPosition()){
+                                orderAdapter1.setCurrentPosition(-1);
+                                foodInfoList.clear();
+                                foodInfoAdapter.notifyDataSetChanged();
+                            }
                             OrderDetailUtil.deleteById(orderChaoDetails.get(position).id);
                             orderChaoDetails.remove(position);
+                            orderAdapter1.notifyDataSetChanged();
                         }else {
+                            if(position == orderAdapter2.getCurrentPosition()){
+                                orderAdapter2.setCurrentPosition(-1);
+                                foodInfoList.clear();
+                                foodInfoAdapter.notifyDataSetChanged();
+                            }
                             OrderDetailUtil.deleteById(orderKaoDetails.get(position).id);
                             orderKaoDetails.remove(position);
+                            orderAdapter2.notifyDataSetChanged();
                         }
-                        orderAdapter.notifyDataSetChanged();
                         break;
                 }
                 xCom.dismissX();
@@ -426,16 +480,15 @@ public class HomeOrderFragment extends BaseFragment {
 
                         orderChaoDetails.clear();
                         orderChaoDetails.addAll(OrderDetailUtil.getAllByType(type));
-                        orderAdapter.notifyDataSetChanged();
+                        orderAdapter1.notifyDataSetChanged();
                         startMakingThread(bean);
                     }else {
                         orderKaoDetails.get(position).status = 1;
                         BPA_ORDER_DETAIL bean = orderKaoDetails.get(position);
                         OrderDetailUtil.update(bean);
-
                         orderKaoDetails.clear();
                         orderKaoDetails.addAll(OrderDetailUtil.getAllByType(type));
-                        orderAdapter.notifyDataSetChanged();
+                        orderAdapter2.notifyDataSetChanged();
                         startMakingThread2(bean);
                     }
                 }
@@ -627,8 +680,11 @@ public class HomeOrderFragment extends BaseFragment {
             orderKaoDetails = null;
             orderChaoDetails = null;
         }
-        if(orderAdapter!=null){
-            orderAdapter = null;
+        if(orderAdapter1!=null){
+            orderAdapter1 = null;
+        }
+        if(orderAdapter2!=null){
+            orderAdapter2 = null;
         }
     }
 
@@ -652,24 +708,6 @@ public class HomeOrderFragment extends BaseFragment {
         updateOrderStatus(event.type,event.process);
     }
 
-    //刷新数据
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onOrderChangeEvent(FreshOrderEvent event){
-        if(orderKaoDetails!=null){
-            orderChaoDetails.clear();
-            orderKaoDetails.clear();
-            orderChaoDetails.addAll(OrderDetailUtil.getAllByType(0));
-            orderKaoDetails.addAll(OrderDetailUtil.getAllByType(1));
-        }
-        if(orderAdapter!=null){
-            orderAdapter.setCurrentPosition(-1);
-            orderAdapter.notifyDataSetChanged();
-            foodInfoList.clear();
-            viewBinding.orderName.setText("");
-            foodInfoAdapter.notifyDataSetChanged();
-        }
-    }
-
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
@@ -681,9 +719,16 @@ public class HomeOrderFragment extends BaseFragment {
                 orderChaoDetails.addAll(OrderDetailUtil.getAllByType(0));
                 orderKaoDetails.addAll(OrderDetailUtil.getAllByType(1));
             }
-            if(orderAdapter!=null){
-                orderAdapter.setCurrentPosition(-1);
-                orderAdapter.notifyDataSetChanged();
+            if(orderAdapter1!=null){
+                orderAdapter1.setCurrentPosition(-1);
+                orderAdapter1.notifyDataSetChanged();
+                foodInfoList.clear();
+                viewBinding.orderName.setText("");
+                foodInfoAdapter.notifyDataSetChanged();
+            }
+            if(orderAdapter2!=null){
+                orderAdapter2.setCurrentPosition(-1);
+                orderAdapter2.notifyDataSetChanged();
                 foodInfoList.clear();
                 viewBinding.orderName.setText("");
                 foodInfoAdapter.notifyDataSetChanged();

app/src/main/java/com/bonait/bnframework/newui/widget/NewToastUtil.java

@@ -54,7 +54,7 @@ public class NewToastUtil {
             ViewLayoutToastBinding binding = ViewLayoutToastBinding.bind(layout);
             DisplayManager.scaleViewGroup(binding.getRoot());
             binding.toastText.setText(content);
-            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(10)));
+            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(70)));
             toast.setDuration(Toast.LENGTH_SHORT);
             toast.setView(layout);
             toast.show();
@@ -75,7 +75,7 @@ public class NewToastUtil {
             ViewLayoutToastBinding binding = ViewLayoutToastBinding.bind(layout);
             DisplayManager.scaleViewGroup(binding.getRoot());
             binding.toastText.setText(content);
-            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(10)));
+            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(70)));
             toast.setDuration(Toast.LENGTH_SHORT);
             toast.setView(layout);
             toast.show();
@@ -96,7 +96,7 @@ public class NewToastUtil {
             ViewLayoutToastBinding binding = ViewLayoutToastBinding.bind(layout);
             DisplayManager.scaleViewGroup(binding.getRoot());
             binding.toastText.setText(content);
-            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(180)));
+            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(70)));
             toast.setDuration(Toast.LENGTH_SHORT);
             toast.setView(layout);
             toast.show();
@@ -129,7 +129,7 @@ public class NewToastUtil {
                 spannableStringBuilder.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.red_primary)),index,index+colorText.length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
             }
             binding.toastText.setText(spannableStringBuilder);
-            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(10)));
+            toast.setGravity(Gravity.BOTTOM,0, (int) (DisplayManager.getWidthScaleRate()*DimensUtil.getDimens(70)));
             toast.setDuration(Toast.LENGTH_SHORT);
             toast.setView(layout);
             toast.show();

app/src/main/res/drawable/bg_box_click.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" >
+        <shape>
+            <solid android:color="#FF9800"/>
+        </shape>
+
+    </item>
+    <item >
+
+        <shape>
+            <solid android:color="#00000000"/>
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/bg_order.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#80BEAA6A"/>
+    <corners android:radius="10dp"/>
+</shape>

app/src/main/res/layout/new/layout/activity_cook_h.xml

@@ -16,50 +16,52 @@
         android:layout_height="match_parent">
 
         <ImageView
-            android:layout_width="700dp"
+            android:layout_width="match_parent"
+            android:layout_marginEnd="800dp"
             android:layout_height="match_parent"
-            android:src="@mipmap/ic_devices_all"
+            android:src="@mipmap/ic_devices_all2"
+            android:scaleY="1.1"
+            android:scaleX="1.1"
             />
 
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="800dp"
+            android:layout_height="50dp"
             android:textSize="24sp"
             android:text="炒菜"
+            android:layout_marginTop="10dp"
             android:textColor="@color/white"
             android:layout_gravity="end"
-            android:layout_marginEnd="500dp"
             android:paddingStart="10dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:background="@color/blue_primary_dark"
+            android:gravity="center"
+            android:background="@color/main_title_color1"
             />
         <FrameLayout
             android:id="@+id/fragment1"
             android:layout_gravity="end"
-            android:layout_width="500dp"
-            tools:background="@color/right_bg_blue_50p"
-            android:layout_height="480dp"/>
+            android:layout_width="800dp"
+            android:layout_marginTop="60dp"
+            android:background="@color/main_color1"
+            android:layout_height="640dp"/>
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="800dp"
+            android:layout_height="50dp"
             android:textSize="24sp"
             android:text="烤箱"
             android:textColor="@color/white"
-            android:layout_gravity="end"
-            android:layout_marginEnd="500dp"
-            android:layout_marginTop="490dp"
-            android:paddingStart="10dp"
-            android:paddingTop="10dp"
-            android:paddingBottom="10dp"
-            android:background="@color/blue_primary_dark"
+            android:layout_gravity="bottom|end"
+            android:layout_marginBottom="250dp"
+            android:gravity="center"
+            android:layout_marginTop="770dp"
+            android:background="@color/main_title_color1"
+
             />
         <FrameLayout
             android:id="@+id/fragment2"
             android:layout_gravity="bottom|end"
-            android:layout_width="500dp"
-            tools:background="@color/right_bg_blue_50p"
-            android:layout_height="230dp"/>
+            android:layout_width="800dp"
+            android:background="@color/main_color1"
+            android:layout_height="250dp"/>
     </FrameLayout>
 
     <com.qmuiteam.qmui.widget.QMUITopBarLayout

app/src/main/res/layout/new/layout/activity_edit_process_h.xml

@@ -251,7 +251,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/home_tab_height" >
+        android:layout_height="90dp" >
 
         <TextView
             android:id="@+id/back"

app/src/main/res/layout/new/layout/activity_edit_process_oven.xml

@@ -25,6 +25,7 @@
             android:paddingLeft="@dimen/dp_10"
             android:paddingRight="@dimen/dp_10"
             style="@style/TextView_normal_size"
+            android:textSize="42sp"
             android:textStyle="bold"
             android:maxLines="2"
             android:textColor="@color/black"
@@ -57,10 +58,10 @@
         <TextView
             android:id="@+id/tv1"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@id/line1"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="30dp"
             style="@style/TextView_normal"
             android:text="烤盘位置"
             android:layout_marginStart="20dp"
@@ -68,8 +69,8 @@
         <Spinner
             android:id="@+id/spinner_pan"
             style="@style/commonSpinnerStyle"
-            android:layout_width="@dimen/dp_280"
-            android:layout_height="@dimen/dp_70"
+            android:layout_width="@dimen/dp_480"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintLeft_toRightOf="@id/tv1"
             app:layout_constraintTop_toTopOf="@id/tv1"
             android:layout_marginStart="20dp"
@@ -77,18 +78,18 @@
         <TextView
             android:id="@+id/tv2"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toRightOf="@id/spinner_pan"
             app:layout_constraintTop_toTopOf="@id/tv1"
             style="@style/TextView_normal"
-            android:text="烤盘档位"
+            android:text="       烤盘档位"
             android:layout_marginStart="50dp"
             />
         <Spinner
             android:id="@+id/spinner_model"
             style="@style/commonSpinnerStyle"
-            android:layout_width="@dimen/dp_280"
-            android:layout_height="@dimen/dp_70"
+            android:layout_width="@dimen/dp_480"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toRightOf="@id/tv2"
             app:layout_constraintTop_toTopOf="@id/tv1"
             android:layout_marginStart="20dp"
@@ -96,19 +97,19 @@
         <TextView
             android:id="@+id/tv3"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv1"
             style="@style/TextView_normal"
             android:text="烤盘温度"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
             />
         <Spinner
             android:id="@+id/spinner_wendu"
             style="@style/commonSpinnerStyle"
-            android:layout_width="@dimen/dp_280"
-            android:layout_height="@dimen/dp_70"
+            android:layout_width="@dimen/dp_480"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toRightOf="@id/tv3"
             app:layout_constraintTop_toTopOf="@id/tv3"
             android:layout_marginStart="20dp"
@@ -116,7 +117,7 @@
         <TextView
             android:id="@+id/tv_time"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toRightOf="@id/spinner_wendu"
             app:layout_constraintTop_toTopOf="@id/spinner_wendu"
             style="@style/TextView_normal"
@@ -125,8 +126,8 @@
             />
         <EditText
             android:id="@+id/edittext_time"
-            android:layout_width="@dimen/dp_280"
-            android:layout_height="70dp"
+            android:layout_width="@dimen/dp_480"
+            android:layout_height="90dp"
             android:inputType="number"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -145,24 +146,24 @@
             android:layout_height="@dimen/dp_1"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="@dimen/dp_270"
+            android:layout_marginTop="@dimen/dp_370"
             android:background="@color/color3"
             />
         <TextView
             android:id="@+id/title1"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@id/line2"
             style="@style/TextView_normal"
             android:text="第1层菜名"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
             />
         <EditText
             android:id="@+id/edittext1"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -177,7 +178,7 @@
         <TextView
             android:id="@+id/title2"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title1"
             style="@style/TextView_normal"
@@ -188,7 +189,7 @@
         <EditText
             android:id="@+id/edittext2"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -203,7 +204,7 @@
         <TextView
             android:id="@+id/title3"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title2"
             style="@style/TextView_normal"
@@ -214,7 +215,7 @@
         <EditText
             android:id="@+id/edittext3"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -229,7 +230,7 @@
         <TextView
             android:id="@+id/title4"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title3"
             style="@style/TextView_normal"
@@ -240,7 +241,7 @@
         <EditText
             android:id="@+id/edittext4"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -255,7 +256,7 @@
         <TextView
             android:id="@+id/title5"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title4"
             style="@style/TextView_normal"
@@ -266,7 +267,7 @@
         <EditText
             android:id="@+id/edittext5"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -283,18 +284,18 @@
         <TextView
             android:id="@+id/title6"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@id/line2"
             style="@style/TextView_normal"
             android:text="第6层菜名"
             android:layout_marginStart="620dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
             />
         <EditText
             android:id="@+id/edittext6"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -309,7 +310,7 @@
         <TextView
             android:id="@+id/title7"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="@id/title6"
             app:layout_constraintTop_toBottomOf="@id/title6"
             style="@style/TextView_normal"
@@ -319,7 +320,7 @@
         <EditText
             android:id="@+id/edittext7"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -334,7 +335,7 @@
         <TextView
             android:id="@+id/title8"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="@id/title7"
             app:layout_constraintTop_toBottomOf="@id/title7"
             style="@style/TextView_normal"
@@ -344,7 +345,7 @@
         <EditText
             android:id="@+id/edittext8"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -359,7 +360,7 @@
         <TextView
             android:id="@+id/title9"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="@id/title6"
             app:layout_constraintTop_toBottomOf="@id/title8"
             style="@style/TextView_normal"
@@ -369,7 +370,7 @@
         <EditText
             android:id="@+id/edittext9"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -384,7 +385,7 @@
         <TextView
             android:id="@+id/title10"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             app:layout_constraintLeft_toLeftOf="@id/title9"
             app:layout_constraintTop_toBottomOf="@id/title9"
             style="@style/TextView_normal"
@@ -394,7 +395,7 @@
         <EditText
             android:id="@+id/edittext10"
             android:layout_width="@dimen/dp_350"
-            android:layout_height="70dp"
+            android:layout_height="90dp"
             android:inputType="text"
             android:padding="3dp"
             android:textColor="@color/text1"
@@ -412,7 +413,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/home_tab_height" >
+        android:layout_height="90dp" >
 
         <TextView
             android:id="@+id/back"
@@ -425,7 +426,7 @@
             android:paddingRight="@dimen/dp_50"
             android:text=" 保存并返回"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_32" />
+            android:textSize="@dimen/sp_42" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"

app/src/main/res/layout/new/layout/activity_main_h.xml

@@ -11,82 +11,9 @@
         android:layout_width="@dimen/dp_300"
         android:background="@color/main_title_color1"
         android:layout_gravity="end"
+        android:visibility="gone"
         android:layout_height="match_parent">
-        <TextView
-            android:id="@+id/device_status_wok"
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_marginStart="5dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="炒锅状态:未连接"
-            android:layout_height="wrap_content"/>
-        <TextView
-            android:id="@+id/device_status_oven"
-            android:layout_width="match_parent"
-            android:layout_below="@id/device_status_wok"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="5dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="烤箱状态:未连接"
-            android:layout_height="wrap_content"/>
-        <TextView
-            android:id="@+id/device_status_robot"
-            android:layout_width="match_parent"
-            android:layout_below="@id/device_status_oven"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="5dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="机器人状态:未连接"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:id="@+id/tv_chucai_box"
-            android:layout_below="@id/device_status_robot"
-            android:layout_width="match_parent"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="25dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="出餐位检测:异常"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:id="@+id/tv_buliao_box"
-            android:layout_below="@id/tv_chucai_box"
-            android:layout_width="match_parent"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="5dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="出料盆检测:异常"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:id="@+id/tv_chuliao_box"
-            android:layout_width="match_parent"
-            android:layout_below="@id/tv_buliao_box"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="5dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="补料盆检测:异常"
-            android:layout_height="wrap_content"/>
-        <TextView
-            android:id="@+id/tv_shusongxian"
-            android:layout_width="match_parent"
-            android:layout_below="@id/tv_chuliao_box"
-            android:layout_marginStart="5dp"
-            android:layout_marginTop="5dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="输送线状态:异常"
-            android:layout_height="wrap_content"/>
-
-
-
+        
         <RelativeLayout
             android:id="@+id/rl_check_box"
             android:layout_width="match_parent"
@@ -108,7 +35,7 @@
                 android:layout_alignEnd="@id/circle_green"
                 android:layout_marginStart="5dp"
                 android:text="有盆"
-                android:textColor="@color/black"
+                android:textColor="#cc000000"
                 android:textSize="32sp"
                 />
 
@@ -126,7 +53,7 @@
 <!--                android:layout_alignEnd="@id/circle_red"-->
 <!--                android:gravity="center"-->
 <!--                android:text="异常"-->
-<!--                android:textColor="@color/black"-->
+<!--                android:textColor="#cc000000"-->
 <!--                android:textSize="32sp"-->
 <!--                />-->
             <TextView
@@ -143,7 +70,7 @@
                 android:layout_alignEnd="@id/circle_yellow"
                 android:gravity="center"
                 android:text="无盆"
-                android:textColor="@color/black"
+                android:textColor="#cc000000"
                 android:textSize="32sp"
                 />
 
@@ -155,7 +82,7 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginTop="5dp"
                 android:textSize="32sp"
-                android:textColor="@color/black"
+                android:textColor="#cc000000"
                 android:text="辅料:"
                 android:layout_height="wrap_content"/>
 
@@ -222,7 +149,7 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginTop="5dp"
                 android:textSize="32sp"
-                android:textColor="@color/black"
+                android:textColor="#cc000000"
                 android:text="主料:"
                 android:layout_height="wrap_content"/>
 
@@ -316,7 +243,7 @@
                 android:layout_marginStart="5dp"
                 android:layout_marginTop="5dp"
                 android:textSize="32sp"
-                android:textColor="@color/black"
+                android:textColor="#cc000000"
                 android:text="烤盘:"
                 android:layout_height="wrap_content"/>
 
@@ -366,36 +293,141 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginStart="150dp"
-        android:layout_marginEnd="300dp"
         android:layout_marginBottom="50dp"
         />
-
-    <LinearLayout
-        android:layout_width="match_parent"
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_order"
         android:layout_gravity="bottom"
-        android:background="@color/main_title_color1"
-        android:layout_height="50dp">
+        android:layout_marginBottom="70dp"
+        android:orientation="vertical"
+        android:layout_marginStart="20dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        >
         <TextView
             android:id="@+id/tv_wok"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            android:layout_width="wrap_content"
             android:layout_height="50dp"
-            tools:text="炒锅：123465"
+            tools:text="炒锅：123465炒锅"
             android:textSize="32sp"
-            android:layout_marginStart="5dp"
             android:textColor="@color/textcolor_subtile"
+            android:paddingBottom="10dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:visibility="gone"
+            tools:visibility="visible"
             />
         <TextView
             android:id="@+id/tv_oven"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            android:layout_width="wrap_content"
             android:layout_height="50dp"
             android:gravity="end"
             tools:text="炒锅：123465"
             android:textSize="32sp"
-            android:layout_marginStart="5dp"
+            android:layout_below="@id/tv_wok"
             android:textColor="@color/textcolor_subtile"
+            android:paddingBottom="10dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_gravity="bottom"
+        android:background="@color/main_title_color1"
+        android:orientation="horizontal"
+        android:layout_height="50dp">
+        <TextView
+            android:id="@+id/device_status_wok"
+            android:layout_width="wrap_content"
+            android:textSize="32sp"
+            android:textColor="#cc000000"
+            android:text="炒锅:未连接"
+            android:layout_marginStart="5dp"
+            android:gravity="center_vertical"
+            android:layout_height="match_parent"/>
+        <TextView
+            android:id="@+id/device_status_oven"
+            android:layout_width="wrap_content"
+            android:layout_below="@id/device_status_wok"
+            android:layout_marginStart="30dp"
+            android:gravity="center_vertical"
+            android:layout_height="match_parent"
+            android:textSize="32sp"
+            android:textColor="#cc000000"
+            android:text="烤箱:未连接"
             />
+        <TextView
+            android:id="@+id/device_status_robot"
+            android:layout_width="wrap_content"
+            android:layout_below="@id/device_status_oven"
+            android:layout_marginStart="30dp"
+            android:textSize="32sp"
+            android:textColor="#cc000000"
+            android:text="机器人:未连接"
+            android:gravity="center_vertical"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/tv_chucai_box"
+            android:layout_below="@id/device_status_robot"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="30dp"
+            android:textSize="32sp"
+            android:textColor="#cc000000"
+            android:text="出餐位:异常"
+            android:gravity="center_vertical"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/tv_buliao_box"
+            android:layout_below="@id/tv_chucai_box"
+            android:layout_width="wrap_content"
+            android:layout_marginStart="30dp"
+            android:textSize="32sp"
+            android:textColor="#cc000000"
+            android:text="出料盆:异常"
+            android:gravity="center_vertical"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/tv_chuliao_box"
+            android:layout_width="wrap_content"
+            android:layout_below="@id/tv_buliao_box"
+            android:layout_marginStart="30dp"
+            android:textSize="32sp"
+            android:textColor="#cc000000"
+            android:text="补料盆:异常"
+            android:gravity="center_vertical"
+            android:layout_height="match_parent"/>
+        <TextView
+            android:id="@+id/tv_shusongxian"
+            android:layout_width="wrap_content"
+            android:layout_below="@id/tv_chuliao_box"
+            android:layout_marginStart="30dp"
+            android:textSize="32sp"
+            android:textColor="#cc000000"
+            android:text="输送线:异常"
+            android:gravity="center_vertical"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/btn_box_check"
+            android:layout_width="200dp"
+            android:layout_height="match_parent"
+            android:text="货架检测"
+            android:textColor="#0088FF"
+            android:textSize="32sp"
+            android:layout_marginStart="50dp"
+            android:gravity="center"
+            android:layout_gravity="end"
+            />
+
     </LinearLayout>
 
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

app/src/main/res/layout/new/layout/dialog_add_order.xml

@@ -7,8 +7,8 @@
     <!--子属性选择-->
     <include
         android:id="@+id/layout_attribute"
-        android:layout_width="@dimen/dp_1000"
-        android:layout_height="740dp"
+        android:layout_width="1400dp"
+        android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -17,4 +17,15 @@
         />
 
 
+    <include
+        android:id="@+id/layout_attribute2"
+        android:layout_width="700dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        layout="@layout/layout_goods_sub_attribute2"
+        android:visibility="gone"
+        />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/new/layout/dialog_food_control.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -8,17 +8,85 @@
     android:background="@color/transparent"
     android:layout_height="wrap_content">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_content1"
+        android:layout_width="800dp"
+        android:background="@drawable/bg_round25_white"
+        android:layout_height="600dp">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_80"
+            android:background="@drawable/bg_round25_top_yellow"
+            style="@style/TextView_btn_dialog"
+            android:text="机器人控制指令"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            />
+
+        <ImageView
+            android:id="@+id/btn_close2"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="@dimen/dp_80"
+            android:layout_marginEnd="20dp"
+            style="@style/TextView_btn_dialog"
+            android:layout_alignParentEnd="true"
+            android:background="@mipmap/ic_clear_white_48dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:textSize="42sp"
+            android:gravity="center"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:text="请确认机器人附近没有人员"
+            android:textColor="@color/red_primary"
+            />
+
+        <TextView
+            android:id="@+id/btn_next"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="下一步"
+            android:gravity="center"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_height="100dp"
+            android:layout_marginBottom="50dp"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="1400dp"
+        android:id="@+id/cl_content2"
         android:background="@drawable/bg_round25_white"
+        android:visibility="visible"
         android:layout_height="900dp">
+        
+        <ImageView
+            android:layout_width="1100dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="80dp"
+            android:src="@mipmap/ic_huojia_box"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            />
         <TextView
             android:id="@+id/title1"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_80"
             android:background="@drawable/bg_round25_top_yellow"
             style="@style/TextView_btn_dialog"
-            android:text="控制机器人指令"
+            android:text="机器人控制指令"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             />
@@ -72,7 +140,7 @@
             android:gravity="center"
             android:background="@drawable/bg_round15_yellow_btn"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="120dp"
+            android:layout_marginTop="250dp"
             app:layout_constraintEnd_toEndOf="parent"
             android:layout_marginEnd="80dp"
             android:layout_height="100dp"/>
@@ -81,11 +149,10 @@
             android:layout_width="wrap_content"
             android:layout_height="100dp"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="120dp"
+            android:layout_marginTop="150dp"
             android:layout_marginStart="200dp"
             app:layout_constraintStart_toStartOf="parent"
             android:orientation="horizontal"
-            android:background="#80b0b0b0"
             android:paddingStart="50dp"
             android:paddingEnd="50dp"
             >
@@ -93,179 +160,178 @@
                 android:id="@+id/top1"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:background="@drawable/bg_blue_wan_click"
+                android:background="@drawable/bg_box_click"
                 android:gravity="center"
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:textSize="28sp"
                 android:text="辅料1"
-                android:textColor="@color/white"
+                android:textColor="@color/textcolor_subtile"
                 />
             <TextView
                 android:id="@+id/top2"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:layout_marginLeft="180dp"
-                android:background="@drawable/bg_blue_wan_click"
+                android:layout_marginLeft="140dp"
+                android:background="@drawable/bg_box_click"
                 android:gravity="center"
                 android:textSize="28sp"
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:text="辅料2"
-                android:textColor="@color/white"
+                android:textColor="@color/textcolor_subtile"
                 />
             <TextView
                 android:id="@+id/top3"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:layout_marginLeft="360dp"
-                android:background="@drawable/bg_blue_wan_click"
+                android:layout_marginLeft="270dp"
+                android:background="@drawable/bg_box_click"
                 android:gravity="center"
                 android:textSize="28sp"
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:text="辅料3"
-                android:textColor="@color/white"
+                android:textColor="@color/textcolor_subtile"
                 />
             <TextView
                 android:id="@+id/top4"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
-                android:layout_marginLeft="540dp"
-                android:background="@drawable/bg_blue_wan_click"
+                android:layout_marginLeft="400dp"
+                android:background="@drawable/bg_box_click"
                 android:gravity="center"
                 android:textSize="28sp"
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:text="辅料4"
-                android:textColor="@color/white"
+                android:textColor="@color/textcolor_subtile"
                 />
 
         </RelativeLayout>
 
         <TextView
             android:id="@+id/right1"
-            android:layout_width="300dp"
-            android:layout_height="150dp"
+            android:layout_width="200dp"
+            android:layout_height="100dp"
             android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="250dp"
-            android:layout_marginStart="455dp"
+            android:layout_marginTop="300dp"
+            android:layout_marginStart="125dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
             android:ellipsize="end"
             android:text="主料1"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
         <TextView
             android:id="@+id/right2"
-            android:layout_width="300dp"
-            android:layout_height="150dp"
+            android:layout_width="200dp"
+            android:layout_height="100dp"
             android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintStart_toEndOf="@id/right1"
             app:layout_constraintTop_toTopOf="@id/right1"
-            android:layout_marginStart="50dp"
+            android:layout_marginStart="100dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
             android:ellipsize="end"
             android:text="主料2"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
         <TextView
             android:id="@+id/right3"
-            android:layout_width="300dp"
-            android:layout_height="150dp"
+            android:layout_width="200dp"
+            android:layout_height="100dp"
             android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintEnd_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right1"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="50dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
             android:ellipsize="end"
             android:text="主料3"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
         <TextView
             android:id="@+id/right4"
-            android:layout_width="300dp"
-            android:layout_height="150dp"
+            android:layout_width="200dp"
+            android:layout_height="100dp"
             android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintStart_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right1"
-            android:layout_marginTop="30dp"
-            android:layout_marginStart="50dp"
+            android:layout_marginTop="50dp"
+            android:layout_marginStart="100dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
             android:ellipsize="end"
             android:text="主料4"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
         <TextView
             android:id="@+id/right5"
-            android:layout_width="300dp"
-            android:layout_height="150dp"
+            android:layout_width="200dp"
+            android:layout_height="100dp"
             android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintEnd_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right3"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="50dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
             android:ellipsize="end"
             android:text="主料5"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
         <TextView
             android:id="@+id/right6"
-            android:layout_width="300dp"
-            android:layout_height="150dp"
+            android:layout_width="200dp"
+            android:layout_height="100dp"
             android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintStart_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right3"
-            android:layout_marginTop="30dp"
-            android:layout_marginStart="50dp"
+            android:layout_marginTop="50dp"
+            android:layout_marginStart="100dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
             android:ellipsize="end"
             android:text="主料6"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
 
         <TextView
             android:id="@+id/left1"
             android:layout_width="150dp"
-            android:layout_height="510dp"
-            android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:layout_height="250dp"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="80dp"
+            android:layout_marginStart="720dp"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="250dp"
+            android:layout_marginTop="430dp"
             android:gravity="center"
             android:textSize="28sp"
             android:maxLines="1"
             android:ellipsize="end"
             android:text="烤盘1"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
         <TextView
             android:id="@+id/left2"
             android:layout_width="150dp"
-            android:layout_height="510dp"
+            android:layout_height="250dp"
             android:layout_marginLeft="40dp"
-            android:background="@drawable/bg_blue_box_click"
+            android:background="@drawable/bg_box_click"
             app:layout_constraintStart_toEndOf="@id/left1"
             android:layout_marginStart="20dp"
             app:layout_constraintTop_toTopOf="@id/left1"
@@ -274,8 +340,8 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:text="烤盘2"
-            android:textColor="@color/white"
+            android:textColor="@color/textcolor_subtile"
             />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
+</FrameLayout>

app/src/main/res/layout/new/layout/dialog_order.xml

@@ -8,7 +8,7 @@
     tools:background="#88000000">
 
     <FrameLayout
-        android:layout_width="@dimen/dp_900"
+        android:layout_width="@dimen/dp_1200"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="@drawable/bg_round25_white"
@@ -26,7 +26,7 @@
 
         <TextView
             android:id="@+id/edit"
-            android:layout_width="@dimen/dp_800"
+            android:layout_width="@dimen/dp_900"
             android:layout_height="wrap_content"
             app:layout_constraintLeft_toRightOf="@id/title"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -37,12 +37,12 @@
             android:paddingRight="@dimen/dp_10"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_130"
-            android:layout_marginBottom="@dimen/dp_130"
+            android:layout_marginBottom="@dimen/dp_140"
             />
         <Button
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             android:textSize="@dimen/sp_32"
             android:textColor="@color/white"
             android:text="取消"
@@ -57,7 +57,7 @@
         <Button
             android:id="@+id/submit"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             android:textSize="@dimen/sp_32"
             android:textColor="@color/white"
             android:text="确认"

app/src/main/res/layout/new/layout/dialog_root_tip.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:background="@color/transparent"
+    android:layout_height="wrap_content">
+
+    <include
+        android:id="@+id/content0"
+        android:layout_width="1000dp"
+        android:layout_height="700dp"
+        layout="@layout/layout_root_tip0"
+        />
+    <include
+        android:id="@+id/content1"
+        android:layout_width="1000dp"
+        android:layout_height="700dp"
+        layout="@layout/layout_root_tip1"
+        android:visibility="gone"
+        />
+    <include
+        android:id="@+id/content2"
+        android:layout_width="1500dp"
+        android:layout_height="980dp"
+        layout="@layout/layout_root_tip2"
+        android:visibility="gone"
+        />
+    <include
+        android:id="@+id/content3"
+        android:layout_width="1000dp"
+        android:layout_height="600dp"
+        layout="@layout/layout_root_tip3"
+        android:visibility="gone"
+        />
+
+</FrameLayout>

app/src/main/res/layout/new/layout/fragment_cooking.xml

@@ -6,9 +6,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <RelativeLayout
         android:id="@+id/ll1"
-        android:layout_width="500dp"
+        android:layout_width="800dp"
         android:background="@color/right_bg_blue_50p"
-        android:layout_height="480dp">
+        android:layout_height="match_parent">
         <TextView
             android:id="@+id/goodname"
             android:layout_width="match_parent"
@@ -52,7 +52,8 @@
             android:layout_width="@dimen/dp_80"
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
-            android:layout_marginTop="@dimen/dp_90"
+            android:layout_marginTop="5dp"
+            android:layout_below="@id/start_goodmake"
             android:layout_marginEnd="5dp"
             android:src="@mipmap/zhizuo_zt"
             android:visibility="visible"
@@ -66,8 +67,12 @@
             android:layout_height="match_parent"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:background="@drawable/bg_gray_round0"
+            android:background="@drawable/bg_gray_round15"
             android:orientation="vertical"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:paddingTop="15dp"
+            android:paddingBottom="15dp"
             />
     </RelativeLayout>
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

app/src/main/res/layout/new/layout/fragment_cooking2.xml

@@ -6,9 +6,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <RelativeLayout
         android:id="@+id/ll1"
-        android:layout_width="500dp"
+        android:layout_width="800dp"
         android:background="@color/right_bg_blue_50p"
-        android:layout_height="230dp">
+        android:layout_height="250dp">
         <TextView
             android:id="@+id/goodname"
             android:layout_width="match_parent"
@@ -40,13 +40,12 @@
         <TextView
             android:id="@+id/time_desc"
             android:layout_width="wrap_content"
-            android:layout_height="70dp"
+            android:layout_height="80dp"
             tools:text="共100分钟,已烹饪99分59秒,还剩100分钟"
             android:textColor="@color/textbg_green"
             android:textSize="28sp"
             android:fontFamily="@font/fz2"
             android:gravity="center_vertical"
-            android:lines="2"
             android:maxLines="2"
             android:layout_below="@id/start_goodmake"
             android:layout_marginStart="10dp"
@@ -58,7 +57,7 @@
             android:layout_width="match_parent"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="20dp"
             android:layout_alignParentBottom="true"
             android:layout_height="@dimen/dp_50"
             />

app/src/main/res/layout/new/layout/fragment_home_device_debug.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true"
-    tools:layout_width="1470dp"
+    tools:layout_width="1770dp"
     tools:layout_height="1030dp"
     android:background="#DCDFE9"
     android:layout_height="match_parent">
@@ -15,8 +15,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:src="@mipmap/ic_devices_all2"
-            android:scaleX="1.2"
-            android:scaleY="1.2"
+            android:scaleX="1.1"
+            android:scaleY="1.1"
             />
         <ImageView
             android:layout_width="1000dp"
@@ -58,7 +58,7 @@
         <TextView
             android:layout_width="220dp"
             android:layout_marginTop="100dp"
-            android:layout_marginStart="950dp"
+            android:layout_marginStart="1150dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="货架料盒检测"
@@ -67,9 +67,9 @@
             android:layout_height="80dp"/>
         <TextView
             android:id="@+id/btn_dish_check"
-            android:layout_width="500dp"
+            android:layout_width="600dp"
             android:layout_marginTop="100dp"
-            android:layout_marginStart="950dp"
+            android:layout_marginStart="1150dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:layout_height="600dp"/>
@@ -78,10 +78,10 @@
         <TextView
             android:layout_width="150dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="100dp"
             android:layout_marginTop="150dp"
             android:background="#800088FF"
             android:gravity="center"
+            android:layout_marginStart="150dp"
             android:text="炒锅调试"
             android:textColor="@color/white"
             android:textSize="32sp" />
@@ -92,12 +92,13 @@
             android:textSize="32sp"
             android:textColor="@color/white"
             android:gravity="center"
+            android:layout_marginStart="150dp"
             android:layout_height="500dp"/>
 
         <TextView
             android:layout_width="150dp"
             android:layout_marginTop="80dp"
-            android:layout_marginStart="450dp"
+            android:layout_marginStart="650dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="烤箱调试"
@@ -108,14 +109,14 @@
             android:id="@+id/btn_kaoxiang"
             android:layout_width="250dp"
             android:layout_marginTop="80dp"
-            android:layout_marginStart="440dp"
+            android:layout_marginStart="640dp"
             android:gravity="center"
             android:layout_height="400dp"/>
 
         <TextView
             android:layout_width="100dp"
             android:layout_marginTop="500dp"
-            android:layout_marginStart="700dp"
+            android:layout_marginStart="900dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="机器人投料\n调试"
@@ -126,7 +127,7 @@
             android:id="@+id/btn_foods"
             android:layout_width="200dp"
             android:layout_marginTop="400dp"
-            android:layout_marginStart="700dp"
+            android:layout_marginStart="900dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:gravity="center"
@@ -203,8 +204,8 @@
             android:id="@+id/btn_line_open"
             android:layout_width="180dp"
             android:layout_gravity="bottom"
-            android:layout_marginBottom="50dp"
-            android:layout_marginStart="100dp"
+            android:layout_marginBottom="200dp"
+            android:layout_marginStart="430dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="启动输送线"
@@ -216,8 +217,8 @@
             android:id="@+id/btn_line_close"
             android:layout_width="180dp"
             android:layout_gravity="bottom"
-            android:layout_marginBottom="50dp"
-            android:layout_marginStart="300dp"
+            android:layout_marginBottom="200dp"
+            android:layout_marginStart="650dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="关闭输送线"

app/src/main/res/layout/new/layout/fragment_home_goods.xml

@@ -40,7 +40,7 @@
             android:layout_toEndOf="@id/recycler_classify"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="3"
+            app:spanCount="4"
             android:layout_height="match_parent">
         </androidx.recyclerview.widget.RecyclerView>
 
@@ -48,13 +48,14 @@
             android:id="@+id/ll_right"
             android:layout_width="450dp"
             android:layout_alignParentEnd="true"
-            android:background="@color/right_bg_blue_50p"
+            android:background="@color/main_color1"
             android:orientation="vertical"
             android:layout_height="match_parent">
             <TextView
                 android:id="@+id/tv1"
                 android:layout_height="50dp"
-                android:layout_width="295dp"
+                android:layout_width="match_parent"
+                android:background="@color/main_title_color1"
                 android:textSize="32sp"
                 android:textColor="@color/black"
                 android:text="炒菜订单"
@@ -71,14 +72,14 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="5dp"
-                android:background="@color/blue_primary_dark"
                 />
             <TextView
                 android:id="@+id/tv2"
                 android:layout_height="50dp"
-                android:layout_width="295dp"
+                android:layout_width="match_parent"
                 android:textSize="32sp"
                 android:textColor="@color/black"
+                android:background="@color/main_title_color1"
                 android:text="烤箱订单"
                 android:gravity="center"
                 />

app/src/main/res/layout/new/layout/fragment_home_mains.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:id="@+id/root"
     android:fitsSystemWindows="true"
-    tools:layout_width="1470dp"
+    tools:layout_width="1770dp"
     android:background="@color/main_color2"
     android:layout_height="match_parent">
 
@@ -129,16 +129,6 @@
 
             </LinearLayout>
 
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="250dp"
-            android:orientation="horizontal"
-            android:layout_marginTop="50dp"
-            android:layout_below="@id/ll_1"
-            >
             <LinearLayout
                 android:id="@+id/ll_order"
                 android:layout_marginStart="50dp"
@@ -149,7 +139,7 @@
 
                 <ImageView
                     android:layout_width="match_parent"
-                     android:layout_height="0dp"
+                    android:layout_height="0dp"
                     android:layout_weight="1"
                     android:src="@mipmap/home_order_ic" />
                 <TextView
@@ -162,6 +152,16 @@
                     android:textStyle="bold"
                     />
             </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="250dp"
+            android:orientation="horizontal"
+            android:layout_marginTop="50dp"
+            android:layout_below="@id/ll_1"
+            >
+
 
             <LinearLayout
                 android:id="@+id/ll_setting"

app/src/main/res/layout/new/layout/fragment_home_order.xml

@@ -5,6 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:fitsSystemWindows="true"
     android:background="@color/main_color2"
+    tools:layout_width="1770dp"
     android:layout_height="match_parent">
 
     <FrameLayout
@@ -12,46 +13,66 @@
         android:layout_height="match_parent">
         <LinearLayout
             android:layout_width="match_parent"
-            android:orientation="vertical"
+            android:orientation="horizontal"
             android:layout_marginEnd="400dp"
             android:gravity="center_horizontal"
             android:layout_height="match_parent">
             <LinearLayout
-                android:layout_width="400dp"
-                android:orientation="horizontal"
-                android:background="@drawable/bg_tab_title"
-                android:layout_height="70dp">
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:layout_height="match_parent">
+                <!--   android:background="@drawable/bg_tab_title_select
+                 bg_tab_title_textcolor_select"-->
                 <TextView
                     android:id="@+id/tv_chaocai"
                     android:text="炒菜"
                     android:textSize="32sp"
-                    android:background="@drawable/bg_tab_title_select"
-                    android:textColor="@drawable/bg_tab_title_textcolor_select"
+                    android:background="@color/textcolor_subtile"
+                    android:textColor="@color/white"
                     android:gravity="center"
                     android:layout_width="200dp"
+                    android:layout_gravity="center_horizontal"
                     android:layout_height="70dp"/>
 
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_info"
+                    android:layout_marginTop="20dp"
+                    android:layout_width="match_parent"
+                    android:layout_marginStart="50dp"
+                    android:layout_marginEnd="25dp"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    android:orientation="vertical"
+                    android:layout_height="match_parent"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                android:layout_height="match_parent">
+
                 <TextView
                     android:id="@+id/tv_kaoxiang"
                     android:text="烤箱"
                     android:textSize="32sp"
-                    android:background="@drawable/bg_tab_title_select"
-                    android:textColor="@drawable/bg_tab_title_textcolor_select"
+                    android:background="@color/textcolor_subtile"
+                    android:textColor="@color/white"
                     android:gravity="center"
                     android:layout_width="200dp"
+                    android:layout_gravity="center_horizontal"
                     android:layout_height="70dp"/>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_info2"
+                    android:layout_marginTop="20dp"
+                    android:layout_width="match_parent"
+                    android:layout_marginStart="25dp"
+                    android:layout_marginEnd="50dp"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    android:orientation="vertical"
+                    android:layout_height="match_parent"/>
             </LinearLayout>
 
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_info"
-                android:layout_marginTop="20dp"
-                android:layout_width="match_parent"
-                android:layout_marginStart="100dp"
-                android:layout_marginEnd="100dp"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                android:orientation="vertical"
-                android:layout_height="match_parent"/>
         </LinearLayout>
 
 
@@ -59,7 +80,7 @@
         <LinearLayout
             android:layout_width="400dp"
             android:layout_gravity="end"
-            android:background="@color/right_bg_blue_50p"
+            android:background="@color/main_color1"
             android:orientation="vertical"
             android:layout_height="match_parent">
             <TextView
@@ -68,6 +89,7 @@
                 android:layout_width="match_parent"
                 android:textSize="32sp"
                 android:textColor="@color/black"
+                android:background="@color/main_title_color1"
                 android:text="配料信息"
                 android:gravity="center"
                 />
@@ -77,9 +99,10 @@
                 android:layout_width="match_parent"
                 android:textSize="32sp"
                 android:textColor="@color/black"
-                android:text="配料信息"
+                tools:text="配料信息"
                 android:paddingStart="5dp"
                 android:paddingEnd="5dp"
+                android:gravity="center"
                 android:paddingBottom="5dp"
                 />
             <androidx.recyclerview.widget.RecyclerView

app/src/main/res/layout/new/layout/item_food_info.xml

@@ -9,9 +9,16 @@
     <FrameLayout
         android:id="@+id/content_bg"
         android:layout_width="match_parent"
-        android:background="@color/color3"
+        android:background="@color/transparent"
         android:layout_marginBottom="2dp"
         android:layout_height="50dp">
+        <TextView
+            android:id="@+id/line1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/color3"
+            android:visibility="gone"
+            />
         <TextView
             android:id="@+id/sort"
             android:layout_width="50dp"
@@ -34,6 +41,13 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/color3"
+            android:layout_gravity="bottom"
+            />
     </FrameLayout>
 
 </FrameLayout>

app/src/main/res/layout/new/layout/item_order_info.xml

@@ -98,6 +98,7 @@
             android:layout_marginStart="10dp"
             android:layout_marginEnd="160dp"
             android:layout_gravity="bottom"
+            android:paddingStart="5dp"
             android:textSize="24sp"
             tools:text="44444444444444444444444444444444444444"
             android:textColor="@color/textbg_green"

app/src/main/res/layout/new/layout/item_order_name.xml

@@ -9,9 +9,16 @@
     <FrameLayout
         android:id="@+id/content_bg"
         android:layout_width="match_parent"
-        tools:background="@color/right_bg_green_50p"
+        android:background="@color/transparent"
         android:layout_marginBottom="10dp"
         android:layout_height="80dp">
+        <TextView
+            android:id="@+id/line1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/color3"
+            android:visibility="gone"
+            />
         <TextView
             android:id="@+id/sort"
             android:layout_width="50dp"
@@ -48,6 +55,12 @@
             android:layout_gravity="bottom"
             android:gravity="center_vertical"
             />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/color3"
+            android:layout_gravity="bottom"
+            />
     </FrameLayout>
 
 </FrameLayout>

app/src/main/res/layout/new/layout/layout_goods_sub_attribute.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_1000"
-    android:layout_height="740dp"
+    android:layout_width="1400dp"
+    android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/bg_round25_white">
@@ -32,28 +32,30 @@
     <Spinner
         android:id="@+id/spinner_list"
         style="@style/commonSpinnerStyle"
-        android:layout_width="0dp"
+        android:layout_width="900dp"
         android:layout_height="@dimen/dp_90"
         android:layout_centerVertical="true"
         app:layout_constraintLeft_toRightOf="@id/desc1"
         app:layout_constraintTop_toTopOf="@id/desc1"
-        app:layout_constraintRight_toRightOf="parent"
         android:layout_marginEnd="@dimen/dp_20"
         android:layout_marginStart="@dimen/dp_20"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
         />
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
         android:layout_margin="@dimen/dp_20"
+        tools:layout_height="500dp"
         app:layout_constraintTop_toBottomOf="@id/spinner_list"
         app:layout_constraintBottom_toTopOf="@id/group_desc"
         >
         <ListView
             android:id="@+id/list_attribute"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:divider="#00000000"
             android:orientation="vertical"
             />
@@ -83,7 +85,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginEnd="@dimen/dp_20"
         android:layout_marginBottom="@dimen/dp_20"
-        android:layout_marginTop="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_120"
         style="@style/TextView_btn_dialog"
         tools:background="@drawable/bg_round25_gray_btn"
         android:text="添加订单"

app/src/main/res/layout/new/layout/layout_goods_sub_attribute2.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="700dp"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/bg_round25_white">
+    
+    <TextView
+        android:id="@+id/title2"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_80"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:background="@drawable/bg_round25_top_yellow"
+        style="@style/TextView_btn_dialog"
+        android:text="请确认"
+        />
+
+    <TextView
+        android:id="@+id/group_desc"
+        android:layout_width="wrap_content"
+        android:textSize="@dimen/sp_32"
+        android:layout_height="@dimen/dp_100"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginTop="@dimen/dp_100"
+        android:textColor="@color/blue"
+        tools:text="存在选中组合(没有工序)"
+        android:gravity="center"
+        />
+
+    <TextView
+        android:id="@+id/btn_next"
+        android:layout_width="@dimen/dp_180"
+        android:layout_height="@dimen/dp_100"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginEnd="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_220"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginBottom="30dp"
+        style="@style/TextView_btn_dialog"
+        tools:background="@drawable/bg_round25_gray_btn"
+        android:text="添加订单"
+        />
+
+    <ImageView
+        android:id="@+id/btn_close2"
+        android:layout_width="@dimen/dp_80"
+        android:layout_height="@dimen/dp_80"
+        android:layout_marginEnd="20dp"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        style="@style/TextView_btn_dialog"
+        android:background="@mipmap/ic_clear_white_48dp"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/new/layout/layout_root_tip0.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:background="@color/transparent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_content1"
+        android:background="@drawable/bg_round25_white"
+        android:layout_width="1000dp"
+        android:layout_height="700dp">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_80"
+            android:background="@drawable/bg_round25_top_yellow"
+            style="@style/TextView_btn_dialog"
+            android:text="自检"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="50dp"
+            android:layout_marginEnd="50dp"
+            android:orientation="vertical"
+            android:layout_marginBottom="50dp"
+            >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textSize="42sp"
+                android:gravity="center"
+                android:text="请确认设备是否连接"
+                android:textColor="@color/black"
+                />
+
+            <TextView
+                android:id="@+id/device_status_wok"
+                android:layout_width="match_parent"
+                android:textSize="42sp"
+                android:textColor="#cc000000"
+                android:gravity="center"
+                android:text="炒锅:未连接"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="20dp"
+                android:layout_height="match_parent"/>
+            <TextView
+                android:id="@+id/device_status_oven"
+                android:layout_width="match_parent"
+                android:layout_below="@id/device_status_wok"
+                android:layout_height="match_parent"
+                android:textSize="42sp"
+                android:textColor="#cc000000"
+                android:gravity="center"
+                android:text="烤箱:未连接"
+                />
+            <TextView
+                android:id="@+id/device_status_robot"
+                android:layout_width="match_parent"
+                android:layout_below="@id/device_status_oven"
+                android:text="机器人:未连接"
+                android:textSize="42sp"
+                android:textColor="#cc000000"
+                android:gravity="center"
+                android:layout_height="match_parent"/>
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/btn_next"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="下一步"
+            android:gravity="center"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_height="100dp"
+            android:layout_marginBottom="50dp"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>

app/src/main/res/layout/new/layout/layout_root_tip1.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:background="@color/transparent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_content1"
+        android:background="@drawable/bg_round25_white"
+        android:layout_width="1000dp"
+        android:layout_height="700dp">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_80"
+            android:background="@drawable/bg_round25_top_yellow"
+            style="@style/TextView_btn_dialog"
+            android:text="自检"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="50dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="50dp"
+            android:orientation="vertical"
+            >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textSize="42sp"
+                android:gravity="center"
+                android:text="1.请确认烤箱内无菜盘"
+                android:textColor="@color/black"
+                />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:layout_marginTop="10dp"
+                android:textSize="42sp"
+                android:gravity="center"
+                android:text="2.请确认炒锅是否清洗"
+                android:textColor="@color/black"
+                />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textSize="42sp"
+                android:gravity="center"
+                android:layout_marginTop="10dp"
+                android:text="3.请确认炒锅料仓是否需要补料"
+                android:textColor="@color/black"
+                />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:layout_marginTop="10dp"
+                android:textSize="42sp"
+                android:gravity="center"
+                android:text="4.请确认补餐盆是否需要补盆"
+                android:textColor="@color/black"
+                />
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/btn_next"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="下一步"
+            android:gravity="center"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_height="100dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="50dp"
+            />
+
+        <TextView
+            android:id="@+id/btn_last"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="上一步"
+            android:gravity="center"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="50dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="50dp"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>

app/src/main/res/layout/new/layout/layout_root_tip2.xml

@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:background="@color/transparent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:background="@drawable/bg_round25_white"
+        android:layout_width="1500dp"
+        android:layout_height="980dp">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="100dp"
+            android:textColor="@color/textcolor_subtile"
+            android:textSize="42sp"
+            android:text="请检查传感器是否感应正确"
+            />
+        <TextView
+            android:id="@+id/title1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_80"
+            android:background="@drawable/bg_round25_top_yellow"
+            style="@style/TextView_btn_dialog"
+            android:text="传感器检测"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            />
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="100dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="180dp"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="200dp"
+            android:orientation="horizontal"
+            android:background="#80b0b0b0"
+            android:paddingStart="50dp"
+            android:paddingEnd="50dp"
+            >
+            <TextView
+                android:id="@+id/top1"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:background="@drawable/bg_box_check"
+                android:gravity="center"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:textSize="26sp"
+                android:text="辅料1"
+                android:textColor="@color/white"
+                />
+            <TextView
+                android:id="@+id/top2"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginLeft="180dp"
+                android:background="@drawable/bg_box_check"
+                android:gravity="center"
+                android:textSize="26sp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="辅料2"
+                android:textColor="@color/white"
+                />
+            <TextView
+                android:id="@+id/top3"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginLeft="360dp"
+                android:background="@drawable/bg_box_check"
+                android:gravity="center"
+                android:textSize="26sp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="辅料3"
+                android:textColor="@color/white"
+                />
+            <TextView
+                android:id="@+id/top4"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_marginLeft="540dp"
+                android:background="@drawable/bg_box_check"
+                android:gravity="center"
+                android:textSize="26sp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="辅料4"
+                android:textColor="@color/white"
+                />
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/right1"
+            android:layout_width="300dp"
+            android:layout_height="150dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="320dp"
+            android:layout_marginStart="400dp"
+            android:gravity="center"
+            android:textSize="32sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="主料1"
+            android:textColor="@color/white"
+            />
+        <TextView
+            android:id="@+id/right2"
+            android:layout_width="300dp"
+            android:layout_height="150dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/right1"
+            android:layout_marginStart="730dp"
+            android:gravity="center"
+            android:textSize="32sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="主料2"
+            android:textColor="@color/white"
+            />
+        <TextView
+            android:id="@+id/right3"
+            android:layout_width="300dp"
+            android:layout_height="150dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/right1"
+            android:layout_marginTop="30dp"
+            android:layout_marginStart="400dp"
+            android:gravity="center"
+            android:textSize="32sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="主料3"
+            android:textColor="@color/white"
+            />
+        <TextView
+            android:id="@+id/right4"
+            android:layout_width="300dp"
+            android:layout_height="150dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/right1"
+            android:layout_marginTop="30dp"
+            android:layout_marginStart="730dp"
+            android:gravity="center"
+            android:textSize="32sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="主料4"
+            android:textColor="@color/white"
+            />
+        <TextView
+            android:id="@+id/right5"
+            android:layout_width="300dp"
+            android:layout_height="150dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/right3"
+            android:layout_marginTop="30dp"
+            android:layout_marginStart="400dp"
+            android:gravity="center"
+            android:textSize="32sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="主料5"
+            android:textColor="@color/white"
+            />
+        <TextView
+            android:id="@+id/right6"
+            android:layout_width="300dp"
+            android:layout_height="150dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/right3"
+            android:layout_marginTop="30dp"
+            android:layout_marginStart="730dp"
+            android:gravity="center"
+            android:textSize="32sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="主料6"
+            android:textColor="@color/white"
+            />
+
+        <TextView
+            android:id="@+id/left1"
+            android:layout_width="150dp"
+            android:layout_height="510dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="50dp"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="320dp"
+            android:gravity="center"
+            android:textSize="26sp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:text="烤盘1"
+            android:textColor="@color/white"
+            />
+        <TextView
+            android:id="@+id/left2"
+            android:layout_width="150dp"
+            android:layout_height="510dp"
+            android:layout_marginLeft="40dp"
+            android:background="@drawable/bg_box_check2"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="215dp"
+            app:layout_constraintTop_toTopOf="@id/left1"
+            android:gravity="center"
+            android:textSize="26sp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:text="烤盘2"
+            android:textColor="@color/white"
+            />
+
+        <LinearLayout
+            android:layout_width="420dp"
+            android:layout_marginEnd="20dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="200dp"
+            android:layout_marginBottom="50dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:orientation="vertical"
+            >
+            <TextView
+                android:layout_below="@id/device_status_robot"
+                android:layout_width="match_parent"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="25dp"
+                android:textSize="36sp"
+                android:textColor="@color/black"
+                android:text="出餐架："
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:layout_below="@id/device_status_robot"
+                android:layout_width="match_parent"
+                android:layout_marginTop="25dp"
+                android:textSize="32sp"
+                android:textColor="@color/yellow_primary_dark"
+                android:text="(制作前确保出餐位无盆，补盆位有盆，出料盆位有盆)"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/tv_chucai_box"
+                android:layout_below="@id/device_status_robot"
+                android:layout_width="match_parent"
+                android:layout_marginStart="55dp"
+                android:layout_marginTop="25dp"
+                android:textSize="32sp"
+                android:textColor="@color/black"
+                android:text="出餐工位检测:异常"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/tv_buliao_box"
+                android:layout_below="@id/tv_chucai_box"
+                android:layout_width="match_parent"
+                android:layout_marginStart="55dp"
+                android:layout_marginTop="15dp"
+                android:textSize="32sp"
+                android:textColor="@color/black"
+                android:text="出料盆检测:异常"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/tv_chuliao_box"
+                android:layout_width="match_parent"
+                android:layout_below="@id/tv_buliao_box"
+                android:layout_marginStart="55dp"
+                android:layout_marginTop="15dp"
+                android:textSize="32sp"
+                android:textColor="@color/black"
+                android:text="补料盆检测:异常"
+                android:layout_height="wrap_content"/>
+
+
+        </LinearLayout>
+        <TextView
+            android:id="@+id/btn_next"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="下一步"
+            android:gravity="center"
+            android:layout_gravity="bottom"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_height="100dp"
+            android:layout_marginBottom="20dp"
+            android:layout_marginEnd="50dp"
+            />
+        <TextView
+            android:id="@+id/btn_last"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="上一步"
+            android:gravity="center"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="50dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="20dp"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>

app/src/main/res/layout/new/layout/layout_root_tip3.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:background="@color/transparent"
+    android:layout_height="wrap_content">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_content1"
+        android:background="@drawable/bg_round25_white"
+        android:layout_width="1000dp"
+
+        android:layout_height="600dp">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_80"
+            android:background="@drawable/bg_round25_top_yellow"
+            style="@style/TextView_btn_dialog"
+            android:text="自检"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginStart="50dp"
+            android:layout_marginEnd="50dp"
+            android:layout_marginBottom="50dp"
+            android:orientation="vertical"
+            >
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textSize="42sp"
+                android:gravity="center"
+                android:text="1.请确认烹饪室内无人"
+                android:textColor="@color/black"
+                />
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:textSize="42sp"
+                android:gravity="center"
+                android:layout_marginTop="20dp"
+                android:text="2.请确认设备状况正常"
+                android:textColor="@color/black"
+                />
+        </LinearLayout>
+
+
+        <TextView
+            android:id="@+id/btn_next"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="确认"
+            android:gravity="center"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginEnd="50dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="50dp"
+            />
+        <TextView
+            android:id="@+id/btn_last"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="上一步"
+            android:gravity="center"
+            android:background="@drawable/bg_round15_yellow_btn"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="50dp"
+            android:layout_height="100dp"
+            android:layout_marginBottom="50dp"
+            />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>

app/src/main/res/values/styles.xml

@@ -43,8 +43,8 @@
         <item name="qmui_dialog_message_content_style">@style/DialogTheme2MessageContentStyle</item>
         <item name="qmui_dialog_menu_container_style">@style/DialogTheme2MenuContainerStyle</item>
         <item name="qmui_dialog_menu_item_style">@style/DialogTheme2MenuItemStyle</item>
-        <item name="qmui_dialog_max_width">1600dp</item>
-        <item name="qmui_dialog_min_width">1400dp</item>
+        <item name="qmui_dialog_max_width">1400dp</item>
+        <item name="qmui_dialog_min_width">800dp</item>
         <item name="qmui_dialog_edit_content_style">@style/DialogTheme2ContentStyle</item>
         <item name="android:windowAnimationStyle">@style/activityanim</item>