fyf
/
AndroidSmartClient
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Browse Source

添加800炒锅带投料版本

授权码生成工具
liup 4 months ago
parent
b7022c85cd
commit
2c718b5d23
6 changed files with 266 additions and 52 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +9
    -1
      app/src/main/java/com/bonait/bnframework/business/ConfigData.java
  2. +0
    -6
      app/src/main/java/com/bonait/bnframework/business/MainInit.java
  3. +250
    -1
      app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
  4. +2
    -19
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java
  5. +0
    -20
      app/src/main/res/layout/fragment_system_systemset.xml
  6. +5
    -5
      app/src/main/res/layout/fragment_wok_set_tlzz.xml

+ 9
- 1
app/src/main/java/com/bonait/bnframework/business/ConfigData.java View File

@@ -72,6 +72,7 @@ import com.bonait.bnframework.common.model.mode.UpdateBomInfo;
import com.bonait.bnframework.common.model.mode.UpdateCloudGood;
import com.bonait.bnframework.common.oss.OssHelper;
import com.bonait.bnframework.common.utils.NetworkUtils;
import com.bonait.bnframework.common.utils.PreferenceUtils;
import com.bonait.bnframework.common.utils.ToastUtils;
import com.bonait.bnframework.common.view.GoodEditDialog;
import com.bonait.bnframework.event.DownGoodsEvent;
@@ -271,6 +272,7 @@ public class ConfigData {
}

}
ConfigName.getInstance().is800WithFeeding = ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料");
}

/**
@@ -1223,6 +1225,9 @@ public class ConfigData {
} else if (ConfigName.getInstance().versionSelectionEnum.equals("一拖二大炒")) {
plcaddresses = ConfigName.getInstance().PlcAddress_大炒自动投料;
processTS = ConfigName.getInstance().Process_一拖四;
}else if (ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料")) {
plcaddresses = ConfigName.getInstance().PlcAddress_800炒锅带投料;
processTS = ConfigName.getInstance().Process_大炒自动投料;
}

//region 恢复PLC
@@ -1269,7 +1274,10 @@ public class ConfigData {
break;
}*/

} else if (ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
} else if (ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料")) {
plcaddresses = ConfigName.getInstance().PlcAddress_800炒锅带投料;
processTS = ConfigName.getInstance().Process_大炒自动投料;
} else if (ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
plcaddresses = ConfigName.getInstance().PlcAddress_小炒;
processTS = ConfigName.getInstance().Process_小炒;
} else if (ConfigName.getInstance().versionSelectionEnum.equals("一拖四大炒")) {


+ 0
- 6
app/src/main/java/com/bonait/bnframework/business/MainInit.java View File

@@ -106,8 +106,6 @@ public class MainInit {
// 内存泄漏检测
initLeakCanary(false);

initData();


// Log日志打印框架
initLogCat();
@@ -132,10 +130,6 @@ public class MainInit {
ExecuteTheRecipe.showlog(app.getString(R.string.text_Appstart));
}

public static void initData(){
ConfigName.getInstance().is800WithFeeding = PreferenceUtils.getBoolean("is800WithFeeding",false);
}


//========================================================================//
public static void text()


+ 250
- 1
app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java View File

@@ -530,6 +530,255 @@ public class ConfigName {
add(new Res_PLCADDRESS("出菜", "M11.5", 0, 1));


//位置动作
add(new Res_PLCADDRESS("原点位", "M11.4", 0, 1));
add(new Res_PLCADDRESS("倒菜位", "M12.7", 0, 1));
add(new Res_PLCADDRESS("维护位", "M20.0", 0, 1));
add(new Res_PLCADDRESS("抽料位", "M11.7", 0, 1));
add(new Res_PLCADDRESS("清洗位", "M13.0", 0, 1));
add(new Res_PLCADDRESS("炒菜位1", "M12.0", 0, 1));
add(new Res_PLCADDRESS("炒菜位2", "M12.1", 0, 1));
add(new Res_PLCADDRESS("炒菜位3", "M12.2", 0, 1));

add(new Res_PLCADDRESS("出餐启动", "M11.5", 0, 1));
add(new Res_PLCADDRESS("炒锅清洗", "M11.6", 0, 1));

//深度清洗功能
add(new Res_PLCADDRESS("深度清洗功能", "-------------", 0, 0));
add(new Res_PLCADDRESS("清洗抽水量", "VW122", 1, 1));
add(new Res_PLCADDRESS("清洗时间", "VW1150", 1, 1));
add(new Res_PLCADDRESS("倒水减速角度", "VW1152", 1, 1));
add(new Res_PLCADDRESS("深度清洗", "M13.6", 0, 1));
add(new Res_PLCADDRESS("编码器复位", "M13.7", 0, 1));

//液体料模型
add(new Res_PLCADDRESS("料仓校准", "-------------", 0, 0));
add(new Res_PLCADDRESS("校准时间", "VW112", 1, 1));
add(new Res_PLCADDRESS("料仓1校准开关", "M12.3", 0, 1));
add(new Res_PLCADDRESS("料仓1校准值", "VW114", 1, 1));
add(new Res_PLCADDRESS("料仓2校准开关", "M12.4", 0, 1));
add(new Res_PLCADDRESS("料仓2校准值", "VW116", 1, 1));
add(new Res_PLCADDRESS("料仓3校准开关", "M12.5", 0, 1));
add(new Res_PLCADDRESS("料仓3校准值", "VW118", 1, 1));
add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));

add(new Res_PLCADDRESS("料仓自动", "-------------", 0, 0));
add(new Res_PLCADDRESS("料仓1需求值", "VW106", 1, 1));
add(new Res_PLCADDRESS("料仓1下料", "M11.1", 0, 1));
add(new Res_PLCADDRESS("料仓2需求值", "VW108", 1, 1));
add(new Res_PLCADDRESS("料仓2下料", "M11.2", 0, 1));
add(new Res_PLCADDRESS("料仓3需求值", "VW110", 1, 1));
add(new Res_PLCADDRESS("料仓3下料", "M11.3", 0, 1));
add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));

