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

修改800炒锅带投料

授权码生成工具
liup 4 months ago
parent
ff24df8b33
commit
b7022c85cd
22 changed files with 391 additions and 83 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      .idea/deploymentTargetSelector.xml
  2. +7
    -0
      app/src/main/java/com/bonait/bnframework/business/MainInit.java
  3. +19
    -8
      app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java
  4. +5
    -0
      app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java
  5. +10
    -0
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java
  6. +9
    -0
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingActivity.java
  7. +10
    -0
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java
  8. +4
    -1
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java
  9. +26
    -2
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java
  10. +30
    -3
      app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/WokSetTLZZFragment.java
  11. +10
    -8
      app/src/main/java/com/bonait/bnframework/ui/dialog/EditGoodsDialog.java
  12. +4
    -7
      app/src/main/java/com/bonait/bnframework/ui/viewmodel/HomeGoodsViewModel.java
  13. +1
    -0
      app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java
  14. +17
    -2
      app/src/main/res/layout/activity_cooking.xml
  15. +18
    -0
      app/src/main/res/layout/activity_cookingsimulated.xml
  16. +12
    -2
      app/src/main/res/layout/activity_dishtest.xml
  17. +9
    -0
      app/src/main/res/layout/activity_diy_memory.xml
  18. +18
    -2
      app/src/main/res/layout/fragment_home_sbkz.xml
  19. +20
    -0
      app/src/main/res/layout/fragment_system_systemset.xml
  20. +112
    -0
      app/src/main/res/layout/fragment_wok_set_tlzz.xml
  21. +1
    -1
      app/src/main/res/layout/item/layout/dialog_edit_goods.xml
  22. +48
    -46
      app/src/main/res/layout/item/layout/layout_add_goods_mainfood.xml

+ 1
- 1
.idea/deploymentTargetSelector.xml View File

@@ -4,7 +4,7 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-08-15T03:12:15.673965900Z">
<DropdownSelection timestamp="2024-08-15T06:56:40.277909800Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="Default" identifier="serial=127.0.0.1:7555;connection=ab909648" />


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

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

initData();


// Log日志打印框架
initLogCat();

@@ -129,6 +132,10 @@ 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()


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

