优化修改

app/build.gradle

@@ -68,7 +68,7 @@ android {
     }
     applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "boluo-xiaochao-v${defaultConfig.versionCode}-${releaseTime()}"+"-unsigned-${variant.name}.apk"
+            outputFileName = "shmz-xiaochao-v${defaultConfig.versionCode}-${releaseTime()}"+"-unsigned-${variant.name}.apk"
         }
     }
 }

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

@@ -1591,28 +1591,6 @@ public class ExecuteTheRecipe {
         return ListeningValue.get(name);
     }
 
-    /**
-     * 反馈主控制台状态
-     */
-    public static void ReadPLCMainStatus() {
-        try {
-            if (WokModbusTcpServer.get().plcIsConnect) {
-                Object obj1 = ReadPLC("翻转轴1允许机器人放盒取盒");
-                Object obj2 = ReadPLC("翻转轴2允许机器人放盒取盒");
-                boolean ob1 = obj1 == null ? false : (boolean) obj1;
-                boolean ob2 = obj2 == null ? false : (boolean) obj2;
-                ConfigName.getInstance().TouLiaoStatus = ob1 && ob2;
-
-                Object obj3 = ReadPLC("初始化完成");
-                boolean ob3 = obj3 == null ? false : (boolean) obj3;
-                ConfigName.getInstance().WokStatus = ob3 && !ExecuteTheRecipe.IsStart;
-            }
-        } catch (Exception ex) {
-            NewToastUtil.getInstance().showToastError("异常信息:" + ex.getMessage());
-        } finally {
-        }
-    }
-
     /**
      * 温控
      */

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