add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
add(new Res_PLCADDRESS("料仓2手动开关", "M13.2", 1, 1));
add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));

//上下限
add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
add(new Res_PLCADDRESS("原点位置下限", "VD150", 1, 1));
add(new Res_PLCADDRESS("原点位置上限", "VD154", 1, 1));
add(new Res_PLCADDRESS("洗锅位置下限", "VD158", 1, 1));
add(new Res_PLCADDRESS("洗锅位置上限", "VD162", 1, 1));
add(new Res_PLCADDRESS("倒菜位置下限", "VD166", 1, 1));
add(new Res_PLCADDRESS("倒菜位置上限", "VD170", 1, 1));
add(new Res_PLCADDRESS("维护位置下限", "VD1130", 1, 1));
add(new Res_PLCADDRESS("维护位置上限", "VD1134", 1, 1));
add(new Res_PLCADDRESS("抽调料位置下限", "VD174", 1, 1));
add(new Res_PLCADDRESS("抽调料位置上限", "VD178", 1, 1));
add(new Res_PLCADDRESS("1#炒制位置下限", "VD182", 1, 1));
add(new Res_PLCADDRESS("1#炒制位置上限", "VD186", 1, 1));
add(new Res_PLCADDRESS("2#炒制位置下限", "VD190", 1, 1));
add(new Res_PLCADDRESS("2#炒制位置上限", "VD194", 1, 1));
add(new Res_PLCADDRESS("3#炒制位置下限", "VD198", 1, 1));
add(new Res_PLCADDRESS("3#炒制位置上限", "VD202", 1, 1));
add(new Res_PLCADDRESS("炒锅工作范围下限", "VD206", 1, 1));
add(new Res_PLCADDRESS("炒锅工作范围上限", "VD210", 1, 1));

//自动投料-平移轴
add(new Res_PLCADDRESS("平移轴控制", "-------------", 0, 0));
add(new Res_PLCADDRESS("平移-伺服当前值", "VD220", 1, 1));
add(new Res_PLCADDRESS("平移-点动速度", "VD224", 1, 1));
add(new Res_PLCADDRESS("平移-回原点速度", "VD228", 1, 1));
add(new Res_PLCADDRESS("平移-定位运行速度", "VD232", 1, 1));