@@ -32,7 +32,9 @@ import java.util.concurrent.ConcurrentHashMap;
* 配置文件
*/
public class ConfigName {
public static boolean isTEST = true;
public static boolean isTEST = false;
public boolean is800WithFeeding = false;//是否是800带投料版 有5个投料位

//region 单例模式
private static ConfigName mInstance; //实例变量设置私有，防止直接通过类名访问

@@ -115,6 +117,7 @@ public class ConfigName {
* 设备id
*/
public String DeviceId = "未知";

//endregion

//region MQTT配置中心
@@ -612,6 +615,7 @@ public class ConfigName {
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("平移-去5号位", "M14.7", 0, 1));

add(new Res_PLCADDRESS("平移-1号位置值", "VD236", 1, 1));
add(new Res_PLCADDRESS("平移-1#位置设定", "M15.0", 0, 1));
@@ -620,7 +624,9 @@ public class ConfigName {
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("平移-5号位置值", "VD252", 1, 1));
add(new Res_PLCADDRESS("平移-4#位置设定", "M15.3", 0, 1));
add(new Res_PLCADDRESS("平移-5#位置设定", "M15.4", 0, 1));

//自动投料-翻转轴
add(new Res_PLCADDRESS("翻转轴控制", "-------------", 0, 0));
@@ -638,9 +644,10 @@ public class ConfigName {
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("翻转-去2号吸料位", "M70.4", 0, 1));
add(new Res_PLCADDRESS("翻转-去3号吸料位", "M70.5", 0, 1));
add(new Res_PLCADDRESS("翻转-去4号吸料位", "M70.6", 0, 1));
add(new Res_PLCADDRESS("翻转-去5号吸料位", "M70.7", 0, 1));


add(new Res_PLCADDRESS("翻转-1号位置值", "VD276", 1, 1));
@@ -653,12 +660,14 @@ public class ConfigName {
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号吸料位置值", "VD134", 1, 1));
add(new Res_PLCADDRESS("翻转-2#吸料位置设定", "M70.0", 0, 1));
add(new Res_PLCADDRESS("翻转-3号吸料位置值", "VD142", 1, 1));
add(new Res_PLCADDRESS("翻转-3号吸料位置值", "VD138", 1, 1));
add(new Res_PLCADDRESS("翻转-3#吸料位置设定", "M70.1", 0, 1));
add(new Res_PLCADDRESS("翻转-4号吸料位置值", "VD146", 1, 1));
add(new Res_PLCADDRESS("翻转-4号吸料位置值", "VD142", 1, 1));
add(new Res_PLCADDRESS("翻转-5号吸料位置值", "VD146", 1, 1));
add(new Res_PLCADDRESS("翻转-4#吸料位置设定", "M70.2", 0, 1));
add(new Res_PLCADDRESS("翻转-5#吸料位置设定", "M70.3", 0, 1));

add(new Res_PLCADDRESS("倒菜启动", "M17.4", 0, 1));
add(new Res_PLCADDRESS("磁铁吸合", "M17.5", 0, 1));
@@ -687,6 +696,7 @@ public class ConfigName {
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("平移轴在5号位", "M43.4", 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));
@@ -695,6 +705,7 @@ public class ConfigName {
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("翻转轴在5号吸料位", "M72.3", 1, 0));

add(new Res_PLCADDRESS("倒菜完成", "M44.4", 1, 0));
add(new Res_PLCADDRESS("心跳位", "VW1000", 0, 1));
@@ -1505,7 +1516,7 @@ public class ConfigName {
} else if (item.equals("清洗方式")) {
data = "一般清洗、深度清洗";
} else if (item.equals("主料位置")) {
data = "1号位、2号位、3号位、4号位";
data = "1号位、2号位、3号位、4号位、5号位";
} else if (item.equals("正转速度") || item.equals("反转速度") || item.equals("转动速度") || item.equals("搅拌速度")) {
data = "停止、最低、低速、中速、高速、最高、极高";
} else if (item.equals("加热功率") || item.equals("热锅功率")) {


+ 5
- 0
app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java View File

@@ -64,6 +64,7 @@ public class DataBus {
String text2="";
String text3="";
String text4="";
String text5="";
try
{
ArrayList<BPA_GOODS_PROCESS_DETAIL> goodsrecipes= GoodsProcessDetailDBUtil.getByGroupId(goodsGroupId);
@@ -116,6 +117,9 @@ public class DataBus {
}else if(formulation.get("主料位置").toString().equals("4号位"))
{
text4+=formulation.get("主料名称");
}else if(formulation.get("主料位置").toString().equals("5号位"))
{
text5+=formulation.get("主料名称");
}
}
}
@@ -129,6 +133,7 @@ public class DataBus {
resultData.put(2,text2);
resultData.put(3,text3);
resultData.put(4,text4);
resultData.put(5,text5);
return resultData;
}
//endregion


+ 10
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/HomeFragmentSBKZ.java View File

@@ -131,6 +131,10 @@ public class HomeFragmentSBKZ extends BaseFragment {

@BindView(R.id.touliao4)
imagebuttom3 touliao4;
@BindView(R.id.touliao5)
imagebuttom3 touliao5;
@BindView(R.id.tv5)
TextView tv5;

@BindView(R.id.yeliao1)
imagebuttom3 yeliao1;
@@ -168,6 +172,8 @@ public class HomeFragmentSBKZ extends BaseFragment {
initTopBar();
initData();
SxUIThread();
touliao5.setVisibility(ConfigName.getInstance().is800WithFeeding?View.VISIBLE:View.GONE);
tv5.setVisibility(ConfigName.getInstance().is800WithFeeding?View.VISIBLE:View.GONE);
}

@Override
@@ -215,6 +221,7 @@ public class HomeFragmentSBKZ extends BaseFragment {
touliao2.mListener = myClickListener;
touliao3.mListener = myClickListener;
touliao4.mListener = myClickListener;
touliao5.mListener = myClickListener;

chushui.SetOnTounch(new View.OnTouchListener() {
@Override
@@ -501,6 +508,9 @@ public class HomeFragmentSBKZ extends BaseFragment {
case R.id.touliao4:
MainDish(4);
break;
case R.id.touliao5:
MainDish(5);
break;
case R.id.huoli:
SetFire(hl);
break;


+ 9
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingActivity.java View File

@@ -116,6 +116,8 @@ public class CookingActivity extends LinearLayout {

@BindView(R.id.touliao4)
imagebuttom3 touliao4;
@BindView(R.id.touliao5)
imagebuttom3 touliao5;

@BindView(R.id.yeliao1)
imagebuttom3 yeliao1;
@@ -142,6 +144,8 @@ public class CookingActivity extends LinearLayout {
initTopBar();

SxUIThread();
touliao5.setVisibility(ConfigName.getInstance().is800WithFeeding?VISIBLE:GONE);

}
//endregion

@@ -179,6 +183,8 @@ public class CookingActivity extends LinearLayout {

touliao4.setTag(resultData.get(4)+"-按钮");
touliao4.Init();
touliao5.setTag(resultData.get(5)+"-按钮");
touliao5.Init();

goodname.setText(good.name + "-"+goodsGroup.name);
start_goodmake.mListener = listener;
@@ -412,6 +418,9 @@ public class CookingActivity extends LinearLayout {
}else if(val.equals("4号位"))
{
flicker_buttom=touliao4;
}else if(val.equals("5号位"))
{
flicker_buttom=touliao5;
}
flicker_buttom.SetStatusKK(true);
break;


+ 10
- 0
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/CookingSimulatedActivity.java View File

@@ -105,6 +105,10 @@ public class CookingSimulatedActivity extends BaseActivity {

@BindView(R.id.touliao4)
imagebuttom3 touliao4;
@BindView(R.id.touliao5)
imagebuttom3 touliao5;
@BindView(R.id.tv5)
TextView tv5;

@BindView(R.id.yeliao1)
imagebuttom3 yeliao1;
@@ -149,6 +153,8 @@ public class CookingSimulatedActivity extends BaseActivity {
}
initData();
SxUIThread();
touliao5.setVisibility(ConfigName.getInstance().is800WithFeeding?View.VISIBLE:View.GONE);
tv5.setVisibility(ConfigName.getInstance().is800WithFeeding?View.VISIBLE:View.GONE);
}
//endregion

@@ -193,6 +199,8 @@ public class CookingSimulatedActivity extends BaseActivity {

touliao4.setTag(resultData.get(4) + "-按钮");
touliao4.Init();
touliao5.setTag(resultData.get(5) + "-按钮");
touliao5.Init();

goodname.setText(goods.name + "-"+goodsGroup.name);
runtime.setText(formatTime(goodsGroup.maketime));
@@ -612,6 +620,8 @@ public class CookingSimulatedActivity extends BaseActivity {
flicker_buttom = touliao3;
} else if (val.equals("4号位")) {
flicker_buttom = touliao4;
} else if (val.equals("5号位")) {
flicker_buttom = touliao5;
}
flicker_buttom.SetStatusKK(true);
break;


+ 4
- 1
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/DiyMemoryActivity.java View File

@@ -192,7 +192,7 @@ public class DiyMemoryActivity extends BaseActivity {
@OnClick({R.id.startbutton, R.id.querendangwei,
R.id.chuliao, R.id.touliao1, R.id.touliao0,
R.id.touliao2, R.id.touliao3,
R.id.touliao4
R.id.touliao4 ,R.id.touliao5
, R.id.ydw, R.id.dcw, R.id.clw
, R.id.qxw, R.id.ccw1, R.id.ccw2, R.id.ccw3
, R.id.zidongchucan
@@ -289,6 +289,9 @@ public class DiyMemoryActivity extends BaseActivity {
case R.id.touliao4://主料4
ClickZL(time, time_c, 4);
break;
case R.id.touliao5://主料5
ClickZL(time, time_c, 5);
break;
case R.id.ydw://原点位
ClickWZ(time, time_c, "原点位");
break;


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

@@ -22,11 +22,13 @@ import com.bonait.bnframework.common.db.QueryDB;
import com.bonait.bnframework.common.db.mode.BPA_MATERIAL;
import com.bonait.bnframework.common.db.mode.BPA_SYSTEMSET;
import com.bonait.bnframework.common.model.mode.VersionSelectionEnum;
import com.bonait.bnframework.common.utils.PreferenceUtils;
import com.bonait.bnframework.common.utils.ToastUtils;
import com.orhanobut.logger.Logger;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import butterknife.BindView;
@@ -61,6 +63,8 @@ public class SystemSystemsetFragment extends BaseFragment {

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


@BindView(R.id.edittext_wd)
@@ -124,9 +128,12 @@ public class SystemSystemsetFragment extends BaseFragment {
material_map.put("测试环境", 1);
material_map.put("正式环境", 2);

material_map_yes_no.put("是", 0);
material_map_yes_no.put("否", 1);
material_map_yes_no.put("否", 0);
material_map_yes_no.put("是", 1);

List<String> yesNoList = new ArrayList<>();
yesNoList.add("否");
yesNoList.add("是");

for (int i = 0; i < ConfigName.getInstance().versionSelectionValues.length; i++) {
material_map_vis.put(ConfigName.getInstance().versionSelectionValues[i], i);
@@ -146,6 +153,16 @@ 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);
@@ -245,6 +262,13 @@ 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();


+ 30
- 3
app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/WokSetTLZZFragment.java View File

@@ -70,6 +70,8 @@ public class WokSetTLZZFragment extends BaseFragment {
TextView edit_pyz_wz3;
@BindView(R.id.edit_pyz_wz4)
TextView edit_pyz_wz4;
@BindView(R.id.edit_pyz_wz5)
TextView edit_pyz_wz5;

@BindView(R.id.edit_fzz_dqz)
TextView edit_fzz_dqz;
@@ -90,6 +92,8 @@ public class WokSetTLZZFragment extends BaseFragment {
TextView edit_fzz_xl3;
@BindView(R.id.edit_fzz_xl4)
TextView edit_fzz_xl4;
@BindView(R.id.edit_fzz_xl5)
TextView edit_fzz_xl5;
//endregion

//region 界面
@@ -207,6 +211,7 @@ public class WokSetTLZZFragment extends BaseFragment {
Object o2 = ExecuteTheRecipe.ReadPLC("平移-2号位置值");
Object o3 = ExecuteTheRecipe.ReadPLC("平移-3号位置值");
Object o4 = ExecuteTheRecipe.ReadPLC("平移-4号位置值");
Object o5 = ExecuteTheRecipe.ReadPLC("平移-5号位置值");

Object m0 = ExecuteTheRecipe.ReadPLC("翻转-伺服当前值");
Object m1 = ExecuteTheRecipe.ReadPLC("翻转-1号位置值");
@@ -219,6 +224,7 @@ public class WokSetTLZZFragment extends BaseFragment {
Object m6 = ExecuteTheRecipe.ReadPLC("翻转-2号吸料位置值");
Object m7 = ExecuteTheRecipe.ReadPLC("翻转-3号吸料位置值");
Object m8 = ExecuteTheRecipe.ReadPLC("翻转-4号吸料位置值");
Object m9 = ExecuteTheRecipe.ReadPLC("翻转-5号吸料位置值");
getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -247,6 +253,11 @@ public class WokSetTLZZFragment extends BaseFragment {
} else {
edit_pyz_wz4.setText("未知");
}
if (o5 != null) {
edit_pyz_wz5.setText(o5 + "");
} else {
edit_pyz_wz5.setText("未知");
}

if (m0 != null) {
edit_fzz_dqz.setText(m0 + "");
@@ -296,7 +307,11 @@ public class WokSetTLZZFragment extends BaseFragment {
} else {
edit_fzz_xl4.setText("未知");
}

if (m9 != null) {
edit_fzz_xl5.setText(m9 + "");
} else {
edit_fzz_xl5.setText("未知");
}
}
});
Thread.sleep(500);
@@ -315,11 +330,11 @@ public class WokSetTLZZFragment extends BaseFragment {
@OnClick({
R.id.pyz_hl,
R.id.pyz_wzsz1, R.id.pyz_wzsz2, R.id.pyz_wzsz3, R.id.pyz_wzsz4,
R.id.pyz_qu1, R.id.pyz_qu2, R.id.pyz_qu3, R.id.pyz_qu4,
R.id.pyz_qu1, R.id.pyz_qu2, R.id.pyz_qu3, R.id.pyz_qu4,R.id.pyz_qu5,

R.id.fzz_hl,
R.id.fzz_wzsz1, R.id.fzz_wzsz2, R.id.fzz_wzsz3, R.id.fzz_wzsz_xl1,R.id.fzz_wzsz_xl2,R.id.fzz_wzsz_xl3,R.id.fzz_wzsz_xl4,
R.id.fzz_qu1, R.id.fzz_qu2, R.id.fzz_qu3, R.id.fzz_qu5,R.id.fzz_qu6,R.id.fzz_qu7,R.id.fzz_qu8,
R.id.fzz_qu1, R.id.fzz_qu2, R.id.fzz_qu3, R.id.fzz_qu5,R.id.fzz_qu6,R.id.fzz_qu7,R.id.fzz_qu8,R.id.fzz_qu9,

R.id.dcqd_button,

@@ -342,6 +357,9 @@ public class WokSetTLZZFragment extends BaseFragment {
case R.id.pyz_wzsz4:
ButtomZhiWeiZhi("平移-4#位置设定");
break;
case R.id.pyz_wzsz5:
ButtomZhiWeiZhi("平移-5#位置设定");
break;
case R.id.pyz_qu1:
ButtomZhiWeiZhi("平移-去1号位");
break;
@@ -354,6 +372,9 @@ public class WokSetTLZZFragment extends BaseFragment {
case R.id.pyz_qu4:
ButtomZhiWeiZhi("平移-去4号位");
break;
case R.id.pyz_qu5:
ButtomZhiWeiZhi("平移-去5号位");
break;

case R.id.fzz_hl:
ButtomZhiWeiZhi("翻转-回原点");
@@ -382,6 +403,9 @@ public class WokSetTLZZFragment extends BaseFragment {
case R.id.fzz_wzsz_xl4:
ButtomZhiWeiZhi("翻转-4#吸料位置设定");
break;
case R.id.fzz_wzsz_xl5:
ButtomZhiWeiZhi("翻转-5#吸料位置设定");
break;
case R.id.fzz_qu1:
ButtomZhiWeiZhi("翻转-去1号位");
break;
@@ -406,6 +430,9 @@ public class WokSetTLZZFragment extends BaseFragment {
case R.id.fzz_qu8:
ButtomZhiWeiZhi("翻转-去4号吸料位");
break;
case R.id.fzz_qu9:
ButtomZhiWeiZhi("翻转-去5号吸料位");
break;


case R.id.dcqd_button:


+ 10
- 8
app/src/main/java/com/bonait/bnframework/ui/dialog/EditGoodsDialog.java View File

@@ -415,7 +415,7 @@ public class EditGoodsDialog extends DialogFragment {
viewBinding.layoutMainfoods.editName2.setText("");
viewBinding.layoutMainfoods.editName3.setText("");
viewBinding.layoutMainfoods.editName4.setText("");
// viewBinding.layoutMainfoods.editName5.setText("");
viewBinding.layoutMainfoods.editName5.setText("");
// viewBinding.layoutMainfoods.editName6.setText("");
if(subattributeGroup!=null){
ArrayList<BPA_GOODS_PROCESS_DETAIL> list = GoodsProcessDetailDBUtil.getByGroupId(subattributeGroup.id);
@@ -465,9 +465,9 @@ public class EditGoodsDialog extends DialogFragment {
case 4:
viewBinding.layoutMainfoods.editName4.setText(name);
break;
// case 5:
// viewBinding.layoutMainfoods.editName5.setText(name);
// break;
case 5:
viewBinding.layoutMainfoods.editName5.setText(name);
break;
// case 6:
// viewBinding.layoutMainfoods.editName6.setText(name);
// break;
@@ -510,7 +510,7 @@ public class EditGoodsDialog extends DialogFragment {
mainFoods.add(viewBinding.layoutMainfoods.editName2.getText().toString());
mainFoods.add(viewBinding.layoutMainfoods.editName3.getText().toString());
mainFoods.add(viewBinding.layoutMainfoods.editName4.getText().toString());
// mainFoods.add(viewBinding.layoutMainfoods.editName5.getText().toString());
mainFoods.add(viewBinding.layoutMainfoods.editName5.getText().toString());
// mainFoods.add(viewBinding.layoutMainfoods.editName6.getText().toString());
Intent intent = new Intent(getContext(), DiyProcessActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -530,6 +530,8 @@ public class EditGoodsDialog extends DialogFragment {
picUrl = goods.url;
updateImage(picUrl);
}
viewBinding.layoutMainfoods.ll3.setVisibility(ConfigName.getInstance().is800WithFeeding?View.VISIBLE:View.GONE);

viewBinding.layoutName.editName.setText(Objects.requireNonNull(GoodsDBUtil.getById(goodId)).name);
if(!isEdit){
viewBinding.layoutName.editName.setEnabled(false);
@@ -547,9 +549,9 @@ public class EditGoodsDialog extends DialogFragment {
viewBinding.layoutMainfoods.editName4.setEnabled(false);
viewBinding.layoutMainfoods.editName4.setFocusable(false);
viewBinding.layoutMainfoods.editName4.setFocusableInTouchMode(false);
// viewBinding.layoutMainfoods.editName5.setEnabled(false);
// viewBinding.layoutMainfoods.editName5.setFocusable(false);
// viewBinding.layoutMainfoods.editName5.setFocusableInTouchMode(false);
viewBinding.layoutMainfoods.editName5.setEnabled(false);
viewBinding.layoutMainfoods.editName5.setFocusable(false);
viewBinding.layoutMainfoods.editName5.setFocusableInTouchMode(false);
// viewBinding.layoutMainfoods.editName6.setEnabled(false);
// viewBinding.layoutMainfoods.editName6.setFocusable(false);
// viewBinding.layoutMainfoods.editName6.setFocusableInTouchMode(false);


+ 4
- 7
app/src/main/java/com/bonait/bnframework/ui/viewmodel/HomeGoodsViewModel.java View File

@@ -58,7 +58,8 @@ import java.util.Map;
* @date: 2024/5/14 9:33.
*/
public class HomeGoodsViewModel extends ViewModel {

// public static String Path = "https://cfv.black-pa.com";
public static String Path = "https://192.168.1.50:5006";
public MutableLiveData<GoodsData> cloudGoodsList = new MutableLiveData<>();
public boolean hasData = false;

@@ -96,9 +97,7 @@ public class HomeGoodsViewModel extends ViewModel {
}

public void GetGoodsInfo(){
String autoKey = ConfigName.getInstance().DeviceAutoKey;
// String url = "https://cfv.black-pa.com/kitchbase/api/goods/Getdevicegoods?deviceId="+ConfigName.getInstance().DeviceAutoKey;
String url = "http://192.168.1.50:5007/api/goods/Getdevicegoods?deviceId="+274;
String url = Path+"/kitchbase/api/goods/Getdevicegoods?deviceId="+ConfigName.getInstance().DeviceAutoKey;
LogUtils.d("GetGoodsInfo url="+url);
RecordManager.getInstance().addLogRecord("数据接收", "请求商品信息-"+url);
APIHelper.PostT(url,null,null,new TypeReference<APIResultT<GoodsData>>(){}).OnSource(s->{
@@ -119,10 +118,8 @@ public class HomeGoodsViewModel extends ViewModel {
}

public static void GetMaterialInfo(){
// String url = "https://cfv.black-pa.com/saasbase/api/ExternalPlatform/Material/GetMaterialPageList";
String url = "http://192.168.1.50:5006/api/ExternalPlatform/Material/GetMaterialPageList";
String url = Path+"/saasbase/api/ExternalPlatform/Material/GetMaterialPageList";
LogUtils.d("GetMaterialInfo url="+url);
// String key ="2c39bc05-25c2-46c4-b5c6-dba349058492";
String key =UpdateDataService.key;
RecordManager.getInstance().addLogRecord("数据接收", "接收物料信息-"+url);
APIHelper.PostT(url,new MaterialRequestPar(1,100),key,new TypeReference<APIResultT<MaterialData>>(){}).OnSource(s->{


+ 1
- 0
app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java View File

@@ -66,6 +66,7 @@ import okhttp3.RequestBody;
* @date: 2024/7/25 14:55.
*/
public class UpdateDataService {
// public static String path = "cfv.black-pa.com";
public static String path = "192.168.1.50:5006";
public static String key = "b3ceddba-4cc0-4730-be5c-847f770ca287";
public static boolean isDownProcessModel = false;//是否同步了云端工艺模型


+ 17
- 2
app/src/main/res/layout/activity_cooking.xml View File

@@ -179,7 +179,14 @@
android:layout_marginLeft="25dp"
android:layout_marginTop="155dp"
android:orientation="horizontal">

<TextView
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="⑤"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="24dp"
android:textStyle="bold" />
<TextView
android:layout_width="90dp"
android:layout_height="wrap_content"
@@ -226,7 +233,15 @@
android:layout_marginLeft="25dp"
android:layout_marginTop="190dp"
android:orientation="horizontal">

<com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
android:id="@+id/touliao5"
android:layout_width="90dp"
android:layout_height="110dp"
android:contentDescription="false"
android:tag="投料-按钮"
app:imagesrc_ks="@mipmap/sb1"
app:imagesrc_qt="@mipmap/sb2"
app:imagesrc_tz="@mipmap/sb3" />
<com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
android:id="@+id/touliao4"
android:layout_width="90dp"


+ 18
- 0
app/src/main/res/layout/activity_cookingsimulated.xml View File

@@ -148,6 +148,15 @@
android:layout_marginTop="155dp"
android:orientation="horizontal">

<TextView
android:id="@+id/tv5"
android:layout_width="90dp"
android:layout_height="wrap_content"
android:text="⑤"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="24dp"
android:textStyle="bold" />
<TextView
android:layout_width="90dp"
android:layout_height="wrap_content"
@@ -195,6 +204,15 @@
android:layout_marginTop="190dp"
android:orientation="horizontal">

<com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
android:id="@+id/touliao5"
android:layout_width="90dp"
android:layout_height="110dp"
android:contentDescription="false"
android:tag="投料-按钮"
app:imagesrc_ks="@mipmap/sb1"
app:imagesrc_qt="@mipmap/sb2"
app:imagesrc_tz="@mipmap/sb3" />
<com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
android:id="@+id/touliao4"
android:layout_width="90dp"


+ 12
- 2
app/src/main/res/layout/activity_dishtest.xml View File

@@ -167,6 +167,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
tools:visibility="gone"
android:src="@mipmap/device1" />

<!-- 翻炒速度 -->
@@ -770,12 +771,21 @@
android:layout_marginLeft="20dp"
android:layout_marginTop="50dp"
android:layout_marginRight="40dp">

<TextView
android:id="@+id/liaohe5"
android:layout_width="70dp"
android:layout_height="75dp"
android:layout_marginLeft="5dp"
android:background="#567722"
android:ellipsize="end"
android:maxLines="4"
android:text=""
android:textColor="@color/white" />
<TextView
android:id="@+id/liaohe4"
android:layout_width="87dp"
android:layout_height="75dp"
android:layout_marginLeft="30dp"
android:layout_marginLeft="5dp"
android:background="#567722"
android:ellipsize="end"
android:maxLines="4"


+ 9
- 0
app/src/main/res/layout/activity_diy_memory.xml View File

@@ -317,6 +317,15 @@
android:text="四号投料"
android:textColor="@color/black"
android:textSize="14dp"/>
<Button
android:layout_marginLeft="@dimen/dp_10"
android:id="@+id/touliao5"
android:layout_width="80dp"
android:layout_height="match_parent"
android:background="@drawable/button1"
android:text="五号投料"
android:textColor="@color/black"
android:textSize="14dp"/>

</LinearLayout>
</RelativeLayout>


+ 18
- 2
app/src/main/res/layout/fragment_home_sbkz.xml View File

@@ -261,7 +261,15 @@
android:layout_marginLeft="18dp"
android:layout_marginTop="155dp"
android:orientation="horizontal">

<TextView
android:id="@+id/tv5"
android:layout_width="83dp"
android:layout_height="wrap_content"
android:text="⑤"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="24dp"
android:textStyle="bold" />
<TextView
android:layout_width="83dp"
android:layout_height="wrap_content"
@@ -307,7 +315,15 @@
android:layout_marginLeft="18dp"
android:layout_marginTop="190dp"
android:orientation="horizontal">

<com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
android:id="@+id/touliao5"
android:layout_width="83dp"
android:layout_height="80dp"
android:contentDescription="true"
android:tag="@string/btn_putmeal"
app:imagesrc_ks="@mipmap/sb1"
app:imagesrc_qt="@mipmap/sb2"
app:imagesrc_tz="@mipmap/sb3" />
<com.bonait.bnframework.modules.home.fragment.mode.imagebuttom3
android:id="@+id/touliao4"
android:layout_width="83dp"


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

@@ -255,6 +255,26 @@
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>




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

@@ -766,6 +766,81 @@
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">

<Button
android:id="@+id/pyz_wzsz5"
android:layout_width="80dp"
android:layout_height="26dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/dp_10"
android:background="@drawable/button2"
android:text="5#位设定"
android:textSize="14dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_10"
android:minWidth="60dp"
android:text="5#位值" />
<TextView
android:id="@+id/edit_pyz_wz5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="0"
android:textColor="@color/deep_orange_primary"
android:textSize="12dp"
android:textStyle="bold" />
</LinearLayout>


<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_weight="1">

<Button
android:id="@+id/fzz_wzsz_xl5"
android:layout_width="80dp"
android:layout_height="26dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/dp_10"
android:background="@drawable/button2"
android:text="5#吸料设定"
android:textSize="14dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_10"
android:minWidth="60dp"
android:text="5#吸料位值" />
<TextView
android:id="@+id/edit_fzz_xl5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="0"
android:textColor="@color/deep_orange_primary"
android:textSize="12dp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
@@ -1040,6 +1115,14 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
<Button
android:id="@+id/pyz_qu5"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginRight="@dimen/dp_10"
android:background="@drawable/bg_btn_login_selected"
android:text="去5#位"
android:textSize="14dp" />
</RelativeLayout>

<RelativeLayout
@@ -1067,6 +1150,35 @@
android:textSize="14dp" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp">

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">

</RelativeLayout>

<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">

<Button
android:id="@+id/fzz_qu9"
android:layout_width="120dp"
android:layout_height="40dp"
android:layout_marginRight="@dimen/dp_10"
android:background="@drawable/bg_btn_login_selected"
android:text="去5#吸料位"
android:textSize="14dp" />


</RelativeLayout>
</LinearLayout>

<RelativeLayout
android:layout_width="match_parent"


+ 1
- 1
app/src/main/res/layout/item/layout/dialog_edit_goods.xml View File

@@ -47,7 +47,7 @@
<include
android:id="@+id/layout_mainfoods"
android:layout_width="@dimen/dp_660"
android:layout_height="@dimen/dp_550"
android:layout_height="@dimen/dp_620"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"


+ 48
- 46
app/src/main/res/layout/item/layout/layout_add_goods_mainfood.xml View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/dp_660"
android:layout_height="@dimen/dp_550"
android:layout_height="@dimen/dp_620"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/bg_round25_white">
@@ -153,53 +153,55 @@
android:orientation="horizontal"
android:gravity="center"
>
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent"-->
<!-- style="@style/TextView_desc"-->
<!-- android:text="⑤"-->
<!-- />-->
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/TextView_desc"
android:text="⑤"
/>

<!-- <EditText-->
<!-- android:id="@+id/edit_name5"-->
<!-- android:layout_width="@dimen/dp_250"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@drawable/input_bj"-->
<!-- android:hint="5号位"-->
<!-- android:inputType="text"-->
<!-- android:lines="1"-->
<!-- android:padding="@dimen/dp_3"-->
<!-- android:maxLength="100"-->
<!-- android:layout_gravity="center"-->
<!-- android:gravity="center_vertical"-->
<!-- app:layout_constraintTop_toTopOf="@+id/desc_name"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/desc_name"-->
<!-- android:layout_marginLeft="@dimen/dp_5"-->
<!-- android:textSize="@dimen/sp_32" />-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent"-->
<!-- style="@style/TextView_desc"-->
<!-- android:text="⑥"-->
<!-- android:layout_marginLeft="@dimen/dp_20"-->
<!-- />-->
<EditText
android:id="@+id/edit_name5"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"
android:background="@drawable/input_bj"
android:hint="5号位"
android:inputType="text"
android:lines="1"
android:padding="@dimen/dp_3"
android:maxLength="100"
android:layout_gravity="center"
android:gravity="center_vertical"
app:layout_constraintTop_toTopOf="@+id/desc_name"
app:layout_constraintLeft_toRightOf="@+id/desc_name"
android:layout_marginLeft="@dimen/dp_5"
android:textSize="@dimen/sp_32" />
<TextView
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/TextView_desc"
android:visibility="invisible"
android:text="⑥"
android:layout_marginLeft="@dimen/dp_20"
/>

<!-- <EditText-->
<!-- android:id="@+id/edit_name6"-->
<!-- android:layout_width="@dimen/dp_250"-->
<!-- android:layout_height="match_parent"-->
<!-- android:background="@drawable/input_bj"-->
<!-- android:hint="6号位"-->
<!-- android:inputType="text"-->
<!-- android:lines="1"-->
<!-- android:padding="@dimen/dp_3"-->
<!-- android:maxLength="100"-->
<!-- android:layout_gravity="center"-->
<!-- android:gravity="center_vertical"-->
<!-- app:layout_constraintTop_toTopOf="@+id/desc_name"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/desc_name"-->
<!-- android:layout_marginLeft="@dimen/dp_5"-->
<!-- android:textSize="@dimen/sp_32" />-->
<EditText
android:id="@+id/edit_name6"
android:layout_width="@dimen/dp_250"
android:layout_height="match_parent"
android:background="@drawable/input_bj"
android:hint="6号位"
android:inputType="text"
android:lines="1"
android:padding="@dimen/dp_3"
android:maxLength="100"
android:layout_gravity="center"
android:gravity="center_vertical"
app:layout_constraintTop_toTopOf="@+id/desc_name"
app:layout_constraintLeft_toRightOf="@+id/desc_name"
android:layout_marginLeft="@dimen/dp_5"
android:visibility="invisible"
android:textSize="@dimen/sp_32" />
</LinearLayout>




Write Preview
Loading…
Cancel
Save