优化修改

app/src/main/AndroidManifest.xml

@@ -212,12 +212,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </receiver>
-<!--        <meta-data-->
-<!--            android:name="design_width_in_dp"-->
-<!--            android:value="1920" />-->
-<!--        <meta-data-->
-<!--            android:name="design_height_in_dp"-->
-<!--            android:value="1080" />-->
+        <meta-data
+            android:name="design_width_in_dp"
+            android:value="1920" />
+        <meta-data
+            android:name="design_height_in_dp"
+            android:value="1080" />
     </application>
 
 </manifest>

app/src/main/java/com/bonait/bnframework/common/utils/DisplayManager.java

@@ -93,7 +93,7 @@ public class DisplayManager
     }
 
     public static double getScale(int num){
-        return 1920*num/1208;
+        return 1920*num/1920;
     }
 
     /**

app/src/main/java/com/bonait/bnframework/modbus/OvenModbusTcpServer.java

@@ -9,6 +9,7 @@ import com.bonait.bnframework.Service.ModbusTcpHelper;
 import com.bonait.bnframework.common.helper.DataFormat;
 import com.bonait.bnframework.common.helper.I.IReadCallBack;
 import com.bonait.bnframework.common.helper.I.IWriteCallBack;
+import com.bonait.bnframework.newui.widget.NewToastUtil;
 import com.licheedev.modbus4android.ModbusCallback;
 import com.licheedev.modbus4android.ModbusParam;
 import com.licheedev.modbus4android.ModbusRespException;
@@ -48,6 +49,14 @@ public class OvenModbusTcpServer {
     private OvenModbusTcpServer() {
     }
 
+    public boolean checkConnect(){
+        if(!plcIsConnect){
+            NewToastUtil.getInstance().showToast("烤箱/货架设备未连接！");
+            return false;
+        }
+        return true;
+    }
+
     static ModbusParam param;
 
     private int GetAddress(String address) {

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

@@ -90,8 +90,8 @@ public class DiyProcessOvenActivity extends BaseActivity {
 
                     dataMap.clear();
                     dataMap.put("烤盘位置",viewBinding.spinnerPan.getSelectedItem().toString());
-                    dataMap.put("烤盘档位",viewBinding.spinnerModel.getSelectedItem().toString());
-                    dataMap.put("烤盘温度",viewBinding.spinnerWendu.getSelectedItem().toString());
+                    dataMap.put("烤箱档位",viewBinding.spinnerModel.getSelectedItem().toString());
+                    dataMap.put("烤箱温度",viewBinding.spinnerWendu.getSelectedItem().toString());
                     dataMap.put("烹饪时间(分)",viewBinding.edittextTime.getText().toString());
                     dataMap.put("第1层菜名",viewBinding.edittext1.getText().toString());
                     dataMap.put("第2层菜名",viewBinding.edittext2.getText().toString());
@@ -164,6 +164,7 @@ public class DiyProcessOvenActivity extends BaseActivity {
         }else {
             processDetails = list.get(0);
             String value = processDetails.processvalue;
+            LogUtils.d("value="+value);
             //region 获取仓号和值
             List<String> data = new ArrayList<>();
             if (value.contains("|")) {
@@ -198,26 +199,26 @@ public class DiyProcessOvenActivity extends BaseActivity {
             }
         }
         List<String> modelList = new ArrayList<>();
-        modelList.add("档位0");
-        modelList.add("档位1");
-        modelList.add("档位2");
-        modelList.add("档位3");
-        modelList.add("档位4");
+        modelList.add("0档");
+        modelList.add("1档");
+        modelList.add("2档");
+        modelList.add("3档");
+        modelList.add("4档");
         int modePos = 0;
         for(int i=0;i<modelList.size();i++){
-            if(modelList.get(i).equals(dataMap.get("烤盘档位"))){
+            if(modelList.get(i).equals(dataMap.get("烤箱档位"))){
                 modePos = i;
             }
         }
         List<String> wendulList = new ArrayList<>();
-        wendulList.add("温度0");
-        wendulList.add("温度1");
-        wendulList.add("温度2");
-        wendulList.add("温度3");
-        wendulList.add("温度4");
+        wendulList.add("0档0°C");//0档0°C、1档50°C、2档100°C、3档150°C、4档200°C
+        wendulList.add("1档50°C");
+        wendulList.add("2档100°C");
+        wendulList.add("3档150°C");
+        wendulList.add("4档200°C");
         int wenduPos = 0;
         for(int i=0;i<wendulList.size();i++){
-            if(wendulList.get(i).equals(dataMap.get("烤盘温度"))){
+            if(wendulList.get(i).equals(dataMap.get("烤箱温度"))){
                 wenduPos = i;
             }
         }
@@ -273,15 +274,15 @@ public class DiyProcessOvenActivity extends BaseActivity {
         viewBinding.edittextTime.setText(dataMap.get("烹饪时间(分)")==null?"":dataMap.get("烹饪时间(分)"));
         viewBinding.edittext1.setText(dataMap.get("第1层菜名")==null?"":dataMap.get("第1层菜名"));
         viewBinding.edittext2.setText(dataMap.get("第2层菜名")==null?"":dataMap.get("第2层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第3层菜名")==null?"":dataMap.get("第3层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第4层菜名")==null?"":dataMap.get("第4层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第5层菜名")==null?"":dataMap.get("第5层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第6层菜名")==null?"":dataMap.get("第6层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第7层菜名")==null?"":dataMap.get("第7层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第8层菜名")==null?"":dataMap.get("第8层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第9层菜名")==null?"":dataMap.get("第9层菜名"));
-        viewBinding.edittext2.setText(dataMap.get("第10层菜名")==null?"":dataMap.get("第10层菜名"));
-
+        viewBinding.edittext3.setText(dataMap.get("第3层菜名")==null?"":dataMap.get("第3层菜名"));
+        viewBinding.edittext4.setText(dataMap.get("第4层菜名")==null?"":dataMap.get("第4层菜名"));
+        viewBinding.edittext5.setText(dataMap.get("第5层菜名")==null?"":dataMap.get("第5层菜名"));
+        viewBinding.edittext6.setText(dataMap.get("第6层菜名")==null?"":dataMap.get("第6层菜名"));
+        viewBinding.edittext7.setText(dataMap.get("第7层菜名")==null?"":dataMap.get("第7层菜名"));
+        viewBinding.edittext8.setText(dataMap.get("第8层菜名")==null?"":dataMap.get("第8层菜名"));
+        viewBinding.edittext9.setText(dataMap.get("第9层菜名")==null?"":dataMap.get("第9层菜名"));
+        viewBinding.edittext10.setText(dataMap.get("第10层菜名")==null?"":dataMap.get("第10层菜名"));
+        LogUtils.d("dataMap="+dataMap.toString());
     }
 
     /**

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

@@ -1,11 +1,16 @@
 package com.bonait.bnframework.newui.activity;
 
+import android.graphics.Color;
 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.KeyEvent;
 import android.view.View;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -14,9 +19,11 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.MainApplication;
+import com.bonait.bnframework.Model.CheckPositionBean;
 import com.bonait.bnframework.business.ConfigData;
 import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.common.base.BaseActivity;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.file.DBHelper;
 import com.bonait.bnframework.common.db.mode.BPA_ALERTLOG;
 import com.bonait.bnframework.common.db.mode.BPA_LOG_RECORD;
@@ -29,8 +36,12 @@ import com.bonait.bnframework.common.utils.NetworkUtils;
 import com.bonait.bnframework.common.utils.PreferenceUtils;
 import com.bonait.bnframework.databinding.ActivityMainHBinding;
 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 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.fragment.HomeDevicesFragment;
 import com.bonait.bnframework.newui.fragment.HomeGoodsFragment;
 import com.bonait.bnframework.newui.fragment.HomeMainsFragment;
@@ -39,6 +50,7 @@ import com.bonait.bnframework.newui.fragment.HomeWarnFragment;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author: liup
@@ -55,6 +67,35 @@ public class MainHActivity extends BaseActivity {
         public void handleMessage(@NonNull Message msg) {
             super.handleMessage(msg);
             if(msg.what==1){
+                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);
                 BPA_ORDER_DETAIL detail2 = OrderDetailUtil.getByMaking(1);
 
@@ -67,8 +108,10 @@ public class MainHActivity extends BaseActivity {
                     }else if(detail1.status==3){
                         desc = "烹饪异常";
                     }
+                    viewBinding.tvWok.setVisibility(View.VISIBLE);
                     viewBinding.tvWok.setText("炒锅：菜品【"+detail1.goodsName+(detail1.groupName==null?"":detail1.groupName)+"】"+desc);
                 }else {
+                    viewBinding.tvWok.setVisibility(View.GONE);
                     viewBinding.tvWok.setText("");
                 }
                 if(detail2!=null){
@@ -80,8 +123,10 @@ public class MainHActivity extends BaseActivity {
                     }else if(detail2.status==3){
                         desc = "烹饪异常";
                     }
+                    viewBinding.tvOven.setVisibility(View.VISIBLE);
                     viewBinding.tvOven.setText("烤箱：菜品【"+detail2.goodsName+(detail2.groupName==null?"":detail2.groupName)+"】"+desc);
                 }else {
+                    viewBinding.tvOven.setVisibility(View.GONE);
                     viewBinding.tvOven.setText("");
                 }
                 if(handler.hasMessages(1)){
@@ -151,25 +196,91 @@ public class MainHActivity extends BaseActivity {
         viewBinding.tvOven.setOnClickListener(v->{
             viewBinding.viewpager.setCurrentItem(1);
         });
+
+        viewBinding.rlCheckBox.setOnClickListener(v->{
+            FoodCheckDialog dialog = new FoodCheckDialog();
+            dialog.show(getSupportFragmentManager(),"料盒检测");
+        });
+    }
+
+    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.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.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.deviceStatusRobot.setText(spannable3);
+    }
+
+    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号位":
+                    viewBinding.tvFuliaoCircle1.setSelected(value.exist);
+                    break;
+                case "辅料位置2号位":
+                    viewBinding.tvFuliaoCircle2.setSelected(value.exist);
+                    break;
+                case "辅料位置3号位":
+                    viewBinding.tvFuliaoCircle3.setSelected(value.exist);
+                    break;
+                case "辅料位置4号位":
+                    viewBinding.tvFuliaoCircle4.setSelected(value.exist);
+                    break;
+                case "主料位置1号位":
+                    viewBinding.tvZhuliaoCircle1.setSelected(value.exist);
+                    break;
+                case "主料位置2号位":
+                    viewBinding.tvZhuliaoCircle2.setSelected(value.exist);
+                    break;
+                case "主料位置3号位":
+                    viewBinding.tvZhuliaoCircle3.setSelected(value.exist);
+                    break;
+                case "主料位置4号位":
+                    viewBinding.tvZhuliaoCircle4.setSelected(value.exist);
+                    break;
+                case "主料位置5号位":
+                    viewBinding.tvZhuliaoCircle5.setSelected(value.exist);
+                    break;
+                case "主料位置6号位":
+                    viewBinding.tvZhuliaoCircle6.setSelected(value.exist);
+                    break;
+                case "烤盘位置1号位":
+                    viewBinding.tvKaopanCircle1.setSelected(value.exist);
+                    break;
+                case "烤盘位置2号位":
+                    viewBinding.tvKaopanCircle2.setSelected(value.exist);
+                    break;
+            }
+        }
     }
 
     /**
      * viewPager里添加fragment
      */
     private void initFragment() {
-//        FragmentAdapter fragmentAdapter = new FragmentAdapter(getSupportFragmentManager());
-//        fragmentAdapter.addFragment(new HomeGoodsFragment());
-//        fragmentAdapter.addFragment(new HomeOrderFragment());
-//        fragmentAdapter.addFragment(new HomeMainsFragment());
-//        fragmentAdapter.addFragment(new HomeDevicesFragment());
-//        fragmentAdapter.addFragment(new HomeWarnFragment());
         pages = new ArrayList<>();
         pages.add(new HomeGoodsFragment());
         pages.add(new HomeOrderFragment());
         pages.add(new HomeMainsFragment());
         pages.add(new HomeDevicesFragment());
         pages.add(new HomeWarnFragment());
-
         GuidePageAdapter adapter = new GuidePageAdapter(getSupportFragmentManager(), pages);
         viewBinding.viewpager.setAdapter(adapter);
     }
@@ -257,4 +368,5 @@ public class MainHActivity extends BaseActivity {
         ExecuteTheRecipe.reset2();
         OrderDetailUtil.resetOrder();
     }
+
 }

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