add(new Res_PLCADDRESS("平移-点动正转", "M14.0", 0, 1));
add(new Res_PLCADDRESS("平移-点动反转", "M14.1", 0, 1));
add(new Res_PLCADDRESS("平移-回原点", "M14.2", 0, 1));
add(new Res_PLCADDRESS("平移-去1号位", "M14.3", 0, 1));
add(new Res_PLCADDRESS("平移-去2号位", "M14.4", 0, 1));
add(new Res_PLCADDRESS("平移-去3号位", "M14.5", 0, 1));
add(new Res_PLCADDRESS("平移-去4号位", "M14.6", 0, 1));

add(new Res_PLCADDRESS("平移-1号位置值", "VD236", 1, 1));
add(new Res_PLCADDRESS("平移-1#位置设定", "M15.0", 0, 1));
add(new Res_PLCADDRESS("平移-2号位置值", "VD240", 1, 1));
add(new Res_PLCADDRESS("平移-2#位置设定", "M15.1", 0, 1));
add(new Res_PLCADDRESS("平移-3号位置值", "VD244", 1, 1));
add(new Res_PLCADDRESS("平移-3#位置设定", "M15.2", 0, 1));
add(new Res_PLCADDRESS("平移-4号位置值", "VD248", 1, 1));
add(new Res_PLCADDRESS("平移-4#位置设定", "M15.3", 0, 1));

//自动投料-翻转轴
add(new Res_PLCADDRESS("翻转轴控制", "-------------", 0, 0));
add(new Res_PLCADDRESS("翻转-伺服当前值", "VD260", 1, 1));
add(new Res_PLCADDRESS("翻转-点动速度", "VD264", 1, 1));
add(new Res_PLCADDRESS("翻转-回原点速度", "VD268", 1, 1));
add(new Res_PLCADDRESS("翻转-定位运行速度", "VD272", 1, 1));

add(new Res_PLCADDRESS("翻转-点动正转", "M16.0", 0, 1));
add(new Res_PLCADDRESS("翻转-点动反转", "M16.1", 0, 1));
add(new Res_PLCADDRESS("翻转-回原点", "M16.2", 0, 1));
add(new Res_PLCADDRESS("翻转-去1号位", "M16.3", 0, 1));
add(new Res_PLCADDRESS("翻转-去2号位", "M16.4", 0, 1));
add(new Res_PLCADDRESS("翻转-去3号位", "M16.5", 0, 1));
add(new Res_PLCADDRESS("翻转-去4号位", "M16.6", 0, 1));

add(new Res_PLCADDRESS("翻转-去1号吸料位", "M16.6", 0, 1));
add(new Res_PLCADDRESS("翻转-去2号吸料位", "M70.5", 0, 1));
add(new Res_PLCADDRESS("翻转-去3号吸料位", "M70.6", 0, 1));
add(new Res_PLCADDRESS("翻转-去4号吸料位", "M70.7", 0, 1));


add(new Res_PLCADDRESS("翻转-1号位置值", "VD276", 1, 1));
add(new Res_PLCADDRESS("翻转-1#位置设定", "M17.0", 0, 1));
add(new Res_PLCADDRESS("翻转-2号位置值", "VD280", 1, 1));
add(new Res_PLCADDRESS("翻转-2#位置设定", "M17.1", 0, 1));
add(new Res_PLCADDRESS("翻转-3号位置值", "VD284", 1, 1));
add(new Res_PLCADDRESS("翻转-3#位置设定", "M17.2", 0, 1));
add(new Res_PLCADDRESS("翻转-4号位置值", "VD288", 1, 1));
add(new Res_PLCADDRESS("翻转-4#位置设定", "M17.3", 0, 1));
add(new Res_PLCADDRESS("翻转-1号吸料位置值", "VD288", 1, 1));
add(new Res_PLCADDRESS("翻转-1#吸料位置设定", "M17.3", 0, 1));
add(new Res_PLCADDRESS("翻转-2号吸料位置值", "VD138", 1, 1));
add(new Res_PLCADDRESS("翻转-2#吸料位置设定", "M70.0", 0, 1));
add(new Res_PLCADDRESS("翻转-3号吸料位置值", "VD142", 1, 1));
add(new Res_PLCADDRESS("翻转-3#吸料位置设定", "M70.1", 0, 1));
add(new Res_PLCADDRESS("翻转-4号吸料位置值", "VD146", 1, 1));
add(new Res_PLCADDRESS("翻转-4#吸料位置设定", "M70.2", 0, 1));