@@ -35,7 +35,7 @@ public abstract class HomeGoodsAdapter extends BaseAdapter<BPA_GOODS, HomeGoodsA
     public void onBindViewHolder(@NonNull GoodsViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
             LogUtils.d(" ///////// size28="+holder.binding.name.getTextSize());
-            if(holder.binding.name.getTextSize()> DisplayManager.getScale(28)+2 || holder.binding.name.getTextSize()< DisplayManager.getScale(28)-2){
+            if(holder.binding.name.getTextSize()> DisplayManager.getScale(32)+2 || holder.binding.name.getTextSize()< DisplayManager.getScale(32)-2){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
             holder.binding.add.setVisibility(View.GONE);

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

@@ -31,7 +31,7 @@ public class OrderNameAdapter extends BaseAdapter<BPA_ORDER_DETAIL, OrderNameAda
     @Override
     public void onBindViewHolder(@NonNull OrderNameAdapter.ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         BPA_ORDER_DETAIL bean = mData.get(position);
-        if(holder.binding.sort.getTextSize()>DisplayManager.getScale(26)+2||holder.binding.sort.getTextSize()<DisplayManager.getScale(32)-2){
+        if(holder.binding.sort.getTextSize()>DisplayManager.getScale(26)+2||holder.binding.sort.getTextSize()<DisplayManager.getScale(26)-2){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
         if(bean.type == 0){

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

@@ -25,6 +25,8 @@ import com.bonait.bnframework.common.utils.AdbCommandUtil;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogFoodControlBinding;
 import com.bonait.bnframework.modbus.ModbusCenter;
+import com.bonait.bnframework.modbus.RobotModbusTcpServer;
+import com.bonait.bnframework.modbus.WokModbusTcpServer;
 import com.bonait.bnframework.newui.widget.NewToastUtil;
 import com.bonait.bnframework.newui.widget.WaitProcessUtil;
 
@@ -98,20 +100,30 @@ public class FoodControlDialog extends DialogFragment {
         viewBinding.btnClose1.setOnClickListener(v->{
             dismiss();
         });
+        viewBinding.btnWeihu.setOnClickListener(v->{
 
+        });
     }
 
     private HashMap<String, String> data = new HashMap<>();;
     @SuppressLint("NonConstantResourceId")
     @OnClick({R.id.top1, R.id.top2,R.id.top3,R.id.top4,
             R.id.right1,R.id.right2,R.id.right3,R.id.right4,R.id.right5,R.id.right6,
-            R.id.left1,R.id.left2,R.id.btn_wok_chucai,R.id.btn_oven_chucai})
+            R.id.left1,R.id.left2,R.id.btn_wok_chucai,R.id.btn_oven_chucai,R.id.btn_weihu})
     public void onViewClicked(View view) {
         if(ConfigName.getInstance().isFastClick()){
             NewToastUtil.getInstance().showToast("点击太快了");
             return;
         }
         data.clear();
+        if(!RobotModbusTcpServer.get().plcIsConnect&&!ConfigName.TEST){
+            NewToastUtil.getInstance().showToastError("机器人未连接！");
+            return;
+        }
+        if(!WokModbusTcpServer.get().plcIsConnect&&!ConfigName.TEST){
+            NewToastUtil.getInstance().showToastError("炒锅未连接！");
+            return;
+        }
         if(ExecuteTheRecipe.MakeStatus || ExecuteTheRecipe.MakeStatus2){
             NewToastUtil.getInstance().showToast("当前正在制作订单，无法调试");
             return;
@@ -127,6 +139,18 @@ public class FoodControlDialog extends DialogFragment {
             return;
         }
         switch (view.getId()){
+            case R.id.btn_weihu:
+                WaitProcessUtil.getInstance().show(getContext(),"提示","机器人正在去维护位，请等待完成，不要进行其他操作!");
+                ThreadManager.get().execute(new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        ExecuteTheRecipe.Wait_Robot_No_Working();//等待机器人空闲
+                        ModbusCenter.robotWritePlc(true,"机器人去维护位置",true,null);
+                        ExecuteTheRecipe.ThreadWhile2("机器人到达维护位");
+                        WaitProcessUtil.getInstance().dismiss();
+                    }
+                }));
+                break;
             case R.id.top1:
                 data.put("辅料名称","测试投料");
                 data.put("辅料位置","1号位");

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

@@ -13,7 +13,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.apkfuns.logutils.LogUtils;
-import com.bonait.bnframework.HBL.Thread.ThreadManager;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.business.ExecuteTheRecipe;
 import com.bonait.bnframework.common.base.BaseFragment;
@@ -30,7 +29,6 @@ import com.bonait.bnframework.newui.dialog.FoodControlDialog;
 import com.bonait.bnframework.newui.dialog.OvenControlDialog;
 import com.bonait.bnframework.newui.dialog.WokControlDialog;
 import com.bonait.bnframework.newui.widget.NewToastUtil;
-import com.bonait.bnframework.newui.widget.WaitProcessUtil;
 import com.orhanobut.logger.Logger;
 
 /**
@@ -101,26 +99,7 @@ public class HomeDevicesFragment extends BaseFragment {
     }
 
     private void initView(){
-        viewBinding.btnWeihu.setOnClickListener(v->{
-            if(ConfigName.getInstance().isFastClick()){
-                NewToastUtil.getInstance().showToast("点击过快！");
-                return;
-            }
-            if(!RobotModbusTcpServer.get().plcIsConnect&&!ConfigName.TEST){
-                NewToastUtil.getInstance().showToastError("机器人未连接！");
-                return;
-            }
-            WaitProcessUtil.getInstance().show(getContext(),"提示","机器人正在去维护位，请等待完成，不要进行其他操作!");
-            ThreadManager.get().execute(new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    ExecuteTheRecipe.Wait_Robot_No_Working();//等待机器人空闲
-                    ModbusCenter.robotWritePlc(true,"机器人去维护位置",true,null);
-                    ExecuteTheRecipe.ThreadWhile2("机器人到达维护位");
-                    WaitProcessUtil.getInstance().dismiss();
-                }
-            }));
-        });
+
         viewBinding.btnLineOpen.setOnClickListener(v->{
             if(ConfigName.getInstance().isFastClick()){
                 NewToastUtil.getInstance().showToast("点击过快！");

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

@@ -26,6 +26,7 @@ import com.bonait.bnframework.databinding.DialogOrderBinding;
 import com.bonait.bnframework.databinding.FragmentHomeOrderBinding;
 import com.bonait.bnframework.event.FreshOrderEvent;
 import com.bonait.bnframework.event.MakingStepEvent;
+import com.bonait.bnframework.modbus.ModbusCenter;
 import com.bonait.bnframework.modbus.OvenModbusTcpServer;
 import com.bonait.bnframework.modbus.RobotModbusTcpServer;
 import com.bonait.bnframework.modbus.WokModbusTcpServer;
@@ -148,15 +149,42 @@ public class HomeOrderFragment extends BaseFragment {
                 if(ConfigName.getInstance().isFast2Click()){
                     return;
                 }
+                if(!OvenModbusTcpServer.get().plcIsConnect||!WokModbusTcpServer.get().plcIsConnect||!RobotModbusTcpServer.get().plcIsConnect){
+                    NewToastUtil.getInstance().showToast("设备连接异常，请稍后重试");
+                    return;
+                }
                 String tv = ((TextView)v).getText().toString();
                 String name = mData.get(position).goodsName +"—"+ (mData.get(position).groupName==null?"":mData.get(position).groupName);
                 if(mData.get(position).status == 0){
+                    boolean robotNoWorking = false;
+                    Object object1 =  ModbusCenter.robotReadPlc("主任务读取");
+                    Object object2 =  ModbusCenter.robotReadPlc("机器人在原点");
+                    Object object3 =  ModbusCenter.robotReadPlc("机器人准备就绪");
+                    if (object1 != null && object2!=null  && object3!=null) {
+                        robotNoWorking = ((short) object1)==0 && (boolean) object2 &&(boolean) object3;
+                    }
+                    if(!robotNoWorking){
+                        NewToastUtil.getInstance().showToast("机器人正在工作，请稍后重试");
+                        return;
+                    }
+
                     for(BPA_ORDER_DETAIL bean : mData){
                         if(bean.status!=0){
                             NewToastUtil.getInstance().showToast("请确认上一个订单已完成");
                             return;
                         }
                     }
+                    Object object4 = ModbusCenter.getListingValue("出料空盆检测有无");
+                    if(object4!=null && !(boolean) object4){
+                        NewToastUtil.getInstance().showToast("出料空盆未放置，请补盆后重试");
+                        return;
+                    }
+                    Object object5 = ModbusCenter.getListingValue("出餐工位检测有无");
+                    if(object5!=null && (boolean) object5){
+                        NewToastUtil.getInstance().showToast("出餐工位有盆，请取走后重试");
+                        return;
+                    }
+
                     String error = checkPosition(mData.get(position));
                     makingOrderDialog( mData.get(position),error.isEmpty()?0:-1,name,error,position);
                     return;

app/src/main/java/com/bonait/bnframework/ui/activity/CookingActivity.java

@@ -427,43 +427,43 @@ public class CookingActivity extends BaseActivity {
     private boolean isScatterStir = false;//打散搅拌
     private boolean isUp = true;//上升
     private void changeDevicePic(){
-        if(isFire){
-            if(isStir){
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_up);
-                }else {
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                }
-            }else{
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_up);
-                }else {
-                    if(isScatterStir){
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                    }else {
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
-                    }
-                }
-            }
-        }else {
-            if(isStir){
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_up);
-                }else {
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_down);
-                }
-            }else{
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_unstir_up);
-                }else {
-                    if(isScatterStir){
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                    }else {
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
-                    }
-                }
-            }
-        }
+//        if(isFire){
+//            if(isStir){
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_up);
+//                }else {
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                }
+//            }else{
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_up);
+//                }else {
+//                    if(isScatterStir){
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                    }else {
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
+//                    }
+//                }
+//            }
+//        }else {
+//            if(isStir){
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_up);
+//                }else {
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_down);
+//                }
+//            }else{
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_unstir_up);
+//                }else {
+//                    if(isScatterStir){
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                    }else {
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
+//                    }
+//                }
+//            }
+//        }
     }
 
     /**

app/src/main/java/com/bonait/bnframework/ui/activity/RecProcessActivity.java

@@ -439,43 +439,43 @@ public class RecProcessActivity extends BaseActivity {
     }
 
     private void changeDevicePic(){
-        if(isFire){
-            if(isStir){
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_up);
-                }else {
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                }
-            }else{
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_up);
-                }else {
-                    if(isScatterStir){
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                    }else {
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
-                    }
-                }
-            }
-        }else {
-            if(isStir){
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_up);
-                }else {
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_down);
-                }
-            }else{
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_unstir_up);
-                }else {
-                    if(isScatterStir){
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                    }else {
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
-                    }
-                }
-            }
-        }
+//        if(isFire){
+//            if(isStir){
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_up);
+//                }else {
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                }
+//            }else{
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_up);
+//                }else {
+//                    if(isScatterStir){
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                    }else {
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
+//                    }
+//                }
+//            }
+//        }else {
+//            if(isStir){
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_up);
+//                }else {
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_down);
+//                }
+//            }else{
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_unstir_up);
+//                }else {
+//                    if(isScatterStir){
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                    }else {
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
+//                    }
+//                }
+//            }
+//        }
     }
 
     /**

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

@@ -305,43 +305,43 @@ public class HomeDevicesFragment extends BaseFragment {
      * 改变设备图片
      */
     private void changeDevicePic(){
-        if(isFire){
-            if(isStir){
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_up);
-                }else {
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                }
-            }else{
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_up);
-                }else {
-                    if(isScatterStir){
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                    }else {
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
-                    }
-                }
-            }
-        }else {
-            if(isStir){
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_up);
-                }else {
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_down);
-                }
-            }else{
-                if(isUp){
-                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_unstir_up);
-                }else {
-                    if(isScatterStir){
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
-                    }else {
-                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
-                    }
-                }
-            }
-        }
+//        if(isFire){
+//            if(isStir){
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_up);
+//                }else {
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                }
+//            }else{
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_up);
+//                }else {
+//                    if(isScatterStir){
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                    }else {
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
+//                    }
+//                }
+//            }
+//        }else {
+//            if(isStir){
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_up);
+//                }else {
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_stir_down);
+//                }
+//            }else{
+//                if(isUp){
+//                    viewBinding.device.imgDevice.setImageResource(R.mipmap.device_unfire_unstir_up);
+//                }else {
+//                    if(isScatterStir){
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_stir_down);
+//                    }else {
+//                        viewBinding.device.imgDevice.setImageResource(R.mipmap.device_fire_unstir_down);
+//                    }
+//                }
+//            }
+//        }
     }
 
     /**

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

@@ -94,15 +94,15 @@ public class HomeGoodsViewModel extends ViewModel {
             RecordManager.getInstance().addLogRecord("数据接收", "接收商品信息成功");
             goodsList.clear();
             goodsList.addAll(s.Content.getGoodsInfoList());
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    cloudGoodsList.setValue(goodsList);
-                }
-            });
-//            ThreadManager.get().execute(new Thread(()->{
-//                GetGoodsInfo2();
-//            }));
+//            runOnUiThread(new Runnable() {
+//                @Override
+//                public void run() {
+//                    cloudGoodsList.setValue(goodsList);
+//                }
+//            });
+            ThreadManager.get().execute(new Thread(()->{
+                GetGoodsInfo2();
+            }));
         });
     }
 

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

@@ -129,12 +129,13 @@
                 android:layout_height="0dp"
                 android:layout_weight="2">
 
+                <!--android:src="@mipmap/device_normal" -->
                 <ImageView
                     android:id="@+id/device_image"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:scaleType="fitCenter"
-                    android:src="@mipmap/device_normal" />
+                    />
                 <TextView
                     android:id="@+id/test1"
                     android:layout_width="match_parent"

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

@@ -28,6 +28,7 @@
         app:layout_constraintTop_toBottomOf="@id/title3"
         app:layout_constraintLeft_toLeftOf="parent"
         >
+        <!-- android:src="@mipmap/device_mainfood_position"-->
         <ImageView
             android:id="@+id/img_mainfood"
             android:layout_width="@dimen/dp_600"
@@ -36,7 +37,7 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             android:scaleType="fitXY"
-            android:src="@mipmap/device_mainfood_position"
+
 
             />
 

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

@@ -6,6 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- android:src="@mipmap/device_mainfood_position"-->
     <ImageView
         android:id="@+id/img_mainfood"
         android:layout_width="@dimen/dp_700"
@@ -14,7 +15,7 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         android:scaleType="fitXY"
-        android:src="@mipmap/device_mainfood_position"
+
         android:layout_marginTop="@dimen/dp_80"
         />
 

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

@@ -9,11 +9,12 @@
         android:id="@+id/cl_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+        <!--android:src="@mipmap/device_normal"-->
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="fitCenter"
-            android:src="@mipmap/device_normal"
+
             android:antialias="true"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"

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

@@ -7,8 +7,8 @@
     >
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/dp_180"
-        android:layout_height="@dimen/dp_180"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="@dimen/dp_240"
         android:layout_marginBottom="20dp"
         >
 

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

@@ -7,8 +7,8 @@
     >
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/dp_180"
-        android:layout_height="@dimen/dp_180"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="@dimen/dp_240"
         android:layout_marginBottom="20dp"
         >
 

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

@@ -10,6 +10,7 @@
     <RelativeLayout
         android:layout_width="@dimen/dp_300"
         android:background="@color/main_title_color1"
+        android:layout_gravity="end"
         android:layout_height="match_parent">
         <TextView
             android:id="@+id/device_status_wok"
@@ -166,6 +167,10 @@
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="30dp"
                 android:layout_below="@id/tv_fuliao"
+                android:text="1"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:background="@drawable/bg_check_circle_select"
                 />
             <TextView
@@ -174,6 +179,10 @@
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="10dp"
+                android:text="2"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_toEndOf="@id/tv_fuliao_circle1"
                 android:layout_below="@id/tv_fuliao"
                 android:background="@drawable/bg_check_circle_select"
@@ -184,6 +193,10 @@
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="10dp"
+                android:text="3"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_toEndOf="@id/tv_fuliao_circle2"
                 android:layout_below="@id/tv_fuliao"
                 android:background="@drawable/bg_check_circle_select"
@@ -194,6 +207,10 @@
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="10dp"
+                android:text="4"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_below="@id/tv_fuliao"
                 android:layout_toEndOf="@id/tv_fuliao_circle3"
                 android:background="@drawable/bg_check_circle_select"
@@ -215,6 +232,10 @@
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="30dp"
+                android:text="1"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_below="@id/tv_zhuliao"
                 android:background="@drawable/bg_check_circle_select"
                 />
@@ -222,6 +243,10 @@
                 android:id="@+id/tv_zhuliao_circle2"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
+                android:text="2"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="70dp"
                 android:layout_toEndOf="@id/tv_zhuliao_circle1"
@@ -235,6 +260,10 @@
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="30dp"
+                android:text="3"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_below="@id/tv_zhuliao_circle1"
                 android:background="@drawable/bg_check_circle_select"
                 />
@@ -243,6 +272,10 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
+                android:text="4"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_marginStart="70dp"
                 android:layout_toEndOf="@id/tv_zhuliao_circle1"
                 android:layout_below="@id/tv_zhuliao_circle1"
@@ -254,6 +287,10 @@
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="30dp"
+                android:text="5"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_below="@id/tv_zhuliao_circle3"
                 android:background="@drawable/bg_check_circle_select"
                 />
@@ -263,6 +300,10 @@
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="70dp"
+                android:text="6"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_toEndOf="@id/tv_zhuliao_circle1"
                 android:layout_below="@id/tv_zhuliao_circle3"
                 android:background="@drawable/bg_check_circle_select"
@@ -284,6 +325,10 @@
                 android:layout_width="50dp"
                 android:layout_height="50dp"
                 android:layout_marginTop="5dp"
+                android:text="1"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_marginStart="30dp"
                 android:layout_below="@id/tv_kaopan"
                 android:background="@drawable/bg_check_circle_select"
@@ -292,6 +337,10 @@
                 android:id="@+id/tv_kaopan_circle2"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
+                android:text="2"
+                android:textColor="@color/white"
+                android:gravity="center"
+                android:textSize="26sp"
                 android:layout_marginTop="5dp"
                 android:layout_marginStart="70dp"
                 android:layout_toEndOf="@id/tv_zhuliao_circle1"
@@ -308,7 +357,6 @@
         android:layout_width="150dp"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_marginStart="300dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         android:background="@color/main_color1"
         />
@@ -317,7 +365,8 @@
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginStart="450dp"
+        android:layout_marginStart="150dp"
+        android:layout_marginEnd="300dp"
         android:layout_marginBottom="50dp"
         />
 

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

@@ -9,9 +9,9 @@
     android:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="1100dp"
+        android:layout_width="1400dp"
         android:background="@drawable/bg_round25_white"
-        android:layout_height="760dp">
+        android:layout_height="900dp">
         <TextView
             android:id="@+id/title1"
             android:layout_width="match_parent"
@@ -43,12 +43,25 @@
             android:text="烤箱出菜"
             android:gravity="center"
             android:background="@drawable/bg_round15_yellow_btn"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="100dp"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="20dp"
+            app:layout_constraintTop_toTopOf="@id/btn_wok_chucai"
+            android:layout_marginTop="150dp"
+            app:layout_constraintEnd_toEndOf="@id/btn_wok_chucai"
+            android:layout_marginStart="50dp"
             android:layout_height="100dp"/>
 
+        <TextView
+            android:id="@+id/btn_weihu"
+            android:layout_width="150dp"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:text="去维护位"
+            android:gravity="center"
+            app:layout_constraintTop_toTopOf="@id/btn_oven_chucai"
+            android:layout_marginTop="150dp"
+            app:layout_constraintEnd_toEndOf="@id/btn_wok_chucai"
+            android:background="@drawable/bg_round15_yellow_btn"
+            android:layout_height="80dp"/>
+
 
         <TextView
             android:id="@+id/btn_wok_chucai"
@@ -59,17 +72,17 @@
             android:gravity="center"
             android:background="@drawable/bg_round15_yellow_btn"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="100dp"
+            android:layout_marginTop="120dp"
             app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginEnd="20dp"
+            android:layout_marginEnd="80dp"
             android:layout_height="100dp"/>
 
         <RelativeLayout
             android:layout_width="wrap_content"
             android:layout_height="100dp"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="100dp"
-            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="120dp"
+            android:layout_marginStart="200dp"
             app:layout_constraintStart_toStartOf="parent"
             android:orientation="horizontal"
             android:background="#80b0b0b0"
@@ -136,10 +149,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="230dp"
-            android:layout_marginEnd="365dp"
+            android:layout_marginTop="250dp"
+            android:layout_marginStart="455dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -153,9 +166,9 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/right1"
             app:layout_constraintTop_toTopOf="@id/right1"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="50dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -169,10 +182,9 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right1"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="365dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -186,10 +198,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right1"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="50dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -203,10 +215,9 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right3"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="365dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -220,10 +231,10 @@
             android:layout_height="150dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/right1"
             app:layout_constraintTop_toBottomOf="@id/right3"
             android:layout_marginTop="30dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="50dp"
             android:gravity="center"
             android:textSize="32sp"
             android:maxLines="2"
@@ -239,9 +250,9 @@
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
             app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="50dp"
+            android:layout_marginStart="80dp"
             app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="230dp"
+            android:layout_marginTop="250dp"
             android:gravity="center"
             android:textSize="28sp"
             android:maxLines="1"
@@ -255,8 +266,8 @@
             android:layout_height="510dp"
             android:layout_marginLeft="40dp"
             android:background="@drawable/bg_blue_box_click"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginStart="215dp"
+            app:layout_constraintStart_toEndOf="@id/left1"
+            android:layout_marginStart="20dp"
             app:layout_constraintTop_toTopOf="@id/left1"
             android:gravity="center"
             android:textSize="28sp"

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

@@ -75,7 +75,7 @@
             android:layout_marginTop="@dimen/dp_90"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="8"
+            app:spanCount="6"
             android:layout_height="match_parent">
         </androidx.recyclerview.widget.RecyclerView>
 

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

@@ -18,6 +18,12 @@
             android:scaleX="1.2"
             android:scaleY="1.2"
             />
+        <ImageView
+            android:layout_width="1000dp"
+            android:layout_height="303dp"
+            android:src="@mipmap/ic_chuanshu"
+            android:layout_gravity="bottom"
+            />
 <!--        <TextView-->
 <!--            android:id="@+id/device_status_wok"-->
 <!--            android:layout_width="wrap_content"-->
@@ -71,14 +77,14 @@
 
         <TextView
             android:layout_width="150dp"
-            android:layout_marginTop="150dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="100dp"
+            android:layout_marginTop="150dp"
             android:background="#800088FF"
-            android:textSize="32sp"
-            android:textColor="@color/white"
-            android:text="炒锅"
             android:gravity="center"
-            android:layout_height="70dp"/>
+            android:text="炒锅调试"
+            android:textColor="@color/white"
+            android:textSize="32sp" />
         <TextView
             android:id="@+id/btn_chaoguo"
             android:layout_width="400dp"
@@ -94,7 +100,7 @@
             android:layout_marginStart="450dp"
             android:textSize="32sp"
             android:textColor="@color/white"
-            android:text="烤箱"
+            android:text="烤箱调试"
             android:gravity="center"
             android:background="#800088FF"
             android:layout_height="70dp"/>
@@ -112,10 +118,10 @@
             android:layout_marginStart="700dp"
             android:textSize="32sp"
             android:textColor="@color/white"
-            android:text="机器人投料"
+            android:text="机器人投料\n调试"
             android:gravity="center"
             android:background="#800088FF"
-            android:layout_height="120dp"/>
+            android:layout_height="160dp"/>
         <TextView
             android:id="@+id/btn_foods"
             android:layout_width="200dp"
@@ -125,17 +131,17 @@
             android:textColor="@color/white"
             android:gravity="center"
             android:layout_height="420dp"/>
-        <TextView
-            android:id="@+id/btn_weihu"
-            android:layout_width="150dp"
-            android:layout_marginTop="650dp"
-            android:layout_marginStart="670dp"
-            android:textSize="32sp"
-            android:textColor="@color/white"
-            android:text="去维护位"
-            android:gravity="center"
-            android:background="@drawable/bg_round15_yellow_btn"
-            android:layout_height="80dp"/>
+<!--        <TextView-->
+<!--            android:id="@+id/btn_weihu"-->
+<!--            android:layout_width="150dp"-->
+<!--            android:layout_marginTop="650dp"-->
+<!--            android:layout_marginStart="670dp"-->
+<!--            android:textSize="32sp"-->
+<!--            android:textColor="@color/white"-->
+<!--            android:text="去维护位"-->
+<!--            android:gravity="center"-->
+<!--            android:background="@drawable/bg_round15_yellow_btn"-->
+<!--            android:layout_height="80dp"/>-->
 
 <!--        <TextView-->
 <!--            android:id="@+id/tv_chucai_box"-->

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

@@ -40,7 +40,7 @@
             android:layout_toEndOf="@id/recycler_classify"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="4"
+            app:spanCount="3"
             android:layout_height="match_parent">
         </androidx.recyclerview.widget.RecyclerView>
 

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

@@ -78,7 +78,7 @@
             android:layout_toRightOf="@id/recycler_classify"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="8"
+            app:spanCount="6"
             android:layout_height="match_parent">
         </androidx.recyclerview.widget.RecyclerView>
 

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

@@ -62,13 +62,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginStart="350dp"
+            android:layout_marginStart="455dp"
             android:layout_marginBottom="45dp"
             android:orientation="vertical">
 
             <TextView
-                android:layout_width="60dp"
-                android:layout_height="40dp"
+                android:layout_width="80dp"
+                android:layout_height="60dp"
                 android:textSize="32sp"
                 android:gravity="center"
                 android:textColor="@color/white"
@@ -78,8 +78,8 @@
                 android:textStyle="bold"
                 />
             <TextView
-                android:layout_width="60dp"
-                android:layout_height="40dp"
+                android:layout_width="80dp"
+                android:layout_height="60dp"
                 android:textSize="32sp"
                 android:gravity="center"
                 android:textColor="@color/white"
@@ -89,15 +89,15 @@
                 android:textStyle="bold"
                 />
             <TextView
-                android:layout_width="60dp"
-                android:layout_height="40dp"
+                android:layout_width="80dp"
+                android:layout_height="60dp"
                 android:textSize="28sp"
                 android:gravity="center"
                 android:textColor="@color/white"
                 android:background="@color/topbj1"
                 android:text="③"
                 android:textStyle="bold"
-                android:layout_marginBottom="10dp"
+                android:layout_marginBottom="60dp"
                 />
         </LinearLayout>
         <LinearLayout

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

@@ -7,8 +7,8 @@
     >
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="@dimen/dp_178"
-        android:layout_height="@dimen/dp_178"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="@dimen/dp_240"
         android:layout_marginBottom="20dp"
         >
 
@@ -32,7 +32,7 @@
             tools:text="三月瓜"
             android:textAlignment="center"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_28"
+            android:textSize="@dimen/sp_32"
             android:textStyle="bold"
             android:ellipsize="middle"
             android:lines="1"

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

@@ -5,11 +5,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <!--
+        android:src="@mipmap/device_normal"
+    -->
     <ImageView
         android:id="@+id/img_device"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_800"
-        android:src="@mipmap/device_normal"
         android:scaleType="fitCenter"
         android:scaleY="2"
         android:scaleX="2"