diff --git a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java index 3caa8364..8783997e 100644 --- a/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java +++ b/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java @@ -316,10 +316,10 @@ public class ConfigName { add(new Res_PLCADDRESS("当前档位_蒸烤", "M21.3", 0, 0,3)); add(new Res_PLCADDRESS("当前档位_其他", "M21.4", 0, 0,3)); add(new Res_PLCADDRESS("温度设置完成", "M31.0", 0, 0,3)); - add(new Res_PLCADDRESS("档位正限位提示", "M1000.3", 0, 0,3)); - add(new Res_PLCADDRESS("档位负限位提示", "M1000.4", 0, 0,3)); - add(new Res_PLCADDRESS("温度正限位提示", "M1001.3", 0, 0,3)); - add(new Res_PLCADDRESS("温度负限位提示", "M1001.4", 0, 0,3)); + add(new Res_PLCADDRESS("档位正限位提示", "M1000.3", 1, 0,3)); + add(new Res_PLCADDRESS("档位负限位提示", "M1000.4", 1, 0,3)); + add(new Res_PLCADDRESS("温度正限位提示", "M1001.3", 1, 0,3)); + add(new Res_PLCADDRESS("温度负限位提示", "M1001.4", 1, 0,3)); add(new Res_PLCADDRESS("档位回原点超时", "M1100.0", 1, 0,3)); add(new Res_PLCADDRESS("档位定位超时", "M1100.1", 1, 0,3)); add(new Res_PLCADDRESS("温度回原点超时", "M1100.2", 1, 0,3)); diff --git a/app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog.java b/app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog.java index 79f20c66..495bffdc 100644 --- a/app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog.java +++ b/app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog.java @@ -441,7 +441,7 @@ public class RobotControlDialog extends DialogFragment { return; } if(isOpen){ - tipDialog("控制机器人取K2放入烤箱", new MyClickListener() { + tipDialog("控制机器人取K1放入烤箱", new MyClickListener() { @Override public void clickListener(View v, Object s) { WaitProcessUtil.getInstance().show(getContext(),"提示","机器人正在取K1向烤箱投料,请等待完成,不要进行其他操作!"); diff --git a/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeWarnFragment.java b/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeWarnFragment.java index 73fc3e42..d6bea3d3 100644 --- a/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeWarnFragment.java +++ b/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeWarnFragment.java @@ -90,7 +90,6 @@ public class HomeWarnFragment extends BaseFragment { ovenWarnList.add("档位负限位提示"); ovenWarnList.add("温度正限位提示"); ovenWarnList.add("温度负限位提示"); - ovenWarnList.add("档位负限位提示"); ovenWarnList.add("档位回原点超时"); ovenWarnList.add("档位定位超时"); ovenWarnList.add("温度回原点超时"); diff --git a/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java b/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java index 2b8f06b5..8891b95a 100644 --- a/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java +++ b/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java @@ -482,7 +482,9 @@ public class UpdateAllDataService { Post(url,context,upMaterialBean,"商品基础信息",(response->{ RecordManager.getInstance().addLogRecord("数据接收", url+"-上传商品基础信息成功"); NewToastUtil.getInstance().showToast("上传商品基础信息成功"); - upLoadDetailInfo(goods,context); + Analysis(context,response,"商品基础信息",url).OnSource(()->{ + upLoadDetailInfo(goods,context); + }); })); }catch (Exception e){ LogUtils.d("网络请求异常"+e.getMessage());