add(new Res_PLCADDRESS("倒菜启动", "M17.4", 0, 1));
add(new Res_PLCADDRESS("磁铁吸合", "M17.5", 0, 1));

//反馈信号
add(new Res_PLCADDRESS("反馈信号", "-------------", 0, 0));
add(new Res_PLCADDRESS("初始化完成", "M40.0", 1, 0));
add(new Res_PLCADDRESS("设备急停", "M40.1", 1, 0));
add(new Res_PLCADDRESS("原点位反馈", "M40.2", 1, 0));
add(new Res_PLCADDRESS("抽料位反馈", "M40.3", 1, 0));
add(new Res_PLCADDRESS("炒菜位1反馈", "M40.4", 1, 0));
add(new Res_PLCADDRESS("炒菜位2反馈", "M40.5", 1, 0));
add(new Res_PLCADDRESS("炒菜位3反馈", "M40.6", 1, 0));
add(new Res_PLCADDRESS("倒菜位反馈", "M40.7", 1, 0));
add(new Res_PLCADDRESS("维护位反馈", "M48.0", 1, 0));
add(new Res_PLCADDRESS("投料位反馈", "M41.0", 1, 0));
add(new Res_PLCADDRESS("清洗位反馈", "M41.1", 1, 0));
add(new Res_PLCADDRESS("料仓1下料完成", "M41.2", 1, 0));
add(new Res_PLCADDRESS("料仓2下料完成", "M41.3", 1, 0));
add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
add(new Res_PLCADDRESS("炒锅倒菜减速位", "M41.7", 1, 0));
add(new Res_PLCADDRESS("平移轴在1号位", "M43.0", 1, 0));
add(new Res_PLCADDRESS("平移轴在2号位", "M43.1", 1, 0));
add(new Res_PLCADDRESS("平移轴在3号位", "M43.2", 1, 0));
add(new Res_PLCADDRESS("平移轴在4号位", "M43.3", 1, 0));
add(new Res_PLCADDRESS("翻转轴在1号位", "M44.0", 1, 0));
add(new Res_PLCADDRESS("翻转轴在2号位", "M44.1", 1, 0));
add(new Res_PLCADDRESS("翻转轴在3号位", "M44.2", 1, 0));
add(new Res_PLCADDRESS("翻转轴在4号位", "M44.3", 1, 0));
add(new Res_PLCADDRESS("翻转轴在1号吸料位", "M44.3", 1, 0));
add(new Res_PLCADDRESS("翻转轴在2号吸料位", "M72.0", 1, 0));
add(new Res_PLCADDRESS("翻转轴在3号吸料位", "M72.1", 1, 0));
add(new Res_PLCADDRESS("翻转轴在4号吸料位", "M72.2", 1, 0));

add(new Res_PLCADDRESS("倒菜完成", "M44.4", 1, 0));
add(new Res_PLCADDRESS("心跳位", "VW1000", 0, 1));

add(new Res_PLCADDRESS("温度模拟输入量", "-------------", 0, 0));
add(new Res_PLCADDRESS("温度模拟量上限", "VW1050", 1, 1));
add(new Res_PLCADDRESS("温度模拟量下限", "VW1052", 1, 1));
add(new Res_PLCADDRESS("温度模拟量", "VW1054", 1, 1));
add(new Res_PLCADDRESS("温度量程上限", "VD1060", 1, 1));
add(new Res_PLCADDRESS("温度量程下限", "VD1056", 1, 1));

add(new Res_PLCADDRESS("电流模拟输入量", "-------------", 0, 0));
add(new Res_PLCADDRESS("电流模拟量上限", "VW1070", 1, 1));
add(new Res_PLCADDRESS("电流模拟量下限", "VW1072", 1, 1));
add(new Res_PLCADDRESS("电流模拟量", "VW1074", 1, 1));
add(new Res_PLCADDRESS("电流量程上限", "VD1080", 1, 1));
add(new Res_PLCADDRESS("电流量程下限", "VD1076", 1, 1));
add(new Res_PLCADDRESS("电流报警设置", "VW1092", 1, 1));
add(new Res_PLCADDRESS("异常加热故障信息", "M42.1", 1, 1));