@@ -83,7 +83,7 @@ public class WelcomeActivity extends BaseActivity {
      */
     private void initScaleViewDefaultValue()
     {
-        DisplayManager.setReferenceMaxWidthHeight(1208, 800);
+        DisplayManager.setReferenceMaxWidthHeight(1920, 1080);
         DisplayManager.updateDisplayInfo(this);
     }
 

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

@@ -29,7 +29,7 @@ public class WarnInfoAdapter extends BaseAdapter<String, WarnInfoAdapter.ViewHol
     @SuppressLint("SetTextI18n")
     @Override
     public void onBindViewHolder(@NonNull WarnInfoAdapter.ViewHolder holder, @SuppressLint("RecyclerView") int position) {
-        if(holder.binding.name.getTextSize()>DisplayManager.getScale(28)+2||holder.binding.name.getTextSize()<DisplayManager.getScale(28)-2){
+        if(holder.binding.name.getTextSize()>DisplayManager.getScale(32)+2||holder.binding.name.getTextSize()<DisplayManager.getScale(32)-2){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
         holder.binding.name.setText(mData.get(position)+"");

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

@@ -28,7 +28,7 @@ public class WarnRecordAdapter extends BaseAdapter<String, WarnRecordAdapter.Vie
     @SuppressLint("SetTextI18n")
     @Override
     public void onBindViewHolder(@NonNull WarnRecordAdapter.ViewHolder holder, @SuppressLint("RecyclerView") int position) {
-        if(holder.binding.name.getTextSize()>DisplayManager.getScale(28)+2||holder.binding.name.getTextSize()<DisplayManager.getScale(28)-2){
+        if(holder.binding.name.getTextSize()>DisplayManager.getScale(32)+2||holder.binding.name.getTextSize()<DisplayManager.getScale(32)-2){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
         holder.binding.name.setText((position+1)+"."+mData.get(position)+"");

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

@@ -22,9 +22,13 @@ 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.helper.I.IWriteCallBack;
 import com.bonait.bnframework.common.utils.AdbCommandUtil;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogFoodCheckBinding;
+import com.bonait.bnframework.modbus.ModbusCenter;
+import com.bonait.bnframework.modbus.OvenModbusTcpServer;
+import com.bonait.bnframework.newui.widget.NewToastUtil;
 
 import java.util.Map;
 
@@ -111,6 +115,46 @@ public class FoodCheckDialog extends DialogFragment {
         });
         freshView();
         handler.sendEmptyMessageDelayed(1,500);
+        viewBinding.btnBulpen.setOnClickListener(v->{
+            if(ConfigName.getInstance().isFastClick()){
+                NewToastUtil.getInstance().showToast("点击过快！");
+                return;
+            }
+            if(!OvenModbusTcpServer.get().plcIsConnect&&!ConfigName.TEST){
+                NewToastUtil.getInstance().showToastError("烤箱/货架设备未连接！");
+                return;
+            }
+            Object object1 = ModbusCenter.getListingValue("出料空盆检测有无");
+            if(object1 instanceof Boolean){
+                if((Boolean) object1){
+                    NewToastUtil.getInstance().showToast("出料盆位有盆，不能补盆！");
+                }else {
+                    Object object2 = ModbusCenter.getListingValue("补盆工位检测有无");
+                    if(object2 instanceof Boolean){
+                        if(!(Boolean) object2){
+                            ModbusCenter.WritePlc("单次补盆流程触发", true, new IWriteCallBack() {
+                                @Override
+                                public void onSuccess() {
+                                    NewToastUtil.getInstance().showToast("补盆成功！");
+                                }
+
+                                @Override
+                                public void onFailure(String ErrorMsg) {
+                                    NewToastUtil.getInstance().showToast("补盆失败！"+ErrorMsg);
+                                }
+                            });
+                        }else {
+                            NewToastUtil.getInstance().showToast("补料盆位无盆，不能补盆！");
+                        }
+                    }else {
+                        NewToastUtil.getInstance().showToast("补料盆位检测异常！");
+                    }
+                }
+            }else {
+                NewToastUtil.getInstance().showToast("出料盆位检测异常！");
+            }
+        });
+
     }
 
    private void freshView(){
@@ -271,6 +315,27 @@ public class FoodCheckDialog extends DialogFragment {
                    break;
            }
        }
+       try {
+           Object object1 = ModbusCenter.getListingValue("出料空盆检测有无");
+           Object object2  = 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(object4 instanceof Boolean){
+               viewBinding.tvChucaiBox.setText("出餐工位检测:"+(((Boolean)object4)?"有盆":"无盆"));
+           }else {
+               viewBinding.tvChucaiBox.setText("出餐工位检测:异常");
+           }
+       }catch (Exception ignored){
+       }
    }
     @Override
     public void dismiss() {

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

@@ -21,11 +21,13 @@ import androidx.fragment.app.DialogFragment;
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.ExecuteTheRecipe;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.helper.I.IWriteCallBack;
 import com.bonait.bnframework.common.utils.AdbCommandUtil;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogOvenControlBinding;
 import com.bonait.bnframework.modbus.ModbusCenter;
+import com.bonait.bnframework.modbus.OvenModbusTcpServer;
 import com.bonait.bnframework.newui.widget.NewToastUtil;
 
 import butterknife.ButterKnife;
@@ -159,6 +161,13 @@ public class OvenControlDialog extends DialogFragment {
         viewBinding.tvWendu.setText(tv2);
 
         viewBinding.btnOpen.setOnClickListener(v->{
+            if(!OvenModbusTcpServer.get().checkConnect()){
+                return;
+            }
+            if(ConfigName.getInstance().isFastClick()){
+                NewToastUtil.getInstance().showToast("请勿快速点击");
+                return;
+            }
             boolean model = (boolean) ModbusCenter.ReadPlc("模式旋钮在档位0");
             boolean wendu = (boolean) ModbusCenter.ReadPlc("温度旋钮在档位0");
             if(!model||!wendu){
@@ -178,6 +187,13 @@ public class OvenControlDialog extends DialogFragment {
             });
         });
         viewBinding.btnClose.setOnClickListener(v->{
+            if(!OvenModbusTcpServer.get().checkConnect()){
+                return;
+            }
+            if(ConfigName.getInstance().isFastClick()){
+                NewToastUtil.getInstance().showToast("请勿快速点击");
+                return;
+            }
             ModbusCenter.WritePlc("烤箱门关闭控制", true, new IWriteCallBack() {
                 @Override
                 public void onSuccess() {
@@ -227,6 +243,13 @@ public class OvenControlDialog extends DialogFragment {
 
 
     private void setModel(int num){
+        if(!OvenModbusTcpServer.get().checkConnect()){
+            return;
+        }
+        if(ConfigName.getInstance().isFastClick()){
+            NewToastUtil.getInstance().showToast("请勿快速点击");
+            return;
+        }
         boolean status = (boolean) ModbusCenter.ReadPlc("烤箱门关到位检测");
         if(!status){
             NewToastUtil.getInstance().showToast("请先关闭烤箱门");
@@ -235,6 +258,7 @@ public class OvenControlDialog extends DialogFragment {
         ModbusCenter.WritePlc("档位选择", num, new IWriteCallBack() {
             @Override
             public void onSuccess() {
+                NewToastUtil.getInstance().showToast("档位选择"+num+":成功");
                 viewBinding.btnClose1.post(new Runnable() {
                     @Override
                     public void run() {
@@ -245,12 +269,19 @@ public class OvenControlDialog extends DialogFragment {
 
             @Override
             public void onFailure(String ErrorMsg) {
-
+                NewToastUtil.getInstance().showToast("档位选择"+num+":失败");
             }
         });
     }
 
     private void setWendu(int num){
+        if(!OvenModbusTcpServer.get().checkConnect()){
+            return;
+        }
+        if(ConfigName.getInstance().isFastClick()){
+            NewToastUtil.getInstance().showToast("请勿快速点击");
+            return;
+        }
         boolean status = (boolean) ModbusCenter.ReadPlc("烤箱门关到位检测");
         if(!status){
             NewToastUtil.getInstance().showToast("请先关闭烤箱门");
@@ -259,6 +290,7 @@ public class OvenControlDialog extends DialogFragment {
         ModbusCenter.WritePlc("温度选择", num, new IWriteCallBack() {
             @Override
             public void onSuccess() {
+                NewToastUtil.getInstance().showToast("温度选择"+num+":成功");
                 viewBinding.btnClose1.post(new Runnable() {
                     @Override
                     public void run() {
@@ -269,7 +301,7 @@ public class OvenControlDialog extends DialogFragment {
 
             @Override
             public void onFailure(String ErrorMsg) {
-
+                NewToastUtil.getInstance().showToast("温度选择"+num+":失败");
             }
         });
     }

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

@@ -313,6 +313,7 @@ public class WokControlDialog extends DialogFragment {
      * @param num
      */
     public void Pumping(int num, boolean isselectd) {
+        NewToastUtil.getInstance().showToast("料仓" + (num) + "手动"+(isselectd?"开":"关"));
         ExecuteTheRecipe.WritePLC("料仓" + (num) + "手动开关", isselectd, null);
         //NewToastUtil.getInstance().showToast("料仓：" + num + "," + (isselectd ? "打开" : "关闭"));
     }
@@ -322,6 +323,7 @@ public class WokControlDialog extends DialogFragment {
      * @param isselectd
      */
     public void PotWashingWater(boolean isselectd) {
+        NewToastUtil.getInstance().showToast("洗锅水枪"+(isselectd?"开":"关"));
         ExecuteTheRecipe.WritePLC("炒锅放水", isselectd, null);
         //NewToastUtil.getInstance().showToast("洗锅水枪：" + (isselectd ? "打开" : "关闭"));
     }
@@ -448,7 +450,7 @@ public class WokControlDialog extends DialogFragment {
     @SuppressLint("NonConstantResourceId")
     @OnClick({R.id.btn_chushihua, R.id.xiguoshui, R.id.chushui, R.id.yeliao1, R.id.yeliao2, R.id.yeliao3,R.id.guokoucaoxiang,R.id.btn_speed_kuai,
             R.id.btn_speed_zhong,R.id.btn_speed_man,R.id.btn_speed_stop,R.id.guokoucaoxiang_yd,R.id.guokoucaoxiang_cc1,R.id.guokoucaoxiang_cc2,
-            R.id.guokoucaoxiang_cc3,R.id.guokoucaoxiang_cl,R.id.guokoucaoxiang_dc,
+            R.id.guokoucaoxiang_cc3,R.id.guokoucaoxiang_cl,R.id.guokoucaoxiang_dc,R.id.btn_stop,R.id.btn_fuwei,
             R.id.guokoucaoxiang_qx,R.id.btn_chucai,R.id.btn_shengdu_qingxi,R.id.btn_putong_qingxi})
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -488,7 +490,7 @@ public class WokControlDialog extends DialogFragment {
 
                                     }
                                     ExecuteTheRecipe.BottomClick(shengdu?"深度清洗":"一般清洗");
-                                    NewToastUtil.getInstance().showToastError(shengdu?"深度清洗":"普通清洗");
+                                    NewToastUtil.getInstance().showToast(shengdu?"深度清洗":"普通清洗");
                                     dialog.dismiss();
                                 } else {
                                     NewToastUtil.getInstance().showToastError("用量不能为空！");

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

@@ -166,7 +166,7 @@ public class CloudGoodsHFragment extends BaseFragment {
             public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
                 super.getItemOffsets(outRect, view, parent, state);
                 outRect.top = DimensUtil.getDimens(0);
-                outRect.bottom = (int) (DisplayManager.getWidthScaleRate()*(-60));
+                outRect.bottom = (int) (DisplayManager.getWidthScaleRate()*(20));
             }
         });
         viewBinding.recyclerGoods.setAdapter(goodsAdapter);

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

@@ -1,14 +1,10 @@
 package com.bonait.bnframework.newui.fragment;
 
 import android.annotation.SuppressLint;
-import android.graphics.Color;
 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.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -52,40 +48,40 @@ public class HomeDevicesFragment extends BaseFragment {
         @Override
         public void handleMessage(@NonNull Message msg) {
             super.handleMessage(msg);
-            if(msg.what==1){
-                if(handler.hasMessages(1)){
-                    handler.removeMessages(1);
-                }
-                handler.sendEmptyMessageDelayed(1,500);
-                try {
-                    changeStatus();
-                    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){
-                }
-            }
+//            if(msg.what==1){
+//                if(handler.hasMessages(1)){
+//                    handler.removeMessages(1);
+//                }
+//                handler.sendEmptyMessageDelayed(1,500);
+//                try {
+//                    changeStatus();
+//                    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){
+//                }
+//            }
         }
     };
 
@@ -185,45 +181,6 @@ public class HomeDevicesFragment extends BaseFragment {
                 NewToastUtil.getInstance().showToast("输送线检测异常");
             }
         });
-        viewBinding.btnBulpen.setOnClickListener(v->{
-            if(ConfigName.getInstance().isFastClick()){
-                NewToastUtil.getInstance().showToast("点击过快！");
-                return;
-            }
-            if(!OvenModbusTcpServer.get().plcIsConnect&&!ConfigName.TEST){
-                NewToastUtil.getInstance().showToastError("烤箱/货架设备未连接！");
-                return;
-            }
-            Object object1 = ModbusCenter.getListingValue("出料空盆检测有无");
-            if(object1 instanceof Boolean){
-                if((Boolean) object1){
-                    NewToastUtil.getInstance().showToast("出料盆位有盆，不能补盆！");
-                }else {
-                    Object object2 = ModbusCenter.getListingValue("补盆工位检测有无");
-                    if(object2 instanceof Boolean){
-                        if(!(Boolean) object2){
-                            ModbusCenter.WritePlc("单次补盆流程触发", true, new IWriteCallBack() {
-                                @Override
-                                public void onSuccess() {
-                                    NewToastUtil.getInstance().showToast("补盆成功！");
-                                }
-
-                                @Override
-                                public void onFailure(String ErrorMsg) {
-                                    NewToastUtil.getInstance().showToast("补盆失败！"+ErrorMsg);
-                                }
-                            });
-                        }else {
-                            NewToastUtil.getInstance().showToast("补料盆位无盆，不能补盆！");
-                        }
-                    }else {
-                        NewToastUtil.getInstance().showToast("补料盆位检测异常！");
-                    }
-                }
-            }else {
-                NewToastUtil.getInstance().showToast("出料盆位检测异常！");
-            }
-        });
         viewBinding.btnFoods.setOnClickListener(v->{
             if(ConfigName.getInstance().isFastClick()){
                 return;
@@ -280,24 +237,24 @@ public class HomeDevicesFragment extends BaseFragment {
 
     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.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.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.deviceStatusRobot.setText(spannable3);
+//        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?"已连接":"未连接");
+//        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?"已连接":"未连接");
+//        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);
     }
 
     @Override

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

@@ -118,7 +118,7 @@ public class HomeGoodsFragment extends BaseFragment {
             public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
                 super.getItemOffsets(outRect, view, parent, state);
                 outRect.top = DimensUtil.getDimens(0);
-                outRect.bottom = (int) (DisplayManager.getWidthScaleRate()*(-60));
+//                outRect.bottom = (int) (DisplayManager.getWidthScaleRate()*(20));
             }
         });
         viewBinding.recyclerGoods.setAdapter(goodsAdapter);

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

@@ -207,7 +207,7 @@ public class HomeWarnFragment extends BaseFragment {
             if(type==3){
                 warnInfoList.add("机器人急停：检测异常");
             }
-            if(!rightDataList.contains("烤箱功率异常")){
+            if(!rightDataList.contains("机器人急停：检测异常")){
                 rightDataList.add("机器人急停：检测异常");
             }
         }
@@ -230,8 +230,8 @@ public class HomeWarnFragment extends BaseFragment {
             if(type==3){
                 warnInfoList.add("机器人光栅：检测异常");
             }
-            if(!rightDataList.contains("机器人急停：检测异常")){
-                rightDataList.add("机器人急停：检测异常");
+            if(!rightDataList.contains("机器人光栅：无故障")){
+                rightDataList.add("机器人光栅：无故障");
             }
         }
         warnInfoAdapter.notifyDataSetChanged();

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

@@ -211,7 +211,7 @@ public class LocalGoodsHFragment extends BaseFragment {
             public void getItemOffsets(@NonNull Rect outRect, @NonNull View view, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
                 super.getItemOffsets(outRect, view, parent, state);
                 outRect.top = DimensUtil.getDimens(0);
-                outRect.bottom = (int) (DisplayManager.getWidthScaleRate()*(-60));
+                outRect.bottom = (int) (DisplayManager.getWidthScaleRate()*(20));
             }
         });
         viewBinding.recyclerGoods.setAdapter(goodsAdapter);

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

@@ -12,7 +12,6 @@ import androidx.annotation.Nullable;
 
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.db.res.lcMode;
-import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.LayoutProcessBarSilosBinding;
 
 import butterknife.BindView;
@@ -43,7 +42,7 @@ public class SilosProcessBarView extends RelativeLayout {
         root= LayoutInflater.from(context).inflate(R.layout.layout_process_bar_silos, this);
         viewBinding = LayoutProcessBarSilosBinding.bind(root);
         ButterKnife.bind(this, root);
-        DisplayManager.scaleViewGroup(viewBinding.getRoot());
+//        DisplayManager.scaleViewGroup(viewBinding.getRoot());
     }
 
     /**
@@ -71,7 +70,6 @@ public class SilosProcessBarView extends RelativeLayout {
     {
         mode=data;
         xuhao.setText(GetNum(data.num)+"");
-        silosname.setVisibility(mode.num == 4?View.GONE:VISIBLE);
         silosname.setText(data.materialName+"");
         int bfb=0;
         int yl=data.silosmargin;

app/src/main/java/com/bonait/bnframework/ui/adapter/record/OrderAdapter.java

@@ -28,7 +28,7 @@ public abstract class OrderAdapter extends BaseAdapter<BPA_ORDER_RECORD, OrderAd
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         BPA_ORDER_RECORD order =  mData.get(position);//得到当前项选中item实例
-        if(holder.binding.name.getTextSize()>DisplayManager.getScale(26)+2||holder.binding.name.getTextSize()<DisplayManager.getScale(26)-2){
+        if(holder.binding.name.getTextSize()>DisplayManager.getScale(32)+2||holder.binding.name.getTextSize()<DisplayManager.getScale(32)-2){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
 

app/src/main/java/com/bonait/bnframework/ui/adapter/step/DiyStepAdapter.java

@@ -29,7 +29,7 @@ public abstract class DiyStepAdapter extends BaseAdapter<BPA_GOODS_PROCESS_DETAI
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            if(DisplayManager.shouldScale(holder.binding.name)){
+            if(holder.binding.name.getTextSize()> DisplayManager.getScale(36)+2 || holder.binding.name.getTextSize()< DisplayManager.getScale(36)-2){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
             holder.binding.root.setSelected(mCurrentPosition == position);

app/src/main/java/com/bonait/bnframework/ui/viewmodel/HomeGoodsViewModel.java

@@ -86,7 +86,7 @@ public class HomeGoodsViewModel extends ViewModel {
 
     public void GetGoodsInfo(){
         String autoKey = ConfigName.getInstance().DeviceAutoKey;
-        String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=2";
+        String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=260";
         LogUtils.d("GetGoodsInfo url="+url);
         RecordManager.getInstance().addLogRecord("数据接收", "请求商品信息-"+url);
         APIHelper.PostT(url,null,null,new TypeReference<APIResultT<GoodsData>>(){}).OnSource(s->{
@@ -94,15 +94,21 @@ public class HomeGoodsViewModel extends ViewModel {
             RecordManager.getInstance().addLogRecord("数据接收", "接收商品信息成功");
             goodsList.clear();
             goodsList.addAll(s.Content.getGoodsInfoList());
-            ThreadManager.get().execute(new Thread(()->{
-                GetGoodsInfo2();
-            }));
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    cloudGoodsList.setValue(goodsList);
+                }
+            });
+//            ThreadManager.get().execute(new Thread(()->{
+//                GetGoodsInfo2();
+//            }));
         });
     }
 
     public void GetGoodsInfo2(){
         String autoKey = ConfigName.getInstance().DeviceAutoKey;
-        String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=257";
+        String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId=259";
         LogUtils.d("GetGoodsInfo url="+url);
         RecordManager.getInstance().addLogRecord("数据接收", "请求商品信息-"+url);
         APIHelper.PostT(url,null,null,new TypeReference<APIResultT<GoodsData>>(){}).OnSource(s->{
@@ -199,8 +205,6 @@ public class HomeGoodsViewModel extends ViewModel {
         //添加属性
         for (GoodsClassifyBean bean : cloudGoodsList.getValue()){
             if(goodsClassify.id.equals(bean.getGoodsTypeId())){
-
-
                 Map<String ,String> subAttributeMap = new HashMap<>();
                 for(GoodsClassifyBean.GoodsAttributeListBean goodsAttributeListBean: bean.getGoodsAttributeList() ){
                     //判断是否已有属性 不存在则添加
@@ -232,15 +236,17 @@ public class HomeGoodsViewModel extends ViewModel {
                     }
 
                 }
-
+                LogUtils.d("/////////// processDetail="+cloudGoodsList.getValue().size()+":bean.getGoodsInfoList()="+bean.getGoodsInfoList().size());
                 for(GoodsClassifyBean.GoodsInfoListBean goodsInfoListBean: bean.getGoodsInfoList() ){
+                    LogUtils.d("/////////// processDetail="+goods.name+"   goodsInfoListBean.getGoodsName()="+goodsInfoListBean.getGoodsName());
                     if(goodsInfoListBean.getGoodsName().equals(goods.name)){
+                        LogUtils.d("/////////// processDetail="+goods.name);
                         List<String> groupList = new ArrayList<>();
                         for (GoodsClassifyBean.GoodsInfoListBean.GoodsTechnologyActionListBean goodsTechnologyActionListBean:goodsInfoListBean.getGoodsTechnologyActionList()){
                             //添加子属性组合
                             if(!groupList.contains(goodsTechnologyActionListBean.getGoodsAttributeId())){
                                 BPA_GOODS_SUBATTRIBUTE_GROUP group = new BPA_GOODS_SUBATTRIBUTE_GROUP();
-                                group.id = goodsTechnologyActionListBean.getGoodsAttributeId()==null?"xxxxx123":goodsTechnologyActionListBean.getGoodsAttributeId();
+                                group.id = goodsTechnologyActionListBean.getGoodsAttributeId()==null?goods.id:goodsTechnologyActionListBean.getGoodsAttributeId();
                                 group.name = GetRecipeName(goodsTechnologyActionListBean.getGoodsAttributeId(),bean.getGoodsAttributeList());//
                                 group.subAttributeIdList = goodsTechnologyActionListBean.getGoodsAttributeId()==null?"":goodsTechnologyActionListBean.getGoodsAttributeId();//
                                 group.goodsId = goods.id;
@@ -249,17 +255,18 @@ public class HomeGoodsViewModel extends ViewModel {
                             }
                             //添加所有工序
                             BPA_GOODS_PROCESS_DETAIL processDetail = new BPA_GOODS_PROCESS_DETAIL();
-                            processDetail.goodsSubAttributeGroupId = goodsTechnologyActionListBean.getGoodsAttributeId()==null?"xxxxx123":goodsTechnologyActionListBean.getGoodsAttributeId();
+                            processDetail.goodsSubAttributeGroupId = goodsTechnologyActionListBean.getGoodsAttributeId()==null?goods.id:goodsTechnologyActionListBean.getGoodsAttributeId();
                             processDetail.materialType = goodsTechnologyActionListBean.getStepName().contains("液体")?0:1;
                             String value = ProcessValueUtil.dealProcessJsonToValue(goodsTechnologyActionListBean.getActionJson());
                             processDetail.processms = goodsTechnologyActionListBean.getStepName()+ProcessValueUtil.dealProcessSms(value);
                             processDetail.sort = goodsTechnologyActionListBean.getSort();
                             processDetail.processname = goodsTechnologyActionListBean.getStepName();
                             processDetail.processvalue = value;
+                            LogUtils.d("/////////// processDetail="+processDetail.toString());
                             GoodsProcessDetailDBUtil.add(processDetail);
                         }
+                        break;
                     }
-                    break;
                 }
                 break;
             }

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_selected="true" android:drawable="@drawable/bg_circle_green"/>
+    <item  android:drawable="@drawable/bg_circle_yellow"/>
+</selector>

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

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

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

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

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

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

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

@@ -8,13 +8,13 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_marginTop="@dimen/home_tab_height"
         android:layout_height="match_parent">
 
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/navigation"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_56"
+            android:layout_marginTop="30dp"
             android:layout_gravity="top"
             app:layout_constraintTop_toTopOf="parent"
             android:background="@drawable/qmui_list_item_bg_with_border_bottom"

app/src/main/res/layout/dialog/layout/dialog_attribute_select.xml

@@ -7,7 +7,7 @@
     android:layout_height="wrap_content">
     <!--子属性选择-->
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/dp_740"
+        android:layout_width="1440dp"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -90,6 +90,7 @@
             android:id="@+id/btn_close"
             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"

app/src/main/res/layout/dialog/layout/layout_edit_goods_name.xml

@@ -1,6 +1,6 @@
 <?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_660"
+    android:layout_width="@dimen/dp_1060"
     android:layout_height="@dimen/dp_500"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -15,6 +15,7 @@
         android:background="@drawable/bg_round25_top_yellow"
         style="@style/TextView_btn_dialog"
         android:text="编辑菜品"
+        android:textSize="36sp"
         />
 
     <TextView
@@ -56,7 +57,7 @@
 
     <EditText
         android:id="@+id/edit_name"
-        android:layout_width="@dimen/dp_400"
+        android:layout_width="@dimen/dp_800"
         android:layout_height="@dimen/dp_90"
         android:background="@drawable/input_bj"
         android:hint="请输入菜品名称"
@@ -77,9 +78,9 @@
         android:id="@+id/btn_next1"
         android:layout_width="@dimen/dp_155"
         android:layout_height="@dimen/dp_80"
-        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginLeft="@dimen/dp_480"
+        android:layout_marginEnd="20dp"
         android:layout_marginBottom="@dimen/dp_20"
         style="@style/TextView_btn_dialog"
         android:text="下一步"
@@ -101,6 +102,7 @@
         android:id="@+id/btn_close1"
         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"

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     tools:background="#88000000">
 

app/src/main/res/layout/item/layout/dialog_silos_message.xml

@@ -9,8 +9,8 @@
 
 
     <RelativeLayout
-        android:layout_width="700dp"
-        android:layout_height="760dp"
+        android:layout_width="800dp"
+        android:layout_height="1000dp"
         android:gravity="center"
         android:layout_gravity="center"
         android:background="@drawable/silosbj">
@@ -97,7 +97,7 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="200dp"
+                android:layout_height="280dp"
                 android:layout_marginTop="10dp"
                 android:background="@mipmap/rongliangshezhi"
                >
@@ -105,15 +105,15 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="160dp"
-                    android:layout_marginTop="75dp"
-                    android:layout_marginEnd="140dp"
+                    android:layout_marginStart="180dp"
+                    android:layout_marginTop="100dp"
+                    android:layout_marginEnd="160dp"
                     android:orientation="vertical">
 
                     <EditText
                         android:id="@+id/zongliang"
                         android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:layout_height="70dp"
                         android:background="@drawable/input_bj"
                         android:hint="请输入制作时长"
                         android:inputType="number"
@@ -125,7 +125,7 @@
                     <EditText
                         android:id="@+id/gaojingrongliang"
                         android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:layout_height="70dp"
                         android:layout_marginTop="10dp"
                         android:background="@drawable/input_bj"
                         android:hint="请输入制作时长"
@@ -138,10 +138,10 @@
 
                 <TextView
                     android:id="@+id/save_rlsz"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
+                    android:layout_width="120dp"
+                    android:layout_height="150dp"
                     android:layout_alignParentRight="true"
-                    android:layout_marginTop="75dp"
+                    android:layout_marginTop="100dp"
                     android:layout_marginEnd="25dp"
                     android:text="保存"
                     android:gravity="center"
@@ -153,23 +153,23 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="170dp"
+                android:layout_height="200dp"
                 android:layout_marginTop="10dp"
                 android:background="@mipmap/tiaoliaobiaoding">
 
                 <ImageView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="100dp"
                     android:layout_marginStart="180dp"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="-10dp"
                     android:src="@mipmap/pkbdy" />
 
                 <EditText
                     android:id="@+id/tiaoliaobiaoding"
                     android:layout_width="match_parent"
-                    android:layout_height="50dp"
+                    android:layout_height="70dp"
                     android:layout_marginStart="120dp"
-                    android:layout_marginTop="90dp"
+                    android:layout_marginTop="100dp"
                     android:layout_marginEnd="140dp"
                     android:background="@drawable/input_bj"
                     android:digits="0123456789."
@@ -185,7 +185,7 @@
                     android:layout_width="100dp"
                     android:layout_height="70dp"
                     android:layout_alignParentRight="true"
-                    android:layout_marginTop="80dp"
+                    android:layout_marginTop="100dp"
                     android:layout_marginEnd="25dp"
                     android:text="保存"
                     android:gravity="center"
@@ -199,7 +199,7 @@
             <RelativeLayout
                 android:id="@+id/rl_change_wl"
                 android:layout_width="match_parent"
-                android:layout_height="170dp"
+                android:layout_height="200dp"
                 android:layout_marginTop="10dp"
                 android:background="@mipmap/genghuanwuliao">
 
@@ -207,8 +207,8 @@
                     android:id="@+id/editsp_wl"
                     style="@style/commonSpinnerStyle"
                     android:layout_width="match_parent"
-                    android:layout_height="50dp"
-                    android:layout_marginStart="160dp"
+                    android:layout_height="90dp"
+                    android:layout_marginStart="180dp"
                     android:layout_marginTop="90dp"
                     android:layout_marginEnd="140dp" />
 
@@ -217,7 +217,7 @@
                     android:layout_width="100dp"
                     android:layout_height="70dp"
                     android:layout_alignParentRight="true"
-                    android:layout_marginTop="80dp"
+                    android:layout_marginTop="100dp"
                     android:layout_marginEnd="25dp"
                     android:text="保存"
                     android:gravity="center"
@@ -237,14 +237,14 @@
 
             <ImageView
                 android:id="@+id/click_dcbl"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
                 android:src="@mipmap/dcbl" />
 
             <com.bonait.bnframework.newui.widget.imagebuttom
                 android:id="@+id/click_dcqx"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
                 android:layout_alignParentBottom="true"
                 android:layout_marginStart="40dp"
                 app:imagesrc_ks="@mipmap/dcqx_select"
@@ -252,8 +252,8 @@
 
             <ImageView
                 android:id="@+id/click_lcjz"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
                 android:layout_marginStart="40dp"
                 android:src="@mipmap/tljz" />
         </LinearLayout>

app/src/main/res/layout/item/layout/item_cloud_goods.xml

@@ -2,13 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dp_180"
-    android:layout_height="@dimen/dp_180"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     >
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/dp_180"
         android:layout_height="@dimen/dp_180"
+        android:layout_marginBottom="20dp"
         >
 
         <ImageView

app/src/main/res/layout/item/layout/item_local_goods.xml

@@ -2,13 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dp_180"
-    android:layout_height="@dimen/dp_180"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     >
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/dp_180"
         android:layout_height="@dimen/dp_180"
+        android:layout_marginBottom="20dp"
         >
 
         <ImageView

app/src/main/res/layout/item/layout/item_log.xml

@@ -3,32 +3,34 @@
     android:layout_width="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/dp_4"
-    android:paddingTop="@dimen/dp_2"
+    android:paddingBottom="@dimen/dp_3"
+    android:paddingTop="@dimen/dp_3"
     android:background="@drawable/bg_bottom_line"
-    android:layout_height="@dimen/dp_50">
+    android:layout_height="wrap_content">
     <RelativeLayout
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1.6">
         <TextView
             android:id="@+id/type"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:textSize="@dimen/sp_26"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
             android:layout_alignParentLeft="true"
             tools:text="角色操作日志"
             android:textColor="@color/black" />
     </RelativeLayout>
     <RelativeLayout
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="2.8">
         <TextView
             android:id="@+id/time"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:textSize="@dimen/sp_26"
             android:layout_marginLeft="10dp"
@@ -37,12 +39,12 @@
     </RelativeLayout>
     <RelativeLayout
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="4">
         <TextView
             android:id="@+id/desc"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:textSize="@dimen/sp_26"
             android:ellipsize="end"

app/src/main/res/layout/item/layout/item_order.xml

@@ -4,22 +4,24 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:id="@+id/root"
-    android:paddingBottom="@dimen/dp_4"
-    android:paddingTop="@dimen/dp_2"
+    android:paddingBottom="@dimen/dp_3"
+    android:paddingTop="@dimen/dp_3"
     android:background="@drawable/bg_bottom_line"
-    android:layout_height="@dimen/dp_74">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/name"
         android:paddingStart="3dp"
         android:paddingEnd="3dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         android:layout_width="0dp"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="5"
-        tools:text="商品\n名称"
+        tools:text="商品名称"
         android:ellipsize="end"
         android:background="@drawable/input_bj"
-        android:textSize="@dimen/sp_24"
+        android:textSize="@dimen/sp_32"
         android:gravity="center"
         android:textColor="@color/black"/>
 
@@ -30,9 +32,8 @@
         android:layout_weight="2"
         android:paddingStart="3dp"
         android:paddingEnd="3dp"
-        android:textSize="@dimen/sp_24"
+        android:textSize="@dimen/sp_32"
         android:gravity="center"
-        android:layout_alignParentLeft="true"
         tools:text="1"
         android:textColor="@color/black" />
 
@@ -43,7 +44,7 @@
         android:layout_weight="2"
         android:paddingStart="3dp"
         android:paddingEnd="3dp"
-        android:textSize="@dimen/sp_24"
+        android:textSize="@dimen/sp_32"
         android:gravity="center"
         tools:text="2"
         android:textColor="@color/black" />
@@ -55,7 +56,7 @@
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="2"
-        android:textSize="@dimen/sp_24"
+        android:textSize="@dimen/sp_32"
         android:gravity="center"
         tools:text="3"
         android:textColor="@color/black" />
@@ -65,9 +66,9 @@
         android:paddingStart="3dp"
         android:paddingEnd="3dp"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_weight="2"
-        android:textSize="@dimen/sp_24"
+        android:textSize="@dimen/sp_32"
         android:gravity="center"
         tools:text="1"
         android:textColor="@color/black" />

app/src/main/res/layout/item/layout/item_select_attribute_list.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_90"
+    android:layout_height="wrap_content"
     android:id="@+id/root"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -17,10 +17,9 @@
         />
     <androidx.recyclerview.widget.RecyclerView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="100dp"
         android:id="@+id/recycle_sub_attribute"
         android:orientation="horizontal"
-        android:layout_gravity="center"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         />
 </LinearLayout>

app/src/main/res/layout/item/layout/item_select_subattribute.xml

@@ -10,6 +10,7 @@
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_90"
+        android:layout_marginBottom="10dp"
         tools:text="特辣xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
         android:textSize="@dimen/sp_32"
         android:background="@drawable/selector_select_sub_attribute_bg"

app/src/main/res/layout/item/layout/item_spinner_text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_375"
-    android:layout_height="@dimen/dp_90"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:id="@+id/root"
     xmlns:tools="http://schemas.android.com/tools">
 

app/src/main/res/layout/item/layout/item_step.xml

@@ -21,7 +21,7 @@
             android:textColor="@drawable/selector_select_step_text_color"
             android:background="@drawable/selector_select_step_text_bg"
             tools:text="1.双向搅拌"
-            android:textSize="@dimen/sp_32"
+            android:textSize="@dimen/sp_36"
             android:gravity="center_vertical"
             android:duplicateParentState="true"
             tools:background="@color/textbg_green"

app/src/main/res/layout/item/layout/spinner_dropdown_item.xml

@@ -3,10 +3,12 @@
     android:id="@+id/checkedTextViewCustom_1"
     style="?android:attr/spinnerDropDownItemStyle"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_50"
+    android:layout_height="wrap_content"
+    android:paddingBottom="5dp"
+    android:paddingTop="5dp"
     android:background="@color/activity_background"
     android:ellipsize="marquee"
     android:singleLine="true"
     android:text="11111"
     android:textAlignment="inherit"
-    android:textSize="@dimen/sp_26"/>
+    android:textSize="22sp"/>

app/src/main/res/layout/item/layout/spinner_text_item.xml

@@ -3,13 +3,15 @@
     android:id="@+id/textViewCustom"
     style="?android:attr/spinnerItemStyle"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_50"
+    android:layout_height="wrap_content"
+    android:paddingBottom="5dp"
+    android:paddingTop="5dp"
     android:ellipsize="marquee"
     android:singleLine="true"
     android:textAlignment="inherit"
     android:gravity="center_vertical"
     android:text="请选择"
-    android:textSize="@dimen/sp_26"
+    android:textSize="22sp"
     android:textColor="@color/black">
 </TextView>
 

app/src/main/res/layout/item/layout/view_process_value.xml

@@ -2,8 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dp_550"
-    android:layout_height="@dimen/dp_70"
+    android:layout_width="@dimen/dp_800"
+    android:layout_height="@dimen/dp_90"
     android:layout_marginBottom="@dimen/dp_10"
     android:id="@+id/root"
     android:gravity="center_vertical"
@@ -11,7 +11,7 @@
     <CheckBox
         android:id="@+id/check"
         android:layout_width="wrap_content"
-        android:layout_height="70dp"
+        android:layout_height="90dp"
         android:layout_centerVertical="true"
         android:layout_marginLeft="@dimen/dp_10"
         android:buttonTint="@color/radiusImageView_selected_mask_color"/>
@@ -19,10 +19,10 @@
         android:id="@+id/name"
         android:paddingLeft="@dimen/dp_5"
         android:paddingRight="@dimen/dp_10"
-        android:layout_width="@dimen/dp_220"
-        android:layout_height="@dimen/dp_70"
+        android:layout_width="@dimen/dp_250"
+        android:layout_height="@dimen/dp_90"
         tools:text="液体料液体料液体料"
-        android:textSize="@dimen/sp_28"
+        android:textSize="@dimen/sp_36"
         android:maxLines="1"
         android:maxLength="10"
         android:gravity="center_vertical"
@@ -33,20 +33,20 @@
     <Spinner
         android:id="@+id/spinner"
         style="@style/commonSpinnerStyle"
-        android:layout_width="@dimen/dp_280"
-        android:layout_height="@dimen/dp_70"
+        android:layout_width="@dimen/dp_500"
+        android:layout_height="@dimen/dp_90"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         tools:visibility="visible"
         android:visibility="gone"/>
     <EditText
         android:id="@+id/edit"
-        android:layout_width="@dimen/dp_280"
-        android:layout_height="@dimen/dp_70"
+        android:layout_width="@dimen/dp_500"
+        android:layout_height="@dimen/dp_90"
         android:background="@drawable/input_bj"
         android:layout_alignParentRight="true"
         android:inputType="text"
         android:maxLines="1"
         android:padding="@dimen/dp_3"
-        android:textSize="@dimen/sp_32" />
+        android:textSize="@dimen/sp_36" />
 </RelativeLayout>

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

@@ -27,6 +27,7 @@
             style="@style/TextView_normal_size"
             android:textStyle="bold"
             android:maxLines="2"
+            android:textSize="@dimen/sp_42"
             android:textColor="@color/black"
             tools:text="海椒炒肉-xxx-xxx"
             />
@@ -56,9 +57,11 @@
             android:background="@drawable/bg_round50_right_green" />
         <TextView
             android:id="@+id/btn_copy_process"
-            android:layout_width="@dimen/dp_150"
+            android:layout_width="@dimen/dp_180"
             style="@style/TextView_btn_normal"
             android:text="导入工序"
+            android:layout_height="90dp"
+            android:textSize="36sp"
             android:paddingLeft="@dimen/dp_10"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@id/line1"
@@ -94,22 +97,10 @@
             style="@style/TextView_normal_size"
             android:text="步骤："
             android:layout_marginTop="@dimen/dp_10"
+            android:textSize="36sp"
             android:textColor="#567722"
             android:layout_marginLeft="@dimen/dp_10"
             />
-        <TextView
-            android:id="@+id/tv_2"
-            android:layout_marginTop="@dimen/dp_10"
-            android:layout_width="@dimen/dp_160"
-            android:layout_height="@dimen/dp_70"
-            app:layout_constraintLeft_toRightOf="@id/line2"
-            app:layout_constraintTop_toBottomOf="@id/line1"
-            style="@style/TextView_normal_size"
-            android:text="烹饪工序："
-            android:textColor="#823E17"
-            android:layout_marginLeft="@dimen/dp_20"
-            />
-        
 
         <!--步骤列表-->
 
@@ -125,11 +116,25 @@
             app:layout_constraintTop_toBottomOf="@id/tv_1"
             app:layoutManager="com.bonait.bnframework.ui.widget.SmoothLayoutManager"
              />
+        <TextView
+            android:id="@+id/tv_2"
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_width="@dimen/dp_180"
+            android:layout_height="@dimen/dp_90"
+            app:layout_constraintLeft_toRightOf="@id/line2"
+            app:layout_constraintTop_toBottomOf="@id/line1"
+            style="@style/TextView_normal_size"
+            android:text="烹饪工序："
+            android:textSize="36sp"
+            android:textColor="#823E17"
+            android:layout_marginLeft="@dimen/dp_20"
+            />
+
 
         <LinearLayout
             android:id="@+id/ll_1"
-            android:layout_width="@dimen/dp_550"
-            android:layout_height="@dimen/dp_70"
+            android:layout_width="@dimen/dp_800"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintLeft_toRightOf="@id/line2"
             app:layout_constraintTop_toBottomOf="@id/line1"
             android:layout_marginLeft="@dimen/dp_20"
@@ -140,15 +145,15 @@
             <Spinner
                 android:id="@+id/spinner_process"
                 style="@style/commonSpinnerStyle"
-                android:layout_width="@dimen/dp_280"
-                android:layout_height="@dimen/dp_70"
+                android:layout_width="@dimen/dp_500"
+                android:layout_height="@dimen/dp_90"
                 />
         </LinearLayout>
 
 
         <ScrollView
             android:id="@+id/scrollView"
-            android:layout_width="@dimen/dp_550"
+            android:layout_width="@dimen/dp_800"
             android:layout_height="0dp"
             android:layout_marginTop="@dimen/dp_15"
             app:layout_constraintLeft_toRightOf="@id/line2"
@@ -168,10 +173,11 @@
         <!--添加-->
         <TextView
             android:id="@+id/btn_add"
-            android:layout_width="@dimen/dp_150"
-            android:layout_height="80dp"
+            android:layout_width="@dimen/dp_170"
+            android:layout_height="100dp"
             style="@style/TextView_btn_normal"
             android:text="+添加"
+            android:textSize="36sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/line1"
             android:layout_marginTop="60dp"
@@ -181,28 +187,30 @@
         <!--修改-->
         <TextView
             android:id="@+id/btn_update"
-            android:layout_width="@dimen/dp_150"
-            android:layout_height="80dp"
+            android:layout_width="@dimen/dp_170"
+            android:layout_height="100dp"
             style="@style/TextView_btn_normal"
             android:background="@drawable/bg_round50_green_btn"
             android:text="修改"
+            android:textSize="36sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/btn_add"
-            android:layout_marginTop="110dp"
+            android:layout_marginTop="130dp"
             android:layout_marginEnd="50dp"
             android:layout_marginLeft="@dimen/dp_60"
             />
         <!--向上插入-->
         <TextView
             android:id="@+id/btn_insert_up"
-            android:layout_width="@dimen/dp_180"
-            android:layout_height="80dp"
+            android:layout_width="@dimen/dp_200"
+            android:layout_height="100dp"
             style="@style/TextView_btn_normal"
             android:text="向上插入"
+            android:textSize="36sp"
             android:layout_marginBottom="@dimen/dp_10"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/btn_update"
-            android:layout_marginTop="110dp"
+            android:layout_marginTop="130dp"
             android:layout_marginEnd="50dp"
 
             />
@@ -210,28 +218,30 @@
         <!--向下插入-->
         <TextView
             android:id="@+id/btn_insert_down"
-            android:layout_width="@dimen/dp_180"
-            android:layout_height="80dp"
+            android:layout_width="@dimen/dp_200"
+            android:layout_height="100dp"
             style="@style/TextView_btn_normal"
             android:text="向下插入"
+            android:textSize="36sp"
             android:layout_marginBottom="@dimen/dp_10"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/btn_insert_up"
-            android:layout_marginTop="110dp"
+            android:layout_marginTop="130dp"
             android:layout_marginEnd="50dp"
             />
         <!--删除-->
         <TextView
             android:id="@+id/btn_delete"
-            android:layout_width="@dimen/dp_150"
-            android:layout_height="80dp"
+            android:layout_width="@dimen/dp_170"
+            android:layout_height="100dp"
             style="@style/TextView_btn_normal"
             android:background="@drawable/bg_round50_red_btn"
             android:text="删除"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/btn_insert_down"
-            android:layout_marginTop="110dp"
+            android:layout_marginTop="130dp"
             android:layout_marginEnd="50dp"
+            android:textSize="36sp"
             android:layout_marginBottom="@dimen/dp_25"
             android:layout_marginLeft="@dimen/dp_270"
             />
@@ -254,13 +264,13 @@
             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"
             android:text="编辑工序"
             android:textColor="@color/white"
-            android:textSize="36sp"
+            android:textSize="42sp"
             android:layout_gravity="center"
             android:gravity="center"
             />

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

@@ -39,7 +39,7 @@
             </TextView>
             <TextView
                 android:id="@+id/starttime"
-                android:layout_width="@dimen/dp_180"
+                android:layout_width="@dimen/dp_250"
                 android:layout_height="match_parent"
                 android:padding="3dp"
                 android:textColor="@color/foreground"
@@ -58,7 +58,7 @@
                 android:text="—"/>
             <EditText
                 android:id="@+id/stoptime"
-                android:layout_width="@dimen/dp_180"
+                android:layout_width="@dimen/dp_250"
                 android:layout_height="match_parent"
                 android:focusable="false"
                 android:textColor="@color/foreground"
@@ -78,12 +78,12 @@
                 android:text="类型:"/>
             <Spinner
                 android:id="@+id/spinner"
-                android:layout_width="@dimen/dp_200"
+                android:layout_width="@dimen/dp_400"
                 android:layout_height="match_parent"
                 style="@style/commonSpinnerStyle"/>
             <EditText
                 android:id="@+id/edittext"
-                android:layout_width="@dimen/dp_200"
+                android:layout_width="@dimen/dp_400"
                 android:layout_height="match_parent"
                 android:inputType="text"
                 android:padding="3dp"

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

@@ -22,7 +22,7 @@
 
         <RelativeLayout
             android:id="@+id/rl_title"
-            android:layout_width="600dp"
+            android:layout_width="1000dp"
             android:layout_height="match_parent"
             android:background="@mipmap/login_bj2">
 
@@ -46,7 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/dp_10"
-            android:layout_marginStart="600dp"
+            android:layout_marginStart="1000dp"
             android:layout_alignParentBottom="true"
             android:text="BY © 四川黑菠萝Black pineapple"
             android:textSize="@dimen/sp_24"
@@ -59,7 +59,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginEnd="20dp"
-            android:layout_marginStart="620dp"
+            android:layout_marginStart="1020dp"
             android:layout_centerVertical="true"
             android:layout_marginTop="@dimen/dp_100"
             android:layout_marginLeft="@dimen/dp_100"
@@ -74,8 +74,8 @@
 
                 <ImageView
                     android:id="@+id/imgAccount"
-                    android:layout_width="@dimen/dp_50"
-                    android:layout_height="@dimen/dp_50"
+                    android:layout_width="@dimen/dp_70"
+                    android:layout_height="@dimen/dp_70"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="15dp"
                     android:layout_marginTop="@dimen/dp_15"
@@ -88,20 +88,18 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:background="@null"
-
-
                     android:hint="@string/user_account"
                     android:imeOptions="actionNext"
                     android:inputType="text"
                     android:maxLength="20"
                     android:maxLines="1"
                     android:singleLine="true"
-                    android:textSize="@dimen/sp_32" />
+                    android:textSize="@dimen/sp_42" />
 
                 <ImageView
                     android:id="@+id/iv_clean_account"
-                    android:layout_width="@dimen/dp_50"
-                    android:layout_height="@dimen/dp_50"
+                    android:layout_width="@dimen/dp_70"
+                    android:layout_height="@dimen/dp_70"
                     android:scaleType="fitXY"
                     android:src="@drawable/delete_selector"
                     tools:visibility="visible"
@@ -123,8 +121,8 @@
 
                 <ImageView
                     android:id="@+id/imgPass"
-                    android:layout_width="@dimen/dp_50"
-                    android:layout_height="@dimen/dp_50"
+                    android:layout_width="@dimen/dp_70"
+                    android:layout_height="@dimen/dp_70"
                     android:layout_marginStart="15dp"
                     android:layout_marginEnd="15dp"
                     android:layout_marginTop="@dimen/dp_15"
@@ -142,12 +140,12 @@
                     android:maxLength="30"
                     android:singleLine="true"
                     android:text=""
-                    android:textSize="@dimen/sp_32" />
+                    android:textSize="@dimen/sp_42" />
 
                 <ImageView
                     android:id="@+id/clean_password"
-                    android:layout_width="@dimen/dp_50"
-                    android:layout_height="@dimen/dp_50"
+                    android:layout_width="@dimen/dp_70"
+                    android:layout_height="@dimen/dp_70"
                     android:scaleType="fitXY"
                     android:src="@drawable/delete_selector"
                     tools:visibility="visible"
@@ -155,8 +153,8 @@
 
                 <ImageView
                     android:id="@+id/iv_show_pwd"
-                    android:layout_width="@dimen/dp_50"
-                    android:layout_height="@dimen/dp_50"
+                    android:layout_width="@dimen/dp_70"
+                    android:layout_height="@dimen/dp_70"
                     android:scaleType="fitXY"
                     android:src="@drawable/icon_pass_gone" />
 
@@ -206,12 +204,12 @@
             <Button
                 android:id="@+id/btn_login"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_80"
+                android:layout_height="@dimen/dp_90"
                 android:layout_marginBottom="10dp"
                 android:background="@drawable/bg_btn_login_selected"
                 android:text="登    录"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_36" />
+                android:textSize="@dimen/sp_42" />
 
         </LinearLayout>
     </RelativeLayout>

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

@@ -7,11 +7,308 @@
     android:orientation="vertical"
     android:layout_height="match_parent">
 
+    <RelativeLayout
+        android:layout_width="@dimen/dp_300"
+        android:background="@color/main_title_color1"
+        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"
+            android:layout_below="@+id/tv_shusongxian"
+            android:layout_marginTop="25dp"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/circle_green"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="25dp"
+                android:layout_marginTop="50dp"
+                android:background="@drawable/bg_circle_green"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:gravity="center"
+                android:layout_alignEnd="@id/circle_green"
+                android:layout_marginStart="5dp"
+                android:text="有盆"
+                android:textColor="@color/black"
+                android:textSize="32sp"
+                />
+
+<!--            <TextView-->
+<!--                android:id="@+id/circle_red"-->
+<!--                android:layout_width="50dp"-->
+<!--                android:layout_height="50dp"-->
+<!--                android:layout_marginStart="175dp"-->
+<!--                android:layout_marginTop="50dp"-->
+<!--                android:background="@drawable/bg_circle_red"-->
+<!--                />-->
+<!--            <TextView-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="50dp"-->
+<!--                android:layout_alignEnd="@id/circle_red"-->
+<!--                android:gravity="center"-->
+<!--                android:text="异常"-->
+<!--                android:textColor="@color/black"-->
+<!--                android:textSize="32sp"-->
+<!--                />-->
+            <TextView
+                android:id="@+id/circle_yellow"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginStart="100dp"
+                android:layout_marginTop="50dp"
+                android:background="@drawable/bg_circle_yellow"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="50dp"
+                android:layout_alignEnd="@id/circle_yellow"
+                android:gravity="center"
+                android:text="无盆"
+                android:textColor="@color/black"
+                android:textSize="32sp"
+                />
+
+
+            <TextView
+                android:layout_below="@id/circle_green"
+                android:id="@+id/tv_fuliao"
+                android:layout_width="300dp"
+                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_fuliao_circle1"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="30dp"
+                android:layout_below="@id/tv_fuliao"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_fuliao_circle2"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="10dp"
+                android:layout_toEndOf="@id/tv_fuliao_circle1"
+                android:layout_below="@id/tv_fuliao"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_fuliao_circle3"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="10dp"
+                android:layout_toEndOf="@id/tv_fuliao_circle2"
+                android:layout_below="@id/tv_fuliao"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_fuliao_circle4"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="10dp"
+                android:layout_below="@id/tv_fuliao"
+                android:layout_toEndOf="@id/tv_fuliao_circle3"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_zhuliao"
+                android:layout_width="300dp"
+                android:layout_below="@id/tv_fuliao_circle4"
+                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_zhuliao_circle1"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="30dp"
+                android:layout_below="@id/tv_zhuliao"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_zhuliao_circle2"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="70dp"
+                android:layout_toEndOf="@id/tv_zhuliao_circle1"
+                android:layout_below="@id/tv_zhuliao"
+                android:background="@drawable/bg_check_circle_select"
+                />
+
+            <TextView
+                android:id="@+id/tv_zhuliao_circle3"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="30dp"
+                android:layout_below="@id/tv_zhuliao_circle1"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_zhuliao_circle4"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="70dp"
+                android:layout_toEndOf="@id/tv_zhuliao_circle1"
+                android:layout_below="@id/tv_zhuliao_circle1"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_zhuliao_circle5"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="30dp"
+                android:layout_below="@id/tv_zhuliao_circle3"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_zhuliao_circle6"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="70dp"
+                android:layout_toEndOf="@id/tv_zhuliao_circle1"
+                android:layout_below="@id/tv_zhuliao_circle3"
+                android:background="@drawable/bg_check_circle_select"
+                />
+
+            <TextView
+                android:id="@+id/tv_kaopan"
+                android:layout_width="300dp"
+                android:layout_below="@id/tv_zhuliao_circle6"
+                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_kaopan_circle1"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="30dp"
+                android:layout_below="@id/tv_kaopan"
+                android:background="@drawable/bg_check_circle_select"
+                />
+            <TextView
+                android:id="@+id/tv_kaopan_circle2"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginStart="70dp"
+                android:layout_toEndOf="@id/tv_zhuliao_circle1"
+                android:layout_below="@id/tv_kaopan"
+                android:background="@drawable/bg_check_circle_select"
+                />
+        </RelativeLayout>
+
+
+    </RelativeLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycle_view"
         android:layout_width="150dp"
         android:layout_height="match_parent"
         android:orientation="vertical"
+        android:layout_marginStart="300dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         android:background="@color/main_color1"
         />
@@ -20,28 +317,36 @@
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="150dp"
+        android:layout_marginStart="450dp"
+        android:layout_marginBottom="50dp"
         />
 
-    <TextView
-        android:id="@+id/tv_wok"
-        android:layout_width="600dp"
-        android:layout_height="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_gravity="bottom"
-        tools:text="炒锅：123465"
-        android:textSize="28sp"
-        android:layout_marginStart="5dp"
-        android:textColor="@color/textcolor_subtile"
-        />
-    <TextView
-        android:id="@+id/tv_oven"
-        android:layout_width="600dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:gravity="end"
-        tools:text="炒锅：123465"
-        android:textSize="28sp"
-        android:layout_marginStart="5dp"
-        android:textColor="@color/textcolor_subtile"
-        />
+        android:background="@color/main_title_color1"
+        android:layout_height="50dp">
+        <TextView
+            android:id="@+id/tv_wok"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="50dp"
+            tools:text="炒锅：123465"
+            android:textSize="32sp"
+            android:layout_marginStart="5dp"
+            android:textColor="@color/textcolor_subtile"
+            />
+        <TextView
+            android:id="@+id/tv_oven"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="50dp"
+            android:gravity="end"
+            tools:text="炒锅：123465"
+            android:textSize="32sp"
+            android:layout_marginStart="5dp"
+            android:textColor="@color/textcolor_subtile"
+            />
+    </LinearLayout>
+
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>

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

@@ -70,7 +70,7 @@
                 </TextView>
                 <TextView
                     android:id="@+id/starttime"
-                    android:layout_width="@dimen/dp_180"
+                    android:layout_width="@dimen/dp_300"
                     android:layout_height="match_parent"
                     android:padding="3dp"
                     android:textColor="@color/foreground"
@@ -90,7 +90,7 @@
                 </TextView>
                 <TextView
                     android:id="@+id/stoptime"
-                    android:layout_width="@dimen/dp_180"
+                    android:layout_width="@dimen/dp_300"
                     android:layout_height="match_parent"
                     android:focusable="false"
                     android:textColor="@color/foreground"
@@ -102,7 +102,7 @@
 
                 <EditText
                     android:id="@+id/edittext"
-                    android:layout_width="@dimen/dp_200"
+                    android:layout_width="@dimen/dp_400"
                     android:layout_height="match_parent"
                     android:inputType="text"
                     android:padding="3dp"

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

@@ -68,6 +68,7 @@
         <ImageView
             android:id="@+id/btn_close"
             android:layout_width="@dimen/dp_80"
+            android:layout_marginEnd="20dp"
             android:layout_height="@dimen/dp_80"
             android:layout_gravity="end"
             style="@style/TextView_btn_dialog"

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

@@ -57,6 +57,7 @@
             android:id="@+id/btn_close"
             android:layout_width="@dimen/dp_80"
             android:layout_height="@dimen/dp_80"
+            android:layout_marginEnd="20dp"
             android:layout_gravity="end"
             style="@style/TextView_btn_dialog"
             android:background="@mipmap/ic_clear_white_48dp"

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

@@ -9,13 +9,13 @@
     android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="1100dp"
+        android:layout_width="1600dp"
         android:background="@drawable/bg_round25_white"
-        android:layout_height="760dp">
+        android:layout_height="900dp">
         <TextView
             android:id="@+id/title1"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             android:background="@drawable/bg_round25_top_yellow"
             style="@style/TextView_btn_dialog"
             android:text="炒锅控制"
@@ -25,9 +25,10 @@
 
         <ImageView
             android:id="@+id/btn_close1"
-            android:layout_width="@dimen/dp_80"
-            android:layout_height="@dimen/dp_80"
+            android:layout_width="@dimen/dp_90"
+            android:layout_height="@dimen/dp_90"
             style="@style/TextView_btn_dialog"
+            android:layout_marginEnd="30dp"
             android:layout_alignParentEnd="true"
             android:background="@mipmap/ic_clear_white_48dp"
             app:layout_constraintTop_toTopOf="parent"
@@ -37,12 +38,12 @@
         
         <ImageView
             android:id="@+id/image"
-            android:layout_width="594dp"
-            android:layout_height="670dp"
+            android:layout_width="700dp"
+            android:layout_height="match_parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title1"
             android:layout_marginStart="10dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="80dp"
             android:src="@mipmap/device00"
             />
 
@@ -53,40 +54,41 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginBottom="@dimen/dp_55"
-            android:paddingTop="20dp"
-            android:paddingBottom="20dp"
+            android:paddingTop="30dp"
+            android:paddingBottom="30dp"
             style="@style/TextView_btn_dialog"
             android:text="出菜"
-            android:layout_marginStart="190dp"
+            android:layout_marginStart="220dp"
             />
         <TextView
-            android:id="@+id/btn_shengdu_qingxi"
+            android:id="@+id/btn_putong_qingxi"
             android:layout_width="@dimen/dp_155"
-            android:layout_height="@dimen/dp_80"
-            app:layout_constraintStart_toEndOf="@id/image"
-            app:layout_constraintTop_toTopOf="@id/image"
+            android:layout_height="@dimen/dp_90"
+            app:layout_constraintStart_toEndOf="@id/btn_shengdu_qingxi"
+            app:layout_constraintTop_toTopOf="@id/btn_shengdu_qingxi"
             style="@style/TextView_btn_dialog"
-            android:text="深度清洗"
-            android:layout_marginStart="0dp"
+            android:text="一般清洗"
+            android:layout_marginStart="20dp"
             />
 
         <TextView
-            android:id="@+id/btn_putong_qingxi"
+            android:id="@+id/btn_shengdu_qingxi"
             android:layout_width="@dimen/dp_155"
-            android:layout_height="@dimen/dp_80"
-            app:layout_constraintEnd_toEndOf="@id/image"
-            app:layout_constraintTop_toTopOf="@id/image"
-            android:layout_marginEnd="10dp"
+            android:layout_height="@dimen/dp_90"
+            app:layout_constraintStart_toEndOf="@id/image"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="110dp"
             style="@style/TextView_btn_dialog"
-            android:text="一般清洗"
+            android:text="深度清洗"
             android:layout_marginStart="0dp"
             />
         <TextView
             android:id="@+id/btn_chushihua"
             android:layout_width="@dimen/dp_135"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/image"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="110dp"
             style="@style/TextView_btn_dialog"
             android:background="@drawable/bg_round25_red_btn"
             android:text="初始化"
@@ -96,35 +98,37 @@
         <TextView
             android:id="@+id/btn_stop"
             android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/image"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="110dp"
             style="@style/TextView_btn_dialog"
             android:background="@drawable/bg_round25_red_btn"
             android:text="急停"
-            android:layout_marginStart="160dp"
+            android:layout_marginStart="170dp"
             />
 
         <TextView
             android:id="@+id/btn_fuwei"
             android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/image"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="110dp"
             style="@style/TextView_btn_dialog"
             android:background="@drawable/bg_round25_red_btn"
             android:text="复位"
-            android:layout_marginStart="280dp"
+            android:layout_marginStart="290dp"
             />
 
         <TextView
             android:id="@+id/xiguoshui"
             android:layout_width="@dimen/dp_155"
-            android:layout_height="@dimen/dp_80"
-            app:layout_constraintStart_toEndOf="@id/btn_shengdu_qingxi"
+            android:layout_height="@dimen/dp_90"
+            app:layout_constraintStart_toEndOf="@id/btn_putong_qingxi"
             app:layout_constraintTop_toTopOf="@id/btn_shengdu_qingxi"
             style="@style/TextView_btn_dialog"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="20dp"
             android:background="@drawable/bg_round25_blue_btn"
             android:text="洗锅水枪"
             />
@@ -132,11 +136,11 @@
         <TextView
             android:id="@+id/chushui"
             android:layout_width="@dimen/dp_155"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toEndOf="@id/xiguoshui"
             app:layout_constraintTop_toTopOf="@id/xiguoshui"
             style="@style/TextView_btn_dialog"
-            android:layout_marginStart="10dp"
+            android:layout_marginStart="20dp"
             android:text="锅内加水"
             android:background="@drawable/bg_round25_blue_btn"
             />
@@ -148,7 +152,7 @@
             app:layout_constraintTop_toBottomOf="@id/btn_shengdu_qingxi"
             app:layout_constraintEnd_toEndOf="parent"
             android:background="#BEAA6A"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="15dp"
             />
 
         <TextView
@@ -158,7 +162,7 @@
             app:layout_constraintStart_toStartOf="@id/btn_shengdu_qingxi"
             app:layout_constraintTop_toBottomOf="@id/btn_shengdu_qingxi"
             android:textColor="@color/black"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="30dp"
             android:textSize="28sp"
             android:text="火力控制        炒锅温度："
             android:paddingStart="10dp"
@@ -179,12 +183,13 @@
 
         <com.bonait.bnframework.newui.widget.FireControlView
             android:id="@+id/fire_control"
-            android:layout_width="450dp"
-            android:layout_height="85dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="@id/btn_shengdu_qingxi"
             app:layout_constraintTop_toBottomOf="@id/btn_shengdu_qingxi"
-            android:layout_marginTop="55dp"
-            tools:layout_height="85dp"
+            android:layout_marginTop="70dp"
+            tools:layout_height="130dp"
+            tools:layout_width="750dp"
             />
 
         <TextView
@@ -192,8 +197,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="@id/tv_fire"
-            app:layout_constraintTop_toBottomOf="@id/tv_fire"
-            android:layout_marginTop="95dp"
+            app:layout_constraintTop_toBottomOf="@id/fire_control"
+            android:layout_marginTop="10dp"
             android:textColor="@color/black"
             android:textSize="28sp"
             android:text="翻炒速度：快"
@@ -206,8 +211,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toEndOf="@id/tv_speed"
-            app:layout_constraintTop_toBottomOf="@id/tv_fire"
-            android:layout_marginTop="95dp"
+            app:layout_constraintTop_toTopOf="@id/tv_speed"
             android:textColor="@color/black"
             android:textSize="28sp"
             android:text=""
@@ -217,7 +221,7 @@
         <TextView
             android:id="@+id/btn_speed_kuai"
             android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toStartOf="@id/tv_speed"
             app:layout_constraintTop_toBottomOf="@id/tv_speed"
             android:layout_marginTop="10dp"
@@ -227,31 +231,31 @@
         <TextView
             android:id="@+id/btn_speed_zhong"
             android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toEndOf="@id/btn_speed_kuai"
             app:layout_constraintTop_toTopOf="@id/btn_speed_kuai"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="30dp"
             style="@style/TextView_btn_dialog"
             android:text="中"
             />
         <TextView
             android:id="@+id/btn_speed_man"
             android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toEndOf="@id/btn_speed_zhong"
             app:layout_constraintTop_toTopOf="@id/btn_speed_kuai"
             style="@style/TextView_btn_dialog"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="30dp"
             android:text="慢"
             />
         <TextView
             android:id="@+id/btn_speed_stop"
             android:layout_width="@dimen/dp_100"
-            android:layout_height="@dimen/dp_80"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toEndOf="@id/btn_speed_man"
             app:layout_constraintTop_toTopOf="@id/btn_speed_kuai"
             style="@style/TextView_btn_dialog"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="30dp"
             android:text="停"
             />
 
@@ -261,9 +265,9 @@
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="200dp"
+            android:layout_marginTop="230dp"
             style="@style/TextView_btn_dialog"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="30dp"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             android:text="锅口朝向\n设置"
@@ -285,8 +289,8 @@
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="wrap_content"
                 style="@style/TextView_btn_dialog"
-                android:paddingTop="20dp"
-                android:paddingBottom="20dp"
+                android:paddingTop="30dp"
+                android:paddingBottom="30dp"
                 android:text="原点位"
                 />
 
@@ -295,9 +299,9 @@
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="wrap_content"
                 style="@style/TextView_btn_dialog"
-                android:paddingTop="20dp"
+                android:paddingTop="30dp"
                 android:layout_marginTop="10dp"
-                android:paddingBottom="20dp"
+                android:paddingBottom="30dp"
                 android:text="抽料位"
                 />
             <TextView
@@ -305,9 +309,9 @@
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="wrap_content"
                 style="@style/TextView_btn_dialog"
-                android:paddingTop="20dp"
+                android:paddingTop="30dp"
                 android:layout_marginTop="10dp"
-                android:paddingBottom="20dp"
+                android:paddingBottom="30dp"
                 android:text="倒菜位"
                 />
             <TextView
@@ -315,9 +319,9 @@
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="wrap_content"
                 style="@style/TextView_btn_dialog"
-                android:paddingTop="20dp"
+                android:paddingTop="30dp"
                 android:layout_marginTop="10dp"
-                android:paddingBottom="20dp"
+                android:paddingBottom="30dp"
                 android:text="清洗位"
                 />
         </LinearLayout>
@@ -339,8 +343,8 @@
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="wrap_content"
                 style="@style/TextView_btn_dialog"
-                android:paddingTop="20dp"
-                android:paddingBottom="20dp"
+                android:paddingTop="30dp"
+                android:paddingBottom="30dp"
                 android:text="炒菜位1"
                 />
 
@@ -349,9 +353,9 @@
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="wrap_content"
                 style="@style/TextView_btn_dialog"
-                android:paddingTop="20dp"
+                android:paddingTop="30dp"
                 android:layout_marginTop="10dp"
-                android:paddingBottom="20dp"
+                android:paddingBottom="30dp"
                 android:text="炒菜位2"
                 />
             <TextView
@@ -359,9 +363,9 @@
                 android:layout_width="@dimen/dp_155"
                 android:layout_height="wrap_content"
                 style="@style/TextView_btn_dialog"
-                android:paddingTop="20dp"
+                android:paddingTop="30dp"
                 android:layout_marginTop="10dp"
-                android:paddingBottom="20dp"
+                android:paddingBottom="30dp"
                 android:text="炒菜位3"
                 />
 
@@ -374,45 +378,45 @@
             app:layout_constraintTop_toBottomOf="@id/btn_speed_kuai"
             app:layout_constraintEnd_toEndOf="parent"
             android:background="#BEAA6A"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="15dp"
             />
 
         <TextView
             android:id="@+id/yeliao1"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_70"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toStartOf="@id/btn_shengdu_qingxi"
-            app:layout_constraintTop_toTopOf="@id/btn_shengdu_qingxi"
-            android:layout_marginTop="385dp"
+            app:layout_constraintTop_toTopOf="@id/btn_speed_man"
+            android:layout_marginTop="125dp"
             style="@style/TextView_btn_dialog"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
+            android:paddingStart="30dp"
+            android:paddingEnd="30dp"
             android:text="液料1-未设置"
             android:background="@drawable/bg_round25_blue_btn"
             />
         <TextView
             android:id="@+id/yeliao2"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_70"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toStartOf="@id/btn_shengdu_qingxi"
             app:layout_constraintTop_toBottomOf="@id/yeliao1"
             android:layout_marginTop="10dp"
             style="@style/TextView_btn_dialog"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
+            android:paddingStart="30dp"
+            android:paddingEnd="30dp"
             android:text="液料2-未设置"
             android:background="@drawable/bg_round25_blue_btn"
             />
         <TextView
             android:id="@+id/yeliao3"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_70"
+            android:layout_height="@dimen/dp_90"
             app:layout_constraintStart_toStartOf="@id/btn_shengdu_qingxi"
             app:layout_constraintTop_toBottomOf="@id/yeliao2"
             android:layout_marginTop="10dp"
             style="@style/TextView_btn_dialog"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
+            android:paddingStart="30dp"
+            android:paddingEnd="30dp"
             android:text="液料3-未设置"
             android:background="@drawable/bg_round25_blue_btn"
             />

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

@@ -20,7 +20,7 @@
     <!--名称 图片选择-->
     <include
         android:id="@+id/layout_name"
-        android:layout_width="@dimen/dp_660"
+        android:layout_width="@dimen/dp_1060"
         android:layout_height="@dimen/dp_500"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -33,8 +33,8 @@
     <!--子属性选择-->
     <include
         android:id="@+id/layout_attribute"
-        android:layout_width="@dimen/dp_1000"
-        android:layout_height="740dp"
+        android:layout_width="1400dp"
+        android:layout_height="900dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -46,8 +46,8 @@
     <!--主料填写-->
     <include
         android:id="@+id/layout_control"
-        android:layout_width="@dimen/dp_900"
-        android:layout_height="@dimen/dp_450"
+        android:layout_width="@dimen/dp_950"
+        android:layout_height="@dimen/dp_500"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"

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

@@ -9,16 +9,16 @@
     android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="1100dp"
+        android:layout_width="1500dp"
         android:background="@drawable/bg_round25_white"
-        android:layout_height="760dp">
+        android:layout_height="860dp">
         <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"
             />
@@ -29,9 +29,9 @@
             android:layout_marginStart="10dp"
             android:textSize="32sp"
             android:textColor="@color/white"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             android:layout_marginEnd="10dp"
-            android:layout_marginTop="100dp"
+            android:layout_marginTop="130dp"
             app:layout_constraintTop_toTopOf="parent"
             android:text="一键补料"
             android:gravity="center"
@@ -43,6 +43,7 @@
             android:layout_width="@dimen/dp_80"
             android:layout_height="@dimen/dp_80"
             style="@style/TextView_btn_dialog"
+            android:layout_marginEnd="20dp"
             android:layout_alignParentEnd="true"
             android:background="@mipmap/ic_clear_white_48dp"
             app:layout_constraintTop_toTopOf="parent"
@@ -53,9 +54,9 @@
             android:layout_width="wrap_content"
             android:layout_height="100dp"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="100dp"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="130dp"
             app:layout_constraintStart_toStartOf="parent"
+            android:layout_marginStart="200dp"
             android:orientation="horizontal"
             android:background="#80b0b0b0"
             android:paddingStart="50dp"
@@ -121,10 +122,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_box_check2"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="230dp"
-            android:layout_marginEnd="365dp"
+            android:layout_marginTop="280dp"
+            android:layout_marginStart="400dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -138,9 +139,9 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_box_check2"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/right1"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="730dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -154,10 +155,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_box_check2"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/right1"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="365dp"
+            android:layout_marginStart="400dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -171,10 +172,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_box_check2"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/right1"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="730dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -188,10 +189,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_box_check2"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/right3"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="365dp"
+            android:layout_marginStart="400dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -205,10 +206,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_box_check2"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/right3"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="730dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -226,7 +227,7 @@
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="50dp"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="230dp"
+            android:layout_marginTop="280dp"
             android:gravity="center"
             android:textSize="26sp"
             android:maxLines="1"
@@ -250,6 +251,81 @@
             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"/>
+
+            <TextView
+                android:id="@+id/btn_bulpen"
+                android:layout_width="170dp"
+                android:textSize="32sp"
+                android:layout_marginTop="50dp"
+                android:layout_marginStart="55dp"
+                android:textColor="@color/white"
+                android:text="手动补盆"
+                android:gravity="center"
+                android:background="@drawable/bg_round15_yellow_btn"
+                android:layout_height="80dp"/>
+        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </LinearLayout>

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

@@ -27,6 +27,7 @@
             android:id="@+id/btn_close1"
             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/src/main/res/layout/new/layout/dialog_food_info.xml

@@ -28,6 +28,7 @@
             android:layout_width="@dimen/dp_80"
             android:layout_height="@dimen/dp_80"
             style="@style/TextView_btn_dialog"
+            android:layout_marginEnd="20dp"
             android:layout_alignParentEnd="true"
             android:background="@mipmap/ic_clear_white_48dp"
             app:layout_constraintTop_toTopOf="parent"

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

@@ -26,6 +26,7 @@
         <ImageView
             android:id="@+id/btn_close1"
             android:layout_width="@dimen/dp_80"
+            android:layout_marginEnd="20dp"
             android:layout_height="@dimen/dp_80"
             style="@style/TextView_btn_dialog"
             android:layout_alignParentEnd="true"

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

@@ -71,6 +71,7 @@
         <ImageView
             android:id="@+id/btn_close"
             android:layout_width="@dimen/dp_80"
+            android:layout_marginEnd="20dp"
             android:layout_height="@dimen/dp_80"
             android:layout_gravity="end"
             style="@style/TextView_btn_dialog"

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

@@ -27,6 +27,7 @@
             android:id="@+id/btn_close1"
             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/src/main/res/layout/new/layout/fragment_cloud_goods_h.xml

@@ -37,7 +37,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_classify"
-            android:layout_width="@dimen/dp_150"
+            android:layout_width="@dimen/dp_250"
             android:layout_marginTop="@dimen/dp_90"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
@@ -57,7 +57,7 @@
             android:layout_width="@dimen/dp_1"
             android:layout_height="match_parent"
             android:background="@color/color3"
-            android:layout_marginLeft="@dimen/dp_150"
+            android:layout_marginLeft="@dimen/dp_250"
             android:layout_marginTop="@dimen/dp_90"
             />
 
@@ -69,13 +69,13 @@
             />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:layout_marginLeft="@dimen/dp_161"
+            android:layout_marginLeft="@dimen/dp_270"
             android:id="@+id/recycler_goods"
             android:layout_width="match_parent"
             android:layout_marginTop="@dimen/dp_90"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="5"
+            app:spanCount="8"
             android:layout_height="match_parent">
         </androidx.recyclerview.widget.RecyclerView>
 

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

@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:fitsSystemWindows="true"
-    tools:layout_width="1058dp"
+    tools:layout_width="1470dp"
+    tools:layout_height="1030dp"
     android:background="#DCDFE9"
     android:layout_height="match_parent">
 
@@ -13,56 +14,64 @@
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:src="@mipmap/ic_devices_all"
+            android:src="@mipmap/ic_devices_all2"
+            android:scaleX="1.2"
+            android:scaleY="1.2"
             />
-        <TextView
-            android:id="@+id/device_status_wok"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="10dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="炒锅连接状态：未连接"
-            android:gravity="center"
-            android:layout_height="wrap_content"/>
-        <TextView
-            android:id="@+id/device_status_oven"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="60dp"
-            android:layout_marginStart="10dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="烤箱连接状态：未连接"
-            android:gravity="center"
-            android:layout_height="wrap_content"/>
-        <TextView
-            android:id="@+id/device_status_robot"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="110dp"
-            android:layout_marginStart="10dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="机器人连接状态：未连接"
-            android:gravity="center"
-            android:layout_height="wrap_content"/>
+<!--        <TextView-->
+<!--            android:id="@+id/device_status_wok"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_marginTop="10dp"-->
+<!--            android:layout_marginStart="10dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:text="炒锅连接状态：未连接"-->
+<!--            android:gravity="center"-->
+<!--            android:layout_height="wrap_content"/>-->
+<!--        <TextView-->
+<!--            android:id="@+id/device_status_oven"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_marginTop="60dp"-->
+<!--            android:layout_marginStart="10dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:text="烤箱连接状态：未连接"-->
+<!--            android:gravity="center"-->
+<!--            android:layout_height="wrap_content"/>-->
+<!--        <TextView-->
+<!--            android:id="@+id/device_status_robot"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_marginTop="110dp"-->
+<!--            android:layout_marginStart="10dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:text="机器人连接状态：未连接"-->
+<!--            android:gravity="center"-->
+<!--            android:layout_height="wrap_content"/>-->
 
         <TextView
-            android:id="@+id/btn_dish_check"
             android:layout_width="220dp"
-            android:layout_marginTop="220dp"
-            android:layout_marginStart="550dp"
+            android:layout_marginTop="100dp"
+            android:layout_marginStart="950dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="货架料盒检测"
             android:gravity="center"
             android:background="#800088FF"
             android:layout_height="80dp"/>
+        <TextView
+            android:id="@+id/btn_dish_check"
+            android:layout_width="500dp"
+            android:layout_marginTop="100dp"
+            android:layout_marginStart="950dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:layout_height="600dp"/>
 
 
         <TextView
-            android:id="@+id/btn_chaoguo"
             android:layout_width="150dp"
-            android:layout_marginTop="350dp"
+            android:layout_marginTop="150dp"
             android:layout_marginStart="100dp"
             android:background="#800088FF"
             android:textSize="32sp"
@@ -70,35 +79,57 @@
             android:text="炒锅"
             android:gravity="center"
             android:layout_height="70dp"/>
+        <TextView
+            android:id="@+id/btn_chaoguo"
+            android:layout_width="400dp"
+            android:layout_marginTop="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:gravity="center"
+            android:layout_height="500dp"/>
 
         <TextView
-            android:id="@+id/btn_kaoxiang"
             android:layout_width="150dp"
-            android:layout_marginTop="280dp"
-            android:layout_marginStart="300dp"
+            android:layout_marginTop="80dp"
+            android:layout_marginStart="450dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="烤箱"
             android:gravity="center"
             android:background="#800088FF"
             android:layout_height="70dp"/>
+        <TextView
+            android:id="@+id/btn_kaoxiang"
+            android:layout_width="250dp"
+            android:layout_marginTop="80dp"
+            android:layout_marginStart="440dp"
+            android:gravity="center"
+            android:layout_height="400dp"/>
 
         <TextView
-            android:id="@+id/btn_foods"
             android:layout_width="100dp"
-            android:layout_marginTop="450dp"
-            android:layout_marginStart="470dp"
+            android:layout_marginTop="500dp"
+            android:layout_marginStart="700dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="机器人投料"
             android:gravity="center"
             android:background="#800088FF"
             android:layout_height="120dp"/>
+        <TextView
+            android:id="@+id/btn_foods"
+            android:layout_width="200dp"
+            android:layout_marginTop="400dp"
+            android:layout_marginStart="700dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:gravity="center"
+            android:layout_height="420dp"/>
         <TextView
             android:id="@+id/btn_weihu"
             android:layout_width="150dp"
-            android:layout_marginTop="580dp"
-            android:layout_marginStart="470dp"
+            android:layout_marginTop="650dp"
+            android:layout_marginStart="670dp"
             android:textSize="32sp"
             android:textColor="@color/white"
             android:text="去维护位"
@@ -106,66 +137,67 @@
             android:background="@drawable/bg_round15_yellow_btn"
             android:layout_height="80dp"/>
 
-        <TextView
-            android:id="@+id/tv_chucai_box"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="300dp"
-            android:layout_marginStart="770dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="出餐位检测：有盆"
-            android:gravity="center"
-            android:layout_height="wrap_content"/>
+<!--        <TextView-->
+<!--            android:id="@+id/tv_chucai_box"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_marginTop="300dp"-->
+<!--            android:layout_marginStart="770dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:text="出餐位检测：有盆"-->
+<!--            android:gravity="center"-->
+<!--            android:layout_height="wrap_content"/>-->
 
-        <TextView
-            android:id="@+id/btn_bulpen"
-            android:layout_width="170dp"
-            android:layout_marginTop="450dp"
-            android:layout_marginStart="800dp"
-            android:textSize="32sp"
-            android:textColor="@color/white"
-            android:text="手动补盆"
-            android:gravity="center"
-            android:background="@drawable/bg_round15_yellow_btn"
-            android:layout_height="80dp"/>
+<!--        <TextView-->
+<!--            android:id="@+id/btn_bulpen"-->
+<!--            android:layout_width="170dp"-->
+<!--            android:layout_marginTop="650dp"-->
+<!--            android:layout_marginStart="1250dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/white"-->
+<!--            android:text="手动补盆"-->
+<!--            android:gravity="center"-->
+<!--            android:background="@drawable/bg_round15_yellow_btn"-->
+<!--            android:layout_height="80dp"/>-->
 
-        <TextView
-            android:id="@+id/tv_buliao_box"
-            android:layout_width="300dp"
-            android:layout_marginTop="550dp"
-            android:layout_marginStart="670dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="出料盆检测：无盆"
-            android:gravity="center"
-            android:layout_height="wrap_content"/>
+<!--        <TextView-->
+<!--            android:id="@+id/tv_buliao_box"-->
+<!--            android:layout_width="300dp"-->
+<!--            android:layout_marginTop="550dp"-->
+<!--            android:layout_marginStart="670dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:text="出料盆检测：无盆"-->
+<!--            android:gravity="center"-->
+<!--            android:layout_height="wrap_content"/>-->
 
-        <TextView
-            android:id="@+id/tv_chuliao_box"
-            android:layout_width="300dp"
-            android:layout_marginTop="600dp"
-            android:layout_marginStart="670dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="补料盆检测：无盆"
-            android:gravity="center"
-            android:layout_height="wrap_content"/>
+<!--        <TextView-->
+<!--            android:id="@+id/tv_chuliao_box"-->
+<!--            android:layout_width="300dp"-->
+<!--            android:layout_marginTop="600dp"-->
+<!--            android:layout_marginStart="670dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:text="补料盆检测：无盆"-->
+<!--            android:gravity="center"-->
+<!--            android:layout_height="wrap_content"/>-->
 
-        <TextView
-            android:id="@+id/tv_shusongxian"
-            android:layout_width="wrap_content"
-            android:layout_marginTop="700dp"
-            android:layout_marginStart="500dp"
-            android:textSize="32sp"
-            android:textColor="@color/black"
-            android:text="输送线状态：停止"
-            android:gravity="center"
-            android:layout_height="80dp"/>
+<!--        <TextView-->
+<!--            android:id="@+id/tv_shusongxian"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_marginTop="700dp"-->
+<!--            android:layout_marginStart="500dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/black"-->
+<!--            android:text="输送线状态：停止"-->
+<!--            android:gravity="center"-->
+<!--            android:layout_height="80dp"/>-->
 
         <TextView
             android:id="@+id/btn_line_open"
             android:layout_width="180dp"
-            android:layout_marginTop="700dp"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="50dp"
             android:layout_marginStart="100dp"
             android:textSize="32sp"
             android:textColor="@color/white"
@@ -177,7 +209,8 @@
         <TextView
             android:id="@+id/btn_line_close"
             android:layout_width="180dp"
-            android:layout_marginTop="700dp"
+            android:layout_gravity="bottom"
+            android:layout_marginBottom="50dp"
             android:layout_marginStart="300dp"
             android:textSize="32sp"
             android:textColor="@color/white"

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

@@ -33,16 +33,6 @@
             android:gravity="center"
             />
 
-        <TextView
-            android:id="@+id/tv_connect"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="设备状态:未连接"
-            android:layout_gravity="end"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_28"
-            android:gravity="center"
-            />
     </com.qmuiteam.qmui.widget.QMUITopBarLayout>
 
     <RelativeLayout

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

@@ -13,7 +13,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_classify"
-            android:layout_width="@dimen/dp_150"
+            android:layout_width="@dimen/dp_200"
             android:orientation="vertical"
             android:background="@color/white"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
@@ -27,24 +27,26 @@
             android:layout_toEndOf="@id/recycler_classify"
             android:layout_marginStart="@dimen/dp_20"
             android:text="炒菜类"
-            android:textSize="26sp"
+            android:textSize="32sp"
             />
 
         <androidx.recyclerview.widget.RecyclerView
             android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginEnd="315dp"
+            android:layout_toStartOf="@id/ll_right"
+            android:layout_marginEnd="20dp"
             android:layout_below="@id/tv_type"
             android:id="@+id/recycler_goods"
             android:layout_width="match_parent"
             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>
 
         <LinearLayout
-            android:layout_width="295dp"
+            android:id="@+id/ll_right"
+            android:layout_width="450dp"
             android:layout_alignParentEnd="true"
             android:background="@color/right_bg_blue_50p"
             android:orientation="vertical"
@@ -60,8 +62,9 @@
                 />
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_chao_order"
-                android:layout_width="295dp"
-                android:layout_height="360dp"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 android:orientation="vertical"
                 />
@@ -82,10 +85,11 @@
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_kao_order"
-                android:layout_width="295dp"
+                android:layout_width="match_parent"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 android:orientation="vertical"
-                android:layout_height="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 />
         </LinearLayout>
 

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

@@ -5,11 +5,12 @@
     android:layout_width="match_parent"
     android:id="@+id/root"
     android:fitsSystemWindows="true"
+    tools:layout_width="1470dp"
     android:background="@color/main_color2"
     android:layout_height="match_parent">
 
     <RelativeLayout
-        android:layout_width="1050dp"
+        android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <TextView
@@ -17,7 +18,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/color4"
-            android:textSize="32sp"
+            android:textSize="36sp"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
             android:layout_marginEnd="20dp"
@@ -27,7 +28,7 @@
         <LinearLayout
             android:id="@+id/ll_1"
             android:layout_width="match_parent"
-            android:layout_height="180dp"
+            android:layout_height="250dp"
             android:layout_marginTop="50dp"
             >
 
@@ -35,19 +36,20 @@
                 android:id="@+id/ll_classify"
                 android:layout_marginStart="50dp"
                 android:background="@color/white"
-                android:layout_width="180dp"
-                android:layout_height="180dp"
+                android:layout_width="250dp"
+                android:layout_height="250dp"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/home_classify_ic" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="分类属性"
                     android:layout_gravity="center"
                     android:textColor="#567722"
@@ -58,19 +60,20 @@
             <LinearLayout
                 android:id="@+id/ll_yanfa"
                 android:layout_marginStart="50dp"
-                android:layout_width="180dp"
+                android:layout_width="250dp"
                 android:background="@color/white"
-                android:layout_height="180dp"
+                android:layout_height="250dp"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/home_caiping_ic" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="菜品研发"
                     android:layout_gravity="center"
                     android:textColor="#5C6A7C"
@@ -80,19 +83,20 @@
             <LinearLayout
                 android:id="@+id/ll_silos"
                 android:layout_marginStart="50dp"
-                android:layout_width="180dp"
+                android:layout_width="250dp"
                 android:background="@color/white"
-                android:layout_height="180dp"
+                android:layout_height="250dp"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/ic_silos" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="料仓绑定"
                     android:layout_gravity="center"
                     android:textColor="#1295DA"
@@ -102,20 +106,21 @@
             <LinearLayout
                 android:id="@+id/ll_log"
                 android:layout_marginStart="50dp"
-                android:layout_width="180dp"
+                android:layout_width="250dp"
                 android:background="@color/white"
-                android:layout_height="180dp"
+                android:layout_height="250dp"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/home_log_ic" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="日志记录"
                     android:layout_gravity="center"
                     android:textColor="#2C2C2C"
@@ -129,7 +134,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="180dp"
+            android:layout_height="250dp"
             android:orientation="horizontal"
             android:layout_marginTop="50dp"
             android:layout_below="@id/ll_1"
@@ -137,19 +142,20 @@
             <LinearLayout
                 android:id="@+id/ll_order"
                 android:layout_marginStart="50dp"
-                android:layout_width="180dp"
+                android:layout_width="250dp"
                 android:background="@color/white"
-                android:layout_height="180dp"
+                android:layout_height="250dp"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/home_order_ic" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="订单统计"
                     android:layout_gravity="center"
                     android:textColor="#835555"
@@ -160,20 +166,21 @@
             <LinearLayout
                 android:id="@+id/ll_setting"
                 android:layout_marginStart="50dp"
-                android:layout_width="180dp"
-                android:layout_height="180dp"
+                android:layout_width="250dp"
+                android:layout_height="250dp"
                 android:background="@color/white"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/home_setting_ic" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="系统设置"
                     android:layout_gravity="center"
                     android:textColor="#1F84EB"
@@ -185,20 +192,21 @@
             <LinearLayout
                 android:id="@+id/ll_update"
                 android:layout_marginStart="50dp"
-                android:layout_width="180dp"
-                android:layout_height="180dp"
+                android:layout_width="250dp"
+                android:layout_height="250dp"
                 android:background="@color/white"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/ic_update" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="检查更新"
                     android:layout_gravity="center"
                     android:textColor="#F57C00"
@@ -210,20 +218,21 @@
             <LinearLayout
                 android:id="@+id/ll_logout"
                 android:layout_marginStart="50dp"
-                android:layout_width="180dp"
-                android:layout_height="180dp"
+                android:layout_width="250dp"
+                android:layout_height="250dp"
                 android:background="@color/white"
                 android:orientation="vertical">
 
                 <ImageView
                     android:layout_width="match_parent"
-                    android:layout_height="130dp"
+                     android:layout_height="0dp"
+                    android:layout_weight="1"
                     android:src="@mipmap/ic_logout2" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textSize="32sp"
+                    android:textSize="36sp"
                     android:text="注销登录"
                     android:layout_gravity="center"
                     android:textColor="#D32F2F"

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

@@ -13,7 +13,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:orientation="vertical"
-            android:layout_marginEnd="295dp"
+            android:layout_marginEnd="400dp"
             android:gravity="center_horizontal"
             android:layout_height="match_parent">
             <LinearLayout
@@ -46,7 +46,9 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_info"
                 android:layout_marginTop="20dp"
-                android:layout_width="660dp"
+                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"/>
@@ -55,7 +57,7 @@
 
 
         <LinearLayout
-            android:layout_width="295dp"
+            android:layout_width="400dp"
             android:layout_gravity="end"
             android:background="@color/right_bg_blue_50p"
             android:orientation="vertical"
@@ -63,7 +65,7 @@
             <TextView
                 android:id="@+id/tv1"
                 android:layout_height="50dp"
-                android:layout_width="295dp"
+                android:layout_width="match_parent"
                 android:textSize="32sp"
                 android:textColor="@color/black"
                 android:text="配料信息"
@@ -72,8 +74,8 @@
             <TextView
                 android:id="@+id/order_name"
                 android:layout_height="wrap_content"
-                android:layout_width="295dp"
-                android:textSize="28sp"
+                android:layout_width="match_parent"
+                android:textSize="32sp"
                 android:textColor="@color/black"
                 android:text="配料信息"
                 android:paddingStart="5dp"
@@ -82,25 +84,24 @@
                 />
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_name_list"
-                android:layout_width="295dp"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="90dp"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 android:orientation="vertical"
                 />
-
+            <TextView
+                android:id="@+id/btn_location_info"
+                android:layout_width="250dp"
+                android:layout_height="80dp"
+                android:layout_marginTop="10dp"
+                android:layout_gravity="center_horizontal|bottom"
+                style="@style/TextView_btn_blue"
+                android:text="位置详情"
+                android:layout_marginBottom="10dp"
+                />
         </LinearLayout>
-        <TextView
-            android:id="@+id/btn_location_info"
-            android:layout_width="180dp"
-            android:layout_height="70dp"
-            android:layout_marginTop="10dp"
-            android:layout_gravity="end|bottom"
-            style="@style/TextView_btn_blue"
-            android:layout_marginEnd="55dp"
-            android:text="位置详情"
-            android:layout_marginBottom="10dp"
-            />
+
     </FrameLayout>
 
 

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

@@ -11,7 +11,7 @@
         android:layout_height="match_parent">
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_marginEnd="@dimen/dp_295"
+            android:layout_marginEnd="@dimen/dp_400"
             android:gravity="center_horizontal"
             android:orientation="vertical"
             android:layout_height="match_parent">
@@ -65,9 +65,11 @@
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycle_warn_info"
-                android:layout_width="600dp"
+                android:layout_width="match_parent"
                 android:layout_marginTop="20dp"
-                android:layout_height="610dp"
+                android:layout_marginStart="100dp"
+                android:layout_marginEnd="100dp"
+                android:layout_height="match_parent"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 android:orientation="vertical"
                 />
@@ -90,7 +92,7 @@
         
         <LinearLayout
             android:id="@+id/ll_right"
-            android:layout_width="295dp"
+            android:layout_width="400dp"
             android:layout_alignParentEnd="true"
             android:background="@color/right_bg_blue_50p"
             android:orientation="vertical"
@@ -98,7 +100,7 @@
             <TextView
                 android:id="@+id/tv1"
                 android:layout_height="50dp"
-                android:layout_width="295dp"
+                android:layout_width="match_parent"
                 android:textSize="32sp"
                 android:textColor="@color/black"
                 android:text="出现报警"
@@ -107,16 +109,17 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycle_warn_record"
                 android:layout_width="match_parent"
-                android:layout_height="650dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
                 android:orientation="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 />
 
             <TextView
                 android:id="@+id/btn_fresh"
-                android:layout_width="@dimen/dp_180"
+                android:layout_width="@dimen/dp_250"
                 android:layout_height="@dimen/dp_80"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="20dp"
                 android:layout_gravity="center"
                 android:layout_marginLeft="@dimen/dp_20"
                 android:layout_marginBottom="@dimen/dp_20"

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

@@ -10,7 +10,7 @@
         android:layout_height="match_parent">
         <TextView
             android:id="@+id/add_classify"
-            android:layout_width="@dimen/dp_150"
+            android:layout_width="@dimen/dp_250"
             android:visibility="gone"
             tools:visibility="visible"
             android:layout_below="@+id/line2"
@@ -28,7 +28,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_classify"
-            android:layout_width="@dimen/dp_150"
+            android:layout_width="@dimen/dp_250"
             android:layout_below="@+id/add_classify"
             android:orientation="vertical"
             android:layout_marginBottom="@dimen/dp_95"
@@ -47,7 +47,6 @@
             android:paddingStart="@dimen/dp_25"
             android:paddingEnd="@dimen/dp_25"
             android:layout_marginBottom="2dp"
-            android:layout_alignParentEnd="true"
             android:ellipsize="middle"
             android:textSize="@dimen/sp_32"
             android:text="删除所有商品"
@@ -61,7 +60,7 @@
             android:layout_width="@dimen/dp_1"
             android:layout_height="match_parent"
             android:background="@color/color3"
-            android:layout_marginLeft="@dimen/dp_150"
+            android:layout_marginLeft="@dimen/dp_250"
             />
 
         <TextView
@@ -76,11 +75,10 @@
             android:layout_marginTop="@dimen/dp_3"
             android:id="@+id/recycler_goods"
             android:layout_width="match_parent"
-            android:layout_marginBottom="@dimen/dp_95"
             android:layout_toRightOf="@id/recycler_classify"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="5"
+            app:spanCount="8"
             android:layout_height="match_parent">
         </androidx.recyclerview.widget.RecyclerView>
 

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    tools:layout_height="635dp"
+    tools:layout_height="900dp"
     >
 
     <RelativeLayout
@@ -22,7 +22,7 @@
             android:scaleType="fitStart"
             android:src="@mipmap/device2" />
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="1000dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="420dp"
             android:orientation="vertical">
@@ -102,7 +102,7 @@
         </LinearLayout>
         <LinearLayout
             android:layout_height="match_parent"
-            android:layout_width="400dp"
+            android:layout_width="800dp"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="20dp"
             android:layout_centerVertical="true"
@@ -111,22 +111,22 @@
             <com.bonait.bnframework.newui.widget.SilosProcessBarView
                 android:id="@+id/silos1"
                 android:layout_width="match_parent"
-                android:layout_height="150dp"
+                android:layout_height="200dp"
                 />
             <com.bonait.bnframework.newui.widget.SilosProcessBarView
                 android:id="@+id/silos2"
                 android:layout_width="match_parent"
-                android:layout_height="150dp"
+                android:layout_height="200dp"
                 />
             <com.bonait.bnframework.newui.widget.SilosProcessBarView
                 android:id="@+id/silos3"
                 android:layout_width="match_parent"
-                android:layout_height="150dp"
+                android:layout_height="200dp"
                 />
             <com.bonait.bnframework.newui.widget.SilosProcessBarView
                 android:id="@+id/silos4"
                 android:layout_width="match_parent"
-                android:layout_height="150dp"
+                android:layout_height="200dp"
                 />
         </LinearLayout>
     </RelativeLayout>

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

@@ -2,13 +2,14 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dp_178"
-    android:layout_height="@dimen/dp_178"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     >
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="@dimen/dp_178"
         android:layout_height="@dimen/dp_178"
+        android:layout_marginBottom="20dp"
         >
 
         <ImageView

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

@@ -16,7 +16,7 @@
             android:id="@+id/name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/sp_28"
+            android:textSize="@dimen/sp_32"
             android:gravity="center_vertical"
             android:paddingTop="5dp"
             android:paddingBottom="5dp"

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

@@ -10,12 +10,12 @@
         android:id="@+id/name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/sp_28"
+        android:textSize="@dimen/sp_32"
         android:gravity="center_vertical"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
-        android:paddingStart="5dp"
-        android:paddingEnd="5dp"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="10dp"
         android:textColor="@color/black"
         tools:text="报sssssss息sssssssssss1"
         android:maxLines="2"

app/src/main/res/layout/new/layout/layout_add_goods_control_h.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_900"
-    android:layout_height="@dimen/dp_450"
+    android:layout_width="@dimen/dp_950"
+    android:layout_height="@dimen/dp_500"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/bg_round25_white">
@@ -18,6 +18,7 @@
         android:paddingRight="@dimen/dp_80"
         android:singleLine="true"
         android:text="配方"
+        android:textSize="36sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -28,7 +29,7 @@
         app:layout_constraintTop_toBottomOf="@id/title3"
         app:layout_constraintBottom_toTopOf="@id/ll_btn"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:textSize="36sp"
+        android:textSize="42sp"
         android:gravity="center"
         android:textColor="@color/black"
         android:maxLines="3"
@@ -86,6 +87,7 @@
         android:id="@+id/btn_close3"
         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"

app/src/main/res/layout/new/layout/layout_edit_goods_sub_attribute_h.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="900dp"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:background="@drawable/bg_round25_white">
@@ -15,6 +15,7 @@
         android:background="@drawable/bg_round25_top_yellow"
         style="@style/TextView_btn_dialog"
         android:text="选择属性"
+        android:textSize="36sp"
         />
 
     <TextView
@@ -104,6 +105,7 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         style="@style/TextView_btn_dialog"
+        android:layout_marginEnd="20dp"
         android:background="@mipmap/ic_clear_white_48dp"
         />
 

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

@@ -4,7 +4,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    tools:layout_height="85dp"
+    tools:layout_height="130dp"
+    tools:layout_width="750dp"
     tools:ignore="MissingDefaultResource">
     <LinearLayout
         android:id="@+id/close_out"
@@ -17,12 +18,12 @@
             android:text="关"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/colse"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/kaiji" />
     </LinearLayout>
@@ -38,13 +39,13 @@
             android:text="①"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl1"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>
@@ -59,13 +60,13 @@
             android:text="②"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl2"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>
@@ -80,13 +81,13 @@
             android:text="③"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl3"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>
@@ -101,13 +102,13 @@
             android:text="④"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl4"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>
@@ -122,13 +123,13 @@
             android:text="⑤"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl5"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>
@@ -143,13 +144,13 @@
             android:text="⑥"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl6"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>
@@ -164,13 +165,13 @@
             android:text="⑦"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl7"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>
@@ -185,13 +186,13 @@
             android:text="⑧"
             android:textAlignment="center"
             android:textColor="#BEAA6A"
-            android:textSize="22sp"
+            android:textSize="32sp"
             android:textStyle="bold" />
         <ImageView
             android:id="@+id/hl8"
             android:layout_marginLeft="0dp"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
             android:layout_centerVertical="true"
             android:src="@mipmap/hlwqd" />
     </LinearLayout>

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

@@ -93,6 +93,7 @@
         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"

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

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="400dp"
-    android:layout_height="150dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/silos_sz">
 
     <RelativeLayout
         android:layout_marginTop="16dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="600dp"
+        android:layout_height="200dp"
         android:background="@drawable/bg_process_bar_yellow"
         >
 
@@ -61,13 +61,15 @@
             android:textColor="@color/topbj1"
             android:textSize="32sp"
             android:textStyle="bold" />
+
+        <RelativeLayout
+            android:layout_marginRight="-2dp"
+            android:layout_alignParentRight="true"
+            android:layout_width="81dp"
+            android:layout_height="56dp"
+            android:background="@mipmap/silos_sz"/>
     </RelativeLayout>
 
-    <RelativeLayout
-        android:layout_marginRight="-2dp"
-        android:layout_alignParentRight="true"
-        android:layout_width="81dp"
-        android:layout_height="56dp"
-        android:background="@mipmap/silos_sz"/>
+
 
 </RelativeLayout>

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">@dimen/dp_600</item>
-        <item name="qmui_dialog_min_width">@dimen/dp_400</item>
+        <item name="qmui_dialog_max_width">1600dp</item>
+        <item name="qmui_dialog_min_width">1400dp</item>
         <item name="qmui_dialog_edit_content_style">@style/DialogTheme2ContentStyle</item>
         <item name="android:windowAnimationStyle">@style/activityanim</item>
 
@@ -256,7 +256,7 @@
     <style name="commonSpinnerStyle" parent="Widget.AppCompat.Spinner">
         <item name="android:background">@drawable/spinner_border</item>
 <!--        <item name="android:popupBackground">@color/main_background</item>-->
-        <item name="android:dropDownVerticalOffset">@dimen/dp_50</item>
+        <item name="android:dropDownVerticalOffset">@dimen/dp_40</item>
         <item name="android:paddingLeft">0dp</item>
         <item name="android:paddingRight">4dp</item>
         <item name="android:paddingTop">0dp</item>