界面调整

.idea/other.xml

@@ -14,6 +14,17 @@
           <option name="screenX" value="720" />
           <option name="screenY" value="1280" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="OPPO" />
+          <option name="codename" value="OP573DL1" />
+          <option name="id" value="OP573DL1" />
+          <option name="manufacturer" value="OPPO" />
+          <option name="name" value="CPH2557" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="28" />
           <option name="brand" value="DOCOMO" />

app/build.gradle

@@ -67,6 +67,7 @@ android {
             jni.srcDirs = []//禁止gradle 自动编译，使用已经编译好的So库
             jniLibs.srcDirs = ['libs']//指向要使用的库文件//的路径，前边的是自己项目的，后边的是第三方的so      'src/main/jniLibs',
             res.srcDirs = [
+                    'src/main/res/layout/svg',
                     'src/main/res/layout/dialog',
                     'src/main/res/layout/datatab',
                     'src/main/res/layout/item',

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

@@ -220,8 +220,8 @@ public class MainInit {
         }
 
 
-        if(QueryDB.GetProcessALL().isEmpty()  || PreferenceUtils.getInt("PlcInit",4)!=5){
-            PreferenceUtils.setInt("PlcInit",5);
+        if(QueryDB.GetProcessALL().isEmpty()  || PreferenceUtils.getInt("PlcInit",5)!=6){
+            PreferenceUtils.setInt("PlcInit",6);
             ConfigData.getInstance().RevertPLCProcess();
         }
 

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

@@ -776,31 +776,6 @@ public class ConfigName {
         add(new ProcessT("出菜", Arrays.asList("等待(秒)","描述")));
         add(new ProcessT("清洗", Arrays.asList("清洗方式","抽水量","清洗时间(秒)","等待(秒)","描述")));
     }};
-    /**
-     * 烤箱工序模型
-     */
-    public List<ProcessT> Process_烤箱 = new ArrayList<ProcessT>() {{
-        add(new ProcessT("放入烤盘", Arrays.asList("烤盘位置")));
-        add(new ProcessT("烤箱设置", Arrays.asList("烤箱工作模式","烤箱温度(°C)", "等待时间")));
-        add(new ProcessT("取出烤盘", Arrays.asList("等待时间")));
-    }};
-
-    /**
-     * 小炒工序模型
-     */
-    public List<ProcessT> Process_桌面小炒 = new ArrayList<ProcessT>() {{
-        add(new ProcessT("加热", Arrays.asList("加热档位","加热控制", "延迟(秒)")));
-        add(new ProcessT("液体料", new ArrayList<>()));
-        add(new ProcessT("主料", Arrays.asList("主料名称", "主料位置","烹饪(秒)")));
-        add(new ProcessT("升降", Arrays.asList("升降控制", "延迟(秒)")));
-        add(new ProcessT("单向搅拌", Arrays.asList("搅拌档位","搅拌控制", "方向选择","延迟(秒)")));
-        add(new ProcessT("双向搅拌", Arrays.asList("搅拌档位","搅拌控制", "正转时间","反转时间","延迟(秒)")));
-        add(new ProcessT("打散搅拌", Arrays.asList("打散时间(秒)")));
-        add(new ProcessT("勾芡", Arrays.asList("重量(克)")));
-        add(new ProcessT("加水", Arrays.asList("重量(克)")));
-        add(new ProcessT("延迟", Arrays.asList("延迟(秒)")));
-        add(new ProcessT("出菜", Arrays.asList("等待(秒)")));
-    }};
 
     /**
      * 根据名称获取变量
@@ -809,40 +784,6 @@ public class ConfigName {
      * @return
      */
     public String GetProcessTypeVal(String item) {
-//        String data = "";
-//        if (item.equals("搅拌动作")) {
-//            data = "正转反转、一直正转、一直反转";
-//        } else if (item.equals("位置动作")) {
-//            data = "原点位、出餐启动、倒菜位、抽料位、清洗位、炒菜位1、炒菜位2、炒菜位3";
-//        } else if (item.equals("投料动作")) {
-//            //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
-//            data = "投出等待三秒、直接投出、手动投料";
-//        } else if (item.equals("主料位置")) {
-//            data = "1号位、2号位、3号位、4号位、5号位";
-//        } else if (item.equals("正转速度") || item.equals("反转速度") || item.equals("转动速度") || item.equals("搅拌速度")) {
-//            data = "停止、最低、低速、中速、高速、最高、极高";
-//        } else if (item.equals("加热功率") || item.equals("热锅功率")) {
-//            data = "停止、一档、二档、三档、四档、五档、六档、七档、八档";
-//        }
-//        return data;
-
-//        String data = "";
-//        if (item.equals("加热控制")) {
-//            data = "启动加热、停止加热";
-//        } else if (item.equals("主料位置")) {
-//            data = "1号位、2号位、3号位、4号位、5号位、6号位";
-//        } else if (item.equals("升降控制") ) {
-//            data = "上升、下降";
-//        } else if (item.equals("搅拌控制") ) {
-//            data = "启动搅拌、停止搅拌";
-//        } else if (item.equals("方向选择") ) {
-//            data = "正转、反转";
-//        }else if(item.equals("加热档位")){
-//            data = "0档、1档、2档、3档、4档、5档、6档、7档、8档、9档、10档";
-//        }else if(item.equals("搅拌档位")){
-//            data = "0档、1档、2档、3档、4档、5档";
-//        }
-
         String data = "";
         switch (item) {
             case "搅拌动作":
@@ -854,18 +795,18 @@ public class ConfigName {
             case "炒制位置":
                 data = "炒菜位高、炒菜位低、原点位";
                 break;
-            case "投料动作":
-                //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
-                data = "投出等待三秒、直接投出、手动投料";
-                break;
+//            case "投料动作":
+//                //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
+//                data = "投出等待三秒、直接投出、手动投料";
+//                break;
             case "清洗方式":
                 data = "一般清洗、深度清洗";
                 break;
             case "主料位置":
-                data = "Z1、Z2、Z3、Z4、Z5、Z6";
+                data = "1号位、2号位";
                 break;
             case "辅料位置":
-                data = "F1、F2、F3、F4、F5、F6";
+                data = "F1、F2、F3、F4、F5、F6、F7、F8";
                 break;
             case "正转速度":
             case "反转速度":
@@ -877,15 +818,6 @@ public class ConfigName {
             case "热锅功率":
                 data = "停止、一档、二档、三档、四档、五档、六档、七档、八档";
                 break;
-            case "烤盘位置":
-                data = "K1、K2";
-                break;
-            case "烤箱工作模式":
-                data = "关闭、蒸、烤、蒸烤、其他";
-                break;
-//            case "烤箱温度":
-//                data = "0档0°C、1档50°C、2档100°C、3档150°C、4档200°C";
-//                break;
         }
         return data;
 

app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java

@@ -95,6 +95,35 @@ public class GlideUtil {
                 .into(imageView);
     }
 
+    public static void showImageById(Context context,  ImageView imageView,int placeId) {
+        if (context == null) {
+            return;
+        }
+
+        GlideApp.with(context)
+                .load(placeId)
+                .addListener(new RequestListener<Drawable>() {
+                    @Override
+                    public boolean onLoadFailed(@Nullable GlideException e, Object model,
+                                                Target<Drawable> target, boolean isFirstResource) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onResourceReady(Drawable resource, Object model,
+                                                   Target<Drawable> target, DataSource dataSource,
+                                                   boolean isFirstResource) {
+                        if (imageView == null) {
+                            return false;
+                        }
+                        imageView.setBackground(null);
+                        return false;
+                    }
+                })
+                .transition(DrawableTransitionOptions.withCrossFade(CROSS_FADE_DURATION))
+                .into(imageView);
+    }
+
     public static void showImageWithRadius(Context context, String path, ImageView imageView,int placeId,int radius) {
         if (context == null||path==null) {
             return;

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

@@ -20,6 +20,8 @@ import com.bonait.bnframework.databinding.ActivityCookHBinding;
 import com.bonait.bnframework.modbus.ModbusCenter;
 import com.bonait.bnframework.modbus.Wok1ModbusTcpServer;
 import com.bonait.bnframework.modbus.Wok2ModbusTcpServer;
+import com.bonait.bnframework.modbus.Wok3ModbusTcpServer;
+import com.bonait.bnframework.modbus.Wok4ModbusTcpServer;
 import com.bonait.bnframework.newui.dialog.control.WokControlDialog;
 import com.bonait.bnframework.newui.fragment.cooking.CookingFragment;
 import com.bonait.bnframework.newui.widget.NewToastUtil;
@@ -28,41 +30,45 @@ import com.bumptech.glide.Glide;
 public class CookingHActivity extends BaseActivity {
     private final String TAG = "CookingHActivity==>";
     private ActivityCookHBinding viewBinding;
-    private CookingFragment cookingFragment1,cookingFragment2;
+    private CookingFragment cookingFragment1,cookingFragment2,cookingFragment3,cookingFragment4;
     private boolean isWorking = false;
     private Handler handler = new Handler(Looper.getMainLooper()){
         @Override
         public void handleMessage(@NonNull Message msg) {
             super.handleMessage(msg);
-            BPA_ORDER_DETAIL detail0 = OrderDetailUtil.getByMaking(1);
-            BPA_ORDER_DETAIL detail1 = OrderDetailUtil.getByMaking(2);
+//            BPA_ORDER_DETAIL detail0 = OrderDetailUtil.getByMaking(1);
+//            BPA_ORDER_DETAIL detail1 = OrderDetailUtil.getByMaking(2);
             if(msg.what==1){
-                boolean working = false;
-                if(detail0!=null){
-                    if(detail0.status==1){
-                        working = true;
-                    }
-                }
-                if(detail1!=null){
-                    if(detail1.status==1){
-                        working = true;
-                    }
-                }
-                if(working){
-                    if(!isWorking){
-                        Glide.with(viewBinding.deviceImage.getContext()).asGif().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
-                    }
-                }else{
-                    if(isWorking){
-                        Glide.with(viewBinding.deviceImage.getContext()).asBitmap().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
-                    }
-                }
-                isWorking = working;
+//                boolean working = false;
+//                if(detail0!=null){
+//                    if(detail0.status==1){
+//                        working = true;
+//                    }
+//                }
+//                if(detail1!=null){
+//                    if(detail1.status==1){
+//                        working = true;
+//                    }
+//                }
+//                if(working){
+//                    if(!isWorking){
+//                        Glide.with(viewBinding.deviceImage.getContext()).asGif().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
+//                    }
+//                }else{
+//                    if(isWorking){
+//                        Glide.with(viewBinding.deviceImage.getContext()).asBitmap().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
+//                    }
+//                }
+//                isWorking = working;
 
                 Object val_wd = ModbusCenter.getWokListingValue(1,"当前锅底温度");
                 Object val_wd2 = ModbusCenter.getWokListingValue(2,"当前锅底温度");
-                String s = "1号炒锅温度：" + val_wd + "°C     " + "2号炒锅温度：" + val_wd2 + "°C";
-                viewBinding.wokWendu.setText(s);
+                Object val_wd3 = ModbusCenter.getWokListingValue(3,"当前锅底温度");
+                Object val_wd4 = ModbusCenter.getWokListingValue(4,"当前锅底温度");
+                viewBinding.tvTitle1.setText("1号炒锅温度：" + val_wd + "°C");
+                viewBinding.tvTitle2.setText("2号炒锅温度：" + val_wd2 + "°C");
+                viewBinding.tvTitle3.setText("3号炒锅温度：" + val_wd3 + "°C");
+                viewBinding.tvTitle4.setText("4号炒锅温度：" + val_wd4 + "°C");
             }
             if(handler.hasMessages(1)){
                 handler.removeMessages(1);
@@ -86,12 +92,20 @@ public class CookingHActivity extends BaseActivity {
 
         cookingFragment1 = CookingFragment.newInstance(1);
         cookingFragment2 = CookingFragment.newInstance(2);
+        cookingFragment3 = CookingFragment.newInstance(3);
+        cookingFragment4 = CookingFragment.newInstance(4);
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.fragment1, cookingFragment1)
                 .commit();
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.fragment2, cookingFragment2)
                 .commit();
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.fragment3, cookingFragment3)
+                .commit();
+        getSupportFragmentManager().beginTransaction()
+                .replace(R.id.fragment4, cookingFragment4)
+                .commit();
 
         viewBinding.btnWok1.setOnClickListener(v->{
             showWokDialog(1);
@@ -99,6 +113,12 @@ public class CookingHActivity extends BaseActivity {
         viewBinding.btnWok2.setOnClickListener(v->{
             showWokDialog(2);
         });
+        viewBinding.btnWok3.setOnClickListener(v->{
+            showWokDialog(3);
+        });
+        viewBinding.btnWok4.setOnClickListener(v->{
+            showWokDialog(4);
+        });
     }
 
     /**
@@ -106,16 +126,33 @@ public class CookingHActivity extends BaseActivity {
      * @param num  几号炒锅
      */
     private void showWokDialog(int num){
-        if(num==2){
-            if(!Wok2ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
-                NewToastUtil.getInstance().showToastError("2号炒锅设备未连接！");
-                return;
-            }
-        }else {
-            if(!Wok1ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
-                NewToastUtil.getInstance().showToastError("1号炒锅设备未连接！");
+        switch (num){
+            case 1:
+                if(!Wok1ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+                    NewToastUtil.getInstance().showToastError("1号炒锅设备未连接！");
+                    return;
+                }
+                break;
+            case 2:
+                if(!Wok2ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+                    NewToastUtil.getInstance().showToastError("2号炒锅设备未连接！");
+                    return;
+                }
+                break;
+            case 3:
+                if(!Wok3ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+                    NewToastUtil.getInstance().showToastError("3号炒锅设备未连接！");
+                    return;
+                }
+                break;
+            case 4:
+                if(!Wok4ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+                    NewToastUtil.getInstance().showToastError("4号炒锅设备未连接！");
+                    return;
+                }
+                break;
+            default:
                 return;
-            }
         }
 
         WokControlDialog dialog = new WokControlDialog();
@@ -152,6 +189,8 @@ public class CookingHActivity extends BaseActivity {
         super.onDestroy();
         cookingFragment1.onDestroy();
         cookingFragment2.onDestroy();
+        cookingFragment3.onDestroy();
+        cookingFragment4.onDestroy();
         LogUtils.d("CookingHActivity onDestroy");
         if(handler!=null){
             handler.removeCallbacksAndMessages(null);

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

@@ -97,10 +97,7 @@ public class DiyProcessHActivity extends BaseActivity {
      * 导入已有属性组合弹窗
      */
     private AttributeSelectDialog attributeSelectDialog;
-    /**
-     * 0炒菜 1烤箱
-     */
-    private int type = 0;
+
     private WaiteProgressDialog progressDialog;
     private Handler handler = new Handler(Looper.getMainLooper()){
         @Override
@@ -168,11 +165,9 @@ public class DiyProcessHActivity extends BaseActivity {
         }
         BPA_GOODS_CLASSIFY classify = GoodsClassifyDBUtil.getById(goods.goodClassifyid);
         assert classify != null;
-        type = classify.type;
-//        viewBinding.tvType.setText(type==0?"炒菜":"烤菜");
-        viewBinding.btnInsertDown.setVisibility(type==0?View.VISIBLE:View.GONE);
-        viewBinding.btnInsertUp.setVisibility(type==0?View.VISIBLE:View.GONE);
-        viewBinding.tvOvenTip.setVisibility(type==1?View.VISIBLE:View.GONE);
+
+        viewBinding.btnInsertDown.setVisibility(View.VISIBLE);
+        viewBinding.btnInsertUp.setVisibility(View.VISIBLE);
         initProcessModel();
         initStepAdapter();
         initBtnListener();
@@ -255,26 +250,6 @@ public class DiyProcessHActivity extends BaseActivity {
      */
     private void initBtnListener(){
         viewBinding.btnAdd.setOnClickListener(view -> {
-            if(type == 1){
-                BPA_GOODS_PROCESS_DETAIL goodsrecipe = getSelectItemFromValue();
-                boolean exit = false;
-                for(BPA_GOODS_PROCESS_DETAIL bean : processDetails){
-                    if(bean.processname.equals("放入烤盘")){
-                        exit = true;
-                    }
-                }
-                if(exit){
-                    if(goodsrecipe.processname.equals("放入烤盘")) {
-                        NewToastUtil.getInstance().showToastError("一个菜品只能放一次烤盘");
-                        return;
-                    }
-                }else {
-                    if(!goodsrecipe.processname.equals("放入烤盘")) {
-                        NewToastUtil.getInstance().showToastError("请先添加[放入烤盘]步骤");
-                        return;
-                    }
-                }
-            }
             addProcess();
         });
         viewBinding.btnUpdate.setOnClickListener(view -> {
@@ -361,7 +336,7 @@ public class DiyProcessHActivity extends BaseActivity {
      */
     private void initProcessModel(){
         //初始化工序
-        ArrayList<BPA_PROCESS> data = QueryDB.GetProcessALLByType(type);
+        ArrayList<BPA_PROCESS> data = QueryDB.GetProcessALLByType(0);
         int i = 0;
         String id = "";
         for (BPA_PROCESS item : data) {
@@ -437,7 +412,20 @@ public class DiyProcessHActivity extends BaseActivity {
     private void addProcess(){
         RecordManager.getInstance().addLogRecord("角色操作日志", subAttributeGroupName+"-添加工序");
         BPA_GOODS_PROCESS_DETAIL goodsrecipe = getSelectItemFromValue();
+
         if (goodsrecipe != null) {
+            if(goodsrecipe.processname.contains("主料")){
+                int mainFoodNum = 0;
+                for(BPA_GOODS_PROCESS_DETAIL bean :processDetails){
+                    if(bean.processname.contains("主料")){
+                        mainFoodNum++;
+                    }
+                }
+                if(mainFoodNum>=2){
+                    NewToastUtil.getInstance().showToastError("最多只能添加两个主料");
+                    return;
+                }
+            }
             processDetails.add(goodsrecipe);
             stepAdapter.setCurrentPosition(processDetails.size()-1);
             stepAdapter.notifyDataSetChanged();
@@ -454,6 +442,18 @@ public class DiyProcessHActivity extends BaseActivity {
         RecordManager.getInstance().addLogRecord("角色操作日志", subAttributeGroupName+"-向上插入工序");
         BPA_GOODS_PROCESS_DETAIL goodSrecipeUp = getSelectItemFromValue();
         if (goodSrecipeUp != null) {
+            if(goodSrecipeUp.processname.contains("主料")){
+                int mainFoodNum = 0;
+                for(BPA_GOODS_PROCESS_DETAIL bean :processDetails){
+                    if(bean.processname.contains("主料")){
+                        mainFoodNum++;
+                    }
+                }
+                if(mainFoodNum>=2){
+                    NewToastUtil.getInstance().showToastError("最多只能添加两个主料");
+                    return;
+                }
+            }
             int index_update = stepAdapter.getCurrentPosition();
             if (index_update >= 0 && processDetails.size()>0) {
                 BPA_GOODS_PROCESS_DETAIL processDetail = goodSrecipeUp;
@@ -474,6 +474,19 @@ public class DiyProcessHActivity extends BaseActivity {
         RecordManager.getInstance().addLogRecord("角色操作日志", subAttributeGroupName+"-向下插入工序");
         BPA_GOODS_PROCESS_DETAIL goodSrecipeUp = getSelectItemFromValue();
         if (goodSrecipeUp != null) {
+            if(goodSrecipeUp.processname.contains("主料")){
+                int mainFoodNum = 0;
+                for(BPA_GOODS_PROCESS_DETAIL bean :processDetails){
+                    if(bean.processname.contains("主料")){
+                        mainFoodNum++;
+                    }
+                }
+                if(mainFoodNum>=2){
+                    NewToastUtil.getInstance().showToastError("最多只能添加两个主料");
+                    return;
+                }
+            }
+
             int index_update = stepAdapter.getCurrentPosition();
             if (index_update >= 0 && !processDetails.isEmpty()) {
                 BPA_GOODS_PROCESS_DETAIL processDetail = goodSrecipeUp;
@@ -611,7 +624,7 @@ public class DiyProcessHActivity extends BaseActivity {
      */
     private void initTopBar(){
         viewBinding.topbar.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.topbj1));
-        viewBinding.titleBar.setText(type==0?"炒菜-编辑工序":"烤菜-编辑工序");
+        viewBinding.titleBar.setText("编辑工序");
         viewBinding.back.setOnClickListener(v->{
             goBack();
         });

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

@@ -271,6 +271,8 @@ public class MainHActivity extends BaseActivity {
         public void onPageSelected(int position) {
             tabAdapter.setCurrentPosition(position);
             tabAdapter.notifyDataSetChanged();
+
+            viewBinding.rlOrderTip.setVisibility(position==1?View.GONE:View.VISIBLE);
         }
 
         @Override

app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java

@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.glide.GlideUtil;
 import com.bonait.bnframework.newui.adapter.base.BaseAdapter;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS;
 import com.bonait.bnframework.common.db.util.GoodsDBUtil;
@@ -53,7 +54,8 @@ public abstract class CloudGoodsAdapter extends BaseAdapter<BPA_GOODS,CloudGoods
                 myBitmapUtils.disPlay(holder.binding.image,url);
 //                GlideUtil.showImage(holder.binding.image.getContext(),url,holder.binding.image,R.mipmap.loading123);
             }else {
-                holder.binding.image.setBackgroundResource(R.mipmap.loading123);
+//                holder.binding.image.setBackgroundResource(R.mipmap.loading123);
+                GlideUtil.showImageById(holder.binding.image.getContext(),holder.binding.image,R.mipmap.loading123);
             }
 
             if(GoodsDBUtil.getByNameAndClassifyId(goods.name,goods.propClassifyId)!=null){

app/src/main/java/com/bonait/bnframework/newui/adapter/goods/HomeGoodsAdapter.java

@@ -78,7 +78,8 @@ public abstract class HomeGoodsAdapter extends BaseAdapter<BPA_GOODS, HomeGoodsA
                 myBitmapUtils.disPlay(holder.binding.image,url);
                 GlideUtil.showImage(holder.binding.image.getContext(),url,holder.binding.image,R.mipmap.loading123);
             }else {
-                holder.binding.image.setBackgroundResource(R.mipmap.loading123);
+//                holder.binding.image.setBackgroundResource(R.mipmap.loading123);
+                GlideUtil.showImageById(holder.binding.image.getContext(),holder.binding.image,R.mipmap.loading123);
             }
 
             //点击查看当前商品信息

app/src/main/java/com/bonait/bnframework/newui/adapter/goods/LocalGoodsAdapter.java

@@ -77,7 +77,8 @@ public abstract class LocalGoodsAdapter extends BaseAdapter<BPA_GOODS,LocalGoods
                 myBitmapUtils.disPlay(holder.binding.image,url);
                 GlideUtil.showImage(holder.binding.image.getContext(),url,holder.binding.image,R.mipmap.loading123);
             }else {
-                holder.binding.image.setBackgroundResource(R.mipmap.loading123);
+//                holder.binding.image.setBackgroundResource(R.mipmap.loading123);
+                GlideUtil.showImageById(holder.binding.image.getContext(),holder.binding.image,R.mipmap.loading123);
             }
             //多选框设置
             holder.binding.image.setEnabled(goods.status>0?false:true);

app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog.java

@@ -117,6 +117,8 @@ public class FoodInfoDialog extends DialogFragment {
         viewBinding.top4.setText("");
         viewBinding.top5.setText("");
         viewBinding.top6.setText("");
+        viewBinding.top7.setText("");
+        viewBinding.top8.setText("");
         viewBinding.mainFood1.setText("");
         viewBinding.mainFood2.setText("");
         viewBinding.mainFood3.setText("");
@@ -374,6 +376,7 @@ public class FoodInfoDialog extends DialogFragment {
                     orderDetail.mainPosition = mainPosition;
                     OrderDetailUtil.update(orderDetail);
                     freshView();
+                    xCom.dismissX();
                 }
             };
 

app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog.java

@@ -188,7 +188,7 @@ public class RobotControlDialog extends DialogFragment {
     private HashMap<String, String> data = new HashMap<>();;
     @SuppressLint("NonConstantResourceId")
     @OnClick({R.id.top1, R.id.top2,R.id.top3,R.id.top4,R.id.top5,R.id.top6,R.id.top7,R.id.top8,
-            R.id.right1,R.id.right2,R.id.right3,R.id.right4,R.id.right5,R.id.right6,R.id.btn_pen_back,
+            R.id.mainFood1,R.id.mainFood2,R.id.mainFood3,R.id.mainFood4,R.id.mainFood5,R.id.mainFood6,R.id.btn_pen_back,
             R.id.btn_wok_chucai,R.id.btn_wok_chucai2,R.id.btn_wok_chucai3,R.id.btn_wok_chucai4,R.id.btn_weihu,R.id.btn_weihu_finish})
     public void onViewClicked(View view) {
         RecordManager.getInstance().addLogRecord("角色操作日志","用户点击按钮-机器人调试");
@@ -331,22 +331,22 @@ public class RobotControlDialog extends DialogFragment {
                 data.put("烹饪(秒)","0");
                 robotPutMaterial();
                 break;
-            case R.id.right1:
+            case R.id.mainFood1:
                 robotPutFood(1);
                 break;
-            case R.id.right2:
+            case R.id.mainFood2:
                 robotPutFood(2);
                 break;
-            case R.id.right3:
+            case R.id.mainFood3:
                 robotPutFood(3);
                 break;
-            case R.id.right4:
+            case R.id.mainFood4:
                 robotPutFood(4);
                 break;
-            case R.id.right5:
+            case R.id.mainFood5:
                 robotPutFood(5);
                 break;
-            case R.id.right6:
+            case R.id.mainFood6:
                 robotPutFood(6);
                 break;
             case R.id.btn_wok_chucai:

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

@@ -11,12 +11,10 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.RecyclerView;
-
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.RecordManager;
@@ -45,11 +43,9 @@ import com.bonait.bnframework.newui.adapter.classify.GoodClassifyAdapter;
 import com.bonait.bnframework.newui.adapter.goods.LocalGoodsAdapter;
 import com.bonait.bnframework.newui.dialog.add.AddGoodsDialog;
 import com.bonait.bnframework.newui.widget.NewToastUtil;
-
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -194,7 +190,7 @@ public class LocalGoodsHFragment extends BaseFragment {
                 NewToastUtil.getInstance().showToast("点击过快！");
                 return;
             }
-            AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认上传全部分类、全部商品、全部工序信息？上传将会覆盖云端商品，请确认", new AlertDialogUtils.DialogClickListener() {
+            AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认上传选中商品？上传将会覆盖云端商品，请确认", new AlertDialogUtils.DialogClickListener() {
                 @Override
                 public void onConfirm() {
                     List<BPA_GOODS> res = goodsList.stream().filter(p->p.status==1).collect(Collectors.toList());
@@ -222,7 +218,7 @@ public class LocalGoodsHFragment extends BaseFragment {
         });
         viewBinding.deleteAll.setVisibility(isEdit?View.VISIBLE:View.GONE);
         viewBinding.deleteAll.setOnClickListener(v->{
-            AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认删除全部分类、全部商品、全部工序信息？", new AlertDialogUtils.DialogClickListener() {
+            AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认删除选中商品？", new AlertDialogUtils.DialogClickListener() {
                 @Override
                 public void onConfirm() {
                     if(ConfigName.getInstance().isFastClick()){

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

@@ -247,13 +247,13 @@ public class HomeOrderFragment extends BaseFragment{
             if(foodInfoList.isEmpty()){
                 return;
             }
-            FoodPosSetDialog foodInfoDialog = new FoodPosSetDialog();
+            FoodPosSetDialog dialog = new FoodPosSetDialog();
             Bundle bundle = new Bundle();
             bundle.putString("orderId",orderDetail.id);
-            foodInfoDialog.setArguments(bundle);
+            dialog.setArguments(bundle);
             if(getActivity()!=null){
-                foodInfoDialog.show(getActivity().getSupportFragmentManager(),"修改配料位置");
-                foodInfoDialog.setListener(new MyClickListener() {
+                dialog.show(getActivity().getSupportFragmentManager(),"修改配料位置");
+                dialog.setListener(new MyClickListener() {
                     @Override
                     public void clickListener(View v, Object data) {
                         orderDetails1.clear();
@@ -279,12 +279,13 @@ public class HomeOrderFragment extends BaseFragment{
      */
     private void changeRightBtn(){
         if(foodInfoList.isEmpty()){
+            viewBinding.orderName.setText("");
             viewBinding.btnLocationInfo.setVisibility(View.GONE);
             viewBinding.btnFoodPosSet.setVisibility(View.GONE);
         }else {
-            if(orderDetail.status==1){
+            if(orderDetail.status!=0){
                 viewBinding.btnFoodPosSet.setVisibility(View.GONE);
-                viewBinding.btnLocationInfo.setVisibility(View.VISIBLE);
+                viewBinding.btnLocationInfo.setVisibility(View.GONE);
             }else {
                 viewBinding.btnFoodPosSet.setVisibility(View.VISIBLE);
                 viewBinding.btnLocationInfo.setVisibility(View.VISIBLE);
@@ -298,7 +299,10 @@ public class HomeOrderFragment extends BaseFragment{
      * @param deviceNum 设备号
      * @return
      */
-    private boolean checkPosition(int mainPosition,int deviceNum){
+    private boolean validationPosition(BPA_ORDER_DETAIL orderDetail,int mainPosition,int deviceNum){
+        if(orderDetail.status != 0){
+            return true;
+        }
         if(mainPosition==0|deviceNum==0){
             NewToastUtil.getInstance().showToastError("请先绑定位置信息");
             AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "警告",
@@ -354,7 +358,7 @@ public class HomeOrderFragment extends BaseFragment{
      * @param position
      */
     private void orderMaking(List<BPA_ORDER_DETAIL> mData,int position){
-        if(!checkPosition(mData.get(position).mainPosition,mData.get(position).type)){
+        if(!validationPosition(mData.get(position),mData.get(position).mainPosition,mData.get(position).type)){
             return;
         }
         if(ConfigName.getInstance().isFastClick()){
@@ -522,6 +526,7 @@ public class HomeOrderFragment extends BaseFragment{
                 orderDetails1.remove(position);
                 orderAdapter1.setCurrentPosition(-1);
                 foodInfoList.clear();
+                changeRightBtn();
                 foodInfoAdapter.notifyDataSetChanged();
                 orderAdapter1.notifyDataSetChanged();
                 NewToastUtil.getInstance().showToast("删除成功");
@@ -595,6 +600,7 @@ public class HomeOrderFragment extends BaseFragment{
                         foodInfoList.clear();
                         foodInfoAdapter.notifyDataSetChanged();
                         orderAdapter1.notifyDataSetChanged();
+                        changeRightBtn();
                         startMakingThread(bean);
                         jumpToCook(bean);
                         break;
@@ -612,6 +618,7 @@ public class HomeOrderFragment extends BaseFragment{
                         orderDetails1.remove(position);
                         orderAdapter1.setCurrentPosition(-1);
                         foodInfoList.clear();
+                        changeRightBtn();
                         foodInfoAdapter.notifyDataSetChanged();
                         orderAdapter1.notifyDataSetChanged();
                         break;
@@ -632,6 +639,7 @@ public class HomeOrderFragment extends BaseFragment{
                     orderDetails1.addAll(OrderDetailUtil.getAll());
                     orderAdapter1.setCurrentPosition(-1);
                     foodInfoList.clear();
+                    changeRightBtn();
                     foodInfoAdapter.notifyDataSetChanged();
                     orderAdapter1.notifyDataSetChanged();
                     viewBinding.recyclerInfo.smoothScrollToPosition(0);

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

@@ -5,14 +5,14 @@
 
     <item android:state_pressed="true">
         <shape>
-            <solid android:color="#d4d4d4" />
+            <solid android:color="#0088FF" />
             <corners android:radius="10dp" />
         </shape>
     </item>
 
     <item android:state_enabled="false">
         <shape>
-            <solid android:color="#d4d4d4" />
+            <solid android:color="#0088FF" />
             <corners android:radius="10dp" />
         </shape>
     </item>
@@ -20,7 +20,7 @@
 
     <item>
         <shape>
-            <solid android:color="#d4d4d4" />
+            <solid android:color="#0088FF" />
             <corners android:radius="10dp" />
         </shape>
     </item>

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

@@ -67,7 +67,7 @@
                 android:id="@+id/iv_delete"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                android:src="@mipmap/file_picker_delete"
+                android:src="@drawable/ic_delete_x"
                 />
         </RelativeLayout>
 

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    android:background="@color/main_color2"
+    android:background="@color/white"
     >
 
 
@@ -15,19 +15,22 @@
         android:layout_marginTop="@dimen/home_tab_height"
         android:layout_height="match_parent">
 
-        <ImageView
-            android:id="@+id/device_image"
-            android:layout_width="match_parent"
-            android:layout_marginEnd="800dp"
-            android:layout_height="match_parent"
-            />
+<!--        <ImageView-->
+<!--            android:id="@+id/device_image"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_marginEnd="800dp"-->
+<!--            android:layout_height="match_parent"-->
+<!--            />-->
+
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:orientation="vertical"
             android:layout_gravity="end"
+            android:layout_marginEnd="820dp"
             android:layout_height="match_parent">
             <TextView
+                android:id="@+id/tv_title1"
                 android:layout_width="800dp"
                 android:layout_height="50dp"
                 android:textSize="32sp"
@@ -47,10 +50,11 @@
                 android:layout_height="0dp"
                 android:layout_weight="1"/>
             <TextView
+                android:id="@+id/tv_title3"
                 android:layout_width="800dp"
                 android:layout_height="50dp"
                 android:textSize="32sp"
-                android:text="2号炒锅"
+                android:text="3号炒锅"
                 android:layout_marginTop="10dp"
                 android:textColor="@color/white"
                 android:layout_gravity="bottom|end"
@@ -59,23 +63,59 @@
 
                 />
             <FrameLayout
-                android:id="@+id/fragment2"
+                android:id="@+id/fragment3"
                 android:layout_gravity="bottom|end"
                 android:layout_width="800dp"
                 android:background="@color/main_color1"
                 android:layout_height="0dp"
                 android:layout_weight="1"/>
         </LinearLayout>
-
-        <TextView
-            android:id="@+id/wok_wendu"
+        <LinearLayout
             android:layout_width="wrap_content"
-            android:textSize="36sp"
-            tools:text="炒锅温度100oc"
-            android:layout_marginTop="20dp"
-            android:layout_marginStart="50dp"
-            android:layout_height="wrap_content"/>
+            android:orientation="vertical"
+            android:layout_gravity="end"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/tv_title2"
+                android:layout_width="800dp"
+                android:layout_height="50dp"
+                android:textSize="32sp"
+                android:text="2号炒锅"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/white"
+                android:layout_gravity="end"
+                android:paddingStart="10dp"
+                android:gravity="center"
+                android:background="@color/main_title_color1"
+                />
+            <FrameLayout
+                android:id="@+id/fragment2"
+                android:layout_gravity="end"
+                android:layout_width="800dp"
+                android:background="@color/main_color1"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+            <TextView
+                android:id="@+id/tv_title4"
+                android:layout_width="800dp"
+                android:layout_height="50dp"
+                android:textSize="32sp"
+                android:text="4号炒锅"
+                android:layout_marginTop="10dp"
+                android:textColor="@color/white"
+                android:layout_gravity="bottom|end"
+                android:gravity="center"
+                android:background="@color/main_title_color1"
 
+                />
+            <FrameLayout
+                android:id="@+id/fragment4"
+                android:layout_gravity="bottom|end"
+                android:layout_width="800dp"
+                android:background="@color/main_color1"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+        </LinearLayout>
 
         <TextView
             android:id="@+id/btn_wok1"
@@ -86,9 +126,8 @@
             style="@style/TextView_btn_normal"
             android:text="1号炒锅控制"
             android:textSize="36sp"
-            android:layout_marginStart="50dp"
-            android:layout_marginBottom="50dp"
-            android:layout_gravity="bottom"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="50dp"
             />
         <TextView
             android:id="@+id/btn_wok2"
@@ -99,9 +138,32 @@
             style="@style/TextView_btn_normal"
             android:text="2号炒锅控制"
             android:textSize="36sp"
-            android:layout_marginStart="400dp"
-            android:layout_marginBottom="50dp"
-            android:layout_gravity="bottom"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="200dp"
+            />
+        <TextView
+            android:id="@+id/btn_wok3"
+            android:layout_width="wrap_content"
+            android:paddingStart="40dp"
+            android:paddingEnd="40dp"
+            android:layout_height="100dp"
+            style="@style/TextView_btn_normal"
+            android:text="3号炒锅控制"
+            android:textSize="36sp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="350dp"
+            />
+        <TextView
+            android:id="@+id/btn_wok4"
+            android:layout_width="wrap_content"
+            android:paddingStart="40dp"
+            android:paddingEnd="40dp"
+            android:layout_height="100dp"
+            style="@style/TextView_btn_normal"
+            android:text="4号炒锅控制"
+            android:textSize="36sp"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="500dp"
             />
 
     </FrameLayout>

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

@@ -10,7 +10,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/content"
-        android:layout_marginTop="90dp"
+        android:layout_marginTop="70dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <TextView
@@ -26,34 +26,6 @@
             android:layout_marginStart="10dp"
             />
 
-<!--        <TextView-->
-<!--            android:id="@+id/tv_type"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="100dp"-->
-<!--            app:layout_constraintTop_toTopOf="parent"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            android:gravity="center"-->
-<!--            android:text="炒菜"-->
-<!--            style="@style/TextView_normal_size"-->
-<!--            android:textSize="36sp"-->
-<!--            android:textColor="@color/black"-->
-<!--            android:layout_marginStart="230dp"-->
-<!--            />-->
-        <TextView
-            android:id="@+id/tv_oven_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="100dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:layout_marginBottom="200dp"
-            app:layout_constraintStart_toStartOf="parent"
-            android:gravity="center"
-            android:text="注意:第一步请先添加[放入烤盘]步骤,再进行烤盘设置\n一个菜品只能放一次烤盘，程序会自动控制烤箱开关门"
-            style="@style/TextView_normal_size"
-            android:textColor="@color/black"
-            android:layout_marginStart="400dp"
-            android:textSize="36sp"
-            android:visibility="gone"
-            />
         <!--顶部-->
         <TextView
             android:id="@+id/title"
@@ -224,7 +196,7 @@
             app:layout_constraintStart_toEndOf="@id/line2"
             app:layout_constraintBottom_toBottomOf="parent"
             android:layout_marginStart="40dp"
-            android:layout_marginBottom="50dp"
+            android:layout_marginBottom="20dp"
             />
         <!--修改-->
         <TextView
@@ -289,7 +261,7 @@
                 android:id="@+id/layout_huojia"
                 android:layout_width="700dp"
                 android:layout_height="350dp"
-                layout="@layout/layout_huojia"
+                layout="@layout/layout_huojia2"
                 android:layout_marginTop="25dp"
                 android:visibility="gone"
                 />
@@ -327,7 +299,7 @@
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"
-        android:layout_height="90dp" >
+        android:layout_height="70dp" >
 
         <TextView
             android:id="@+id/back"

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

@@ -25,6 +25,7 @@
         android:layout_marginBottom="50dp"
         />
     <RelativeLayout
+        android:id="@+id/rl_order_tip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_order"

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

@@ -9,9 +9,9 @@
     android:layout_height="wrap_content">
 
     <RelativeLayout
-        android:layout_width="1200dp"
+        android:layout_width="1000dp"
         android:background="@drawable/bg_round25_white"
-        android:layout_height="900dp">
+        android:layout_height="700dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="1200dp"
@@ -20,24 +20,24 @@
             android:layout_height="900dp">
 
             <ImageView
-                android:layout_width="1100dp"
-                android:layout_height="550dp"
-                android:layout_marginTop="220dp"
+                android:id="@+id/image"
+                android:layout_width="900dp"
+                android:layout_height="500dp"
+                android:layout_marginTop="140dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                android:scaleY="1.1"
-                android:scaleX="1.1"
+                android:background="@mipmap/ic_chucan_box"
                 />
             <TextView
                 android:id="@+id/tv_chucan1"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
+                android:layout_width="350dp"
+                android:layout_height="120dp"
                 android:background="@drawable/bg_pen_check"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="340dp"
-                android:layout_marginStart="140dp"
+                app:layout_constraintStart_toStartOf="@id/image"
+                app:layout_constraintTop_toTopOf="@id/image"
+                android:layout_marginTop="125dp"
+                android:layout_marginStart="65dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
@@ -49,12 +49,12 @@
 
             <TextView
                 android:id="@+id/tv_chucan2"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
+                android:layout_width="350dp"
+                android:layout_height="120dp"
                 android:background="@drawable/bg_pen_check"
                 app:layout_constraintStart_toStartOf="@id/tv_chucan1"
                 app:layout_constraintTop_toTopOf="@id/tv_chucan1"
-                android:layout_marginStart="540dp"
+                android:layout_marginStart="405dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
@@ -66,12 +66,12 @@
 
             <TextView
                 android:id="@+id/tv_chucan3"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
+                android:layout_width="350dp"
+                android:layout_height="120dp"
                 android:background="@drawable/bg_pen_check"
                 app:layout_constraintStart_toStartOf="@id/tv_chucan1"
                 app:layout_constraintTop_toTopOf="@id/tv_chucan1"
-                android:layout_marginTop="200dp"
+                android:layout_marginTop="220dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
@@ -82,8 +82,8 @@
                 />
             <TextView
                 android:id="@+id/tv_chucan4"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
+                android:layout_width="350dp"
+                android:layout_height="120dp"
                 android:background="@drawable/bg_pen_check"
                 app:layout_constraintStart_toStartOf="@id/tv_chucan2"
                 app:layout_constraintTop_toTopOf="@id/tv_chucan3"

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

@@ -89,15 +89,14 @@
         
         <ImageView
             android:id="@+id/image"
-            android:layout_width="1000dp"
-            android:layout_height="match_parent"
-            android:layout_marginTop="220dp"
+            android:layout_width="1200dp"
+            android:layout_height="500dp"
+            android:scaleType="fitCenter"
+            android:layout_marginTop="300dp"
             android:src="@mipmap/ic_huojia_box"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
-            android:scaleY="1.2"
-            android:scaleX="1.2"
-            android:layout_marginStart="140dp"
+            android:layout_marginStart="50dp"
             />
         <TextView
             android:layout_width="wrap_content"
@@ -233,7 +232,7 @@
             android:layout_width="170dp"
             android:textSize="32sp"
             android:textColor="@color/white"
-            android:text="2号炒锅\n模拟出菜"
+            android:text="3号炒锅\n模拟出菜"
             android:gravity="center"
             android:background="@drawable/bg_round15_yellow_btn"
             app:layout_constraintTop_toTopOf="@id/btn_wok_chucai2"
@@ -246,7 +245,7 @@
             android:layout_width="170dp"
             android:textSize="32sp"
             android:textColor="@color/white"
-            android:text="2号炒锅\n模拟出菜"
+            android:text="4号炒锅\n模拟出菜"
             android:gravity="center"
             android:background="@drawable/bg_round15_yellow_btn"
             app:layout_constraintTop_toTopOf="@id/btn_wok_chucai3"
@@ -286,10 +285,10 @@
             android:id="@+id/ll_fuliao"
             android:layout_width="wrap_content"
             android:layout_height="90dp"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="225dp"
-            android:layout_marginStart="290dp"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@id/image"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="200dp"
+            app:layout_constraintStart_toStartOf="@id/image"
             android:orientation="horizontal"
             android:paddingStart="20dp"
             android:paddingEnd="50dp"
@@ -315,6 +314,7 @@
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:textSize="28sp"
+                android:layout_marginStart="20dp"
                 android:text="辅料F7"
                 android:textColor="@color/black"
                 />
@@ -324,6 +324,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/bg_box_click"
                 android:gravity="center_horizontal"
+                android:layout_marginStart="35dp"
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:textSize="28sp"
@@ -334,9 +335,9 @@
                 android:id="@+id/top5"
                 android:layout_width="100dp"
                 android:layout_height="match_parent"
-                android:layout_marginStart="25dp"
                 android:background="@drawable/bg_box_click"
                 android:gravity="center_horizontal"
+                android:layout_marginStart="25dp"
                 android:textSize="28sp"
                 android:maxLines="2"
                 android:ellipsize="end"
@@ -399,14 +400,14 @@
         </LinearLayout>
 
         <TextView
-            android:id="@+id/right1"
+            android:id="@+id/mainFood1"
             android:layout_width="200dp"
             android:layout_height="90dp"
             android:background="@drawable/bg_box_click"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="390dp"
-            android:layout_marginStart="540dp"
+            app:layout_constraintStart_toStartOf="@id/image"
+            app:layout_constraintTop_toTopOf="@id/image"
+            android:layout_marginTop="180dp"
+            android:layout_marginStart="160dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -415,13 +416,13 @@
             android:textColor="@color/black"
             />
         <TextView
-            android:id="@+id/right2"
+            android:id="@+id/mainFood2"
             android:layout_width="200dp"
             android:layout_height="90dp"
             android:background="@drawable/bg_box_click"
-            app:layout_constraintStart_toEndOf="@id/right1"
-            app:layout_constraintTop_toTopOf="@id/right1"
-            android:layout_marginStart="165dp"
+            app:layout_constraintStart_toEndOf="@id/mainFood1"
+            app:layout_constraintTop_toTopOf="@id/mainFood1"
+            android:layout_marginStart="150dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -430,14 +431,13 @@
             android:textColor="@color/black"
             />
         <TextView
-            android:id="@+id/right3"
+            android:id="@+id/mainFood3"
             android:layout_width="200dp"
             android:layout_height="90dp"
-            android:layout_marginStart="40dp"
+            android:layout_marginStart="500dp"
             android:background="@drawable/bg_box_click"
-            app:layout_constraintEnd_toEndOf="@id/right1"
-            app:layout_constraintTop_toBottomOf="@id/right1"
-            android:layout_marginTop="85dp"
+            app:layout_constraintStart_toEndOf="@id/mainFood1"
+            app:layout_constraintTop_toTopOf="@id/mainFood1"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -446,12 +446,13 @@
             android:textColor="@color/black"
             />
         <TextView
-            android:id="@+id/right4"
+            android:id="@+id/mainFood4"
             android:layout_width="200dp"
             android:layout_height="90dp"
             android:background="@drawable/bg_box_click"
-            app:layout_constraintStart_toStartOf="@id/right2"
-            app:layout_constraintTop_toTopOf="@id/right3"
+            app:layout_constraintStart_toStartOf="@id/mainFood1"
+            app:layout_constraintTop_toTopOf="@id/mainFood1"
+            android:layout_marginTop="170dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -460,14 +461,13 @@
             android:textColor="@color/black"
             />
         <TextView
-            android:id="@+id/right5"
+            android:id="@+id/mainFood5"
             android:layout_width="200dp"
             android:layout_height="90dp"
-            android:layout_marginStart="40dp"
             android:background="@drawable/bg_box_click"
-            app:layout_constraintEnd_toEndOf="@id/right1"
-            app:layout_constraintTop_toBottomOf="@id/right3"
-            android:layout_marginTop="85dp"
+            app:layout_constraintStart_toStartOf="@id/mainFood2"
+            app:layout_constraintTop_toTopOf="@id/mainFood2"
+            android:layout_marginTop="170dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -476,12 +476,13 @@
             android:textColor="@color/black"
             />
         <TextView
-            android:id="@+id/right6"
+            android:id="@+id/mainFood6"
             android:layout_width="200dp"
             android:layout_height="90dp"
             android:background="@drawable/bg_box_click"
-            app:layout_constraintStart_toStartOf="@id/right2"
-            app:layout_constraintTop_toTopOf="@id/right5"
+            app:layout_constraintStart_toStartOf="@id/mainFood3"
+            app:layout_constraintTop_toTopOf="@id/mainFood3"
+            android:layout_marginTop="170dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"

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

@@ -9,245 +9,239 @@
     android:layout_height="wrap_content">
 
     <RelativeLayout
-        android:layout_width="1200dp"
+        android:layout_width="1300dp"
         android:background="@drawable/bg_round25_white"
-        android:layout_height="900dp">
+        android:layout_height="700dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="1200dp"
+            android:layout_width="1300dp"
             android:id="@+id/cl_content2"
             android:background="@drawable/bg_round25_white"
-            android:layout_height="900dp">
+            android:layout_height="700dp">
 
             <ImageView
-                android:layout_width="1100dp"
-                android:layout_height="550dp"
-                android:layout_marginTop="220dp"
+                android:id="@+id/image"
+                android:layout_width="1200dp"
+                android:layout_height="500dp"
+                android:scaleType="fitCenter"
+                android:layout_marginTop="150dp"
                 android:src="@mipmap/ic_huojia_box"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                android:scaleY="1.1"
-                android:scaleX="1.1"
                 />
 
-            <RelativeLayout
+            <LinearLayout
+                android:id="@+id/ll_fuliao"
                 android:layout_width="wrap_content"
-                android:layout_height="120dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="135dp"
-                android:layout_marginStart="230dp"
-                app:layout_constraintStart_toStartOf="parent"
+                android:layout_height="90dp"
+                app:layout_constraintTop_toTopOf="@id/image"
+                android:layout_marginTop="15dp"
+                android:layout_marginStart="200dp"
+                app:layout_constraintStart_toStartOf="@id/image"
                 android:orientation="horizontal"
+                android:paddingStart="20dp"
+                android:paddingEnd="50dp"
                 >
                 <TextView
                     android:id="@+id/top8"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:gravity="center"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
                     android:maxLines="2"
                     android:ellipsize="end"
                     android:textSize="28sp"
+                    android:text="辅料F8"
                     android:textColor="@color/black"
-                    tools:text="调料"
                     />
-              
                 <TextView
                     android:id="@+id/top7"
-                    android:layout_toEndOf="@id/top8"
-                    android:layout_marginStart="30dp"
-                    tools:text="调料"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:gravity="center"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
                     android:maxLines="2"
                     android:ellipsize="end"
                     android:textSize="28sp"
+                    android:layout_marginStart="20dp"
+                    android:text="辅料F7"
                     android:textColor="@color/black"
                     />
-               
                 <TextView
                     android:id="@+id/top6"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:layout_toEndOf="@id/top7"
-                    android:layout_marginStart="30dp"
-                    tools:text="调料"
-                    android:gravity="center"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
+                    android:layout_marginStart="35dp"
                     android:maxLines="2"
                     android:ellipsize="end"
                     android:textSize="28sp"
+                    android:text="辅料F6"
                     android:textColor="@color/black"
                     />
-               
                 <TextView
                     android:id="@+id/top5"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:layout_marginStart="30dp"
-                    tools:text="调料"
-                    android:layout_marginLeft="125dp"
-                    android:layout_toEndOf="@id/top6"
-                    android:gravity="center"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
+                    android:layout_marginStart="25dp"
                     android:textSize="28sp"
                     android:maxLines="2"
                     android:ellipsize="end"
+                    android:text="辅料F5"
                     android:textColor="@color/black"
                     />
-               
                 <TextView
                     android:id="@+id/top4"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:layout_marginStart="30dp"
-                    tools:text="调料"
-                    android:layout_marginLeft="220dp"
-                    android:gravity="center"
-                    android:layout_toEndOf="@id/top5"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="25dp"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
                     android:textSize="28sp"
                     android:maxLines="2"
                     android:ellipsize="end"
+                    android:text="辅料F4"
                     android:textColor="@color/black"
                     />
-                
                 <TextView
                     android:id="@+id/top3"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:layout_marginStart="30dp"
-                    tools:text="调料"
-                    android:layout_marginLeft="355dp"
-                    android:layout_toEndOf="@id/top4"
-                    android:gravity="center"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="25dp"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
                     android:textSize="28sp"
                     android:maxLines="2"
                     android:ellipsize="end"
+                    android:text="辅料F3"
                     android:textColor="@color/black"
                     />
-
                 <TextView
                     android:id="@+id/top2"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:layout_marginStart="30dp"
-                    tools:text="调料"
-                    android:layout_marginLeft="455dp"
-                    android:gravity="center"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="25dp"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
                     android:textSize="28sp"
-                    android:layout_toEndOf="@id/top3"
                     android:maxLines="2"
                     android:ellipsize="end"
+                    android:text="辅料F2"
                     android:textColor="@color/black"
                     />
-
                 <TextView
                     android:id="@+id/top1"
-                    android:layout_width="90dp"
-                    android:layout_height="100dp"
-                    android:layout_marginStart="30dp"
-                    tools:text="调料"
-                    android:gravity="center"
-                    android:layout_toEndOf="@id/top2"
+                    android:layout_width="100dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="25dp"
+                    android:background="@drawable/bg_box_click"
+                    android:gravity="center_horizontal"
                     android:textSize="28sp"
                     android:maxLines="2"
                     android:ellipsize="end"
+                    android:text="辅料F1"
                     android:textColor="@color/black"
                     />
-            </RelativeLayout>
 
+            </LinearLayout>
 
             <TextView
-                android:id="@+id/mainFood6"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="40dp"
-                android:background="@drawable/bg_pen_check"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="320dp"
-                android:layout_marginStart="460dp"
+                android:id="@+id/mainFood1"
+                android:layout_width="200dp"
+                android:layout_height="90dp"
+                android:background="@drawable/bg_box_click"
+                app:layout_constraintStart_toStartOf="@id/image"
+                app:layout_constraintTop_toTopOf="@id/image"
+                android:layout_marginTop="180dp"
+                android:layout_marginStart="160dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
                 android:ellipsize="end"
+                android:text="主料Z1"
                 android:textColor="@color/black"
-                
                 />
             <TextView
-                android:id="@+id/mainFood5"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="40dp"
-                android:background="@drawable/bg_pen_check"
-                app:layout_constraintStart_toEndOf="@id/mainFood6"
-                app:layout_constraintTop_toTopOf="@id/mainFood6"
-                android:layout_marginStart="60dp"
+                android:id="@+id/mainFood2"
+                android:layout_width="200dp"
+                android:layout_height="90dp"
+                android:background="@drawable/bg_box_click"
+                app:layout_constraintStart_toEndOf="@id/mainFood1"
+                app:layout_constraintTop_toTopOf="@id/mainFood1"
+                android:layout_marginStart="150dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
                 android:ellipsize="end"
+                android:text="主料Z2"
                 android:textColor="@color/black"
                 />
             <TextView
-                android:id="@+id/mainFood4"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="40dp"
-                android:background="@drawable/bg_pen_check"
-                app:layout_constraintEnd_toEndOf="@id/mainFood6"
-                app:layout_constraintTop_toBottomOf="@id/mainFood6"
-                android:layout_marginTop="70dp"
+                android:id="@+id/mainFood3"
+                android:layout_width="200dp"
+                android:layout_height="90dp"
+                android:layout_marginStart="500dp"
+                android:background="@drawable/bg_box_click"
+                app:layout_constraintStart_toEndOf="@id/mainFood1"
+                app:layout_constraintTop_toTopOf="@id/mainFood1"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
                 android:ellipsize="end"
+                android:text="主料Z3"
                 android:textColor="@color/black"
-                
                 />
             <TextView
-                android:id="@+id/mainFood3"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
-                android:background="@drawable/bg_pen_check"
-                app:layout_constraintStart_toStartOf="@id/mainFood5"
-                app:layout_constraintTop_toTopOf="@id/mainFood4"
+                android:id="@+id/mainFood4"
+                android:layout_width="200dp"
+                android:layout_height="90dp"
+                android:background="@drawable/bg_box_click"
+                app:layout_constraintStart_toStartOf="@id/mainFood1"
+                app:layout_constraintTop_toTopOf="@id/mainFood1"
+                android:layout_marginTop="170dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
                 android:ellipsize="end"
+                android:text="主料Z4"
                 android:textColor="@color/black"
-                
                 />
             <TextView
-                android:id="@+id/mainFood2"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
-                android:layout_marginLeft="40dp"
-                android:background="@drawable/bg_pen_check"
-                app:layout_constraintEnd_toEndOf="@id/mainFood6"
-                app:layout_constraintTop_toBottomOf="@id/mainFood3"
-                android:layout_marginTop="74dp"
+                android:id="@+id/mainFood5"
+                android:layout_width="200dp"
+                android:layout_height="90dp"
+                android:background="@drawable/bg_box_click"
+                app:layout_constraintStart_toStartOf="@id/mainFood2"
+                app:layout_constraintTop_toTopOf="@id/mainFood2"
+                android:layout_marginTop="170dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
                 android:ellipsize="end"
+                android:text="主料Z5"
                 android:textColor="@color/black"
-                
                 />
             <TextView
-                android:id="@+id/mainFood1"
-                android:layout_width="270dp"
-                android:layout_height="80dp"
-                android:background="@drawable/bg_pen_check"
-                app:layout_constraintStart_toStartOf="@id/mainFood5"
-                app:layout_constraintTop_toTopOf="@id/mainFood2"
+                android:id="@+id/mainFood6"
+                android:layout_width="200dp"
+                android:layout_height="90dp"
+                android:background="@drawable/bg_box_click"
+                app:layout_constraintStart_toStartOf="@id/mainFood3"
+                app:layout_constraintTop_toTopOf="@id/mainFood3"
+                android:layout_marginTop="170dp"
                 android:gravity="center"
                 android:textSize="32sp"
                 android:maxLines="2"
                 android:ellipsize="end"
+                android:text="主料Z6"
                 android:textColor="@color/black"
-                tools:text="1号炒锅"
                 />
+
+
         </androidx.constraintlayout.widget.ConstraintLayout>
         <TextView
             android:id="@+id/title1"

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

@@ -33,12 +33,13 @@
 
          <ImageView
              android:id="@+id/btn_close"
-             android:layout_width="@dimen/dp_100"
-             android:layout_height="@dimen/dp_100"
+             android:layout_width="@dimen/dp_70"
+             android:layout_height="@dimen/dp_70"
+             android:layout_marginTop="15dp"
              style="@style/TextView_btn_dialog"
              android:layout_marginEnd="20dp"
              android:layout_alignParentEnd="true"
-             android:background="@mipmap/file_picker_delete"
+             android:background="@drawable/ic_delete_x"
              app:layout_constraintTop_toTopOf="parent"
              app:layout_constraintEnd_toEndOf="parent"
              />

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

@@ -24,16 +24,18 @@
             app:layout_constraintLeft_toLeftOf="parent"
             />
 
-        <ImageView
+        <TextView
             android:id="@+id/btn_close"
-            android:layout_width="@dimen/dp_80"
-            android:layout_height="@dimen/dp_80"
+            android:layout_width="@dimen/dp_180"
+            android:layout_height="@dimen/dp_70"
+            android:layout_marginTop="5dp"
             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:layout_constraintEnd_toEndOf="parent"
+            android:background="@drawable/bg_round15_blue_btn"
+            android:text="确定"
             />
         <LinearLayout
             android:layout_width="match_parent"
@@ -141,7 +143,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="注意：主料和辅料的位置不能重复"
+            android:text="注意：辅料的位置不能重复"
             android:textSize="28sp"
             android:layout_marginTop="420dp"
             android:textColor="@color/yellow_primary_dark"

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

@@ -5,71 +5,69 @@
     android:fitsSystemWindows="true"
     tools:layout_width="1770dp"
     tools:layout_height="1030dp"
-    android:background="#DCDFE9"
+    android:background="@color/white"
     android:layout_height="match_parent">
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_width="1770dp"
+            android:layout_height="1030dp"
             android:src="@mipmap/ic_devices_all2"
-            android:scaleX="1.5"
-            android:scaleY="1.5"
             />
         <ImageView
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:src="@mipmap/ic_click"
-            android:layout_marginTop="400dp"
-            android:layout_marginStart="200dp"
+            android:layout_marginTop="500dp"
+            android:layout_marginStart="400dp"
             />
         <ImageView
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:src="@mipmap/ic_click"
-            android:layout_marginTop="300dp"
-            android:layout_marginStart="550dp"
+            android:layout_marginTop="250dp"
+            android:layout_marginStart="600dp"
             />
         <ImageView
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:src="@mipmap/ic_click"
             android:layout_marginTop="800dp"
-            android:layout_marginStart="1550dp"
+            android:layout_marginStart="1100dp"
             />
         <ImageView
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:src="@mipmap/ic_click"
             android:layout_marginTop="400dp"
-            android:layout_marginStart="1550dp"
+            android:layout_marginStart="1300dp"
             />
         <ImageView
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:src="@mipmap/ic_click"
             android:layout_marginTop="800dp"
-            android:layout_marginStart="550dp"
+            android:layout_marginStart="650dp"
             />
 
         <ImageView
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:src="@mipmap/ic_click"
-            android:layout_marginTop="650dp"
-            android:layout_marginStart="950dp"
+            android:layout_marginTop="550dp"
+            android:layout_marginStart="850dp"
             />
 
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="120dp"
-            android:layout_marginTop="250dp"
+            android:layout_marginTop="400dp"
             android:background="#c0BEAA6A"
             android:gravity="center"
-            android:layout_marginStart="150dp"
+            android:layout_marginStart="300dp"
             android:text="点击调试\n1号炒锅"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
@@ -79,17 +77,17 @@
         <TextView
             android:id="@+id/btn_chaoguo"
             android:layout_width="300dp"
-            android:layout_marginTop="250dp"
+            android:layout_marginTop="400dp"
             android:textSize="36sp"
             android:textColor="@color/white"
             android:gravity="center"
-            android:layout_marginStart="150dp"
-            android:layout_height="400dp"/>
+            android:layout_marginStart="300dp"
+            android:layout_height="300dp"/>
 
         <TextView
             android:layout_width="wrap_content"
-            android:layout_marginTop="150dp"
-            android:layout_marginStart="500dp"
+            android:layout_marginTop="100dp"
+            android:layout_marginStart="550dp"
             android:textSize="36sp"
             android:textColor="@color/white"
             android:text="点击调试\n2号炒锅"
@@ -101,18 +99,18 @@
         <TextView
             android:id="@+id/btn_chaoguo2"
             android:layout_width="250dp"
-            android:layout_marginTop="150dp"
-            android:layout_marginStart="500dp"
+            android:layout_marginTop="100dp"
+            android:layout_marginStart="550dp"
             android:gravity="center"
-            android:layout_height="400dp"/>
+            android:layout_height="300dp"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="120dp"
-            android:layout_marginTop="250dp"
+            android:layout_marginTop="300dp"
             android:background="#c0BEAA6A"
             android:gravity="center"
-            android:layout_marginStart="1450dp"
+            android:layout_marginStart="1350dp"
             android:text="点击调试\n3号炒锅"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
@@ -122,12 +120,12 @@
         <TextView
             android:id="@+id/btn_chaoguo3"
             android:layout_width="300dp"
-            android:layout_marginTop="250dp"
+            android:layout_marginTop="300dp"
             android:textSize="36sp"
             android:textColor="@color/white"
             android:gravity="center"
-            android:layout_marginStart="1450dp"
-            android:layout_height="400dp"/>
+            android:layout_marginStart="1250dp"
+            android:layout_height="300dp"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -135,7 +133,7 @@
             android:layout_marginTop="650dp"
             android:background="#c0BEAA6A"
             android:gravity="center"
-            android:layout_marginStart="1450dp"
+            android:layout_marginStart="1150dp"
             android:text="点击调试\n4号炒锅"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
@@ -148,7 +146,7 @@
             android:textSize="36sp"
             android:textColor="@color/white"
             android:gravity="center"
-            android:layout_marginStart="1450dp"
+            android:layout_marginStart="1050dp"
             android:layout_height="350dp"/>
 
         <TextView
@@ -157,7 +155,7 @@
             android:layout_marginTop="700dp"
             android:background="#c0BEAA6A"
             android:gravity="center"
-            android:layout_marginStart="450dp"
+            android:layout_marginStart="550dp"
             android:text="查看出餐盆"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
@@ -170,13 +168,13 @@
             android:textSize="36sp"
             android:textColor="@color/white"
             android:gravity="center"
-            android:layout_marginStart="450dp"
+            android:layout_marginStart="550dp"
             android:layout_height="300dp"/>
 
         <TextView
             android:layout_width="200dp"
             android:layout_marginTop="500dp"
-            android:layout_marginStart="900dp"
+            android:layout_marginStart="800dp"
             android:textSize="36sp"
             android:textColor="@color/white"
             android:text="点击调试\n机器人投料"
@@ -187,11 +185,11 @@
             android:id="@+id/btn_robot"
             android:layout_width="200dp"
             android:layout_marginTop="500dp"
-            android:layout_marginStart="900dp"
+            android:layout_marginStart="800dp"
             android:textSize="36sp"
             android:textColor="@color/white"
             android:gravity="center"
-            android:layout_height="420dp"/>
+            android:layout_height="200dp"/>
 
     </FrameLayout>
 

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

@@ -44,7 +44,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/home_classify_ic" />
+                    android:src="@drawable/home_classify_ic" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -69,7 +69,7 @@
                     android:layout_width="match_parent"
                      android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/home_caiping_ic" />
+                    android:src="@drawable/home_caiping_ic" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
                     android:layout_width="match_parent"
                      android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/ic_silos" />
+                    android:src="@drawable/ic_silos" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -115,7 +115,7 @@
                     android:layout_width="match_parent"
                      android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/home_log_ic" />
+                    android:src="@drawable/home_log_ic" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -141,7 +141,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/home_order_ic" />
+                    android:src="@drawable/home_order_ic" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -175,7 +175,7 @@
                     android:layout_width="match_parent"
                      android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/home_setting_ic" />
+                    android:src="@drawable/home_setting_ic" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -201,7 +201,7 @@
                     android:layout_width="match_parent"
                      android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/ic_update" />
+                    android:src="@drawable/ic_update" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -227,7 +227,7 @@
                     android:layout_width="match_parent"
                      android:layout_height="0dp"
                     android:layout_weight="1"
-                    android:src="@mipmap/ic_logout2" />
+                    android:src="@drawable/ic_logout2" />
 
                 <TextView
                     android:layout_width="wrap_content"

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

@@ -81,7 +81,7 @@
             android:id="@+id/selectCB"
             android:layout_width="wrap_content"
             android:layout_marginEnd="20dp"
-            android:buttonTint="@color/gray"
+            android:buttonTint="@color/right_bg_blue_50p"
             android:checked="true"
             android:scaleX="2"
             android:scaleY="2"
@@ -163,7 +163,7 @@
                     android:layout_toRightOf="@id/img1"
                     android:layout_centerVertical="true"
                     android:textColor="@color/black"
-                    android:textSize="25sp" />
+                    android:textSize="32sp" />
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/delete_all"
@@ -187,7 +187,7 @@
                     android:layout_toRightOf="@id/img2"
                     android:layout_centerVertical="true"
                     android:textColor="@color/black"
-                    android:textSize="25sp" />
+                    android:textSize="32sp" />
             </RelativeLayout>
         </LinearLayout>
 

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

@@ -5,21 +5,21 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     
     <ImageView
+        android:id="@+id/image"
         android:layout_width="700dp"
-        android:layout_height="320dp"
+        android:layout_height="300dp"
         android:src="@mipmap/ic_huojia_box"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginStart="35dp"
         />
 
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginStart="140dp"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/image"
+        android:layout_marginStart="80dp"
+        app:layout_constraintStart_toStartOf="@id/image"
         android:orientation="horizontal"
         android:paddingStart="0dp"
         android:paddingEnd="50dp"
@@ -44,7 +44,7 @@
             android:ellipsize="end"
             android:textSize="28sp"
             android:text="F7"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="40dp"
             android:textColor="@color/black"
             />
         <TextView
@@ -55,7 +55,7 @@
             android:maxLines="2"
             android:ellipsize="end"
             android:textSize="28sp"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="45dp"
             android:text="F6"
             android:textColor="@color/black"
             />
@@ -63,7 +63,7 @@
             android:id="@+id/top5"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="40dp"
             android:gravity="center"
             android:textSize="28sp"
             android:maxLines="2"
@@ -75,7 +75,7 @@
             android:id="@+id/top4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="40dp"
             android:gravity="center"
             android:textSize="28sp"
             android:maxLines="2"
@@ -87,7 +87,7 @@
             android:id="@+id/top3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="40dp"
             android:gravity="center"
             android:textSize="28sp"
             android:maxLines="2"
@@ -99,7 +99,7 @@
             android:id="@+id/top2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="40dp"
             android:gravity="center"
             android:textSize="28sp"
             android:maxLines="2"
@@ -111,7 +111,7 @@
             android:id="@+id/top1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
+            android:layout_marginStart="45dp"
             android:gravity="center"
             android:textSize="28sp"
             android:maxLines="2"
@@ -123,89 +123,94 @@
     </LinearLayout>
 
     <TextView
-        android:id="@+id/right1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="335dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginTop="95dp"
+        android:id="@+id/mainFood1"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/image"
+        app:layout_constraintTop_toTopOf="@id/image"
+        android:layout_marginTop="110dp"
+        android:layout_marginStart="80dp"
         android:gravity="center"
         android:textSize="32sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:text="主料Z6"
+        android:text="主料Z1"
         android:textColor="@color/black"
         />
     <TextView
-        android:id="@+id/right2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="75dp"
-        app:layout_constraintStart_toEndOf="@id/right1"
-        app:layout_constraintTop_toTopOf="@id/right1"
+        android:id="@+id/mainFood2"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toEndOf="@id/mainFood1"
+        app:layout_constraintTop_toTopOf="@id/mainFood1"
+        android:layout_marginStart="50dp"
         android:gravity="center"
         android:textSize="32sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:text="主料Z5"
+        android:text="主料Z2"
         android:textColor="@color/black"
         />
     <TextView
-        android:id="@+id/right3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="@id/right1"
-        app:layout_constraintTop_toBottomOf="@id/right1"
-        android:layout_marginTop="35dp"
+        android:id="@+id/mainFood3"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="250dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toEndOf="@id/mainFood1"
+        app:layout_constraintTop_toTopOf="@id/mainFood1"
         android:gravity="center"
         android:textSize="32sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:text="主料Z4"
+        android:text="主料Z3"
         android:textColor="@color/black"
         />
     <TextView
-        android:id="@+id/right4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        
-        app:layout_constraintEnd_toEndOf="@id/right2"
-        app:layout_constraintTop_toTopOf="@id/right3"
+        android:id="@+id/mainFood4"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/mainFood1"
+        app:layout_constraintTop_toTopOf="@id/mainFood1"
+        android:layout_marginTop="100dp"
         android:gravity="center"
         android:textSize="32sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:text="主料Z3"
+        android:text="主料Z4"
         android:textColor="@color/black"
         />
     <TextView
-        android:id="@+id/right5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
-        app:layout_constraintEnd_toEndOf="@id/right1"
-        app:layout_constraintTop_toBottomOf="@id/right3"
-        android:layout_marginTop="35dp"
+        android:id="@+id/mainFood5"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/mainFood2"
+        app:layout_constraintTop_toTopOf="@id/mainFood2"
+        android:layout_marginTop="100dp"
         android:gravity="center"
         android:textSize="32sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:text="主料Z2"
+        android:text="主料Z5"
         android:textColor="@color/black"
         />
     <TextView
-        android:id="@+id/right6"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        
-        app:layout_constraintEnd_toEndOf="@id/right4"
-        app:layout_constraintTop_toTopOf="@id/right5"
+        android:id="@+id/mainFood6"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/mainFood3"
+        app:layout_constraintTop_toTopOf="@id/mainFood3"
+        android:layout_marginTop="100dp"
         android:gravity="center"
         android:textSize="32sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:text="主料Z1"
+        android:text="主料Z6"
         android:textColor="@color/black"
         />
 

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

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="700dp"
+    android:layout_height="350dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="700dp"
+        android:layout_height="300dp"
+        android:src="@mipmap/ic_huojia_box"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        />
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="@id/image"
+        android:layout_marginStart="80dp"
+        app:layout_constraintStart_toStartOf="@id/image"
+        android:orientation="horizontal"
+        android:paddingStart="0dp"
+        android:paddingEnd="50dp"
+        >
+        <TextView
+            android:id="@+id/top8"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textSize="28sp"
+            android:text="辅料 F8"
+            android:textColor="@color/black"
+            />
+        <TextView
+            android:id="@+id/top7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textSize="28sp"
+            android:text="F7"
+            android:layout_marginStart="40dp"
+            android:textColor="@color/black"
+            />
+        <TextView
+            android:id="@+id/top6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:textSize="28sp"
+            android:layout_marginStart="45dp"
+            android:text="F6"
+            android:textColor="@color/black"
+            />
+        <TextView
+            android:id="@+id/top5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="40dp"
+            android:gravity="center"
+            android:textSize="28sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="F5"
+            android:textColor="@color/black"
+            />
+        <TextView
+            android:id="@+id/top4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="40dp"
+            android:gravity="center"
+            android:textSize="28sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="F4"
+            android:textColor="@color/black"
+            />
+        <TextView
+            android:id="@+id/top3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="40dp"
+            android:gravity="center"
+            android:textSize="28sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="F3"
+            android:textColor="@color/black"
+            />
+        <TextView
+            android:id="@+id/top2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="40dp"
+            android:gravity="center"
+            android:textSize="28sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="F2"
+            android:textColor="@color/black"
+            />
+        <TextView
+            android:id="@+id/top1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="45dp"
+            android:gravity="center"
+            android:textSize="28sp"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="F1"
+            android:textColor="@color/black"
+            />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/mainFood1"
+        android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/image"
+        app:layout_constraintTop_toTopOf="@id/image"
+        android:layout_marginTop="110dp"
+        android:layout_marginStart="80dp"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textColor="@color/black"
+        />
+    <TextView
+        android:id="@+id/mainFood2"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toEndOf="@id/mainFood1"
+        app:layout_constraintTop_toTopOf="@id/mainFood1"
+        android:layout_marginStart="50dp"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textColor="@color/black"
+        />
+    <TextView
+        android:id="@+id/mainFood3"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:layout_marginStart="250dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toEndOf="@id/mainFood1"
+        app:layout_constraintTop_toTopOf="@id/mainFood1"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textColor="@color/black"
+        />
+    <TextView
+        android:id="@+id/mainFood4"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/mainFood1"
+        app:layout_constraintTop_toTopOf="@id/mainFood1"
+        android:layout_marginTop="100dp"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textColor="@color/black"
+        />
+    <TextView
+        android:id="@+id/mainFood5"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/mainFood2"
+        app:layout_constraintTop_toTopOf="@id/mainFood2"
+        android:layout_marginTop="100dp"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textColor="@color/black"
+        />
+    <TextView
+        android:id="@+id/mainFood6"
+          android:layout_width="150dp"
+        android:layout_height="50dp"
+        android:background="@drawable/bg_box_click"
+        app:layout_constraintStart_toStartOf="@id/mainFood3"
+        app:layout_constraintTop_toTopOf="@id/mainFood3"
+        android:layout_marginTop="100dp"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textColor="@color/black"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -35,67 +35,95 @@
             app:layout_constraintLeft_toLeftOf="parent"
             />
 
-        <RelativeLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="900dp"
+            android:id="@+id/cl_content2"
+            android:background="@drawable/bg_round25_white"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginTop="250dp"
-            android:layout_marginStart="100dp"
-            android:layout_marginEnd="100dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_marginTop="200dp"
+            android:layout_marginStart="50dp"
+            android:layout_height="550dp">
+
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="900dp"
+                android:layout_height="500dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:background="@mipmap/ic_chucan_box"
+                />
             <TextView
                 android:id="@+id/tv_kongPen1"
                 android:layout_width="350dp"
-                android:layout_height="100dp"
-                android:text="炒锅1出餐盆：无"
-                android:textSize="36sp"
-                android:textColor="@color/black"
+                android:layout_height="120dp"
+                android:background="@drawable/bg_pen_check"
+                app:layout_constraintStart_toStartOf="@id/image"
+                app:layout_constraintTop_toTopOf="@id/image"
+                android:layout_marginTop="125dp"
+                android:layout_marginStart="65dp"
                 android:gravity="center"
-                android:background="@mipmap/ic_pen"
+                android:textSize="32sp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="出餐盆1有盆"
+                android:textColor="@color/black"
+                tools:background="@mipmap/ic_pen"
                 />
 
             <TextView
                 android:id="@+id/tv_kongPen2"
                 android:layout_width="350dp"
-                android:layout_height="100dp"
-                android:layout_alignParentEnd="true"
-                android:text="炒锅2出餐盆：无"
-                android:textSize="36sp"
-                android:textColor="@color/black"
+                android:layout_height="120dp"
+                android:background="@drawable/bg_pen_check"
+                app:layout_constraintStart_toStartOf="@id/tv_kongPen1"
+                app:layout_constraintTop_toTopOf="@id/tv_kongPen1"
+                android:layout_marginStart="405dp"
                 android:gravity="center"
-                android:background="@mipmap/ic_pen"
+                android:textSize="32sp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="出餐盆2有盆"
+                android:textColor="@color/black"
+                tools:background="@mipmap/ic_pen"
                 />
 
             <TextView
                 android:id="@+id/tv_kongPen3"
                 android:layout_width="350dp"
-                android:layout_height="100dp"
-                android:layout_below="@id/tv_kongPen1"
-                android:text="炒锅3出餐盆：无"
-                android:textSize="36sp"
-                android:textColor="@color/black"
-                android:layout_marginTop="100dp"
+                android:layout_height="120dp"
+                android:background="@drawable/bg_pen_check"
+                app:layout_constraintStart_toStartOf="@id/tv_kongPen1"
+                app:layout_constraintTop_toTopOf="@id/tv_kongPen1"
+                android:layout_marginTop="220dp"
                 android:gravity="center"
-                android:background="@mipmap/ic_pen"
+                android:textSize="32sp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="出餐盆3有盆"
+                android:textColor="@color/black"
+                tools:background="@mipmap/ic_pen"
                 />
-
             <TextView
                 android:id="@+id/tv_kongPen4"
                 android:layout_width="350dp"
-                android:layout_height="100dp"
-                android:layout_below="@id/tv_kongPen1"
-                android:layout_alignParentEnd="true"
-                android:layout_marginTop="100dp"
-                android:text="炒锅4出餐盆：无"
-                android:textSize="36sp"
-                android:textColor="@color/black"
+                android:layout_height="120dp"
+                android:background="@drawable/bg_pen_check"
+                app:layout_constraintStart_toStartOf="@id/tv_kongPen2"
+                app:layout_constraintTop_toTopOf="@id/tv_kongPen3"
                 android:gravity="center"
-                android:background="@mipmap/ic_pen"
+                android:textSize="32sp"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:text="出餐盆4有盆"
+                android:textColor="@color/black"
+                tools:background="@mipmap/ic_pen"
                 />
-        </RelativeLayout>
-
 
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
+        
         <TextView
             android:id="@+id/btn_next"
             android:layout_width="150dp"

app/src/main/res/layout/svg/drawable/home_caiping_ic.xml

@@ -0,0 +1,66 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M707.3,832.1L631.5,904l-2.2,2.1H394.7l-2.2,-2.1 -75.7,-71.9c23.4,-89.3 83.4,-130.1 83.4,-130.1h223.7s59.9,40.8 83.4,130.1z"
+      android:fillColor="#DEE3E3"/>
+  <path
+      android:pathData="M394.7,827.1v79h-87.2c0,-27.6 3.5,-57.2 9.3,-79h77.9zM716.5,906.1h-87.2v-79h77.9c5.7,21.8 9.3,51.4 9.3,79z"
+      android:fillColor="#FFECE3"/>
+  <path
+      android:pathData="M517.3,720.1l-26.8,38.6c-9.6,13.9 -30,14.4 -40.3,1l-46.4,-60.4 113.5,20.8z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M506.7,720.1l26.8,38.6c9.6,13.9 30,14.4 40.3,1l46.4,-60.4 -113.5,20.8z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
+      android:fillColor="#EFEAEB"/>
+  <path
+      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
+      android:fillColor="#EFEAEB"/>
+  <path
+      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
+      android:fillColor="#EFEAEB"/>
+  <path
+      android:pathData="M507.3,720l-0.3,0.5 -0.3,-0.5h0.3z"
+      android:fillColor="#EFEAEB"/>
+  <path
+      android:pathData="M249.7,470.5m-76.8,0a76.8,76.8 0,1 0,153.6 0,76.8 76.8,0 1,0 -153.6,0Z"
+      android:fillColor="#F7DBD0"/>
+  <path
+      android:pathData="M774.3,470.5m-76.8,0a76.8,76.8 0,1 0,153.6 0,76.8 76.8,0 1,0 -153.6,0Z"
+      android:fillColor="#F7DBD0"/>
+  <path
+      android:pathData="M512,459.5m-269.3,0a269.3,269.3 0,1 0,538.6 0,269.3 269.3,0 1,0 -538.6,0Z"
+      android:fillColor="#FFECE3"/>
+  <path
+      android:pathData="M812.6,394c-4.1,0.1 -8.3,0.2 -12.4,0.2 -83.8,0 -162.2,-23.1 -229.1,-63.4 -69.3,44.5 -151.8,70.4 -240.4,70.4 -40.9,0 -80.6,-5.5 -118.3,-15.9 11,-87.8 60.1,-164.1 130.1,-211.9C390.9,140.3 449.3,121 512,121s121,19.4 169.4,52.4c15.7,10.7 30.4,22.9 43.8,36.3 48.4,48.3 80.5,112.7 87.4,184.3z"
+      android:fillColor="#5C6A7C"/>
+  <path
+      android:pathData="M436.3,526.3c-7,0 -12.7,-5.7 -12.7,-12.7v-10.2c0,-7 5.7,-12.7 12.7,-12.7s12.7,5.7 12.7,12.7v10.2c0,7.1 -5.7,12.7 -12.7,12.7zM587.7,526.3c-7,0 -12.7,-5.7 -12.7,-12.7v-10.2c0,-7 5.7,-12.7 12.7,-12.7s12.7,5.7 12.7,12.7v10.2c0,7.1 -5.7,12.7 -12.7,12.7zM512,645.3c-16.4,0 -31.9,-7.1 -42.7,-19.4 -4.6,-5.3 -4,-13.3 1.2,-17.9 5.3,-4.6 13.3,-4 17.9,1.2 6,6.8 14.6,10.8 23.6,10.8s17.6,-3.9 23.6,-10.7c4.6,-5.3 12.6,-5.8 17.9,-1.2 5.3,4.6 5.8,12.6 1.2,17.9 -10.8,12.2 -26.3,19.3 -42.7,19.3z"
+      android:fillColor="#450064"/>
+  <path
+      android:pathData="M609.6,619H414.4c-5.9,0 -10.7,-4.8 -10.7,-10.7 0,-28.1 23,-51.1 51.1,-51.1h114.4c28.1,0 51.1,23 51.1,51.1 0,5.9 -4.8,10.7 -10.7,10.7z"
+      android:fillColor="#5C6A7C"/>
+  <path
+      android:pathData="M770,132.8c0,-56.6 -45.9,-102.5 -102.5,-102.5 -31.9,0 -60.4,14.6 -79.2,37.4 -18.8,-22.8 -47.3,-37.4 -79.2,-37.4 -30.3,0 -57.5,13.2 -76.3,34.1 -18.8,-20.9 -46,-34.1 -76.3,-34.1 -56.6,0 -102.5,45.9 -102.5,102.5 0,24.7 8.7,47.4 23.3,65.1v41.3h469.6v-41.6c14.4,-17.7 23.1,-40.2 23.1,-64.8z"
+      android:fillColor="#F3F3F3"/>
+  <path
+      android:pathData="M510.5,801.7m-14.8,0a14.8,14.8 0,1 0,29.6 0,14.8 14.8,0 1,0 -29.6,0Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M510.5,859.5m-14.8,0a14.8,14.8 0,1 0,29.6 0,14.8 14.8,0 1,0 -29.6,0Z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M512.6,206.8h-1.3c-11,0 -20,-9 -20,-20V133c0,-11 9,-20 20,-20h1.3c11,0 20,9 20,20v53.8c0,11 -9,20 -20,20zM599.3,206.8H598c-11,0 -20,-9 -20,-20V133c0,-11 9,-20 20,-20h1.3c11,0 20,9 20,20v53.8c0,11 -9,20 -20,20zM425.9,206.8h-1.3c-11,0 -20,-9 -20,-20V133c0,-11 9,-20 20,-20h1.3c11,0 20,9 20,20v53.8c0,11 -9,20 -20,20z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M821.8,397.9c0.6,-1.5 0.9,-3.2 0.7,-4.8 -5.7,-59.4 -28.4,-115.5 -65.7,-162.7v-29.3c15.1,-19.8 23.1,-43.3 23.1,-68.3 0,-62 -50.5,-112.5 -112.5,-112.5 -29.9,0 -58.2,11.8 -79.2,32.6 -21,-20.8 -49.3,-32.6 -79.2,-32.6 -28.3,0 -55.6,10.8 -76.3,29.9 -20.7,-19.1 -48,-29.9 -76.3,-29.9 -62,0 -112.5,50.5 -112.5,112.5 0,24.9 8.2,49.1 23.3,68.6v28.7c-35.4,44.8 -57.7,97.9 -64.7,153.9 -0.5,4.3 1.7,8.4 5.5,10.2 -7.3,4 -14,9.1 -20,15.1 -16.2,16.4 -25.1,38.1 -25.1,61.1 0,47.9 38.9,86.8 86.8,86.8h0.6c23.7,63.3 70.3,116.4 129.8,148.4 -19.6,17.9 -52.3,54.9 -70.2,114.2 -1.3,1.2 -2.3,2.8 -2.8,4.7 -6,22.7 -9.6,53.2 -9.6,81.6 0,5.5 4.5,10 10,10h409c5.5,0 10,-4.5 10,-10 0,-28 -3.6,-58.5 -9.6,-81.5 -0.5,-1.8 -1.4,-3.3 -2.6,-4.5 -17.9,-59.5 -51.5,-97 -70.3,-114.4 59.4,-31.9 106,-85 129.7,-148.4h0.6c47.9,0 86.8,-38.9 86.8,-86.8 0,-30.3 -15.6,-57.1 -39.3,-72.6zM264,132.8c0,-51 41.5,-92.5 92.5,-92.5 26.2,0 51.3,11.2 68.9,30.8 1.9,2.1 4.6,3.3 7.4,3.3s5.5,-1.2 7.4,-3.3c17.6,-19.6 42.7,-30.8 68.9,-30.8 27.7,0 53.8,12.3 71.5,33.8 1.9,2.3 4.7,3.6 7.7,3.6s5.8,-1.3 7.7,-3.6c17.7,-21.5 43.7,-33.8 71.5,-33.8 51,0 92.5,41.5 92.5,92.5 0,21.5 -7.2,41.7 -20.9,58.5 -1.5,1.8 -2.2,4 -2.2,6.3v31.6L287.3,229.2v-31.3c0,-2.3 -0.8,-4.6 -2.3,-6.4 -13.5,-16.4 -21,-37.3 -21,-58.7zM277.9,249.2h468.3c29.7,39.9 48.7,86.1 55.2,135h-1.2c-8.4,0 -17,-0.3 -26.5,-0.8 -69.6,-4.2 -137.9,-25.3 -197.4,-61.2 -3.3,-2 -7.4,-1.9 -10.6,0.2 -70.1,45 -151.4,68.8 -235,68.8 -18.7,0 -37.3,-1.2 -55.4,-3.5 -6.9,-0.9 -13.7,-1.9 -20.4,-3.1 -1.3,-0.6 -2.7,-0.9 -4.1,-0.9L250,383.7c-8.9,-1.7 -17.6,-3.6 -26.3,-5.8 7.2,-46.5 25.8,-90.6 54.2,-128.7zM182.9,470.5c0,-32.8 23.9,-60.3 55.2,-65.8 -3.6,18.1 -5.4,36.4 -5.4,54.8 0,26.4 3.7,52.4 10.9,77.5 -34,-3.1 -60.7,-31.7 -60.7,-66.5zM324.6,837.1h60.1v59h-67c0.6,-20.7 3.1,-41.7 6.9,-59zM639.3,896.1v-59h60c3.9,17.5 6.4,38.6 7,59h-67zM692.3,817.1h-63c-5.5,0 -10,4.5 -10,10v69L404.7,896.1v-69c0,-5.5 -4.5,-10 -10,-10h-62.9c19.5,-57 53.9,-90.2 67.8,-101.9 2,0.9 3.8,1.7 5.6,2.4l37,48.2c6.7,8.7 16.7,13.7 27.7,13.7h0.9c11.3,-0.3 21.4,-5.8 27.8,-15l13.3,-19.1 13.3,19.1c6.4,9.3 16.6,14.8 27.8,15.1h0.9c10.9,0 21,-4.9 27.7,-13.6l37,-48.2c1.8,-0.8 3.8,-1.6 5.8,-2.5 14.1,11.5 48.4,44.6 67.9,101.8zM439.3,729.1c17.5,4.7 35.3,7.7 53.4,8.9l-10.4,15c-2.7,4 -7.1,6.3 -11.9,6.4 -4.8,0.1 -9.3,-2 -12.2,-5.8l-18.9,-24.5zM531.3,738c18.2,-1.2 36,-4.2 53.3,-8.8l-18.8,24.4c-2.9,3.8 -7.4,5.9 -12.2,5.8 -4.8,-0.1 -9.2,-2.5 -11.9,-6.5L531.3,738zM621.9,694.4s-0.1,0 0,0c-0.1,0 -0.1,0 0,0 -5.1,2.4 -9.3,4.2 -13.2,5.7 -30.4,12.2 -62.7,18.5 -96,18.6h-1.4c-33,-0.1 -65.3,-6.3 -96.1,-18.6 -3.8,-1.5 -8,-3.3 -13,-5.6 -63.5,-29.7 -112.9,-84.7 -135.6,-150.8 -9.3,-27 -14,-55.3 -14,-84.2 0,-18.1 1.9,-36.3 5.6,-54.1 4.8,0.8 9.6,1.5 14.4,2.1 18.9,2.4 38.4,3.7 58,3.7 85.4,0 168.4,-23.7 240.6,-68.7 58.9,34.4 125.6,55.1 193.8,60.3 4.1,18.4 6.2,37.4 6.2,56.6 0,28.8 -4.7,57.2 -14,84.2v0.1c-22.6,66.2 -72,121.1 -135.3,150.7zM780.4,537c7.2,-25.1 10.9,-51.1 10.9,-77.5 0,-18.5 -1.8,-36.9 -5.4,-54.8 31.3,5.5 55.2,32.9 55.2,65.8 0,34.8 -26.7,63.4 -60.7,66.5z"
+      android:fillColor="#450064"/>
+  <path
+      android:pathData="M569.2,547.2L454.8,547.2c-16.3,0 -31.6,6.4 -43.2,18 -11.5,11.7 -17.9,27 -17.9,43.1 0,11.4 9.3,20.7 20.7,20.7h195.2c5.8,0 11,-2.2 14.9,-6.2 3.8,-4 5.8,-9.1 5.8,-14.5 0,-33.7 -27.4,-61.1 -61.1,-61.1zM610,609L414.4,609c-0.4,0 -0.7,-0.3 -0.7,-0.7 0,-10.9 4.3,-21.2 12.1,-29 7.8,-7.8 18.1,-12.1 29,-12.1h114.4c22.7,0 41.1,18.4 41.1,41.1 0,0.1 0,0.3 -0.3,0.7zM510.5,776.9c-13.7,0 -24.8,11.1 -24.8,24.8s11.1,24.8 24.8,24.8 24.8,-11.1 24.8,-24.8 -11.1,-24.8 -24.8,-24.8zM510.5,806.5c-2.6,0 -4.8,-2.2 -4.8,-4.8s2.2,-4.8 4.8,-4.8 4.8,2.2 4.8,4.8 -2.2,4.8 -4.8,4.8zM510.5,834.7c-13.7,0 -24.8,11.1 -24.8,24.8s11.1,24.8 24.8,24.8 24.8,-11.1 24.8,-24.8 -11.1,-24.8 -24.8,-24.8zM510.5,864.3c-2.6,0 -4.8,-2.2 -4.8,-4.8s2.2,-4.8 4.8,-4.8 4.8,2.2 4.8,4.8 -2.2,4.8 -4.8,4.8zM482,193L482,193.3c3,13.7 15.3,23.6 29.3,23.6h1.3c14.1,0 26.5,-10 29.4,-23.9 0.1,-0.7 0.2,-1.4 0.2,-2 0.2,-1.3 0.3,-2.6 0.3,-4.1L542.5,133c0,-5.7 -1.7,-11.2 -4.8,-16.1 -0.2,-0.3 -0.4,-0.7 -0.6,-1 -5.6,-8 -14.7,-12.8 -24.5,-12.8h-1.3c-9.3,0 -18,4.3 -23.6,11.5l-0.3,0.3c-0.2,0.3 -0.4,0.5 -0.6,0.8 -3.6,5.2 -5.5,11.1 -5.5,17.3v53.8c0,2.2 0.2,4.2 0.6,6.1 0.1,0 0.1,0 0.1,0.1zM512.7,123.1c3.1,0 6.1,1.5 7.9,4l0.1,0.1c1.2,1.8 1.9,3.8 1.9,5.8v53.8c0,0.7 -0.1,1.6 -0.3,2.6v0.4c-1.3,4.1 -5.2,7 -9.6,7h-1.3c-4.6,0 -8.9,-3.4 -9.8,-8v-0.1,-0.1c-0.1,-0.2 -0.1,-0.8 -0.1,-1.9L501.5,133c0,-2.2 0.8,-4 1.5,-5.3 0.1,-0.1 0.2,-0.3 0.3,-0.4 1.8,-2.6 4.9,-4.2 8.1,-4.2h1.3zM598,216.8h1.3c16.5,0 30,-13.5 30,-30L629.3,133c0,-16.5 -13.5,-30 -30,-30L598,103c-16.5,0 -30,13.5 -30,30v53.8c0,16.5 13.5,30 30,30zM588,133c0,-5.5 4.5,-10 10,-10h1.3c5.5,0 10,4.5 10,10v53.8c0,5.5 -4.5,10 -10,10L598,196.8c-5.5,0 -10,-4.5 -10,-10L588,133zM424.6,216.8h1.3c16.5,0 30,-13.5 30,-30L455.9,133c0,-16.5 -13.5,-30 -30,-30h-1.3c-16.5,0 -30,13.5 -30,30v53.8c0,16.5 13.5,30 30,30zM414.6,133c0,-5.5 4.5,-10 10,-10h1.3c5.5,0 10,4.5 10,10v53.8c0,5.5 -4.5,10 -10,10h-1.3c-5.5,0 -10,-4.5 -10,-10L414.6,133z"
+      android:fillColor="#450064"/>
+</vector>

app/src/main/res/layout/svg/drawable/home_classify_ic.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M320,64 L192,64C121.6,64 64,121.6 64,192l0,128c0,70.4 57.6,128 128,128l128,0c70.4,0 128,-57.6 128,-128L448,192C448,121.6 390.4,64 320,64zM768,64l-128,0C569.6,64 512,121.6 512,192l0,128c0,70.4 57.6,128 128,128l128,0c70.4,0 128,-57.6 128,-128L896,192C896,121.6 838.4,64 768,64zM320,512 L192,512c-70.4,0 -128,57.6 -128,128l0,128c0,70.4 57.6,128 128,128l128,0c70.4,0 128,-57.6 128,-128l0,-128C448,569.6 390.4,512 320,512zM768,512l-128,0c-70.4,0 -128,57.6 -128,128l0,128c0,70.4 57.6,128 128,128l128,0c70.4,0 128,-57.6 128,-128l0,-128C896,569.6 838.4,512 768,512z"
+      android:fillColor="#567722"/>
+</vector>

app/src/main/res/layout/svg/drawable/home_log_ic.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M298.7,298.7c17.1,0 32,-14.9 32,-32v-128c0,-17.1 -14.9,-32 -32,-32s-32,14.9 -32,32v128c0,17.1 14.9,32 32,32zM576,298.7c17.1,0 32,-14.9 32,-32v-128c0,-17.1 -14.9,-32 -32,-32s-32,14.9 -32,32v128c0,17.1 14.9,32 32,32z"
+      android:fillColor="#707070"/>
+  <path
+      android:pathData="M469.3,725.3c0,-104.5 64,-196.3 153.6,-234.7L224,490.7c-17.1,0 -32,-14.9 -32,-32s14.9,-32 32,-32h405.3c17.1,0 32,14.9 32,32 0,8.5 -4.3,14.9 -8.5,21.3 23.5,-6.4 46.9,-10.7 72.5,-10.7 6.4,0 14.9,0 21.3,2.1L746.7,277.3c0,-46.9 -38.4,-85.3 -85.3,-85.3v74.7c0,53.3 -42.7,96 -96,96S469.3,320 469.3,266.7L469.3,192h-85.3v74.7c0,53.3 -42.7,96 -96,96S192,320 192,266.7L192,192c-46.9,0 -85.3,38.4 -85.3,85.3v554.7c0,46.9 38.4,85.3 85.3,85.3h364.8c-53.3,-46.9 -87.5,-115.2 -87.5,-192zM416,746.7h-192c-17.1,0 -32,-14.9 -32,-32s14.9,-32 32,-32h192c17.1,0 32,14.9 32,32s-14.9,32 -32,32zM416,618.7h-192c-17.1,0 -32,-14.9 -32,-32s14.9,-32 32,-32h192c17.1,0 32,14.9 32,32s-14.9,32 -32,32z"
+      android:fillColor="#707070"/>
+  <path
+      android:pathData="M725.3,533.3c-106.7,0 -192,87.5 -192,192s87.5,192 192,192 192,-87.5 192,-192 -85.3,-192 -192,-192zM800,789.3h-106.7c-17.1,0 -32,-14.9 -32,-32v-128c0,-17.1 14.9,-32 32,-32s32,14.9 32,32L725.3,725.3h74.7c17.1,0 32,14.9 32,32s-14.9,32 -32,32z"
+      android:fillColor="#707070"/>
+</vector>

app/src/main/res/layout/svg/drawable/home_order_ic.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M686.5,220c30,0 54.4,-23.2 54.4,-51.9v-51.9c0,-28.7 -24.4,-51.9 -54.4,-51.9 -30.1,0 -54.4,23.2 -54.4,51.9v51.9c0,28.7 24.4,51.9 54.4,51.9zM336.6,220c30,0 54.4,-23.2 54.4,-51.9v-51.9c0,-28.7 -24.4,-51.9 -54.4,-51.9 -30.1,0 -54.4,23.2 -54.4,51.9v51.9c0,28.7 24.3,51.9 54.4,51.9z"
+      android:fillColor="#835555"/>
+  <path
+      android:pathData="M776.6,146.5v31.9c0,40.2 -40.6,72.9 -90.6,72.9 -50.1,0 -90.7,-32.6 -90.7,-72.9L595.3,142L426.5,142v36.4c0,40.2 -40.6,72.9 -90.6,72.9 -50.1,0 -90.7,-32.6 -90.7,-72.9v-31.3c-47.5,14.7 -82,59.1 -82,111.7v584.1c0,64.5 52,116.8 116.2,116.8h465c64.2,0 116.2,-52.3 116.2,-116.8L860.6,258.8c0.1,-53.3 -35.4,-98.3 -84,-112.3zM733.5,815.3h-443c-18.4,0 -33.2,-15.4 -33.2,-34.5 0,-19 14.9,-34.5 33.2,-34.5h443.1c18.4,0 33.2,15.4 33.2,34.5s-14.9,34.5 -33.3,34.5zM733.5,632.3h-443c-18.4,0 -33.2,-15.4 -33.2,-34.5 0,-19 14.9,-34.5 33.2,-34.5h443.1c18.4,0 33.2,15.4 33.2,34.5s-14.9,34.5 -33.3,34.5zM733.5,449.3h-443c-18.4,0 -33.2,-15.4 -33.2,-34.5 0,-19 14.9,-34.5 33.2,-34.5h443.1c18.4,0 33.2,15.4 33.2,34.5s-14.9,34.5 -33.3,34.5z"
+      android:fillColor="#835555"/>
+</vector>

app/src/main/res/layout/svg/drawable/home_setting_ic.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M940,596l-76,-57.6c0.8,-8 1.6,-16.8 1.6,-26.4s-0.8,-18.4 -1.6,-26.4l76,-57.6c20.8,-16 26.4,-44 12.8,-68l-84.8,-143.2c-9.6,-16.8 -28,-27.2 -47.2,-27.2 -6.4,0 -12,0.8 -18.4,3.2L712,228c-15.2,-10.4 -31.2,-19.2 -47.2,-26.4l-13.6,-92c-4,-26.4 -26.4,-45.6 -53.6,-45.6H426.4c-27.2,0 -49.6,19.2 -53.6,44.8L360,201.6c-16,7.2 -31.2,16 -47.2,26.4l-90.4,-35.2c-6.4,-2.4 -12.8,-3.2 -19.2,-3.2 -19.2,0 -37.6,9.6 -46.4,26.4L71.2,360c-13.6,22.4 -8,52 12.8,68l76,57.6c-0.8,9.6 -1.6,18.4 -1.6,26.4s0,16.8 1.6,26.4l-76,57.6c-20.8,16 -26.4,44 -12.8,68l84.8,143.2c9.6,16.8 28,27.2 47.2,27.2 6.4,0 12,-0.8 18.4,-3.2L312,796c15.2,10.4 31.2,19.2 47.2,26.4l13.6,92c3.2,25.6 26.4,45.6 53.6,45.6h171.2c27.2,0 49.6,-19.2 53.6,-44.8l13.6,-92.8c16,-7.2 31.2,-16 47.2,-26.4l90.4,35.2c6.4,2.4 12.8,3.2 19.2,3.2 19.2,0 37.6,-9.6 46.4,-26.4l85.6,-144.8c12.8,-23.2 7.2,-51.2 -13.6,-67.2zM704,512c0,105.6 -86.4,192 -192,192S320,617.6 320,512s86.4,-192 192,-192 192,86.4 192,192z"
+      android:fillColor="#1F84EB"/>
+</vector>

app/src/main/res/layout/svg/drawable/ic_delete_x.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M512,2C235.1,2 2,235.1 2,512s233.1,510 510,510 510,-233.1 510,-510S788.9,2 512,2zM730.8,657.9c21.9,21.9 21.9,51 0,65.8 -21.9,21.9 -51,21.9 -65.8,0L519.1,577.8l-153,153c-21.9,21.9 -51,21.9 -72.9,0s-21.9,-58.1 0,-72.9l153,-153L300.9,359c-21.9,-14.8 -21.9,-43.9 0,-65.8s51,-21.9 65.8,0L512,439.1l153,-153c21.9,-21.9 51,-21.9 72.9,0s21.9,51 0,72.9l-153,153 145.9,145.9z"
+      android:fillColor="#FF0000"/>
+</vector>

app/src/main/res/layout/svg/drawable/ic_logout2.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M749.1,157.2A426.2,426.2 0,0 1,938.7 512c0,235.6 -191,426.7 -426.7,426.7S85.3,747.6 85.3,512a426.2,426.2 0,0 1,189.2 -354.6,42.7 42.7,0 1,1 47.5,70.9 341.3,341.3 0,1 0,379.5 -0.2,42.7 42.7,0 0,1 47.5,-70.9zM512,64a42.7,42.7 0,0 1,42.7 42.7v298.7a42.7,42.7 0,0 1,-85.3 0v-298.7a42.7,42.7 0,0 1,42.7 -42.7z"
+      android:fillColor="#D32F2F"/>
+</vector>

app/src/main/res/layout/svg/drawable/ic_silos.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M949.3,170.7c-17.1,0 -32,14.9 -32,32v10.7H512c-164.3,0 -298.7,134.4 -298.7,298.7 0,38.4 6.4,72.5 19.2,106.7H106.7v-10.7c0,-17.1 -14.9,-32 -32,-32S42.7,590.9 42.7,608v213.3c0,17.1 14.9,32 32,32S106.7,838.4 106.7,821.3V810.7h405.3c164.3,0 298.7,-134.4 298.7,-298.7 0,-38.4 -6.4,-72.5 -19.2,-106.7H917.3v10.7c0,17.1 14.9,32 32,32s32,-14.9 32,-32v-213.3c0,-17.1 -14.9,-32 -32,-32zM512,682.7c-93.9,0 -170.7,-76.8 -170.7,-170.7s76.8,-170.7 170.7,-170.7 170.7,76.8 170.7,170.7 -76.8,170.7 -170.7,170.7z"
+      android:fillColor="#1295DA"/>
+  <path
+      android:pathData="M503.5,413.9c-19.2,38.4 -55.5,117.3 -55.5,140.8 0,36.3 27.7,64 64,64s64,-27.7 64,-64c0,-23.5 -36.3,-102.4 -55.5,-140.8 -4.3,-6.4 -12.8,-6.4 -17.1,0z"
+      android:fillColor="#1295DA"/>
+</vector>

app/src/main/res/layout/svg/drawable/ic_update.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M855,463.9l-322.6,-331.8a29,29 0,0 0,-41 0L169,463.9c-9.2,9.7 -2.6,26.1 10.8,26.1H327.7v243.7c0,1.5 1.5,3.1 3.1,3.1h362.5c1.5,0 3.1,-1.5 3.1,-3.1V490h148a15.4,15.4 0,0 0,10.8 -26.1zM685.6,825.3H338.4a10.2,10.2 0,0 1,-10.2 -10.2v-34.3c0,-5.6 4.6,-10.2 10.2,-10.2h347.1c5.6,0 10.2,4.6 10.2,10.2v34.3a10.2,10.2 0,0 1,-10.2 10.2zM686.1,896H337.9a9.7,9.7 0,0 1,-9.7 -9.7v-18.4c0,-5.1 4.1,-9.7 9.7,-9.7h348.2c5.1,0 9.7,4.1 9.7,9.7v18.4c0,5.1 -4.1,9.7 -9.7,9.7z"
+      android:fillColor="#F57C00"/>
+</vector>