//检测信号
add(new Res_PLCADDRESS("监测信号", "-------------", 0, 0));
add(new Res_PLCADDRESS("当前锅底温度", "VD300", 1, 0));
add(new Res_PLCADDRESS("炒锅搅拌转速", "VD304", 1, 0));
add(new Res_PLCADDRESS("当前加热档位", "VD308", 1, 0));
add(new Res_PLCADDRESS("炒锅当前电压", "VD312", 1, 0));
add(new Res_PLCADDRESS("炒锅当前电流", "VD316", 1, 0));
add(new Res_PLCADDRESS("炒锅当前功率", "VD320", 1, 0));
add(new Res_PLCADDRESS("搅拌频率", "VW324", 1, 0));
add(new Res_PLCADDRESS("搅拌电机电流", "VW326", 1, 0));
add(new Res_PLCADDRESS("搅拌电机电压", "VW328", 1, 0));
add(new Res_PLCADDRESS("搅拌变频器温度", "VW330", 1, 0));
add(new Res_PLCADDRESS("翻转频率", "VW332", 1, 0));
add(new Res_PLCADDRESS("翻转电机电流", "VW334", 1, 0));
add(new Res_PLCADDRESS("翻转电机电压", "VW336", 1, 0));
add(new Res_PLCADDRESS("翻转变频器温度", "VW338", 1, 0));
add(new Res_PLCADDRESS("编码器当前位值", "VD340", 1, 0));

