From e7380e42f9a9eb2b216372686709b2ebdc6939be Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Wed, 18 Dec 2024 14:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/other.xml | 11 +
app/build.gradle | 1 +
.../bonait/bnframework/business/MainInit.java | 4 +-
.../common/constant/ConfigName.java | 80 +-----
.../bnframework/common/glide/GlideUtil.java | 29 +++
.../newui/activity/CookingHActivity.java | 109 +++++---
.../newui/activity/DiyProcessHActivity.java | 75 +++---
.../newui/activity/MainHActivity.java | 2 +
.../adapter/goods/CloudGoodsAdapter.java | 4 +-
.../newui/adapter/goods/HomeGoodsAdapter.java | 3 +-
.../adapter/goods/LocalGoodsAdapter.java | 3 +-
.../newui/dialog/check/FoodInfoDialog.java | 3 +
.../dialog/control/RobotControlDialog.java | 14 +-
.../fragment/goods/LocalGoodsHFragment.java | 8 +-
.../fragment/main/HomeOrderFragment.java | 24 +-
app/src/main/res/drawable/all_edit_btn.xml | 6 +-
.../item/layout/item_file_picker_show.xml | 2 +-
.../res/layout/new/layout/activity_cook_h.xml | 108 ++++++--
.../new/layout/activity_edit_process_h.xml | 36 +--
.../res/layout/new/layout/activity_main_h.xml | 1 +
.../new/layout/dialog_chu_can_pen_check.xml | 42 +--
.../layout/new/layout/dialog_food_control.xml | 77 +++---
.../layout/new/layout/dialog_food_info.xml | 240 +++++++++---------
.../new/layout/dialog_food_pos_select.xml | 7 +-
.../layout/new/layout/dialog_food_pos_set.xml | 12 +-
.../new/layout/fragment_home_device_debug.xml | 70 +++--
.../layout/new/layout/fragment_home_mains.xml | 16 +-
.../new/layout/fragment_local_goods_h.xml | 6 +-
.../res/layout/new/layout/layout_huojia.xml | 117 +++++----
.../res/layout/new/layout/layout_huojia2.xml | 211 +++++++++++++++
.../layout/new/layout/layout_root_tip2.xml | 98 ++++---
.../layout/svg/drawable/home_caiping_ic.xml | 66 +++++
.../layout/svg/drawable/home_classify_ic.xml | 9 +
.../res/layout/svg/drawable/home_log_ic.xml | 15 ++
.../res/layout/svg/drawable/home_order_ic.xml | 12 +
.../layout/svg/drawable/home_setting_ic.xml | 9 +
.../res/layout/svg/drawable/ic_delete_x.xml | 9 +
.../res/layout/svg/drawable/ic_logout2.xml | 9 +
.../main/res/layout/svg/drawable/ic_silos.xml | 12 +
.../res/layout/svg/drawable/ic_update.xml | 9 +
.../main/res/mipmap-xxxhdpi/ic_chucan_box.jpg | Bin 0 -> 27562 bytes
.../res/mipmap-xxxhdpi/ic_devices_all2.png | Bin 2209570 -> 222379 bytes
.../main/res/mipmap-xxxhdpi/ic_huojia_box.jpg | Bin 0 -> 155222 bytes
.../main/res/mipmap-xxxhdpi/ic_huojia_box.png | Bin 701228 -> 0 bytes
44 files changed, 1016 insertions(+), 553 deletions(-)
create mode 100644 app/src/main/res/layout/new/layout/layout_huojia2.xml
create mode 100644 app/src/main/res/layout/svg/drawable/home_caiping_ic.xml
create mode 100644 app/src/main/res/layout/svg/drawable/home_classify_ic.xml
create mode 100644 app/src/main/res/layout/svg/drawable/home_log_ic.xml
create mode 100644 app/src/main/res/layout/svg/drawable/home_order_ic.xml
create mode 100644 app/src/main/res/layout/svg/drawable/home_setting_ic.xml
create mode 100644 app/src/main/res/layout/svg/drawable/ic_delete_x.xml
create mode 100644 app/src/main/res/layout/svg/drawable/ic_logout2.xml
create mode 100644 app/src/main/res/layout/svg/drawable/ic_silos.xml
create mode 100644 app/src/main/res/layout/svg/drawable/ic_update.xml
create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_chucan_box.jpg
create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_huojia_box.jpg
delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_huojia_box.png
diff --git a/.idea/other.xml b/.idea/other.xml
index 104e542e..b45a6e02 100644
--- a/.idea/other.xml
+++ b/.idea/other.xml
@@ -14,6 +14,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 4a254f62..dce49e72 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,6 +67,7 @@ android {
jni.srcDirs = []//禁止gradle 自动编译，使用已经编译好的So库
jniLibs.srcDirs = ['libs']//指向要使用的库文件//的路径，前边的是自己项目的，后边的是第三方的so 'src/main/jniLibs',
res.srcDirs = [
+ 'src/main/res/layout/svg',
'src/main/res/layout/dialog',
'src/main/res/layout/datatab',
'src/main/res/layout/item',
diff --git a/app/src/main/java/com/bonait/bnframework/business/MainInit.java b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
index 5786716d..38747548 100644
--- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java
+++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
@@ -220,8 +220,8 @@ public class MainInit {
}
- if(QueryDB.GetProcessALL().isEmpty() || PreferenceUtils.getInt("PlcInit",4)!=5){
- PreferenceUtils.setInt("PlcInit",5);
+ if(QueryDB.GetProcessALL().isEmpty() || PreferenceUtils.getInt("PlcInit",5)!=6){
+ PreferenceUtils.setInt("PlcInit",6);
ConfigData.getInstance().RevertPLCProcess();
}
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 31a0d030..56ec9674 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
@@ -776,31 +776,6 @@ public class ConfigName {
add(new ProcessT("出菜", Arrays.asList("等待(秒)","描述")));
add(new ProcessT("清洗", Arrays.asList("清洗方式","抽水量","清洗时间(秒)","等待(秒)","描述")));
}};
- /**
- * 烤箱工序模型
- */
- public List Process_烤箱 = new ArrayList() {{
- add(new ProcessT("放入烤盘", Arrays.asList("烤盘位置")));
- add(new ProcessT("烤箱设置", Arrays.asList("烤箱工作模式","烤箱温度(°C)", "等待时间")));
- add(new ProcessT("取出烤盘", Arrays.asList("等待时间")));
- }};
-
- /**
- * 小炒工序模型
- */
- public List Process_桌面小炒 = new ArrayList() {{
- add(new ProcessT("加热", Arrays.asList("加热档位","加热控制", "延迟(秒)")));
- add(new ProcessT("液体料", new ArrayList<>()));
- add(new ProcessT("主料", Arrays.asList("主料名称", "主料位置","烹饪(秒)")));
- add(new ProcessT("升降", Arrays.asList("升降控制", "延迟(秒)")));
- add(new ProcessT("单向搅拌", Arrays.asList("搅拌档位","搅拌控制", "方向选择","延迟(秒)")));
- add(new ProcessT("双向搅拌", Arrays.asList("搅拌档位","搅拌控制", "正转时间","反转时间","延迟(秒)")));
- add(new ProcessT("打散搅拌", Arrays.asList("打散时间(秒)")));
- add(new ProcessT("勾芡", Arrays.asList("重量(克)")));
- add(new ProcessT("加水", Arrays.asList("重量(克)")));
- add(new ProcessT("延迟", Arrays.asList("延迟(秒)")));
- add(new ProcessT("出菜", Arrays.asList("等待(秒)")));
- }};
/**
* 根据名称获取变量
@@ -809,40 +784,6 @@ public class ConfigName {
* @return
*/
public String GetProcessTypeVal(String item) {
-// String data = "";
-// if (item.equals("搅拌动作")) {
-// data = "正转反转、一直正转、一直反转";
-// } else if (item.equals("位置动作")) {
-// data = "原点位、出餐启动、倒菜位、抽料位、清洗位、炒菜位1、炒菜位2、炒菜位3";
-// } else if (item.equals("投料动作")) {
-// //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
-// data = "投出等待三秒、直接投出、手动投料";
-// } else if (item.equals("主料位置")) {
-// data = "1号位、2号位、3号位、4号位、5号位";
-// } else if (item.equals("正转速度") || item.equals("反转速度") || item.equals("转动速度") || item.equals("搅拌速度")) {
-// data = "停止、最低、低速、中速、高速、最高、极高";
-// } else if (item.equals("加热功率") || item.equals("热锅功率")) {
-// data = "停止、一档、二档、三档、四档、五档、六档、七档、八档";
-// }
-// return data;
-
-// String data = "";
-// if (item.equals("加热控制")) {
-// data = "启动加热、停止加热";
-// } else if (item.equals("主料位置")) {
-// data = "1号位、2号位、3号位、4号位、5号位、6号位";
-// } else if (item.equals("升降控制") ) {
-// data = "上升、下降";
-// } else if (item.equals("搅拌控制") ) {
-// data = "启动搅拌、停止搅拌";
-// } else if (item.equals("方向选择") ) {
-// data = "正转、反转";
-// }else if(item.equals("加热档位")){
-// data = "0档、1档、2档、3档、4档、5档、6档、7档、8档、9档、10档";
-// }else if(item.equals("搅拌档位")){
-// data = "0档、1档、2档、3档、4档、5档";
-// }
-
String data = "";
switch (item) {
case "搅拌动作":
@@ -854,18 +795,18 @@ public class ConfigName {
case "炒制位置":
data = "炒菜位高、炒菜位低、原点位";
break;
- case "投料动作":
- //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
- data = "投出等待三秒、直接投出、手动投料";
- break;
+// case "投料动作":
+// //data = "投出抖动三次、投出等待三秒、直接投出、手动投料";
+// data = "投出等待三秒、直接投出、手动投料";
+// break;
case "清洗方式":
data = "一般清洗、深度清洗";
break;
case "主料位置":
- data = "Z1、Z2、Z3、Z4、Z5、Z6";
+ data = "1号位、2号位";
break;
case "辅料位置":
- data = "F1、F2、F3、F4、F5、F6";
+ data = "F1、F2、F3、F4、F5、F6、F7、F8";
break;
case "正转速度":
case "反转速度":
@@ -877,15 +818,6 @@ public class ConfigName {
case "热锅功率":
data = "停止、一档、二档、三档、四档、五档、六档、七档、八档";
break;
- case "烤盘位置":
- data = "K1、K2";
- break;
- case "烤箱工作模式":
- data = "关闭、蒸、烤、蒸烤、其他";
- break;
-// case "烤箱温度":
-// data = "0档0°C、1档50°C、2档100°C、3档150°C、4档200°C";
-// break;
}
return data;
diff --git a/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java b/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java
index 208b6e98..3dcb5604 100644
--- a/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java
+++ b/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java
@@ -95,6 +95,35 @@ public class GlideUtil {
.into(imageView);
}
+ public static void showImageById(Context context, ImageView imageView,int placeId) {
+ if (context == null) {
+ return;
+ }
+
+ GlideApp.with(context)
+ .load(placeId)
+ .addListener(new RequestListener() {
+ @Override
+ public boolean onLoadFailed(@Nullable GlideException e, Object model,
+ Target target, boolean isFirstResource) {
+ return false;
+ }
+
+ @Override
+ public boolean onResourceReady(Drawable resource, Object model,
+ Target target, DataSource dataSource,
+ boolean isFirstResource) {
+ if (imageView == null) {
+ return false;
+ }
+ imageView.setBackground(null);
+ return false;
+ }
+ })
+ .transition(DrawableTransitionOptions.withCrossFade(CROSS_FADE_DURATION))
+ .into(imageView);
+ }
+
public static void showImageWithRadius(Context context, String path, ImageView imageView,int placeId,int radius) {
if (context == null||path==null) {
return;
diff --git a/app/src/main/java/com/bonait/bnframework/newui/activity/CookingHActivity.java b/app/src/main/java/com/bonait/bnframework/newui/activity/CookingHActivity.java
index 88dec0be..74033f3b 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/activity/CookingHActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/activity/CookingHActivity.java
@@ -20,6 +20,8 @@ import com.bonait.bnframework.databinding.ActivityCookHBinding;
import com.bonait.bnframework.modbus.ModbusCenter;
import com.bonait.bnframework.modbus.Wok1ModbusTcpServer;
import com.bonait.bnframework.modbus.Wok2ModbusTcpServer;
+import com.bonait.bnframework.modbus.Wok3ModbusTcpServer;
+import com.bonait.bnframework.modbus.Wok4ModbusTcpServer;
import com.bonait.bnframework.newui.dialog.control.WokControlDialog;
import com.bonait.bnframework.newui.fragment.cooking.CookingFragment;
import com.bonait.bnframework.newui.widget.NewToastUtil;
@@ -28,41 +30,45 @@ import com.bumptech.glide.Glide;
public class CookingHActivity extends BaseActivity {
private final String TAG = "CookingHActivity==>";
private ActivityCookHBinding viewBinding;
- private CookingFragment cookingFragment1,cookingFragment2;
+ private CookingFragment cookingFragment1,cookingFragment2,cookingFragment3,cookingFragment4;
private boolean isWorking = false;
private Handler handler = new Handler(Looper.getMainLooper()){
@Override
public void handleMessage(@NonNull Message msg) {
super.handleMessage(msg);
- BPA_ORDER_DETAIL detail0 = OrderDetailUtil.getByMaking(1);
- BPA_ORDER_DETAIL detail1 = OrderDetailUtil.getByMaking(2);
+// BPA_ORDER_DETAIL detail0 = OrderDetailUtil.getByMaking(1);
+// BPA_ORDER_DETAIL detail1 = OrderDetailUtil.getByMaking(2);
if(msg.what==1){
- boolean working = false;
- if(detail0!=null){
- if(detail0.status==1){
- working = true;
- }
- }
- if(detail1!=null){
- if(detail1.status==1){
- working = true;
- }
- }
- if(working){
- if(!isWorking){
- Glide.with(viewBinding.deviceImage.getContext()).asGif().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
- }
- }else{
- if(isWorking){
- Glide.with(viewBinding.deviceImage.getContext()).asBitmap().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
- }
- }
- isWorking = working;
+// boolean working = false;
+// if(detail0!=null){
+// if(detail0.status==1){
+// working = true;
+// }
+// }
+// if(detail1!=null){
+// if(detail1.status==1){
+// working = true;
+// }
+// }
+// if(working){
+// if(!isWorking){
+// Glide.with(viewBinding.deviceImage.getContext()).asGif().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
+// }
+// }else{
+// if(isWorking){
+// Glide.with(viewBinding.deviceImage.getContext()).asBitmap().load(R.mipmap.ic_device_working).into(viewBinding.deviceImage);
+// }
+// }
+// isWorking = working;
Object val_wd = ModbusCenter.getWokListingValue(1,"当前锅底温度");
Object val_wd2 = ModbusCenter.getWokListingValue(2,"当前锅底温度");
- String s = "1号炒锅温度：" + val_wd + "°C " + "2号炒锅温度：" + val_wd2 + "°C";
- viewBinding.wokWendu.setText(s);
+ Object val_wd3 = ModbusCenter.getWokListingValue(3,"当前锅底温度");
+ Object val_wd4 = ModbusCenter.getWokListingValue(4,"当前锅底温度");
+ viewBinding.tvTitle1.setText("1号炒锅温度：" + val_wd + "°C");
+ viewBinding.tvTitle2.setText("2号炒锅温度：" + val_wd2 + "°C");
+ viewBinding.tvTitle3.setText("3号炒锅温度：" + val_wd3 + "°C");
+ viewBinding.tvTitle4.setText("4号炒锅温度：" + val_wd4 + "°C");
}
if(handler.hasMessages(1)){
handler.removeMessages(1);
@@ -86,12 +92,20 @@ public class CookingHActivity extends BaseActivity {
cookingFragment1 = CookingFragment.newInstance(1);
cookingFragment2 = CookingFragment.newInstance(2);
+ cookingFragment3 = CookingFragment.newInstance(3);
+ cookingFragment4 = CookingFragment.newInstance(4);
getSupportFragmentManager().beginTransaction()
.replace(R.id.fragment1, cookingFragment1)
.commit();
getSupportFragmentManager().beginTransaction()
.replace(R.id.fragment2, cookingFragment2)
.commit();
+ getSupportFragmentManager().beginTransaction()
+ .replace(R.id.fragment3, cookingFragment3)
+ .commit();
+ getSupportFragmentManager().beginTransaction()
+ .replace(R.id.fragment4, cookingFragment4)
+ .commit();
viewBinding.btnWok1.setOnClickListener(v->{
showWokDialog(1);
@@ -99,6 +113,12 @@ public class CookingHActivity extends BaseActivity {
viewBinding.btnWok2.setOnClickListener(v->{
showWokDialog(2);
});
+ viewBinding.btnWok3.setOnClickListener(v->{
+ showWokDialog(3);
+ });
+ viewBinding.btnWok4.setOnClickListener(v->{
+ showWokDialog(4);
+ });
}
/**
@@ -106,16 +126,33 @@ public class CookingHActivity extends BaseActivity {
* @param num 几号炒锅
*/
private void showWokDialog(int num){
- if(num==2){
- if(!Wok2ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
- NewToastUtil.getInstance().showToastError("2号炒锅设备未连接！");
- return;
- }
- }else {
- if(!Wok1ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
- NewToastUtil.getInstance().showToastError("1号炒锅设备未连接！");
+ switch (num){
+ case 1:
+ if(!Wok1ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+ NewToastUtil.getInstance().showToastError("1号炒锅设备未连接！");
+ return;
+ }
+ break;
+ case 2:
+ if(!Wok2ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+ NewToastUtil.getInstance().showToastError("2号炒锅设备未连接！");
+ return;
+ }
+ break;
+ case 3:
+ if(!Wok3ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+ NewToastUtil.getInstance().showToastError("3号炒锅设备未连接！");
+ return;
+ }
+ break;
+ case 4:
+ if(!Wok4ModbusTcpServer.get().plcIsConnect &&!ConfigName.TEST){
+ NewToastUtil.getInstance().showToastError("4号炒锅设备未连接！");
+ return;
+ }
+ break;
+ default:
return;
- }
}
WokControlDialog dialog = new WokControlDialog();
@@ -152,6 +189,8 @@ public class CookingHActivity extends BaseActivity {
super.onDestroy();
cookingFragment1.onDestroy();
cookingFragment2.onDestroy();
+ cookingFragment3.onDestroy();
+ cookingFragment4.onDestroy();
LogUtils.d("CookingHActivity onDestroy");
if(handler!=null){
handler.removeCallbacksAndMessages(null);
diff --git a/app/src/main/java/com/bonait/bnframework/newui/activity/DiyProcessHActivity.java b/app/src/main/java/com/bonait/bnframework/newui/activity/DiyProcessHActivity.java
index 38fd33e3..3f92fc13 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/activity/DiyProcessHActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/activity/DiyProcessHActivity.java
@@ -97,10 +97,7 @@ public class DiyProcessHActivity extends BaseActivity {
* 导入已有属性组合弹窗
*/
private AttributeSelectDialog attributeSelectDialog;
- /**
- * 0炒菜 1烤箱
- */
- private int type = 0;
+
private WaiteProgressDialog progressDialog;
private Handler handler = new Handler(Looper.getMainLooper()){
@Override
@@ -168,11 +165,9 @@ public class DiyProcessHActivity extends BaseActivity {
}
BPA_GOODS_CLASSIFY classify = GoodsClassifyDBUtil.getById(goods.goodClassifyid);
assert classify != null;
- type = classify.type;
-// viewBinding.tvType.setText(type==0?"炒菜":"烤菜");
- viewBinding.btnInsertDown.setVisibility(type==0?View.VISIBLE:View.GONE);
- viewBinding.btnInsertUp.setVisibility(type==0?View.VISIBLE:View.GONE);
- viewBinding.tvOvenTip.setVisibility(type==1?View.VISIBLE:View.GONE);
+
+ viewBinding.btnInsertDown.setVisibility(View.VISIBLE);
+ viewBinding.btnInsertUp.setVisibility(View.VISIBLE);
initProcessModel();
initStepAdapter();
initBtnListener();
@@ -255,26 +250,6 @@ public class DiyProcessHActivity extends BaseActivity {
*/
private void initBtnListener(){
viewBinding.btnAdd.setOnClickListener(view -> {
- if(type == 1){
- BPA_GOODS_PROCESS_DETAIL goodsrecipe = getSelectItemFromValue();
- boolean exit = false;
- for(BPA_GOODS_PROCESS_DETAIL bean : processDetails){
- if(bean.processname.equals("放入烤盘")){
- exit = true;
- }
- }
- if(exit){
- if(goodsrecipe.processname.equals("放入烤盘")) {
- NewToastUtil.getInstance().showToastError("一个菜品只能放一次烤盘");
- return;
- }
- }else {
- if(!goodsrecipe.processname.equals("放入烤盘")) {
- NewToastUtil.getInstance().showToastError("请先添加[放入烤盘]步骤");
- return;
- }
- }
- }
addProcess();
});
viewBinding.btnUpdate.setOnClickListener(view -> {
@@ -361,7 +336,7 @@ public class DiyProcessHActivity extends BaseActivity {
*/
private void initProcessModel(){
//初始化工序
- ArrayList data = QueryDB.GetProcessALLByType(type);
+ ArrayList data = QueryDB.GetProcessALLByType(0);
int i = 0;
String id = "";
for (BPA_PROCESS item : data) {
@@ -437,7 +412,20 @@ public class DiyProcessHActivity extends BaseActivity {
private void addProcess(){
RecordManager.getInstance().addLogRecord("角色操作日志", subAttributeGroupName+"-添加工序");
BPA_GOODS_PROCESS_DETAIL goodsrecipe = getSelectItemFromValue();
+
if (goodsrecipe != null) {
+ if(goodsrecipe.processname.contains("主料")){
+ int mainFoodNum = 0;
+ for(BPA_GOODS_PROCESS_DETAIL bean :processDetails){
+ if(bean.processname.contains("主料")){
+ mainFoodNum++;
+ }
+ }
+ if(mainFoodNum>=2){
+ NewToastUtil.getInstance().showToastError("最多只能添加两个主料");
+ return;
+ }
+ }
processDetails.add(goodsrecipe);
stepAdapter.setCurrentPosition(processDetails.size()-1);
stepAdapter.notifyDataSetChanged();
@@ -454,6 +442,18 @@ public class DiyProcessHActivity extends BaseActivity {
RecordManager.getInstance().addLogRecord("角色操作日志", subAttributeGroupName+"-向上插入工序");
BPA_GOODS_PROCESS_DETAIL goodSrecipeUp = getSelectItemFromValue();
if (goodSrecipeUp != null) {
+ if(goodSrecipeUp.processname.contains("主料")){
+ int mainFoodNum = 0;
+ for(BPA_GOODS_PROCESS_DETAIL bean :processDetails){
+ if(bean.processname.contains("主料")){
+ mainFoodNum++;
+ }
+ }
+ if(mainFoodNum>=2){
+ NewToastUtil.getInstance().showToastError("最多只能添加两个主料");
+ return;
+ }
+ }
int index_update = stepAdapter.getCurrentPosition();
if (index_update >= 0 && processDetails.size()>0) {
BPA_GOODS_PROCESS_DETAIL processDetail = goodSrecipeUp;
@@ -474,6 +474,19 @@ public class DiyProcessHActivity extends BaseActivity {
RecordManager.getInstance().addLogRecord("角色操作日志", subAttributeGroupName+"-向下插入工序");
BPA_GOODS_PROCESS_DETAIL goodSrecipeUp = getSelectItemFromValue();
if (goodSrecipeUp != null) {
+ if(goodSrecipeUp.processname.contains("主料")){
+ int mainFoodNum = 0;
+ for(BPA_GOODS_PROCESS_DETAIL bean :processDetails){
+ if(bean.processname.contains("主料")){
+ mainFoodNum++;
+ }
+ }
+ if(mainFoodNum>=2){
+ NewToastUtil.getInstance().showToastError("最多只能添加两个主料");
+ return;
+ }
+ }
+
int index_update = stepAdapter.getCurrentPosition();
if (index_update >= 0 && !processDetails.isEmpty()) {
BPA_GOODS_PROCESS_DETAIL processDetail = goodSrecipeUp;
@@ -611,7 +624,7 @@ public class DiyProcessHActivity extends BaseActivity {
*/
private void initTopBar(){
viewBinding.topbar.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.topbj1));
- viewBinding.titleBar.setText(type==0?"炒菜-编辑工序":"烤菜-编辑工序");
+ viewBinding.titleBar.setText("编辑工序");
viewBinding.back.setOnClickListener(v->{
goBack();
});
diff --git a/app/src/main/java/com/bonait/bnframework/newui/activity/MainHActivity.java b/app/src/main/java/com/bonait/bnframework/newui/activity/MainHActivity.java
index e93bc47d..097c35d3 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/activity/MainHActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/activity/MainHActivity.java
@@ -271,6 +271,8 @@ public class MainHActivity extends BaseActivity {
public void onPageSelected(int position) {
tabAdapter.setCurrentPosition(position);
tabAdapter.notifyDataSetChanged();
+
+ viewBinding.rlOrderTip.setVisibility(position==1?View.GONE:View.VISIBLE);
}
@Override
diff --git a/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java b/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java
index ba538de7..ae4ead75 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java
@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.apkfuns.logutils.LogUtils;
import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.glide.GlideUtil;
import com.bonait.bnframework.newui.adapter.base.BaseAdapter;
import com.bonait.bnframework.common.db.mode.BPA_GOODS;
import com.bonait.bnframework.common.db.util.GoodsDBUtil;
@@ -53,7 +54,8 @@ public abstract class CloudGoodsAdapter extends BaseAdapter0?false:true);
diff --git a/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog.java b/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog.java
index d6457141..78712828 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog.java
@@ -117,6 +117,8 @@ public class FoodInfoDialog extends DialogFragment {
viewBinding.top4.setText("");
viewBinding.top5.setText("");
viewBinding.top6.setText("");
+ viewBinding.top7.setText("");
+ viewBinding.top8.setText("");
viewBinding.mainFood1.setText("");
viewBinding.mainFood2.setText("");
viewBinding.mainFood3.setText("");
@@ -374,6 +376,7 @@ public class FoodInfoDialog extends DialogFragment {
orderDetail.mainPosition = mainPosition;
OrderDetailUtil.update(orderDetail);
freshView();
+ xCom.dismissX();
}
};
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 b5853f5a..f4d370d2 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
@@ -188,7 +188,7 @@ public class RobotControlDialog extends DialogFragment {
private HashMap data = new HashMap<>();;
@SuppressLint("NonConstantResourceId")
@OnClick({R.id.top1, R.id.top2,R.id.top3,R.id.top4,R.id.top5,R.id.top6,R.id.top7,R.id.top8,
- R.id.right1,R.id.right2,R.id.right3,R.id.right4,R.id.right5,R.id.right6,R.id.btn_pen_back,
+ R.id.mainFood1,R.id.mainFood2,R.id.mainFood3,R.id.mainFood4,R.id.mainFood5,R.id.mainFood6,R.id.btn_pen_back,
R.id.btn_wok_chucai,R.id.btn_wok_chucai2,R.id.btn_wok_chucai3,R.id.btn_wok_chucai4,R.id.btn_weihu,R.id.btn_weihu_finish})
public void onViewClicked(View view) {
RecordManager.getInstance().addLogRecord("角色操作日志","用户点击按钮-机器人调试");
@@ -331,22 +331,22 @@ public class RobotControlDialog extends DialogFragment {
data.put("烹饪(秒)","0");
robotPutMaterial();
break;
- case R.id.right1:
+ case R.id.mainFood1:
robotPutFood(1);
break;
- case R.id.right2:
+ case R.id.mainFood2:
robotPutFood(2);
break;
- case R.id.right3:
+ case R.id.mainFood3:
robotPutFood(3);
break;
- case R.id.right4:
+ case R.id.mainFood4:
robotPutFood(4);
break;
- case R.id.right5:
+ case R.id.mainFood5:
robotPutFood(5);
break;
- case R.id.right6:
+ case R.id.mainFood6:
robotPutFood(6);
break;
case R.id.btn_wok_chucai:
diff --git a/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java b/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java
index 928a08d5..330b7834 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java
@@ -11,12 +11,10 @@ import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.RecyclerView;
-
import com.apkfuns.logutils.LogUtils;
import com.bonait.bnframework.R;
import com.bonait.bnframework.business.RecordManager;
@@ -45,11 +43,9 @@ import com.bonait.bnframework.newui.adapter.classify.GoodClassifyAdapter;
import com.bonait.bnframework.newui.adapter.goods.LocalGoodsAdapter;
import com.bonait.bnframework.newui.dialog.add.AddGoodsDialog;
import com.bonait.bnframework.newui.widget.NewToastUtil;
-
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
-
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -194,7 +190,7 @@ public class LocalGoodsHFragment extends BaseFragment {
NewToastUtil.getInstance().showToast("点击过快！");
return;
}
- AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认上传全部分类、全部商品、全部工序信息？上传将会覆盖云端商品，请确认", new AlertDialogUtils.DialogClickListener() {
+ AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认上传选中商品？上传将会覆盖云端商品，请确认", new AlertDialogUtils.DialogClickListener() {
@Override
public void onConfirm() {
List res = goodsList.stream().filter(p->p.status==1).collect(Collectors.toList());
@@ -222,7 +218,7 @@ public class LocalGoodsHFragment extends BaseFragment {
});
viewBinding.deleteAll.setVisibility(isEdit?View.VISIBLE:View.GONE);
viewBinding.deleteAll.setOnClickListener(v->{
- AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认删除全部分类、全部商品、全部工序信息？", new AlertDialogUtils.DialogClickListener() {
+ AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "请确认", "确认删除选中商品？", new AlertDialogUtils.DialogClickListener() {
@Override
public void onConfirm() {
if(ConfigName.getInstance().isFastClick()){
diff --git a/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java b/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java
index b16c3b64..629c97be 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java
@@ -247,13 +247,13 @@ public class HomeOrderFragment extends BaseFragment{
if(foodInfoList.isEmpty()){
return;
}
- FoodPosSetDialog foodInfoDialog = new FoodPosSetDialog();
+ FoodPosSetDialog dialog = new FoodPosSetDialog();
Bundle bundle = new Bundle();
bundle.putString("orderId",orderDetail.id);
- foodInfoDialog.setArguments(bundle);
+ dialog.setArguments(bundle);
if(getActivity()!=null){
- foodInfoDialog.show(getActivity().getSupportFragmentManager(),"修改配料位置");
- foodInfoDialog.setListener(new MyClickListener() {
+ dialog.show(getActivity().getSupportFragmentManager(),"修改配料位置");
+ dialog.setListener(new MyClickListener() {
@Override
public void clickListener(View v, Object data) {
orderDetails1.clear();
@@ -279,12 +279,13 @@ public class HomeOrderFragment extends BaseFragment{
*/
private void changeRightBtn(){
if(foodInfoList.isEmpty()){
+ viewBinding.orderName.setText("");
viewBinding.btnLocationInfo.setVisibility(View.GONE);
viewBinding.btnFoodPosSet.setVisibility(View.GONE);
}else {
- if(orderDetail.status==1){
+ if(orderDetail.status!=0){
viewBinding.btnFoodPosSet.setVisibility(View.GONE);
- viewBinding.btnLocationInfo.setVisibility(View.VISIBLE);
+ viewBinding.btnLocationInfo.setVisibility(View.GONE);
}else {
viewBinding.btnFoodPosSet.setVisibility(View.VISIBLE);
viewBinding.btnLocationInfo.setVisibility(View.VISIBLE);
@@ -298,7 +299,10 @@ public class HomeOrderFragment extends BaseFragment{
* @param deviceNum 设备号
* @return
*/
- private boolean checkPosition(int mainPosition,int deviceNum){
+ private boolean validationPosition(BPA_ORDER_DETAIL orderDetail,int mainPosition,int deviceNum){
+ if(orderDetail.status != 0){
+ return true;
+ }
if(mainPosition==0|deviceNum==0){
NewToastUtil.getInstance().showToastError("请先绑定位置信息");
AlertDialogUtils.showTipDialog((AppCompatActivity) getActivity(), "警告",
@@ -354,7 +358,7 @@ public class HomeOrderFragment extends BaseFragment{
* @param position
*/
private void orderMaking(List mData,int position){
- if(!checkPosition(mData.get(position).mainPosition,mData.get(position).type)){
+ if(!validationPosition(mData.get(position),mData.get(position).mainPosition,mData.get(position).type)){
return;
}
if(ConfigName.getInstance().isFastClick()){
@@ -522,6 +526,7 @@ public class HomeOrderFragment extends BaseFragment{
orderDetails1.remove(position);
orderAdapter1.setCurrentPosition(-1);
foodInfoList.clear();
+ changeRightBtn();
foodInfoAdapter.notifyDataSetChanged();
orderAdapter1.notifyDataSetChanged();
NewToastUtil.getInstance().showToast("删除成功");
@@ -595,6 +600,7 @@ public class HomeOrderFragment extends BaseFragment{
foodInfoList.clear();
foodInfoAdapter.notifyDataSetChanged();
orderAdapter1.notifyDataSetChanged();
+ changeRightBtn();
startMakingThread(bean);
jumpToCook(bean);
break;
@@ -612,6 +618,7 @@ public class HomeOrderFragment extends BaseFragment{
orderDetails1.remove(position);
orderAdapter1.setCurrentPosition(-1);
foodInfoList.clear();
+ changeRightBtn();
foodInfoAdapter.notifyDataSetChanged();
orderAdapter1.notifyDataSetChanged();
break;
@@ -632,6 +639,7 @@ public class HomeOrderFragment extends BaseFragment{
orderDetails1.addAll(OrderDetailUtil.getAll());
orderAdapter1.setCurrentPosition(-1);
foodInfoList.clear();
+ changeRightBtn();
foodInfoAdapter.notifyDataSetChanged();
orderAdapter1.notifyDataSetChanged();
viewBinding.recyclerInfo.smoothScrollToPosition(0);
diff --git a/app/src/main/res/drawable/all_edit_btn.xml b/app/src/main/res/drawable/all_edit_btn.xml
index a88429b5..e0b1d89a 100644
--- a/app/src/main/res/drawable/all_edit_btn.xml
+++ b/app/src/main/res/drawable/all_edit_btn.xml
@@ -5,14 +5,14 @@
-
-
+
-
-
+
@@ -20,7 +20,7 @@
-
-
+
diff --git a/app/src/main/res/layout/item/layout/item_file_picker_show.xml b/app/src/main/res/layout/item/layout/item_file_picker_show.xml
index a151a002..fe7fb73d 100644
--- a/app/src/main/res/layout/item/layout/item_file_picker_show.xml
+++ b/app/src/main/res/layout/item/layout/item_file_picker_show.xml
@@ -67,7 +67,7 @@
android:id="@+id/iv_delete"
android:layout_width="40dp"
android:layout_height="40dp"
- android:src="@mipmap/file_picker_delete"
+ android:src="@drawable/ic_delete_x"
/>
diff --git a/app/src/main/res/layout/new/layout/activity_cook_h.xml b/app/src/main/res/layout/new/layout/activity_cook_h.xml
index 8f85ae93..19bddc35 100644
--- a/app/src/main/res/layout/new/layout/activity_cook_h.xml
+++ b/app/src/main/res/layout/new/layout/activity_cook_h.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical"
- android:background="@color/main_color2"
+ android:background="@color/white"
>
@@ -15,19 +15,22 @@
android:layout_marginTop="@dimen/home_tab_height"
android:layout_height="match_parent">
-
+
+
+
+
+
+
+
-
-
+ android:orientation="vertical"
+ android:layout_gravity="end"
+ android:layout_height="match_parent">
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/new/layout/activity_edit_process_h.xml b/app/src/main/res/layout/new/layout/activity_edit_process_h.xml
index 205ad50b..9198143e 100644
--- a/app/src/main/res/layout/new/layout/activity_edit_process_h.xml
+++ b/app/src/main/res/layout/new/layout/activity_edit_process_h.xml
@@ -10,7 +10,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -327,7 +299,7 @@
+ android:layout_height="70dp" >
+ android:layout_height="700dp">
@@ -324,6 +324,7 @@
android:layout_height="match_parent"
android:background="@drawable/bg_box_click"
android:gravity="center_horizontal"
+ android:layout_marginStart="35dp"
android:maxLines="2"
android:ellipsize="end"
android:textSize="28sp"
@@ -334,9 +335,9 @@
android:id="@+id/top5"
android:layout_width="100dp"
android:layout_height="match_parent"
- android:layout_marginStart="25dp"
android:background="@drawable/bg_box_click"
android:gravity="center_horizontal"
+ android:layout_marginStart="25dp"
android:textSize="28sp"
android:maxLines="2"
android:ellipsize="end"
@@ -399,14 +400,14 @@
+ android:layout_height="700dp">
+ android:layout_height="700dp">
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/app/src/main/res/layout/new/layout/dialog_food_pos_set.xml b/app/src/main/res/layout/new/layout/dialog_food_pos_set.xml
index 329c8d79..4016d5ca 100644
--- a/app/src/main/res/layout/new/layout/dialog_food_pos_set.xml
+++ b/app/src/main/res/layout/new/layout/dialog_food_pos_set.xml
@@ -24,16 +24,18 @@
app:layout_constraintLeft_toLeftOf="parent"
/>
-
+ android:layout_marginStart="300dp"
+ android:layout_height="300dp"/>
+ android:layout_height="300dp"/>
+ android:layout_marginStart="1250dp"
+ android:layout_height="300dp"/>
+ android:layout_height="200dp"/>
diff --git a/app/src/main/res/layout/new/layout/fragment_home_mains.xml b/app/src/main/res/layout/new/layout/fragment_home_mains.xml
index 195e7266..1fd3c056 100644
--- a/app/src/main/res/layout/new/layout/fragment_home_mains.xml
+++ b/app/src/main/res/layout/new/layout/fragment_home_mains.xml
@@ -44,7 +44,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:src="@mipmap/home_classify_ic" />
+ android:src="@drawable/home_classify_ic" />
+ android:src="@drawable/home_caiping_ic" />
+ android:src="@drawable/ic_silos" />
+ android:src="@drawable/home_log_ic" />
+ android:src="@drawable/home_order_ic" />
+ android:src="@drawable/home_setting_ic" />
+ android:src="@drawable/ic_update" />
+ android:src="@drawable/ic_logout2" />
+ android:textSize="32sp" />
+ android:textSize="32sp" />
diff --git a/app/src/main/res/layout/new/layout/layout_huojia.xml b/app/src/main/res/layout/new/layout/layout_huojia.xml
index f3810f31..686d34f0 100644
--- a/app/src/main/res/layout/new/layout/layout_huojia.xml
+++ b/app/src/main/res/layout/new/layout/layout_huojia.xml
@@ -5,21 +5,21 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -63,7 +63,7 @@
android:id="@+id/top5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="30dp"
+ android:layout_marginStart="40dp"
android:gravity="center"
android:textSize="28sp"
android:maxLines="2"
@@ -75,7 +75,7 @@
android:id="@+id/top4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="30dp"
+ android:layout_marginStart="40dp"
android:gravity="center"
android:textSize="28sp"
android:maxLines="2"
@@ -87,7 +87,7 @@
android:id="@+id/top3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="30dp"
+ android:layout_marginStart="40dp"
android:gravity="center"
android:textSize="28sp"
android:maxLines="2"
@@ -99,7 +99,7 @@
android:id="@+id/top2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="30dp"
+ android:layout_marginStart="40dp"
android:gravity="center"
android:textSize="28sp"
android:maxLines="2"
@@ -111,7 +111,7 @@
android:id="@+id/top1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="30dp"
+ android:layout_marginStart="45dp"
android:gravity="center"
android:textSize="28sp"
android:maxLines="2"
@@ -123,89 +123,94 @@
diff --git a/app/src/main/res/layout/new/layout/layout_huojia2.xml b/app/src/main/res/layout/new/layout/layout_huojia2.xml
new file mode 100644
index 00000000..6745439c
--- /dev/null
+++ b/app/src/main/res/layout/new/layout/layout_huojia2.xml
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/new/layout/layout_root_tip2.xml b/app/src/main/res/layout/new/layout/layout_root_tip2.xml
index b258f985..93ebd7bd 100644
--- a/app/src/main/res/layout/new/layout/layout_root_tip2.xml
+++ b/app/src/main/res/layout/new/layout/layout_root_tip2.xml
@@ -35,67 +35,95 @@
app:layout_constraintLeft_toLeftOf="parent"
/>
-
+ android:layout_marginTop="200dp"
+ android:layout_marginStart="50dp"
+ android:layout_height="550dp">
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/home_classify_ic.xml b/app/src/main/res/layout/svg/drawable/home_classify_ic.xml
new file mode 100644
index 00000000..7607a9ce
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/home_classify_ic.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/home_log_ic.xml b/app/src/main/res/layout/svg/drawable/home_log_ic.xml
new file mode 100644
index 00000000..fbae9da4
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/home_log_ic.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/home_order_ic.xml b/app/src/main/res/layout/svg/drawable/home_order_ic.xml
new file mode 100644
index 00000000..2a2df805
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/home_order_ic.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/home_setting_ic.xml b/app/src/main/res/layout/svg/drawable/home_setting_ic.xml
new file mode 100644
index 00000000..af05754a
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/home_setting_ic.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/ic_delete_x.xml b/app/src/main/res/layout/svg/drawable/ic_delete_x.xml
new file mode 100644
index 00000000..81eb25f1
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/ic_delete_x.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/ic_logout2.xml b/app/src/main/res/layout/svg/drawable/ic_logout2.xml
new file mode 100644
index 00000000..31d4d41e
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/ic_logout2.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/ic_silos.xml b/app/src/main/res/layout/svg/drawable/ic_silos.xml
new file mode 100644
index 00000000..6f6b5a70
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/ic_silos.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/layout/svg/drawable/ic_update.xml b/app/src/main/res/layout/svg/drawable/ic_update.xml
new file mode 100644
index 00000000..8705e92c
--- /dev/null
+++ b/app/src/main/res/layout/svg/drawable/ic_update.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_chucan_box.jpg b/app/src/main/res/mipmap-xxxhdpi/ic_chucan_box.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3090183fd252021cc0eed320a05582541e267fb3
GIT binary patch
literal 27562
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
a-anfvqfdUa4f?TtVPs&Y|L&Z9*#7|fh-2db
literal 0
HcmV?d00001
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_devices_all2.png b/app/src/main/res/mipmap-xxxhdpi/ic_devices_all2.png
index b735279ee8ad3095e1da2d141c593f81fcab4d5d..cf129e49a72470056dc24987706cf747e8185671 100644
GIT binary patch
literal 222379
zcmYgXcR1T``)##aLbXUjm1?ziLX8$xTS`TV9kF*>dlXTlHCr)SBW97HcCFZ(+A|cj
z_bRG3wSM`&@Ati~-yi-+;>z`$JomZJIrsB!
z9y)P_zl8Z>1rwqUr)#1P`7nZ-K$s>2Oa;iPG5vO{?l1z#`8h!~=XZe2JDSt2R;ETu
z4q*{t41QOlCrnoHdE?~wE$*v3aQ+m}=4Tq~hNYbiCmz<(u4~f8&8$Q-%tdIx6VVHS
z1esF2#A@2hC_k|m=lc#O8q!LC<6rhc>kq%wbT)|Gxl5$jTAv?KxY;_9R4F6rSD5s0
z>s3oYn32Qzdi!DN{Jm1M64pNZMDF48+Vy>mU*<+#S$*WClAiIqde084#tzKl;0JY6
zYO=+X!!A+nKPSGdbWdv)pVz(_c#c~cFS9j}lCjY$ox3l#G$Z4#Ux&#
zujWUx)34jh#L_;Iim8({%tAoya`>T)aKmx0V~d_#vnb$buy5?sWzt)%QB6SngqwFpB$DMbZxNUnT`1O+XrjG}n9k$gh2aQe(!wak1
z@+-HO_naF}rndO{mul9()$~v@8Jd2poClOT&B^b2mdyBUw=!AxCO%%SJDe5~Y}g6K
z><{Y=6?)V!s+A5kPi$kxH)?nLmfLICUI}=ge%YJZW%rs&etW^cHYzi@nZ36%-I-l
zT|0z}O~f!Kn-#sa$25QHxpq$5P2Lnrc&&X|{sVUu3V~EMow^lT^h$KP$SizY>CLH-
zvRA9#7IK{|yP0TX{B|PWuxilzXf9+q;HI>wW8FS(%;#__+I~*3VA^Zl-gOQ}6IIxd
zUAF%FZ9;b(b0-SGv^b2w&%SK
z$70JTGZ(&p@48PqE0wm;NyguCtR>YRjN7i+zTGQs?-|xJv2cK=zzy8itd_@YQbia$
zeP2mkG-ItBuH1Z4e?F}>)_>_a%7t0?W;w=xjOG41({OQqeXU_fq4Ai)
zOzG6IWP-`mp22RZfv-ljg!6)6Pkn`h<+SggtmXadevZ>#zdU!l7*~>Na2x1zw~qVP
z4QGd9k`KFWHh)(4jK8tI!6H`paG^aJvpZDSYGXUTS=18Ixi!z-JJjjBJGtAR6ld%!
zVRYS*>m+K!WUKz<8%FH*o#_|nKKx^9R_t&0hevy`f^{*FiIrY0bs76|^^}EZ^>zkZ
zt-LaI6~X$w+$z)Gr+e#>oxdJ~@;chT#a2a1pNAFvGPU}huHGBM=7U&g+&d4Msylp-
zWZN*BIoX`XTv!|!$5*V^<`v|6=3zZ@r}N8%w>4@iWP}}6qeg2yZ373^^W?VPGCLVb
zpufZ=Zw8iUf`7Z`mYa>YF%s49jkhxp)kpk&lH1;UxvReDIGPU^3m`ZbhPL(eU{?B}
z=Vgm;S^OHb1I?)k#L2=rb)6z3||S@E&!0ADqs%Vxv&@-2zOK{&*26~tB52gBCA1aX!3kTPGa
zJ}X8iNR329CYk*9AdESl16uPh`@bu9)m(cYk7nFg0pN(1mmo3>EHA6{s0z_3nJRHu|!A
zi_DOhCV5w-sTXcaofhdAo5ObCPbBVj!*NRNK0luQX}n_H#G@
za)#~imX-Vmg~$F%)1oUlx&_3Y|x#Z1==K=q}?EG!t6
zmp>B@f|!g&leW&4O1G&y`ztw$H!7?b@}m408)|=5Soc92L<*&eb(r0p=pKG`W7FTr
zlDgv|UxWB0$NE<9gR#VXwElV=MDuGHzJDYzny^&dp87~#dSAQR(8PNiwyPq{RhweR
zUXoh3t7c4mcu{{mGO=7XYNFn)&s&k=yR5(aJz9MUhUL?%^=}=mF{RHn-Nxc#+5MJL
zI#CQuEw}ii0}c=_?=H-iufzmW&4zrw_2jBE()`sQf>ZFrS*zq(rOPA*vr>dsE*j|Y
znLW|fp$MnR**K9Y7QC_l-8Lsu*wLrb*VCZmZQpbQul~Bo64oZLUboQO{LR(X+kk%hdTq!ON%0A
zEPWhL$wrS^M&~#FI+Fg&1pT;Y7j=W*rhJbVrTAAIQ_l+GvfuqqusZNutcvU1qLZ1}
zXqXM&g9JHqrk#+lyLrqJv%ijd+ivT)d?qrwTs^7~KQ4@OeyToG%^>c0$
zuYv@R*2l}q7@D5VLn+JOn7tRfJ2mX_ant9rUxaom6GZ&pSMB%J42kGxSW@$%z)+Os
z@2Zu%A~wG#_rfmo8vd@?l6EC4dDi=1KD_$iX)||}Q{I^K`Ah3|8plVHJ^E(u;*M2g
z=NnemH6pn9O|=@@RD)6&Ho4VhL`v|hNp}Lfrs^rrvDfx|>zY27i+gX0Rrla0u3c7_
z&fev;AhE9|7nY+fLj!94g1@G_WA%&^&Qss;>Mx#@_C4jNUaLrafSWd>YgqIu-8;AG
zrCTwvPx0CH@iyjY{pcg83GN)b?^nOJy$1nHC@iin9cJ1ru+}d|5P71Gt!^K!R)xS)
zO!~|vOs5}Pr|!ljNc9^>fuY>XHpQ%OhU=D#7Wdg))}YJ9E2VGF$WSwFc*&Z%jvzXH
zWM~#d*$I_w`ZDBk2tYqeQ2UH;C}u7;
zuQY0@rHU-0g$czTbRv#36K*0_zYF0TJ$*9ZQxX52-`I?nHpv3mJm^?%{ri
zt6-80E9RTTa;Rj_4fO_xJ`?ZQv8~2{9!@<&D~GC;%dQvE{Z=+ThUE{XESAqh?!NS&
zxGJs3c8m;7rslB0bm()&8M=JLkacS?a`f5uV)U^-q#}`RWy;b$`EA|U+^KEP!HTg}
zx#T*abn13o(xzJ754*QJ^4<nCr=gs?)SS({n)5p|F&GY5FxUX
z>Q^tZ)A68JO>)cJxBP_OdYw@~b!F@qZ$rZ-~kQft0c{oHW*
z#jzV*7xA*+{Bx<@;sWwIw3@WxM*{42lnQ1RD)sSvUgEKd?6A#P;VjwI^EMuYVND_+
z4S!i&hjqG#QuDZZQEp8f>>^Q7WGap7q%4$A2x}%jJDhY~j#ig0C_{awaKM`o^Gg>W
zNU!(YxH)6z{_HJN>F}{+Vzh(!RKDkFHSyu?i$8{?%h7thKMk%YR&0&6K5MXBCp`Py
zJ`qV3jv3+V=Ur5d;e^L=RfH$4NPA9CZcl!(PHnmQs6oa~WOst`iBM8Xak#_|VX9|J
zZ`0hN&ds3oDF0=zgQUIr-AbE;uo_6-aC*5%-U%+>*sx)Ej)Gj$LOQmH6(u|$8
z78dJ0BngjBuW)>mo^Kx@DyRs5u
z9f}#gOJob)JncOBI8PgM@5Lv2W+x;);UTh4DeBR+M?WZeS_pt>pr{m3mj>w0$Qogw
zysFC+BQ``S%L~1pEgOHeFkIZLS0P%^7InS0{ugNCvOV{WX%)=G1N(}1%^q
z4=bJ!9c$34%Cff=7T`ASwEP3&qv1dy&HRj@FtN6%X&C%=dAA6|;Kb|xh+D%VsIMvz
zl**bux6!DAlhDw6*J~i@pCfzCkeVcj6KjH`jW*o1>`Rtd-m9YNQOkmeN+yfS
zKv5g|kn3E9_A{8##5%#su4j9DyRS(1*9}y1eGbOj4c~5-9o4=JQu*?g0Gmv`;1p7qdw3+Ro;|RcI4bb&NCUYF}Ck#etyxNjiDb-;mUy1WrL+
zZwreB>-}HqJ&gU&tkm>9tE*49ZF1p&N^4huz%*k&yvWv6({G~HW`nPMLp}yYZ
za)AWD_B}6d7qXzF`o8`RKX^aoJ~3riF?FyU={MQD@n%4Jc{bhSaXV{S#h6QXK~KN$
zf$J{Ta;Hk)jLyeIxPv>KE
zhE(4tDPNih08oMEw?Hrik^ck7PcHk`P$z8ctp8HFs&cV;rcD76Wz^WH*}|*K7iBt}
zww}OeMYTu4L8%->k=;UF{N$%K&(X-B*;6^QB#jS(W|tpb;^Rlv9nY=eN5|gbTJNEa
ztk7(w=5O(vIYBj3e8g~W^o(rZ`Ea@?>7-oV;$8P0nZ2W^wCyZGsc9>;YQ7B?%>IQ^
zWcD^xLr
zkUT%yTaY}kP$*B1m-KL8U>!}^>^E{Cck(Xcr?mEp;{TYM`5TdBQ=`wmL&{^{a=$9z
zdW;P8GhnRwz1YKy5p=0z!U!^0b276#HC}#kk5$akyQphJ!X^Q;Sr-}FF1`P2Vl6>}
z$;hv8*HH0y-2CEqOG$Ax0e60O#_Amh*P}tno>cIRHC_FpwX5k){i5n;AHmwT4JjLp
z22oX~)4Ws3X1TxNXR`P2AnT-s<*zU-nK`LddP!3K`sVJE$MPbF^FgnuIoD4zug`FXE0MQ
ze&+nQ$8tqOY$VnB6Moc4U>v{i$H9j+9|}79tzV?Tr`y#eH|@%2e6N=dk4$7_4sdn8
zJ(}9`b@V-3pJ6^eihA}HRh0hhE_HG9Ufip1mi%L5)tGi`
z@GF&!+9SfOwu?MdkVxd60~a7b3iyZ(cJB=h2ulGSye}blzgp4E@ck_r+Sro0mozHa
zeM)E?E3~EFNh%9{!gD+Ua(LS~6*26tcJfaCdl1mTfj}-O#R=+D(I{adHsFdQ|^EAkM`f@0W||vMyk_
zd+~&1cPSD)ji&oV)8AL~1S)(`Je^`ZI_Lz@ck`F&4kOC
z>g}Osja_uGFxOz39Gs9Zn(A}Plbe?_>EeXml*ncVAm39YDP5R&T&HYj4eA51AwgBR
zU~EgFLXZvMr%wmWhJ77*>r9=Ag
zp1Ui?Ydvp=6#C=sBU0m1_KSO+T~YmaqvkX6I(hUfsdA!9Rd7%fhw_Q_OQqcoHCgPW
z&mwwlZEaB}RjjuIU7x5D)JcOMpQgjkpGKT^u07oub%q?5w)QDYFkfy{*#?F_9&G=(?bxw3OBQ#}O;$y589*I&u@}
z^0RsOO}x)To#XJ#0u#
z5zW){d%ZX==i;|bx;GOKk7L*&;X~Q}Zg(@DY2Yb<+=_mN9dSmt#8UhDmMgk6TY0sg
z#_}z-2eQZr5OceD5yV(d2!cpZo(phaWc#BRdq03e`A&r*zEL|j5CSl#J7)H$^8!%H
z-wf)Exsm!poRifYBzRRzS)gi3newU|`Up
z_BYss?i&MD(v!S_CnmocsmE=AL%i&pdELbRCs4eV)ISquw&y=uV`
zg0lXIB+`!lH6$VsSOU+^nuy-7s?2Un*RG`RDQ~yh{h;W02eSG+OY*G^uKkT!POvfP
zL(>nhmurXVZI3~8eJ&62%s!CUE%UywPo0hhYsT<3^XquOWM^c!&(2tqypy>y264E2
zMc19j)a7>q1R50P(Kz$Tj3%^DmqXS@LmG&iIVLp
z=uq`CT``F7k`{u_N(P|V
zNtx-_M(k6v2c&e!l%?MOp|#1>0$b3Da$NqT_hVfRlx1C{-7H7zyvVg(eS9R620sG0F9
z6kwSm{Nu$>Ego7vAQuf#k&)HZcJ*FzdXZsfzitQTWgjF{!y9=S5FJu;Pr>H1Dz{ho
z6sEh|7)oM|J@GkORss5
z;VBNwWR(d*G>W&<+|GE%+X>_3^}NNsfnautnd_uB0Cv2i^PmF+Q3IkoXfl55L%|{A
z{(x3sVvTaY9sRBGleC>Q#)ePKlzUIFkc59>M@)F?dNa^9DmoQPeo3vHECaq#gfkWV
zSuw7`kDG;taXuU>dJtH=a69r%%Yb|Fq#&sY0fdneMnB+Zsbog7?@MT9-ZjaCMPoa3
zRrdm5oq=z0DvS_SqI0m#w-3d9ke9@=1xmh`RIywMJL3@T#82fSNJY<&C0~h&!%V!;
zQLAFz*va|Dp}{T&9M`xK3wu7(PJq|bS&!HYG29hp5wW8f$`@Zav^DTnenFmcy80iUfnP)L&R@TXxpyL$!|hvc`S#+F
zL`5=CjUR*weICPX)oWQ9^vL?XfS|C)^by_hfv#;TAq>~BaZlHUE!aYtik}R*ji{Kt
z493Q3{@unmQnX1~wEohn<;kl73vxmX^K0F5z=Eg-im#htpga^&H2u%O!y6Fa54_q}
zBI#5q0lIe&FEUo};r?Ib?+ayKL^g0sioCnRtJ#EWb`$|6>-@Z{t0YWlhbV*~bwHzblcE54zUkBSsYZ3(W|u#P=JoT26AEeQ}?
zVQqq?S8}hWRt8!vheO(VjKgY}+g3$8}xh~x|Y
z$O7|x(GnK;MW^C?JKRl1i&3Ysh~v9lXuac(t=hC8DpiKj$%)7Wyo~}R@NxD
z_+(y9+qp*z0@V#9a1MPmwzy8rZ_eJ2DilOT8i}Tk$xoQIjk&)%IT$z>B62(*sQ;2C
zlorckfS%0JGx;$PFGhPFzmA2$|5Kmg^S7Z@ADxhmR4b}rAoPjiz(+&V@~b
zPS0t;0^ihZN|0)oEtX*Lmvi&oU2#`IkT>L13p*~k1_!4aR3B9{2@aR)Cw4On7{#A8
zlml73|6Z_adGZFlyzTC$+Z@1&b18<#G-$^(e!0}w!b9hw97de^K0KaIvrw+5PI
zm_byWd|c1j>LU42U;uRHY5`Ww@{DPM!k)WV9t*^lA5v^`12%0a$7Mj{6`y6EKioU|
zoFk~p`r4bYomWBNnG+&n|67M7V5kkTGT0#IPXYvt<2EPUAqUPk4$ksLvZS`W*KnYH
zz9MC)h5a=e;7lSdh&SQ4O(~TT;Z_!sK3AD^t>y_9T_xSkriqciJDV*OppWYZ
z#DA!T+q@1--*#j^-5w47XO})uX#BVV9Ywp5o`wb6{t*tMiFu05{qXTTcd1L!+DHVV
zO{_(1o8bxJu|){dj!WhcrBgAI-l}Ra(~`FzHRsa$TE^DuC8CKVcS)tf9M>37-Jv*)gL^{i@IL-SNzhQ1B*2YS|o_v6m2NX;+sCVNvp5}LQ`m^@Q
z|9)GO9QBo0dHlwv2kh?bGav9;2qZkjW>K2d#>HhC}%
zzfMT_{AW2s?$@xZ7o_|Af@;6=b6v18rx4t!D)`J9|D2t=LNsT=+b~;~fll!*@buDP
z2ely3OQme7vxfGH0S&;9ms_-&-D7rOZCkzk0Pwc
z(SG<=Aw0JFX773T3;fbVk3mS$HwDl{-1IVlXpc+YOe{ZR89QItGN2y60FFCOY%^=5
zIm3QBE8&ZC5@h-~(U6Tss5S7756(0EKjj*FZSW!=jK#(aBoDSV3v(G_o?|_9yA_!s
zW>-@>HJd4(chkhbrq;566nWFXx-3#=Q%X$j6b8G2u}=M##jgQOb1?$nVsrYR#t3w&
z8qnuV(^gQWf9EDnxR+^ZQ-B0^83GSJF){NRj_gqI
zQ;s7F8#u)g72Ew8*?(Gm0`#;D`SSfrmgKr~{Bbq%>jklPOw;ZR&0_+uY6>*KpI@h@
z`CJ>2{+U0S`pVB^)mdK4LPdl*4!yxbA?f?q?X$c^A^5*!WVyT@hLhV)fZ()nNX98M
z%s)G*f0b-FDrw-+_~gzg{Lc5wnIF6BZaGZch8ljQom0gHm+FtJfU=ZHx;j->p>Mh1
z4Z^KbuB}SfHz5*7afn;lR19iJysTEUaAxqyX9|E-7=?*kNUJuOgV*%wXr!f@U)6bN_*v7~XK~t)>k=>b
z=Aw&KAD?!{G;CNC)E2Jm#i}wOuG7!H#c(XHY_W(~gsGATdt~mRrG|aE0C5ksT6rx*
zA*kw>9hhohOEXN|CYRQ@_G+x41)EA-;M-*tg=2phws5OG1X5^MoQ5WO8DU|2JVuix
zFnxWn06r7G9|jUauQB-E05@e~b%Q}Ns~J4Ec%K?d@Wd?f`~>mPF8hD0GtWV&;LB0~
z^_Y8Ki&*7T@6Uzo^8t=H`DpwRw}rGwCp5C%L$LJ+_!0Jk83Flj;7i9A%JC7l+O668
zWxUVu<)F~#3kpzX+dZTn>QQ9!qv#r?9#D|RMw
zv}sM8CBW_oI*$?dd5q*~;;zO)!c@QoYYXxTWliLjTPVEG#OhVj8doFVXOeZ@yr>!G
zR&~kY?V7pst>(rI#F0u}Ud}8oePAVRHhzHV+R{LRmRu}_{ih0HAVFbm);R6mOfG~v
z8_CSa_v|lWg`K0$(6eedZ9gjQ%};?7Cr(t?_0rCP&+C#>+kIf>yPgRF&)hqb7R^k@c3-_4MKeSA#1iQ_Ui+E)d!
zgSkh<^J2K_iy6S&S5=}>h{VcfX#vZ%`HUAoZ<7sIp1w~))Y;my08`@|c#Jxn-w2t8
zWVgx|&rzo9!OARz?OjM^nj#8OgjLxE7yp}-57ciLMcuPDQ|8wwf@|=6m(_2%nL!OG
z5O||2$ME4XU60x1!0(W=N7^hI+4)r3XUM+mB8JDtt7qkerMv;JoUD;5yDQUANU&nI
zUz;MZ38&!l3*aWd3g#u#R=OfFl487_#>Q_|a
z<{v0DOSr;3gRqoVT7L@EASuo(z&;$=I1Hg-|A@&}3c=MMUz%XjrKvp>{H9`gXOX9yq?2>9zp
z4zx69$;PWb6=_RJ`2EkjBisdBh|0Rh0~0Rq%Q4rt6e{~KkK6F08`KAm5Z&yK45D1y
zKXnwsF``@tTtOZv@7>CORXz0S`r+sMSa>V~Sx=>t;kM*!rwn?;I9KFEueLVd90j}M
z;XG#^8w5wJ`3GT#3q6mu7h6@5UXPjYLk;tT39UPTxDvPb^Hw@=l6g+#4YN*y*_@_H
zHPzEkg^W9&@3ToiN)|71Qn*jmq8TBtXLeOu;2}>(FkyhT>*g=!hYHj*UQ;|YWAGF<$_7I5PBlcEh(|f<$ZY=wzIVxq!
zh5|w^Esb&PIVX)dG?rSTr54ds!~7N0lPx2>>Y<%e3QHAMBm7~dHnuGUT8D6$*8Svu0(3Pllr2foohF>TBM)0q9?z#5o>|FkRw@Ke
z@J%+68MNmG-}4O^*y$xzlL=RBcST}cTE5aM6gJ_|IdiT>O!X|%rYA=75gi{$J;@dd
zXp7dJW`-@qce9^7dmWas?Rx89Wc$bp+ft+&T(*btT4UAQ9KQl~LOKCPhPQM$Yj
zO`K+2sbQrPsmp0TBmo$77j`{c^DdDE@y_*VPEgLQm_nXAXh`>#f6V}Xf_kAW_kN1X
zJ6&x)(X<_NZPI#SniWHb(K#^!Smyic>^jDvv3#_7to{{yw%iHu_uF>|bN*V{A6y`5
zLh1Bja$aHPqTe|8j^fgVToBc?O#dRw*3syof|!gu;Rjob;7oJIajoS^@Z9jr)aM0aN&9}jI%VelOxbeI;QE0>@~k?i{Pk1kr2C#eETr|dk2w8Djz*+v
zyY>kLPu-Mmh3)u(2(e+-cggwiWm*5Abin`;fo+R*tDSSsrVq0fJt*64(~vA*MsE}_
z{u_R{TAmJBXx}LGCXxN%h@zNbCC~a(Fcb`iS{l9T38KUbLJftri^Pj8iziDm-_Ds2
z$3PJ!==(uft#YbDr=}>_A|>2sOcQEYWJ>-DsA0(`hafB?;Iwg;5&+<0HU*yfYyWYuivn6@#*
zzZH7>wXk%G2#71|9et`RiG!=UB?_i34G^UybIYj6a9hF(4xcOGYO%sT0ejO=ernD<
zQ3|ZIqpt(R>F5lXz+!C5+;|OF7i6Uc^qAQ?MsoxW@`dfRn*o$8k#x#em;`W4zq%r&
zobEw9@lo@4k&-i
z`)!&%XW$f94G?l(|L%ll)gT{9Y+y<@hs9W24~K@MYrEEjdSMHxN|6cFELtZY{%g7l
zvi_R5lB2hrb{9E%#yTY17Vhzw7TJ;bTCwr7WI-#OZ-!M`!JX!!sH*6&t&~{Xq7s-V
z47>lLuDm2ulZec9YAPY0K01#@A;<7`^sq6)4c$u1(QC5-Ua5?Cc?>fq5%YmefTwra
z5&<_x&FFzY0JjeI-f*#CnFK90Z`sF&7y#;xM41FKSf+XR^blsZK7@uQ1Ws%5qk(b9S*_*7JxFELPJ35{#Qj`<^9HIuukbAhX%mm4NG}(4@iWjg_*7Zr9Qv$_I1wmJ1?i)YI{RBVuNg#|LZNgJ|LbqvCDdUAs6&Mgt8#vOywh^v|8_4Y;
z#OK+n)@T<)
zELTwEcWz!jRo3bE9-Vcw1+CY2bzn$kg}@6x49UbQvJa|0@%wz|x@Bbfq_KM_%vkFd>RLED
zq2k@X%6fx-xe@6Jlf2_h<=KL7l=A`q_~GlylcMp4R~LHd$!yqyx_?`q>1)~yp^`h2
zzn3kXBHGse^)R;(azaTrD!hv;(e$w;u%y*sEZB;Ti98{LumGWiXChW?clgb!u4_%+k@Tp9J(-xmnY`Tuth2++&Q^tKQYj(;@5q<6j6&{o9D(CfqCwEp2ijbn#
z;(N&GUl?%MQltkp3**GvwvNVvQ}n+mMbkMfxDs=BD7(QzBsMT~5;^rk(32%y2KBcyKp-_;6f+;u{yh^sMf!a
zS}3vndw=tlsU`NMcqXS_>s@>gSY2;
ziIp4(L<7zKPNmpNjc<2waKfAo
zBsbNCyJTtnnr2EbdRLf59prdw|F250n6=a{cWNgjH)oRh^_X-64AEWk;&0(Kphx200_;s`v*!+&F|3XttvYGA_hD_*-uUsRFt4d
zEi$BdAi#(hU?%~<&;hX2fLI81Iz~D3&p3=FhF3O=$1aYiD2r#ZB8}p`1~qxBB03cd
z@r+&#Z(7)1WHc2z=GA0DzDs)O{7BS$n!mc8SA8Jk4w9CU{iwrN@GgS^(
znvyED@7u%Rhb2}oHxr<-gx1&msPBAwW$4a=4FqvC!o`gO^Py>Jh
z!gv_gDFAUdf=7Ib$5Y~7Z7kE;;y~Pvf`z}oRo%0U+&|-SH+q?~wSbLq;ItO-zyN_q
zM0R~l$>yOZUsa%~lX>1-8@J(&HP%%t8
zWzcg1_V45brwnJ(;5CK_$bY54LBTQHKBi+FT+OCU<`QHG8-!LDEN-?WQ-L&izI|Wl
zi7AQWFA$0uD@iP4f^rDzU4x+HX_zYh=_c98`(vq2%U3)L>d?hqfBwNEbQkdajbHs3
z;U11~FK*q{nufCX`C6*O-C8?(=6rfeH@ZDuzDpDubB~z$q`9t~ZTO6bj_AypFEHihoBT^O01HdJEQKbYm|$_;BUv8mqH`4
zAoe)&W7^~a3(%_j7y0tc<6%N8zX92m>ALfyy4HzTW1zZkP;;34
zW!_;#IpQ8%BfdKphJ`gfnhSaXNDdz?vEmG#5O9lcD>Bl!u>t(erVSvb?U?z