//状态上报
add(new Res_PLCADDRESS("状态上报", "-------------", 0, 0));
add(new Res_PLCADDRESS("搅拌电机", "VW350", 1, 0));
add(new Res_PLCADDRESS("翻转电机", "VW352", 1, 0));
add(new Res_PLCADDRESS("炒锅", "VW354", 1, 0));
}};
public List<Res_PLCADDRESS> PlcAddress_800炒锅带投料 = new ArrayList<Res_PLCADDRESS>() {{

//硬件设备 初始化
add(new Res_PLCADDRESS("硬件设备", "-------------", 0, 0));
add(new Res_PLCADDRESS("初始化", "M10.0", 1, 1));
add(new Res_PLCADDRESS("停止", "M10.1", 1, 1));
add(new Res_PLCADDRESS("复位", "M10.2", 0, 1));

//搅拌模型
add(new Res_PLCADDRESS("模型控制", "-------------", 0, 0));
add(new Res_PLCADDRESS("搅拌", "M10.3", 1, 1));
add(new Res_PLCADDRESS("搅拌速度", "VW102", 1, 1));

//翻转正转模型
add(new Res_PLCADDRESS("翻转正转", "M10.4", 0, 1));
add(new Res_PLCADDRESS("翻转反转", "M10.5", 0, 1));
add(new Res_PLCADDRESS("转动速度", "VW104", 1, 1));


//加热模型
add(new Res_PLCADDRESS("加热", "M10.6", 0, 1));
add(new Res_PLCADDRESS("加热功率", "VW100", 1, 1));
add(new Res_PLCADDRESS("温控开关", "M17.6", 1, 1));
add(new Res_PLCADDRESS("暂停开关", "M17.7", 1, 1));

//主料
add(new Res_PLCADDRESS("主料", "M17.4", 0, 1));

//抽水放水
add(new Res_PLCADDRESS("炒锅抽水", "M10.7", 0, 1));
add(new Res_PLCADDRESS("炒锅放水", "M11.0", 0, 1));


//出菜模型
add(new Res_PLCADDRESS("出菜", "M11.5", 0, 1));


//位置动作
add(new Res_PLCADDRESS("原点位", "M11.4", 0, 1));
add(new Res_PLCADDRESS("倒菜位", "M12.7", 0, 1));
@@ -1706,7 +1955,7 @@ public class ConfigName {
/**
* 版本信息
*/
public String[] versionSelectionValues = new String[]{"大炒版本", "大炒自动投料版本", "小炒版本","一拖四大炒","一拖二大炒"};
public String[] versionSelectionValues = new String[]{"大炒版本","800炒锅带投料", "大炒自动投料版本", "小炒版本","一拖四大炒","一拖二大炒"};
/**
* 选配版本信息
*/


+ 2
- 19
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java View File

@@ -63,8 +63,6 @@ public class SystemSystemsetFragment extends BaseFragment {

@BindView(R.id.isStop)
Spinner isStop;
@BindView(R.id.is800WithFeefing)
Spinner is800WithFeefing;


@BindView(R.id.edittext_wd)
@@ -153,16 +151,6 @@ public class SystemSystemsetFragment extends BaseFragment {
isStop.setAdapter(adapter11);
isStop.setSelection(material_map_yes_no.get(ConfigName.getInstance().WhetherManualFeedingSuspended));

ArrayAdapter<String> adapter12 = new ArrayAdapter<>(context, R.layout.spinner_text_item, new ArrayList<>(yesNoList));
adapter12.setDropDownViewResource(R.layout.spinner_dropdown_item);
is800WithFeefing.setAdapter(adapter12);
ConfigName.getInstance().is800WithFeeding = PreferenceUtils.getBoolean("is800WithFeeding",false);
if(ConfigName.getInstance().is800WithFeeding){
is800WithFeefing.setSelection(1);
}else{
is800WithFeefing.setSelection(0);
}


ArrayAdapter<String> adapter2 = new ArrayAdapter<>(context, R.layout.spinner_text_item, new ArrayList<>(ConfigName.getInstance().HeatingGearL.keySet()));
adapter2.setDropDownViewResource(R.layout.spinner_dropdown_item);
@@ -262,13 +250,6 @@ public class SystemSystemsetFragment extends BaseFragment {
ConfigName.getInstance().MainAddress = edittext100.getText().toString();
ConfigName.getInstance().MainPost = Integer.parseInt(edittext101.getText().toString());
ConfigName.getInstance().DeviceHao = Integer.parseInt(edittext102.getText().toString());
if(is800WithFeefing.getSelectedItem().toString().equals("是")){
PreferenceUtils.setBoolean("is800WithFeefing",true);
ConfigName.getInstance().is800WithFeeding = true;
}else{
PreferenceUtils.setBoolean("is800WithFeefing",false);
ConfigName.getInstance().is800WithFeeding = false;
}

ConfigName.getInstance().ClientAutoKey = edittext3.getText().toString();
ConfigName.getInstance().DeviceAutoKey = edittext4.getText().toString();
@@ -281,6 +262,8 @@ public class SystemSystemsetFragment extends BaseFragment {
isgb = true;
}

ConfigName.getInstance().is800WithFeeding = ConfigName.getInstance().versionSelectionEnum.equals("800炒锅带投料");

for (BPA_SYSTEMSET item : bpa_systemsets) {
QueryDB.DeleteSystemset(item.id);
}


+ 0
- 20
app/src/main/res/layout/fragment_system_systemset.xml View File

@@ -255,26 +255,6 @@
android:layout_height="24dp"
android:layout_centerVertical="true" />
</TableRow>
<TableRow
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp">


<com.qmuiteam.qmui.widget.textview.QMUILinkTextView
android:layout_marginLeft="@dimen/dp_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="800炒锅带投料" />
<Spinner
android:id="@+id/is800WithFeefing"
style="@style/commonSpinnerStyle"
android:layout_width="80dp"
android:layout_height="24dp"
android:layout_centerVertical="true" />
</TableRow>
</TableLayout>




+ 5
- 5
app/src/main/res/layout/fragment_wok_set_tlzz.xml View File

@@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10">
android:layout_marginTop="5dp">

<LinearLayout
android:layout_width="0dp"
@@ -433,7 +433,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="30dp">
android:layout_marginTop="10dp">

<LinearLayout
android:layout_width="0dp"
@@ -1199,13 +1199,13 @@

<Button
android:id="@+id/dcqd_button"
android:layout_width="160dp"
android:layout_height="100dp"
android:layout_width="180dp"
android:layout_height="70dp"
android:layout_centerInParent="true"
android:layout_marginLeft="50dp"
android:layout_marginRight="@dimen/dp_10"
android:background="@drawable/button3"
android:text="倒菜\n启动"
android:text="倒菜启动"
android:textColor="@color/white"
android:textSize="20dp" />
</LinearLayout>


Write Preview
Loading…
Cancel
Save