From bec47dd32da404f40e4f4ba5bfe61245fe5e728d Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Sat, 9 Nov 2024 17:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 .idea/easycode/codebase-v2.xml                |   6 +
 .idea/other.xml                               | 329 ++++++++++++++++++
 .../bnframework/business/ConfigData.java      |  38 +-
 .../business/ExecuteTheRecipe.java            |  42 ++-
 .../bonait/bnframework/business/MainInit.java |  10 +-
 .../common/constant/ConfigName.java           |  29 +-
 .../db/util/GoodsProcessDetailDBUtil.java     |   4 +-
 .../newui/activity/DiyProcessHActivity.java   |  19 +-
 .../classify/ClassifySpinnerAdapter.java      |   6 +-
 .../adapter/other/FoodPosSelectAdapter.java   |  67 ++++
 .../newui/dialog/check/FoodInfoDialog.java    | 152 ++++++++
 .../newui/dialog/check/FoodInfoDialog2.java   | 142 ++++++++
 .../newui/dialog/check/FoodInfoDialog3.java   | 140 ++++++++
 .../dialog/control/FoodPosSetDialog.java      |   4 +
 .../dialog/control/WokControlDialog.java      |  44 ++-
 .../calssify/GoodEditClassifyFragment.java    |  33 ++
 .../fragment/goods/CloudGoodsHFragment.java   |  43 +++
 .../fragment/goods/LocalGoodsHFragment.java   |  39 +++
 .../fragment/main/HomeOrderFragment.java      |  48 +++
 .../newui/http/UpdateAllDataService.java      |   2 +
 .../newui/http/UpdateDataService.java         |   4 +
 .../newui/viewmodel/HomeGoodsViewModel.java   |   2 +-
 .../newui/widget/FoodPosSetView.java          |   6 +-
 .../main/res/drawable/bg_round_white_btn.xml  |  15 +
 .../layout/item/layout/item_food_select.xml   |  29 ++
 .../new/layout/dialog_chaoguo_control.xml     |   7 +-
 .../new/layout/dialog_food_pos_select.xml     |  68 ++++
 .../new/layout/fragment_cloud_goods_h.xml     |  16 +-
 .../layout/fragment_good_edit_classify.xml    |  27 +-
 .../new/layout/fragment_local_goods_h.xml     |  16 +-
 31 files changed, 1295 insertions(+), 96 deletions(-)
 create mode 100644 .idea/easycode/codebase-v2.xml
 create mode 100644 .idea/other.xml
 create mode 100644 app/src/main/java/com/bonait/bnframework/newui/adapter/other/FoodPosSelectAdapter.java
 create mode 100644 app/src/main/res/drawable/bg_round_white_btn.xml
 create mode 100644 app/src/main/res/layout/item/layout/item_food_select.xml
 create mode 100644 app/src/main/res/layout/new/layout/dialog_food_pos_select.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 574b7989..d9719869 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-09-23T03:31:50.481919400Z">
+        <DropdownSelection timestamp="2024-11-09T05:59:25.231451600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=192.168.6.99:5555;connection=46812695" />
+              <DeviceId pluginId="Default" identifier="serial=127.0.0.1:7555;connection=3e6e6b9b" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/easycode/codebase-v2.xml b/.idea/easycode/codebase-v2.xml
new file mode 100644
index 00000000..e43b8cad
--- /dev/null
+++ b/.idea/easycode/codebase-v2.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="com.obiscr.chatgpt.settings.EasyCodeState">
+    <option name="projectFiles" value="$PROJECT_DIR$/app/release/output-metadata.json;D:/AndroidStudioGit/shanghai/app/src/main/assets/error_code.json;D:/AndroidStudioGit/shanghai/app/src/main/assets/litepal.xml;D:/AndroidStudioGit/shanghai/app/src/main/java/android_serialport_api/SerialPort.java;D:/AndroidStudioGit/shanghai/app/src/main/java/android_serialport_api/SerialPortFinder.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/api/Api.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/api/CmsResponse.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/api/CommonResponse.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/api/Constant.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/api/IApi.kt;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/api/IHttpCallBack.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/api/ServerManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/business/address/PlcAddress.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/business/ConfigData.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/business/MainInit.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/business/PlcReadHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/business/ReadModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/business/RecordManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/base/BaseActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/base/BaseFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/base/BaseFragmentActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/base/BootReceiver.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/bg/mode/ColorUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/bg/mode/SnowBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/bg/mode/StarBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/bg/SnowView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/bg/StarView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/constant/ConfigName.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/constant/Constants.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/constant/DataBus.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/constant/MessageName.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/constant/SPConstants.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/EnumMode/StatusEnum.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/file/DBHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/file/Feild.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/file/Table.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ALERTLOG.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ATTRIBUTE.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_CALIBRATION_PAR.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_CLOUDDATA.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_CRAFT.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_CRAFTPROCESS.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_GOODS.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_GOODS_CLASSIFY.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_GOODS_OLD.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_GOODS_PROCESS_DETAIL.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_GOODS_SUBATTRIBUTE_GROUP.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_GOODSRECIPE.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_LOG.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_LOG_RECORD.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_MATERIAL.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_MATERIAL_TYPE.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_MENU.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_MENUANDUSER.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ORDER.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ORDER_DETAIL.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ORDER_LIST.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ORDER_RECORD.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ORDERLOG.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_ORDERLOGDESC.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_PLCADDRESS.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_PROCESS.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_PROCESSModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_PROPERTY_CLASSIFY.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SILOS.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SILOS_CALIBRATE.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SILOSANDMATERIAL.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUBATTRIBUTE.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUBORDER.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUBORDER_RECORD.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SUGAR.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_SYSTEMSET.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/BPA_USER.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/ModeBase.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/mode/Res_PLCADDRESS.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/AlertLogEnum.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/lcMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/mainGoods.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/MakeStatus.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/MenuMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/ResAlertLog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/ResGoodsMake.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/ResGoodsRecipe.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/ResLog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/ResReceiveOrder.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/ResSilosMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/ResSubOrder.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/StatusMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/res/UserLogEnum.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/AttributeDBUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/DBListDataUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/GoodsClassifyDBUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/GoodsDBUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/GoodsProcessDetailDBUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/LogRecordUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/MaterialUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/OrderDetailUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/OrderListUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/OrderRecordUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/PlcAddressUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/ProcessModelUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/PropClassifyDBUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/SubAttributeDBUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/SubAttributeGroupDBUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/util/SubOrderRecordUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/db/QueryDB.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/adapter/AllFileAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/adapter/CommonFileAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/adapter/FilePickerShowAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/adapter/FilePickerViewHolder.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/adapter/OnDeleteListener.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/adapter/OnFileItemClickListener.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/model/FileEntity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/model/FileType.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/util/FileComparator.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/util/FileUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/util/OpenFile.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/FileAllFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/FileCommonFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/FileScannerTask.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/FileSelectFilter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/OnUpdateDataListener.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/filepicker/PickerManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/glide/transform/FitXYRoundRadiusTransform.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/glide/transform/GlideBorderTransform.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/glide/transform/GlideRoundTransform.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/glide/transform/RoundRadiusTransform.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/glide/transform/TransformationFitXYUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/glide/GlideUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/glide/MyAppGlideModule.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/IMessage.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/IMessageLogNotify.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/IReadCallBack.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/IRun.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/IRunT.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/IThread.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/IWriteCallBack.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/I/MyClickListener.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/BatchingsInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/Batchingstechnology.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/BPA_GoodsInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/BPA_HeartPackage.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/BPAPackage.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/GoodsBom.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/Message_HeartModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/OrderA.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/OrderStatusChange.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/PushDeviceGoods.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/ReceiveOrder.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/ResultA.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/ResVersion.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/RunStatusModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/SuOrderA.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/VersionMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/mode/VersionResponse.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/ActiveMax.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/AES.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/ByteHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/CharacterParser.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/ConfigUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/CountDownTimer.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/CountDownTimerExt.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/CRCHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/DataFormat.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/DataHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/DateUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/DateUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/FileUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/FlashHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/HttpUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/Json.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/MQTT.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/MY.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/MyImage.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/MyImageView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/SdCart.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/SortTools.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/Tools.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/Utils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/helper/WrapContentLinearLayoutManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/bitmap/BitmapDialogCallback.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/files/FileProgressDialogCallBack.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/files2/FileCallback2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/files2/FileConvert2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/files2/FileProgressDialogCallBack2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/json/JsonCallback.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/json/JsonConvert.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/json/JsonDialogCallback.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/callback/strings/StringDialogCallback.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/exception/TokenException.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/http/GsonConvert.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/image/utils/LocalCacheUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/image/utils/MD5Encoder.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/image/utils/MemoryCacheUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/image/utils/NetCacheUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/image/MyBitmapUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/interfaces/OnDoIntListener.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/iot/manager/IDemoCallback.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/iot/manager/InitManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/iot/manager/MD5Util.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/iot/manager/ToastUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/iot/mode/AppLog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/iot/mode/DeviceInfoData.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/iot/AliyunIOTManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/message/MessageLooper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/message/MessageManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/message/testmode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/ActionJsonMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/ActionTypeEnum.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BaseCodeJson.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BaseJson.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BatchingInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BomInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BomTechnologyActionInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BomTypeInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BPA_GoodsAttributeValue.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/BPA_GoodsTechnologyAction.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/CloudGood.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/DeviceInformation.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/DicModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/FoodMenuInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/GoodBomInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/GoodsParentTypeInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/GoodsTechnology.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/GoodsTypeInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/GoodsUintInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/InPage.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/InputDev.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/KeyConfig.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/MouthFacingEnum.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/OrganizeMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/ProcessT.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/ResALLData.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/ResGoodProcess.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/SimpleBaseJson.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/SimpleCodeJson.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/SpeedEnum.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/TechnologyAction.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/TechnologyValueMode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/UpdateBomInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/UpdateCloudGood.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/mode/VersionSelectionEnum.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/AddrType.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/PageAPI.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/PageListAPI.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/ResAPI.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/model/ResListAPI.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/CircleProgress.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/CustomSeekbar.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/HorizonalProgress.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/MyProgress.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/ResponseOnTouch.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/SlideSelectView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/WaveProgressView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/myprogress/WaveView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/notification/DownloadNotification.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/notification/MainNotification.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/oss/OssHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/oss/OssManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/AdbCommandUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/AlertDialogUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/AnimationToolUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/AppFileUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/AppUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/CookTimeUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/Des3Utils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/DimensUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/DisplayManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/FileUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/KeyboardToolUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/LogLongUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/MediaFileUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/NetworkUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/PreferenceUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/ProcessValueUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/ScreenUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/ToastUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/UpdateAppUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/UriUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/utils/WifiInterceptor.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/AddUserDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/BottomNavigationBar.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/CircleImageView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/ClearEditTextView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/GoodEditDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/MyImageDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/MyLayoutManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/QMAutoDialogBuilderView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/view/RoundCornerImageView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/watermark/WaterMarkBg.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/watermark/WaterMarkInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/watermark/WaterMarkManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/common/watermark/WaterMarkView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/FreshLocalGoodPicEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/FreshLocalGoodsEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/FreshOrderEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/FreshOrderStatusEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/ImageSelectEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/MakingStepEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/ProcessMakingEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/event/SerialButtonEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/API/APIHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/API/APIResult.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/API/APIResultT.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/API/Utils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Modbus/ExceptionServer.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Modbus/IExceptionHandling.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Modbus/IModbusMaster.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Modbus/IRead.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Modbus/IWrite.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Modbus/ModbusMaster.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Siemens/CommHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/Siemens/SiemensHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Communication/CommBase.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/CustomView/ShadowContainer.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/ByteLib.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/ByteTransDataFormat.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/Convert.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/DataConvertLib.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/DataType.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/ErrorCodeManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/ErrorCodeUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/FloatLib.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/IntLib.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/NotifyPropVar.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/DataUtil/ShortLib.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Dialog/AlertDialogButton.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Dialog/DialogActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Dialog/DialogManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Dialog/DialogType.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Dialog/DialogView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Dialog/IDialogAction.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Enum/DataFormat.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Interface/IRun.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Interface/IRunT.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Interface/IRunT2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Logs/IMessageLogNotify.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Logs/MessageLog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Result/IResult.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Result/OperateResult.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Result/OperateResultT.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Result/ResultCode.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Thread/IThread.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Thread/IThreadComplete.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Thread/ThreadManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Thread/ThreadModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Trig/RTrig.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/Executor.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/NetworkUtils.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/HBL/NotifyEvent.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/manager/ActivityLifecycleManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/modbus/ModbusCenter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/modbus/ModbusTcpHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/modbus/RackModbusTcpServer.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/modbus/RobotModbusTcpServer.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/modbus/Wok1ModbusTcpServer.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/modbus/Wok2ModbusTcpServer.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/GoodsDataInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/GoodsProcessDetail.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/MaterialDataInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/ProcessModelBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/UpAttributeBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/UpBaseBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/UpClassifyBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/UpGoodsClassifyBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/UploadRes.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/upload/UpResData.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/AppLoginPo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/CheckPositionBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/DeviceInfoBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/DeviceRecordBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/ErrorCodeBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/GoodsClassifyBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/GoodsData.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/GoodsInfoBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/MaterialData.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/MaterialModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/MaterialModelType.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/MaterialRequestPar.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/MaterialTypeData.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/MyStatus.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/OrderRecordBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/ProcessValueUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/SerialBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/UpdateAppPo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Model/UserInfo.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/CookingHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/DiyProcessHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/DiyProcessOvenActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/EditClassifyHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/EditClassifyTabActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/EditGoodsHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/FileActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/ImageChooseActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/LoginHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/LogRecordHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/MainHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/OrderRecordHActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/SetSeasoningActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/SystemSetActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/activity/WelcomeActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/base/BaseAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/base/FragmentAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/base/GuidePageAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/AttributeHAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/ClassifySpinnerAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/GoodClassifyAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/GoodsClassifyAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/SelectAttributeListAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/SelectSubAttributeAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/SubattributeHAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/CloudGoodsAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/HomeGoodsAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/goods/LocalGoodsAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/order/FoodInfoAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/order/OrderInfoAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/order/OrderNameAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/other/DiyStepAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/other/image_sp_adapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/other/TabAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/record/DeviceRecordAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/record/LocalLogAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/record/OrderAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/record/SubOrderAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/silos/MaterialAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/silos/SilosAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/warn/WarnInfoAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/adapter/warn/WarnRecordAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/bean/item_gx.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/add/AddGoodsDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/add/AddOrderDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodCheckDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodCheckDialog2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodCheckDialog3.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog3.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/RootTipDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/RootTipDialog2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/RootTipDialog3.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/check/SubOrderDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/control/ChuCanCheckDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/control/FoodPosSetDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog2.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/control/RobotControlDialog3.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/control/SilosInfoDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/control/WokControlDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/edit/AttributeSelectDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/edit/EditGoodsHDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/dialog/WaiteProgressDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/calssify/GoodEditClassifyFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/calssify/PropEditClassifyFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/cooking/CookingFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/CloudGoodsHFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/LocalGoodsHFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeDevicesFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeGoodsFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeMainsFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeOrderFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/main/HomeWarnFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/setting/DeviceSetFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/setting/MaterialFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/setting/PicManagerFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/setting/PlcAddressFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/setting/SceneSetFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/fragment/setting/SilosSettingFragment.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/http/UpdateDataService.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/viewmodel/HomeGoodsViewModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/DeviceStatusView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/FireControlView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/FocusBorderView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/FoodPosSetView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/image_sp.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/imagebuttom.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/imagebuttom3.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/jingdutiao.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/NewToastUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/NonSwipeableViewPager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/PlcControlView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/ProcessValueView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/SilosProcessBarView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/SmoothLayoutManager.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/WaitProcessUtil.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/newui/widget/XComDialog.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/oldui/activity/LogRecordActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/oldui/activity/OrderRecordActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/oldui/adapter/step/StepAdapter.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/oldui/widget/FireView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/oldui/widget/PlcAddressView.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/serial/AssistBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/serial/ComAssistantActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/serial/ComBean.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/serial/MyFunc.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/serial/SerialHelper.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Service/AnalogConvert.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Service/ControlAdress.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Service/Func.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Service/OperationModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/Service/PLCModel.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/test/Test.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/test/TestActivity.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/CrashHandler.java;D:/AndroidStudioGit/shanghai/app/src/main/java/com/bonait/bnframework/MainApplication.java;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_bottom_in.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_bottom_out.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_left_in.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_left_out.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_right_in.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_right_out.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_rotate.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_scale_in.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_scale_out.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_top_in.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/anim_top_out.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/dialog_enter_anim.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/dialog_exit_anim.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/interpolator_slight_anticipate.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/interpolator_slight_overshoot.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_in_from_bottom.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_in_from_top.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_left_in.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_left_out.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_out_to_bottom.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_out_to_top.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_right_in.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/anim/slide_right_out.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/color/s_app_color_blue_2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/color/s_app_color_gray.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/color/s_btn_blue_bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/color/s_btn_blue_border.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/color/s_btn_blue_text.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/color/s_topbar_btn_color.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/all_edit_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_blue_box.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_blue_box_click.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_blue_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_blue_pan.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_blue_round15_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_blue_wan.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_blue_wan_click.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_bottom_line.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_box_click.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_box_click2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_box_click3.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_btn_cancel.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_btn_dialog_qupenren.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_btn_login_selected.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_btn_normal.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_btn_run_anim.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_btn_run_anim_looper.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_btn_select.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_check_circle_select.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_circle_green.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_circle_red.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_circle_yellow.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_dash_line.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_device_position_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_gray_round0.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_gray_round15.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_home_title_yellow.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_kaopan_check.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_left_round_green.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_left_round_red.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_liaohe_check.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_main_food_position_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_order.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_order_blue_right_top.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_order_red.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_order_select.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_order_sort.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_pen_check.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_process_bar_green.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_process_bar_white.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_process_bar_yellow.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round10_red_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round10_yellow2_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round10_yellow_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round15_blue_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round15_red_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round15_yellow_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round25_blue_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round25_gray_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round25_green_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round25_red_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round25_top_yellow.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round25_white.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round25_yellow_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_green_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_left_gray_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_left_green.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_left_green_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_red_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_right_green.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_right_green_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round50_yellow_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_round_penren_btn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_step_bord.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_stroke_gray.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_tab_text.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_tab_text_color_selector.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_tab_title.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_tab_title_select.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_tab_title_textcolor_select.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_text_click_blue_round10.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_text_normal_gray_round10.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_text_normal_yellow_round10.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_text_round50_white.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_top_round25_yellow.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bg_white_15.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/border1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bottom_line.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/bt_circular.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/button.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/button1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/circular11.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/common_bg_with_radius_and_border.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/cp_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/delete_selector.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/dialog_back.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/dialog_error_title_back.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/dialog_info_title_back.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/dialog_warn_title_back.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/diy_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/edit_bord.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/fire_progress.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/gongyi_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/goodpf_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/home_waitcourse_yellow_shape.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/hr_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/huanxing.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/ic_dashboard_black_24dp.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/ic_home_black_24dp.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/ic_launcher_background.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/ic_notifications_black_24dp.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/icon_deviceinformation.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/icon_home1_selector.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/icon_home2_selector.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/icon_home_my_selector.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/icon_networkmanagement.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/icon_seasoningsettings.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/icon_systemsettings.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/input_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/input_bj1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/item_text_selector_bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/item_text_selector_color.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/layer_list_progress_vertical_high.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/makestartbj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/order_progressbar.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/progress_gj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/progress_zc.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/progressbar.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/qmui_list_item_bg_with_border_bottom.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/qmui_list_item_bg_with_border_top.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/qs_switch.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/qs_textcolor.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/radius_button_bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/radius_button_bg_pressed.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/s_radius_button_bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/selector_bop_bar_textcolor.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/selector_select_step_text_bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/selector_select_step_text_color.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/selector_select_sub_attribute_bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/selector_select_sub_attribute_color.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/selector_text_click_blue_round10.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/selector_text_click_yellow_round15.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/silosbj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/spinner_border.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/spinner_white_border.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/ssk.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/sz_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/tab_panel_bg.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/welcome.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/wh_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/yijianbj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/yjyy.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/zailaiyibei.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/zy_bj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable/zybj.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/drawable-v24/ic_launcher_foreground.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/gx_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/gx_item1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/lcsz_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/material_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/process_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/processchid_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/silos_calibrate_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/silos_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/layout/user_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/datatab/values/strings.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_add_classify.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_add_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_attribute_select.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_delete_classify.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_device_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_edit_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_log_desc.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_progress_waite.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_rec_save_process.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/dialog_sub_order.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/item_h90_spinner_dropdown_text32.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/item_h90_spinner_text32.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_add_goods_mainfood.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_add_goods_name.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_add_goods_sel_classify.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_edit_goods_name.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_edit_goods_sub_attribute.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_fire_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_food_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_silos_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_stir_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog/layout/layout_updown_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/bottom_navigation.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/devstatus.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/dialog_edit.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/dialog_qupenren.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/dialog_silos_message.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/dialog_user.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/fragment_file_all.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/fragment_file_normal.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/fragment_item_gx.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/fragment_item_plc.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/fragment_item_plc_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/fragment_item_silos_cl.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/good_show.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/imagedialogview.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_attribute.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_classify.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_cloud_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_device_record.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_file_picker.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_file_picker_show.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_fire_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_huolikongzhi.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_huolikongzhi1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_image_sp.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_imagebuttomnew.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_imagebuttomnew1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_imagebutton.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_jingdutiao.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_jingdutiao1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_liaochang.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_local_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_log.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_order.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_rec_process.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_select_attribute_list.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_select_subattribute.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_sp.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_spinner_text.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_step.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_step_desc.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/item_subattribute.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/newgx_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/newgx_item1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/note_rv_tree_second.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/plcstatus.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/spinner_dropdown_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/spinner_dropdown_item_text_size26.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/spinner_text_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/spinner_text_item_text_size26.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/toast_layout.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/view_layout_error_toast.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/view_layout_toast.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/view_plc_address.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/view_process_value.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/item/layout/view_water_mark.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_cook_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_edit_classify_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_edit_classify_tab.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_edit_process_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_edit_process_oven.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_log_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_login_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_main_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/activity_order_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_add_classify_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_add_name.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_add_order.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_chaoguo_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_chucan_check.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_edit_goods_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_check.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_check2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_check3.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_control2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_control3.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_info.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_info2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_info3.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_food_pos_set.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_log_desc_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_order.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_oven_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_root2_tip.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_root3_tip.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_root_tip.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_tip.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/dialog_wok_tip.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_cloud_goods_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_cooking.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_cooking2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_good_edit_classify.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_home_device_debug.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_home_foods_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_home_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_home_mains.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_home_order.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_home_warn_info.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_local_goods_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_prop_edit_classify.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/fragment_silos_setting.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_attribute_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_food_info.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_home_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_order_info.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_order_name.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_subattribute_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_tab.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_warn.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/item_warn_info.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_add_goods_control_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_edit_goods_sub_attribute_h.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_fires_view.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_goods_sub_attribute.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_goods_sub_attribute2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_huojia.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_huojia2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_huojia3.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_process_bar_silos.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_root_tip0.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_root_tip1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_root_tip2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_root_tip2_2.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_root_tip2_3.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/layout_root_tip3.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/view_device_status.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/new/layout/view_food_pos_set.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_cook.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_cooking_new.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_device_record.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_dialog.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_diy_update1.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_edit_classify.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_edit_process.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_error_info.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_file.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_image_choose.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_log.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_login.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_main.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_order.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_rec_process.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_seasoning_set.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_serial_test.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_system_set.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_sz.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_test.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_user.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/activity_welcome.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog_silos_calibrates_edit.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog_silos_edit.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog_silos_name_edit.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/dialog_with_cancel_confirm.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_cloud_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_home_device.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_home_devices.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_home_foods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_home_main.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_local_goods.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_material.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_material_set.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_plc_address.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_scene_set.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_silos.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_silos_item.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_system_device.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_system_devicein.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/fragment_system_internet.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/season_jiaozhun_layout.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/layout/view_device_control.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/menu/maintenance.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/menu/navigation.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/menu/system.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/array.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/attr.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/attrs.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/baudrates.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/colors.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/dimens.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/ids.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/strings.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/styles.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values/themes.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values-en/strings.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/values-night/themes.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/xml/app_provider_paths.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/xml/fileproviderpath.xml;D:/AndroidStudioGit/shanghai/app/src/main/res/xml/network_security_config.xml;D:/AndroidStudioGit/shanghai/app/src/main/AndroidManifest.xml;D:/AndroidStudioGit/shanghai/README.md" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 00000000..49481ad4
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="direct_access_persist.xml">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="Lenovo" />
+          <option name="codename" value="TB370FU" />
+          <option name="id" value="TB370FU" />
+          <option name="manufacturer" value="Lenovo" />
+          <option name="name" value="Tab P12" />
+          <option name="screenDensity" value="340" />
+          <option name="screenX" value="1840" />
+          <option name="screenY" value="2944" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="caiman" />
+          <option name="id" value="caiman" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="960" />
+          <option name="screenY" value="2142" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="comet" />
+          <option name="id" value="comet" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro Fold" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="2076" />
+          <option name="screenY" value="2152" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="e1q" />
+          <option name="id" value="e1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S24" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="komodo" />
+          <option name="id" value="komodo" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9 Pro XL" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q6q" />
+          <option name="id" value="q6q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="SM-F956B" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1856" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tokay" />
+          <option name="id" value="tokay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2424" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java
index ba5b71cb..5e47bd62 100644
--- a/app/src/main/java/com/bonait/bnframework/business/ConfigData.java
+++ b/app/src/main/java/com/bonait/bnframework/business/ConfigData.java
@@ -1055,18 +1055,6 @@ public class ConfigData {
             plcaddresses.addAll(ConfigName.getInstance().PlcAddress_Rack);
             plcaddresses.addAll(ConfigName.getInstance().PlcAddress_Robot);
             List<ProcessT> processTS = ConfigName.getInstance().Process_800炒锅;
-            List<ProcessT> processTS2 = ConfigName.getInstance().Process_烤箱;
-
-//            if (ConfigName.getInstance().versionSelectionEnum.equals("大炒版本")) {
-//                plcaddresses = ConfigName.getInstance().PlcAddress_大炒;
-//                processTS = ConfigName.getInstance().Process_大炒;
-//            } else if (ConfigName.getInstance().versionSelectionEnum.equals("大炒自动投料版本")) {
-//                plcaddresses = ConfigName.getInstance().PlcAddress_大炒自动投料;
-//                processTS = ConfigName.getInstance().Process_大炒自动投料;
-//            } else if (ConfigName.getInstance().versionSelectionEnum.equals("小炒版本")) {
-//                plcaddresses = ConfigName.getInstance().PlcAddress_小炒;
-//                processTS = ConfigName.getInstance().Process_小炒;
-//            }
 
             //region 恢复PLC
             DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_PLCADDRESS.class,null);
@@ -1103,32 +1091,16 @@ public class ConfigData {
                     processModel.name = item;
                     processModel.sort = chidindex;
                     processModel.data = ConfigName.getInstance().GetProcessTypeVal(item);
-                    processModel.datatype = ((item.contains("名称") ? 1 : (processModel.data.isEmpty() ? 0 : 2)));
+                    if(item.contains("名称")||item.contains("描述")||item.contains("重量")||item.contains("温度")){
+                        processModel.datatype = 1;
+                    }else {
+                        processModel.datatype = (processModel.data.isEmpty() ? 0 : 2);
+                    }
                     QueryDB.AddProcessModel(processModel);
                     chidindex++;
                 }
                 index++;
             }
-            for (ProcessT key : processTS2) {
-                List<String> values = key.val;
-                BPA_PROCESS process = new BPA_PROCESS();
-                process.sort = index;
-                process.name = key.name;
-                process.type = 1;
-                QueryDB.AddProcess(process);//增加模型
-                int chidindex = 1;
-                for (String item : values)//模型
-                {
-                    BPA_PROCESSModel processModel = new BPA_PROCESSModel();
-                    processModel.processid = process.id;
-                    processModel.name = item;
-                    processModel.sort = chidindex;
-                    processModel.data = ConfigName.getInstance().GetProcessTypeVal(item);
-                    processModel.datatype = ((item.contains("名称") ? 1 : (processModel.data.isEmpty() ? 0 : 2)));
-                    QueryDB.AddProcessModel(processModel);
-                    chidindex++;
-                }
-            }
 
         } catch (Exception ex) {
 
diff --git a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
index f5ff7ede..fb286e96 100644
--- a/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
+++ b/app/src/main/java/com/bonait/bnframework/business/ExecuteTheRecipe.java
@@ -143,7 +143,6 @@ public class ExecuteTheRecipe {
                             }else if(orderDetail.type==2){
                                 Wok2ModbusTcpServer.get().WriteBool("M52.0", (boolean) false, null);
                             }
-                            ConfigName.getInstance().IsOpenHuoLi = false;
                             long endTime = System.currentTimeMillis(); //结束时间
                             int time = (int) ((endTime - startTime) / 1000);
                             Log.e("运行时长", String.format("方法使用时间 %d s", time));
@@ -647,11 +646,30 @@ public class ExecuteTheRecipe {
         LogUtils.d(TAG+" BottomClick1 name="+name);
         try {
             Log.e("按钮按下", name);
-            WritePLC(deviceNum,name, true, null);
-            RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-BottomClick1-"+name+":true");
+            WritePLC(deviceNum, name, true, new IWriteCallBack() {
+                @Override
+                public void onSuccess() {
+                    RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-BottomClick1-"+name+":true onSuccess");
+                }
+
+                @Override
+                public void onFailure(String ErrorMsg) {
+                    RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-BottomClick1-"+name+":true onFailure");
+                }
+            });
+
             Thread.sleep(800);
-            RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-BottomClick1-"+name+":false");
-            WritePLC(deviceNum,name, false, null);
+            WritePLC(deviceNum, name, false, new IWriteCallBack() {
+                @Override
+                public void onSuccess() {
+                    RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-BottomClick1-"+name+":false onSuccess");
+                }
+
+                @Override
+                public void onFailure(String ErrorMsg) {
+                    RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-BottomClick1-"+name+":false onFailure");
+                }
+            });
             Log.e("按钮复位", name);
         } catch (Exception ex) {
             Log.e("按钮异常", name + ex.getMessage());
@@ -682,10 +700,8 @@ public class ExecuteTheRecipe {
                         public void onSuccess() {
                             RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-档位-"+finalWriteValue+":成功");
                             if (finalWriteValue == 0) {
-                                ConfigName.getInstance().IsOpenHuoLi = false;
                                 WritePLC(deviceNum,"加热", false, null);
                             } else {
-                                ConfigName.getInstance().IsOpenHuoLi = true;
                                 WritePLC(deviceNum,"加热", true, null);
                             }
                         }
@@ -695,10 +711,8 @@ public class ExecuteTheRecipe {
                             RecordManager.getInstance().addLogRecord("订单处理日志",deviceNum+"号炒锅("+deviceNum+")-档位-"+finalWriteValue+":失败");
                             WritePLC(deviceNum,key, finalWriteValue, null);
                             if (finalWriteValue == 0) {
-                                ConfigName.getInstance().IsOpenHuoLi = false;
                                 WritePLC(deviceNum,"加热", false, null);
                             } else {
-                                ConfigName.getInstance().IsOpenHuoLi = true;
                                 WritePLC(deviceNum,"加热", true, null);
                             }
                         }
@@ -1133,6 +1147,7 @@ public class ExecuteTheRecipe {
 
             if (isJre && ConfigName.getInstance().WhetherManualFeedingSuspended.contains("是")) {
                 WritePLC(deviceNum,"加热", true, null);
+
             }//再次释放加热
 
             Make位置(deviceNum,czwz);
@@ -1162,7 +1177,9 @@ public class ExecuteTheRecipe {
                     ThreadDelay(deviceNum,val,"Write_PLC_MainOutdishes");
                 }
             }
+
             WritePLC(deviceNum,"加热", false, null);
+
             showlog("关闭搅拌、关闭加热！");
             if(!ConfigName.getInstance().versionSelectionEnum.equals(SceneSetFragment.deviceName4)){
                 ThreadWhileFalse(deviceNum,"输送线进料菜盆检测");
@@ -1419,11 +1436,14 @@ public class ExecuteTheRecipe {
             WritePLC(deviceNum,"加热功率", data, new IWriteCallBack() {
                 @Override
                 public void onSuccess() {
+                    if(deviceNum==1){
+                        ConfigName.getInstance().fireNum1 = data+"";
+                    }else if(deviceNum==2){
+                        ConfigName.getInstance().fireNum2 = data+"";
+                    }
                     if (data == 0) {
-                        ConfigName.getInstance().IsOpenHuoLi = false;
                         WritePLC(deviceNum,"加热", false, null);
                     } else {
-                        ConfigName.getInstance().IsOpenHuoLi = true;
                         WritePLC(deviceNum,"加热", true, null);
                     }
                 }
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 8b87a160..12c772df 100644
--- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java
+++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
@@ -175,11 +175,11 @@ public class MainInit {
 
 //        DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_SILOS.class,null);
 //        DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_SILOSANDMATERIAL.class,null);
-        if(ConfigName.TEST){
-            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_SILOS.class,null);
-            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_MATERIAL.class,null);
-            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_SILOSANDMATERIAL.class,null);
-        }
+//        if(ConfigName.TEST){
+//            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_SILOS.class,null);
+//            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_MATERIAL.class,null);
+//            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_SILOSANDMATERIAL.class,null);
+//        }
         //4个料仓
         if (QueryDB.GetSilosALL().isEmpty()) {
             for (int i = 0; i < 4; i++) {
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 b805d0d9..28256d8a 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
@@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class ConfigName {
     //是否是测试模式
-    public final static boolean TEST = false;
+    public final static boolean TEST = true;
     //崩溃重启
     public final static boolean ERROR_ROOT = false;
     //日志打印
@@ -110,7 +110,8 @@ public class ConfigName {
     /**
      * 火力
      */
-    public String fireNum = "";
+    public String fireNum1 = "";
+    public String fireNum2 = "";
     /**
      * 翻炒速度
      */
@@ -764,16 +765,17 @@ public class ConfigName {
      * 炒锅工序模型
      */
     public List<ProcessT> Process_800炒锅 = new ArrayList<ProcessT>() {{
-        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("主料名称", "主料位置", "炒制位置","烹饪(秒)","重量","温度","描述1","描述2","描述3")));
+        add(new ProcessT("辅料", Arrays.asList("辅料名称", "辅料位置","炒制位置","烹饪(秒)","重量","温度","描述1","描述2","描述3"
+                ,"描述4","描述5","描述6","描述7","描述8","描述9","描述10","描述11","描述12")));
         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("清洗方式","抽水量(g)","清洗时间(秒)","等待(秒)")));
+        add(new ProcessT("并行出料", Arrays.asList("出料克数","等待(秒)","描述")));
+        add(new ProcessT("延迟", Arrays.asList("延迟(秒)","描述")));
+        add(new ProcessT("出菜", Arrays.asList("等待(秒)","描述")));
+        add(new ProcessT("清洗", Arrays.asList("清洗方式","抽水量(g)","清洗时间(秒)","等待(秒)","描述")));
     }};
     /**
      * 烤箱工序模型
@@ -940,10 +942,7 @@ public class ConfigName {
      * 最大温度：默认温度
      */
     public int MaxTemp=200;
-    /**
-     * 是否打开火力
-     */
-    public boolean IsOpenHuoLi=false;
+
     //endregion
     /**
      * 炒锅状态上报信息
diff --git a/app/src/main/java/com/bonait/bnframework/common/db/util/GoodsProcessDetailDBUtil.java b/app/src/main/java/com/bonait/bnframework/common/db/util/GoodsProcessDetailDBUtil.java
index 3c79d4e4..698eee53 100644
--- a/app/src/main/java/com/bonait/bnframework/common/db/util/GoodsProcessDetailDBUtil.java
+++ b/app/src/main/java/com/bonait/bnframework/common/db/util/GoodsProcessDetailDBUtil.java
@@ -74,8 +74,8 @@ public class GoodsProcessDetailDBUtil {
      *
      * @param data
      */
-    public static void update(BPA_GOODS_PROCESS_DETAIL data) {
-        QueryDB.Update(BPA_GOODS_PROCESS_DETAIL.class, data);
+    public static boolean update(BPA_GOODS_PROCESS_DETAIL data) {
+        return QueryDB.Update(BPA_GOODS_PROCESS_DETAIL.class, data);
     }
 
     /**
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 b83d0029..6a2d6a65 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
@@ -518,9 +518,14 @@ public class DiyProcessHActivity extends BaseActivity {
                 NewToastUtil.getInstance().showToast("修改失败，选中步骤名称不相同！");
                 return;
             }
-            processDetails.set(index_update, getSelectItemFromValue());
+
+            BPA_GOODS_PROCESS_DETAIL detail = getSelectItemFromValue();
+            if(detail != null){
+                NewToastUtil.getInstance().showToast("修改步骤[" + (index_update + 1) + ":" + obj_update.processname + "]成功！");
+                processDetails.set(index_update, getSelectItemFromValue());
+            }
             stepAdapter.notifyDataSetChanged();
-            NewToastUtil.getInstance().showToast("修改步骤[" + (index_update + 1) + ":" + obj_update.processname + "]成功！");
+
         } else {
             NewToastUtil.getInstance().showToast("请先选择步骤！");
         }
@@ -582,13 +587,13 @@ public class DiyProcessHActivity extends BaseActivity {
                     ProcessValueView viw = (ProcessValueView) viewBinding.llProcessValue.getChildAt(i);
                     String values = viw.GetValues();
                     LogUtils.d("getSelectItemFromValue values="+values);
-                    if (values.isEmpty()) {
-                        IsVerify = false;
-                        description.append(viw.model.name).append("不能为空");
-                    } else {
+//                    if (values.isEmpty()) {
+//                        IsVerify = false;
+//                        description.append(viw.model.name).append("不能为空");
+//                    } else {
                         data.append(viw.model.name).append(",").append(values).append("|");
                         desc.append(values).append(",");
-                    }
+//                    }
                 }
             }
             if (IsVerify) {
diff --git a/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/ClassifySpinnerAdapter.java b/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/ClassifySpinnerAdapter.java
index 16576056..17974332 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/ClassifySpinnerAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/adapter/classify/ClassifySpinnerAdapter.java
@@ -53,10 +53,8 @@ public class ClassifySpinnerAdapter extends BaseAdapter {
         }
         TextView textView = convertView.findViewById(R.id.textViewCustom);
         textView.setText(getItem(position));
-        if(!ConfigName.getInstance().versionSelectionEnum.equals(SceneSetFragment.deviceName4)){
-            if(textView.getWidth()==0){
-                DisplayManager.scaleViewGroup(convertView.findViewById(R.id.root));
-            }
+        if(textView.getWidth()==0){
+            DisplayManager.scaleViewGroup(convertView.findViewById(R.id.root));
         }
         return convertView;
     }
diff --git a/app/src/main/java/com/bonait/bnframework/newui/adapter/other/FoodPosSelectAdapter.java b/app/src/main/java/com/bonait/bnframework/newui/adapter/other/FoodPosSelectAdapter.java
new file mode 100644
index 00000000..ffe698c1
--- /dev/null
+++ b/app/src/main/java/com/bonait/bnframework/newui/adapter/other/FoodPosSelectAdapter.java
@@ -0,0 +1,67 @@
+package com.bonait.bnframework.newui.adapter.other;
+
+import android.annotation.SuppressLint;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bonait.bnframework.common.db.mode.BPA_GOODS_PROCESS_DETAIL;
+import com.bonait.bnframework.common.utils.DisplayManager;
+import com.bonait.bnframework.databinding.ItemFoodSelectBinding;
+import com.bonait.bnframework.databinding.ItemStepBinding;
+import com.bonait.bnframework.newui.adapter.base.BaseAdapter;
+
+/**
+ * @author: liup
+ * @description: 主料 辅料名称列表
+ * @date: 2024/5/8 15:36.
+ */
+public abstract class FoodPosSelectAdapter extends BaseAdapter<BPA_GOODS_PROCESS_DETAIL, FoodPosSelectAdapter.ViewHolder> {
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new ViewHolder(ItemFoodSelectBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
+        try {
+            if(holder.binding.getRoot().getWidth()==0){
+                DisplayManager.scaleViewGroup(holder.binding.getRoot());
+            }
+            String value = mData.get(position).processvalue;
+            String[] res = value.split("\\|");
+            for (String s:res) {
+                if (s.contains("辅料名称")||s.contains("主料名称")) {
+                    String[] res2 = s.split(",");
+                    holder.binding.name.setText(res2[1]);
+                }
+            }
+            holder.binding.name.setOnClickListener(v->{
+                onItemClick(v,position);
+            });
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        private ItemFoodSelectBinding binding;
+
+
+        public ViewHolder(ItemFoodSelectBinding view) {
+            super(view.getRoot());
+            binding = view;
+        }
+    }
+
+
+}
+
+
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 501e40ea..7d125f34 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
@@ -18,13 +18,19 @@ import androidx.fragment.app.DialogFragment;
 
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS_PROCESS_DETAIL;
 import com.bonait.bnframework.common.db.mode.BPA_ORDER_DETAIL;
 import com.bonait.bnframework.common.db.util.GoodsProcessDetailDBUtil;
 import com.bonait.bnframework.common.db.util.OrderDetailUtil;
+import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.utils.AdbCommandUtil;
+import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogFoodInfoBinding;
+import com.bonait.bnframework.databinding.DialogFoodPosSelectBinding;
+import com.bonait.bnframework.newui.adapter.other.FoodPosSelectAdapter;
+import com.bonait.bnframework.newui.fragment.setting.SceneSetFragment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -100,6 +106,23 @@ public class FoodInfoDialog extends DialogFragment {
         viewBinding.btnClose1.setOnClickListener(v->{
             dismiss();
         });
+        freshView();
+        initClick();
+    }
+
+    private void freshView(){
+        viewBinding.top1.setText("");
+        viewBinding.top2.setText("");
+        viewBinding.top3.setText("");
+        viewBinding.top4.setText("");
+        viewBinding.top5.setText("");
+        viewBinding.top6.setText("");
+        viewBinding.right1.setText("");
+        viewBinding.right2.setText("");
+        viewBinding.right3.setText("");
+        viewBinding.right4.setText("");
+        viewBinding.right5.setText("");
+        viewBinding.right6.setText("");
         BPA_ORDER_DETAIL order = OrderDetailUtil.getById(orderId);
         if(order==null){
             dismiss();
@@ -222,4 +245,133 @@ public class FoodInfoDialog extends DialogFragment {
                 break;
         }
     }
+
+    private void initClick(){
+        viewBinding.top1.setOnClickListener(v->{
+            showDialog("辅料位置","F1");
+        });
+        viewBinding.top2.setOnClickListener(v->{
+            showDialog("辅料位置","F2");
+        });
+        viewBinding.top3.setOnClickListener(v->{
+            showDialog("辅料位置","F3");
+        });
+        viewBinding.top4.setOnClickListener(v->{
+            showDialog("辅料位置","F4");
+        });
+        viewBinding.top5.setOnClickListener(v->{
+            showDialog("辅料位置","F5");
+        });
+        if(!ConfigName.getInstance().versionSelectionEnum.equals(SceneSetFragment.deviceName4)){
+            viewBinding.top6.setOnClickListener(v->{
+                showDialog("辅料位置","F6");
+            });
+        }else {
+            viewBinding.top6.setVisibility(View.GONE);
+        }
+
+        viewBinding.right1.setOnClickListener(v->{
+            showDialog("主料位置","Z1");
+        });
+        viewBinding.right2.setOnClickListener(v->{
+            showDialog("主料位置","Z2");
+        });
+        viewBinding.right3.setOnClickListener(v->{
+            showDialog("主料位置","Z3");
+        });
+        viewBinding.right4.setOnClickListener(v->{
+            showDialog("主料位置","Z4");
+        });
+        viewBinding.right5.setOnClickListener(v->{
+            showDialog("主料位置","Z5");
+        });
+        viewBinding.right6.setOnClickListener(v->{
+            showDialog("主料位置","Z6");
+        });
+    }
+
+    private void showDialog(String name,String positionName){
+        AlertDialogUtils.showCancelAndConfirmDialog(getActivity(), R.layout.dialog_food_pos_select, (layoutView, xCom) -> {
+            DialogFoodPosSelectBinding binding = DialogFoodPosSelectBinding.bind(layoutView);
+            DisplayManager.scaleViewGroup(binding.getRoot());
+            binding.title.setText(name+"  "+positionName);
+            binding.btnClose.setOnClickListener(v->{
+                xCom.dismissX();
+            });
+            BPA_ORDER_DETAIL order = OrderDetailUtil.getById(orderId);
+            if(order==null){
+                dismiss();
+                return;
+            }
+            List<BPA_GOODS_PROCESS_DETAIL> data1 = new ArrayList<>();
+
+            List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(order.groupId);
+            for(BPA_GOODS_PROCESS_DETAIL detail:details){
+                if(name.contains("主料")){
+                    if(detail.processname.equals("主料")){
+                        data1.add(detail);
+                    }
+                }else if(name.contains("辅料")){
+                    if(detail.processname.equals("辅料")){
+                        data1.add(detail);
+                    }
+                }
+            }
+
+            FoodPosSelectAdapter adapter = new FoodPosSelectAdapter() {
+                @Override
+                protected void onItemClick(View v, int position) {
+                    BPA_GOODS_PROCESS_DETAIL detail = data1.get(position);
+                    String value = detail.processvalue;
+                    String[] res = value.split("\\|");
+                    String posInfo = "";
+                    String[] res2 = new String[0];
+                    for (String s:res){
+                        if(name.contains("主料")){
+                            if(s.contains("主料位置")){
+                                posInfo = s;
+                                res2 = s.split(",");
+                            }
+                        }else if(name.contains("辅料")){
+                            if(s.contains("辅料位置")){
+                                posInfo = s;
+                                res2 = s.split(",");
+                            }
+                        }
+
+                    }
+                   if(posInfo.isEmpty()||res2.length==0){
+                       return;
+                   }
+                    if(name.contains("主料")){
+                        detail.processvalue = detail.processvalue.replace(posInfo,"主料位置,"+positionName);
+                        detail.processms = detail.processms.replace(res2[1],positionName);
+                    }else if(name.contains("辅料")){
+                        detail.processvalue = detail.processvalue.replace(posInfo,"辅料位置,"+positionName);
+                        detail.processms = detail.processms.replace(res2[1],positionName);
+                    }
+                    if(GoodsProcessDetailDBUtil.update(detail)){
+                        freshView();
+                        xCom.dismissX();
+                    }
+                }
+            };
+            adapter.setNewData(data1);
+            binding.recycleView.setAdapter(adapter);
+        });
+    }
+
+    private MyClickListener listener;
+
+    public void setListener(MyClickListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void dismiss() {
+        if(listener!=null){
+            listener.clickListener(null,null);
+        }
+        super.dismiss();
+    }
 }
diff --git a/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog2.java b/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog2.java
index 2d4d7342..92b67065 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog2.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog2.java
@@ -18,14 +18,21 @@ import androidx.fragment.app.DialogFragment;
 
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS_PROCESS_DETAIL;
 import com.bonait.bnframework.common.db.mode.BPA_ORDER_DETAIL;
 import com.bonait.bnframework.common.db.util.GoodsProcessDetailDBUtil;
 import com.bonait.bnframework.common.db.util.OrderDetailUtil;
+import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.utils.AdbCommandUtil;
+import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogFoodInfo2Binding;
 import com.bonait.bnframework.databinding.DialogFoodInfoBinding;
+import com.bonait.bnframework.databinding.DialogFoodPosSelectBinding;
+import com.bonait.bnframework.newui.adapter.other.FoodPosSelectAdapter;
+import com.bonait.bnframework.newui.fragment.setting.SceneSetFragment;
+import com.bonait.bnframework.newui.widget.XComDialog;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -101,6 +108,11 @@ public class FoodInfoDialog2 extends DialogFragment {
         viewBinding.btnClose1.setOnClickListener(v->{
             dismiss();
         });
+        freshView();
+        initClick();
+    }
+
+    private void freshView(){
         BPA_ORDER_DETAIL order = OrderDetailUtil.getById(orderId);
         if(order==null){
             dismiss();
@@ -223,4 +235,134 @@ public class FoodInfoDialog2 extends DialogFragment {
                 break;
         }
     }
+
+    private void initClick(){
+        viewBinding.top1.setOnClickListener(v->{
+            showDialog("辅料位置","F1");
+        });
+        viewBinding.top2.setOnClickListener(v->{
+            showDialog("辅料位置","F2");
+        });
+        viewBinding.top3.setOnClickListener(v->{
+            showDialog("辅料位置","F3");
+        });
+        viewBinding.top4.setOnClickListener(v->{
+            showDialog("辅料位置","F4");
+        });
+        viewBinding.top5.setOnClickListener(v->{
+            showDialog("辅料位置","F5");
+        });
+        if(!ConfigName.getInstance().versionSelectionEnum.equals(SceneSetFragment.deviceName4)){
+            viewBinding.top6.setOnClickListener(v->{
+                showDialog("辅料位置","F6");
+            });
+        }else {
+            viewBinding.top6.setVisibility(View.GONE);
+        }
+
+        viewBinding.right1.setOnClickListener(v->{
+            showDialog("主料位置","Z1");
+        });
+        viewBinding.right2.setOnClickListener(v->{
+            showDialog("主料位置","Z2");
+        });
+        viewBinding.right3.setOnClickListener(v->{
+            showDialog("主料位置","Z3");
+        });
+        viewBinding.right4.setOnClickListener(v->{
+            showDialog("主料位置","Z4");
+        });
+        viewBinding.right5.setOnClickListener(v->{
+            showDialog("主料位置","Z5");
+        });
+        viewBinding.right6.setOnClickListener(v->{
+            showDialog("主料位置","Z6");
+        });
+    }
+
+    private void showDialog(String name,String positionName){
+        AlertDialogUtils.showCancelAndConfirmDialog(getActivity(), R.layout.dialog_food_pos_select, (layoutView, xCom) -> {
+            DialogFoodPosSelectBinding binding = DialogFoodPosSelectBinding.bind(layoutView);
+            DisplayManager.scaleViewGroup(binding.getRoot());
+            binding.title.setText(name+"  "+positionName);
+            binding.btnClose.setOnClickListener(v->{
+                xCom.dismissX();
+            });
+            BPA_ORDER_DETAIL order = OrderDetailUtil.getById(orderId);
+            if(order==null){
+                dismiss();
+                return;
+            }
+            List<BPA_GOODS_PROCESS_DETAIL> data1 = new ArrayList<>();
+
+            List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(order.groupId);
+            for(BPA_GOODS_PROCESS_DETAIL detail:details){
+                if(name.contains("主料")){
+                    if(detail.processname.equals("主料")){
+                        data1.add(detail);
+                    }
+                }else if(name.contains("辅料")){
+                    if(detail.processname.equals("辅料")){
+                        data1.add(detail);
+                    }
+                }
+            }
+
+            FoodPosSelectAdapter adapter = new FoodPosSelectAdapter() {
+                @Override
+                protected void onItemClick(View v, int position) {
+                    BPA_GOODS_PROCESS_DETAIL detail = data1.get(position);
+                    String value = detail.processvalue;
+                    String[] res = value.split("\\|");
+                    String posInfo = "";
+                    String[] res2 = new String[0];
+                    for (String s:res){
+                        if(name.contains("主料")){
+                            if(s.contains("主料位置")){
+                                posInfo = s;
+                                res2 = s.split(",");
+                            }
+                        }else if(name.contains("辅料")){
+                            if(s.contains("辅料位置")){
+                                posInfo = s;
+                                res2 = s.split(",");
+                            }
+                        }
+
+                    }
+                    if(posInfo.isEmpty()||res2.length==0){
+                        return;
+                    }
+                    if(name.contains("主料")){
+                        detail.processvalue = detail.processvalue.replace(posInfo,"主料位置,"+positionName);
+                        detail.processms = detail.processms.replace(res2[1],positionName);
+                    }else if(name.contains("辅料")){
+                        detail.processvalue = detail.processvalue.replace(posInfo,"辅料位置,"+positionName);
+                        detail.processms = detail.processms.replace(res2[1],positionName);
+                    }
+
+                    if(GoodsProcessDetailDBUtil.update(detail)){
+                        freshView();
+                        xCom.dismissX();
+                    }
+                }
+            };
+            adapter.setNewData(data1);
+            binding.recycleView.setAdapter(adapter);
+        });
+    }
+
+    private MyClickListener listener;
+
+    public void setListener(MyClickListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void dismiss() {
+        if(listener!=null){
+            listener.clickListener(null,null);
+        }
+        super.dismiss();
+    }
 }
diff --git a/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog3.java b/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog3.java
index 1bd074f5..2c915498 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog3.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/dialog/check/FoodInfoDialog3.java
@@ -18,14 +18,20 @@ import androidx.fragment.app.DialogFragment;
 
 import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS_PROCESS_DETAIL;
 import com.bonait.bnframework.common.db.mode.BPA_ORDER_DETAIL;
 import com.bonait.bnframework.common.db.util.GoodsProcessDetailDBUtil;
 import com.bonait.bnframework.common.db.util.OrderDetailUtil;
+import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.utils.AdbCommandUtil;
+import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogFoodInfo3Binding;
 import com.bonait.bnframework.databinding.DialogFoodInfoBinding;
+import com.bonait.bnframework.databinding.DialogFoodPosSelectBinding;
+import com.bonait.bnframework.newui.adapter.other.FoodPosSelectAdapter;
+import com.bonait.bnframework.newui.fragment.setting.SceneSetFragment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -101,6 +107,11 @@ public class FoodInfoDialog3 extends DialogFragment {
         viewBinding.btnClose1.setOnClickListener(v->{
             dismiss();
         });
+        freshView();
+        initClick();
+    }
+
+    private void freshView(){
         BPA_ORDER_DETAIL order = OrderDetailUtil.getById(orderId);
         if(order==null){
             dismiss();
@@ -223,4 +234,133 @@ public class FoodInfoDialog3 extends DialogFragment {
                 break;
         }
     }
+
+    private void initClick(){
+        viewBinding.top1.setOnClickListener(v->{
+            showDialog("辅料位置","F1");
+        });
+        viewBinding.top2.setOnClickListener(v->{
+            showDialog("辅料位置","F2");
+        });
+        viewBinding.top3.setOnClickListener(v->{
+            showDialog("辅料位置","F3");
+        });
+        viewBinding.top4.setOnClickListener(v->{
+            showDialog("辅料位置","F4");
+        });
+        viewBinding.top5.setOnClickListener(v->{
+            showDialog("辅料位置","F5");
+        });
+        if(!ConfigName.getInstance().versionSelectionEnum.equals(SceneSetFragment.deviceName4)){
+            viewBinding.top6.setOnClickListener(v->{
+                showDialog("辅料位置","F6");
+            });
+        }else {
+            viewBinding.top6.setVisibility(View.GONE);
+        }
+
+        viewBinding.right1.setOnClickListener(v->{
+            showDialog("主料位置","Z1");
+        });
+        viewBinding.right2.setOnClickListener(v->{
+            showDialog("主料位置","Z2");
+        });
+        viewBinding.right3.setOnClickListener(v->{
+            showDialog("主料位置","Z3");
+        });
+        viewBinding.right4.setOnClickListener(v->{
+            showDialog("主料位置","Z4");
+        });
+        viewBinding.right5.setOnClickListener(v->{
+            showDialog("主料位置","Z5");
+        });
+        viewBinding.right6.setOnClickListener(v->{
+            showDialog("主料位置","Z6");
+        });
+    }
+
+    private void showDialog(String name,String positionName){
+        AlertDialogUtils.showCancelAndConfirmDialog(getActivity(), R.layout.dialog_food_pos_select, (layoutView, xCom) -> {
+            DialogFoodPosSelectBinding binding = DialogFoodPosSelectBinding.bind(layoutView);
+            DisplayManager.scaleViewGroup(binding.getRoot());
+            binding.title.setText(name+"  "+positionName);
+            binding.btnClose.setOnClickListener(v->{
+                xCom.dismissX();
+            });
+            BPA_ORDER_DETAIL order = OrderDetailUtil.getById(orderId);
+            if(order==null){
+                dismiss();
+                return;
+            }
+            List<BPA_GOODS_PROCESS_DETAIL> data1 = new ArrayList<>();
+
+            List<BPA_GOODS_PROCESS_DETAIL> details = GoodsProcessDetailDBUtil.getByGroupId(order.groupId);
+            for(BPA_GOODS_PROCESS_DETAIL detail:details){
+                if(name.contains("主料")){
+                    if(detail.processname.equals("主料")){
+                        data1.add(detail);
+                    }
+                }else if(name.contains("辅料")){
+                    if(detail.processname.equals("辅料")){
+                        data1.add(detail);
+                    }
+                }
+            }
+
+            FoodPosSelectAdapter adapter = new FoodPosSelectAdapter() {
+                @Override
+                protected void onItemClick(View v, int position) {
+                    BPA_GOODS_PROCESS_DETAIL detail = data1.get(position);
+                    String value = detail.processvalue;
+                    String[] res = value.split("\\|");
+                    String posInfo = "";
+                    String[] res2 = new String[0];
+                    for (String s:res){
+                        if(name.contains("主料")){
+                            if(s.contains("主料位置")){
+                                posInfo = s;
+                                res2 = s.split(",");
+                            }
+                        }else if(name.contains("辅料")){
+                            if(s.contains("辅料位置")){
+                                posInfo = s;
+                                res2 = s.split(",");
+                            }
+                        }
+
+                    }
+                    if(posInfo.isEmpty()||res2.length==0){
+                        return;
+                    }
+                    if(name.contains("主料")){
+                        detail.processvalue = detail.processvalue.replace(posInfo,"主料位置,"+positionName);
+                        detail.processms = detail.processms.replace(res2[1],positionName);
+                    }else if(name.contains("辅料")){
+                        detail.processvalue = detail.processvalue.replace(posInfo,"辅料位置,"+positionName);
+                        detail.processms = detail.processms.replace(res2[1],positionName);
+                    }
+                    if(GoodsProcessDetailDBUtil.update(detail)){
+                        freshView();
+                        xCom.dismissX();
+                    }
+                }
+            };
+            adapter.setNewData(data1);
+            binding.recycleView.setAdapter(adapter);
+        });
+    }
+
+    private MyClickListener listener;
+
+    public void setListener(MyClickListener listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void dismiss() {
+        if(listener!=null){
+            listener.clickListener(null,null);
+        }
+        super.dismiss();
+    }
 }
diff --git a/app/src/main/java/com/bonait/bnframework/newui/dialog/control/FoodPosSetDialog.java b/app/src/main/java/com/bonait/bnframework/newui/dialog/control/FoodPosSetDialog.java
index a728a452..117fd422 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/dialog/control/FoodPosSetDialog.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/dialog/control/FoodPosSetDialog.java
@@ -25,6 +25,7 @@ import com.bonait.bnframework.common.helper.I.MyClickListener;
 import com.bonait.bnframework.common.utils.AdbCommandUtil;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.DialogFoodPosSetBinding;
+import com.bonait.bnframework.newui.fragment.setting.SceneSetFragment;
 import com.bonait.bnframework.newui.widget.FoodPosSetView;
 
 import java.util.ArrayList;
@@ -111,6 +112,9 @@ public class FoodPosSetDialog extends DialogFragment {
                 break;
             default:
                 viewBinding.layoutHuojia.getRoot().setVisibility(View.VISIBLE);
+                if(ConfigName.getInstance().versionSelectionEnum.equals(SceneSetFragment.deviceName4)){
+                    viewBinding.layoutHuojia.top6.setText("");
+                }
                 viewBinding.layoutHuojia2.getRoot().setVisibility(View.GONE);
                 viewBinding.layoutHuojia3.getRoot().setVisibility(View.GONE);
                 break;
diff --git a/app/src/main/java/com/bonait/bnframework/newui/dialog/control/WokControlDialog.java b/app/src/main/java/com/bonait/bnframework/newui/dialog/control/WokControlDialog.java
index cffae53f..7c753ffd 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/dialog/control/WokControlDialog.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/dialog/control/WokControlDialog.java
@@ -85,10 +85,11 @@ public class WokControlDialog extends DialogFragment {
                 } else {
                     viewBinding.tvWokWendu.setText("??°C");
                 }
+                freshFireNum();
                 if(handler.hasMessages(1)){
                     handler.removeMessages(1);
                 }
-                handler.sendEmptyMessageDelayed(1,200);
+                handler.sendEmptyMessageDelayed(1,500);
             }
         }
     };
@@ -151,9 +152,28 @@ public class WokControlDialog extends DialogFragment {
             viewBinding.tvSpeed.setText(ConfigName.getInstance().fanchaoSpeed);
         }
         viewBinding.fireControl.deviceNum = deviceNum;
-        if(!ConfigName.getInstance().fireNum.isEmpty()){
-            viewBinding.fireControl.SetLevel(Integer.parseInt(ConfigName.getInstance().fireNum));
+        freshFireNum();
+
+    }
+    private void freshFireNum(){
+        Object object = ModbusCenter.ReadPlc(deviceNum,"加热功率");
+        Object oOpen = ModbusCenter.ReadPlc(deviceNum,"加热");
+        if(oOpen instanceof Boolean){
+            if((Boolean)oOpen){
+                if(object instanceof Short){
+                    short num = (short) object;
+                    int fire = (int) num;
+                    viewBinding.fireControl.SetLevel(fire);
+                }else {
+                    viewBinding.fireControl.SetLevel(0);
+                }
+            }else {
+                viewBinding.fireControl.SetLevel(0);
+            }
+        }else {
+            viewBinding.fireControl.SetLevel(0);
         }
+
     }
 
     @SuppressLint("ClickableViewAccessibility")
@@ -177,17 +197,25 @@ public class WokControlDialog extends DialogFragment {
 
         viewBinding.btnSilosOpen.setOnClickListener(v->{
             try {
+
                 if(viewBinding.spinnerSilos.getSelectedItem().toString().contains("未设置")){
                     NewToastUtil.getInstance().showToastError("请先绑定液料！");
                     return;
                 }
-                String[] res = viewBinding.spinnerSilos.getSelectedItem().toString().split("料");
-                String num = res[0];
                 String val = viewBinding.editSilosWeight.getText().toString();
                 if(val.isEmpty()){
                     NewToastUtil.getInstance().showToastError("请输入重量！");
                     return;
                 }
+
+                Object ob = ModbusCenter.getWokListingValue(deviceNum,"抽料位反馈");
+                if (ob == null || !(boolean) ob) {
+                    NewToastUtil.getInstance().showToastError("请先控制锅口朝向到抽料位");
+                    return;
+                }
+                String[] res = viewBinding.spinnerSilos.getSelectedItem().toString().split("料");
+                String num = res[0];
+
                 int MaxValue = 0;
                 int weight = Integer.parseInt(val);
                 Object jz_z = ExecuteTheRecipe.ReadPLC(deviceNum,"料仓" + num + "校准值");
@@ -313,7 +341,11 @@ public class WokControlDialog extends DialogFragment {
             @Override
             public void clickListener(View v, Object data) {
                 int hl = (int) data;
-                ConfigName.getInstance().fireNum = hl+"";
+                if(deviceNum == 1){
+                    ConfigName.getInstance().fireNum1 = hl+"";
+                }else {
+                    ConfigName.getInstance().fireNum2 = hl+"";
+                }
                 SetFire(hl);
             }
 
diff --git a/app/src/main/java/com/bonait/bnframework/newui/fragment/calssify/GoodEditClassifyFragment.java b/app/src/main/java/com/bonait/bnframework/newui/fragment/calssify/GoodEditClassifyFragment.java
index 1fe9f6c6..05418fc4 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/fragment/calssify/GoodEditClassifyFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/fragment/calssify/GoodEditClassifyFragment.java
@@ -3,6 +3,8 @@ package com.bonait.bnframework.newui.fragment.calssify;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -72,6 +74,7 @@ public class GoodEditClassifyFragment extends BaseFragment {
     private long lastTime2;
 
     private ArrayList<BPA_GOODS> goodsList = new ArrayList<>();
+    private ArrayList<BPA_GOODS> goodsListOld = new ArrayList<>();
 
     public boolean isFast2Click(){
         long curTime = System.currentTimeMillis();
@@ -136,6 +139,34 @@ public class GoodEditClassifyFragment extends BaseFragment {
      * 删除子属性
      */
     private void initView(){
+        viewBinding.edittext.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                if(editable.toString().isEmpty()){
+                    goodsList.clear();
+                    goodsList.addAll(goodsListOld);
+                    goodsAdapter.notifyDataSetChanged();
+                }else {
+                    goodsList.clear();
+                    for(BPA_GOODS bean :goodsListOld){
+                        if(bean.name.contains(editable.toString())){
+                            goodsList.add(bean);
+                        }
+                    }
+                    goodsAdapter.notifyDataSetChanged();
+                }
+            }
+        });
         //下拉选择
         classifyNameList.clear();
         classifyNameList.addAll(classifyList.keySet());
@@ -233,7 +264,9 @@ public class GoodEditClassifyFragment extends BaseFragment {
         };
         viewBinding.recyclerGoods.setAdapter(goodsAdapter);
         goodsList.clear();
+        goodsListOld.clear();
         goodsList.addAll(GoodsDBUtil.getAll());
+        goodsListOld.addAll(GoodsDBUtil.getAll());
         goodsAdapter.setNewData(goodsList);
     }
 
diff --git a/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/CloudGoodsHFragment.java b/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/CloudGoodsHFragment.java
index c582549f..08233833 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/CloudGoodsHFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/fragment/goods/CloudGoodsHFragment.java
@@ -6,6 +6,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -52,6 +54,7 @@ public class CloudGoodsHFragment extends BaseFragment {
     private CloudGoodsAdapter goodsAdapter;
     private GoodClassifyAdapter classifyAdapter;
     private ArrayList<BPA_GOODS> goodsList = new ArrayList<>();
+    private ArrayList<BPA_GOODS> goodsListOld = new ArrayList<>();
     private ArrayList<BPA_GOODS_CLASSIFY> classifyList = new ArrayList<>();
     private static final int MSG_FRESH_GOODS= 1;
     private HomeGoodsViewModel viewModel;
@@ -100,6 +103,15 @@ public class CloudGoodsHFragment extends BaseFragment {
         });
     }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if(goodsList!=null){
+            goodsList.clear();
+            goodsListOld.clear();
+        }
+    }
+
     @Override
     protected int backViewInitOffset() {
         return 0;
@@ -107,6 +119,34 @@ public class CloudGoodsHFragment extends BaseFragment {
 
     @SuppressLint("NotifyDataSetChanged")
     private void initView(){
+        viewBinding.edittext.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                if(editable.toString().isEmpty()){
+                    goodsList.clear();
+                    goodsList.addAll(goodsListOld);
+                    goodsAdapter.notifyDataSetChanged();
+                }else {
+                    goodsList.clear();
+                    for(BPA_GOODS bean :goodsListOld){
+                        if(bean.name.contains(editable.toString())){
+                            goodsList.add(bean);
+                        }
+                    }
+                    goodsAdapter.notifyDataSetChanged();
+                }
+            }
+        });
         DisplayManager.scaleViewGroup(viewBinding.getRoot());
         viewBinding.btnSynchronizedData.setVisibility(isEdit?View.VISIBLE:View.GONE);
         viewBinding.btnFresh.setOnClickListener(v->{
@@ -211,6 +251,7 @@ public class CloudGoodsHFragment extends BaseFragment {
 
     private void dealGoodsData(int position){
         goodsList.clear();
+        goodsListOld.clear();
         if(type.equals("0")){
             if(classifyList.isEmpty()){
                 return;
@@ -242,6 +283,7 @@ public class CloudGoodsHFragment extends BaseFragment {
                                     }
                                 }
                                 goodsList.add(goods);
+                                goodsListOld.add(goods);
                             });
                         }
                     }
@@ -261,6 +303,7 @@ public class CloudGoodsHFragment extends BaseFragment {
         EventBus.getDefault().unregister(this);
         if(goodsList!=null){
             goodsList.clear();
+            goodsListOld.clear();
             classifyList.clear();
             goodsList = null;
             classifyList = null;
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 32f8e434..928a08d5 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
@@ -7,6 +7,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.text.Editable;
+import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -62,6 +64,8 @@ public class LocalGoodsHFragment extends BaseFragment {
     private LocalGoodsAdapter goodsAdapter;
     private GoodClassifyAdapter goodClassifyAdapter;
     private ArrayList<BPA_GOODS> goodsList = new ArrayList<>();
+    private ArrayList<BPA_GOODS> goodsListOld = new ArrayList<>();
+
     private ArrayList<BPA_GOODS_CLASSIFY> goodClassifyList = new ArrayList<>();
     /**
      * 属性分类列表
@@ -95,6 +99,8 @@ public class LocalGoodsHFragment extends BaseFragment {
                     if(goodClassifyAdapter.getCurrentPosition()>=0){
                         goodsList.clear();
                         goodsList.addAll(GoodsDBUtil.getByClassifyId(goodClassifyList.get(goodClassifyAdapter.getCurrentPosition()).id));
+                        goodsListOld.clear();
+                        goodsListOld.addAll(GoodsDBUtil.getByClassifyId(goodClassifyList.get(goodClassifyAdapter.getCurrentPosition()).id));
                     }
                     goodsAdapter.notifyDataSetChanged();
                     break;
@@ -120,6 +126,36 @@ public class LocalGoodsHFragment extends BaseFragment {
 
     @SuppressLint("NotifyDataSetChanged")
     private void initView(){
+
+        viewBinding.edittext.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                if(editable.toString().isEmpty()){
+                    goodsList.clear();
+                    goodsList.addAll(goodsListOld);
+                    goodsAdapter.notifyDataSetChanged();
+                }else {
+                    goodsList.clear();
+                    for(BPA_GOODS bean :goodsListOld){
+                        if(bean.name.contains(editable.toString())){
+                            goodsList.add(bean);
+                        }
+                    }
+                    goodsAdapter.notifyDataSetChanged();
+                }
+            }
+        });
+
         viewBinding.allSelectTV.setVisibility(View.GONE);
         viewBinding.allSelectTV.setOnClickListener(view->{
             IsAllSelect=!IsAllSelect;
@@ -435,12 +471,14 @@ public class LocalGoodsHFragment extends BaseFragment {
     public void updateData() {
         LogUtils.d("updateData");
         goodsList.clear();
+        goodsListOld.clear();
         goodClassifyList.clear();
         goodClassifyList.addAll(GoodsClassifyDBUtil.getAll("0"));
         if(!goodClassifyList.isEmpty()){
             int last = Math.max(goodClassifyAdapter.getCurrentPosition(), 0);
             int last2 = Math.min(last, goodClassifyList.size()-1);
             goodsList.addAll(GoodsDBUtil.getByClassifyId(goodClassifyList.get(last2).id));
+            goodsListOld.addAll(GoodsDBUtil.getByClassifyId(goodClassifyList.get(last2).id));
         }
 
         goodsAdapter.setNewData(goodsList);
@@ -479,6 +517,7 @@ public class LocalGoodsHFragment extends BaseFragment {
         EventBus.getDefault().unregister(this);
         if(goodsList!=null){
             goodsList.clear();
+            goodsListOld.clear();
             goodClassifyList.clear();
             goodsList = null;
             goodClassifyList = null;
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 48d74086..43baba35 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
@@ -160,6 +160,22 @@ public class HomeOrderFragment extends BaseFragment {
                     Bundle bundle2 = new Bundle();
                     bundle2.putString("orderId",orderDetail.id);
                     foodInfoDialog2.setArguments(bundle2);
+                    foodInfoDialog2.setListener(new MyClickListener() {
+                        @Override
+                        public void clickListener(View v, Object data) {
+                            orderDetails1.clear();
+                            orderDetails1.addAll(OrderDetailUtil.getAll());
+                            orderAdapter1.notifyDataSetChanged();
+                            if(orderAdapter1.getCurrentPosition()>=0){
+                                orderClick(orderAdapter1.getData().get(orderAdapter1.getCurrentPosition()));
+                            }
+                        }
+
+                        @Override
+                        public void clickListenerNew(View v, int k, Object data) {
+
+                        }
+                    });
                     if(getActivity()!=null){
                         foodInfoDialog2.show(getActivity().getSupportFragmentManager(),"配料信息");
                     }
@@ -169,6 +185,22 @@ public class HomeOrderFragment extends BaseFragment {
                     Bundle bundle3 = new Bundle();
                     bundle3.putString("orderId",orderDetail.id);
                     foodInfoDialog3.setArguments(bundle3);
+                    foodInfoDialog3.setListener(new MyClickListener() {
+                        @Override
+                        public void clickListener(View v, Object data) {
+                            orderDetails1.clear();
+                            orderDetails1.addAll(OrderDetailUtil.getAll());
+                            orderAdapter1.notifyDataSetChanged();
+                            if(orderAdapter1.getCurrentPosition()>=0){
+                                orderClick(orderAdapter1.getData().get(orderAdapter1.getCurrentPosition()));
+                            }
+                        }
+
+                        @Override
+                        public void clickListenerNew(View v, int k, Object data) {
+
+                        }
+                    });
                     if(getActivity()!=null){
                         foodInfoDialog3.show(getActivity().getSupportFragmentManager(),"配料信息");
                     }
@@ -178,6 +210,22 @@ public class HomeOrderFragment extends BaseFragment {
                     Bundle bundle = new Bundle();
                     bundle.putString("orderId",orderDetail.id);
                     foodInfoDialog.setArguments(bundle);
+                    foodInfoDialog.setListener(new MyClickListener() {
+                        @Override
+                        public void clickListener(View v, Object data) {
+                            orderDetails1.clear();
+                            orderDetails1.addAll(OrderDetailUtil.getAll());
+                            orderAdapter1.notifyDataSetChanged();
+                            if(orderAdapter1.getCurrentPosition()>=0){
+                                orderClick(orderAdapter1.getData().get(orderAdapter1.getCurrentPosition()));
+                            }
+                        }
+
+                        @Override
+                        public void clickListenerNew(View v, int k, Object data) {
+
+                        }
+                    });
                     if(getActivity()!=null){
                         foodInfoDialog.show(getActivity().getSupportFragmentManager(),"配料信息");
                     }
diff --git a/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java b/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java
index 28da17b0..f5bf4859 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/http/UpdateAllDataService.java
@@ -116,6 +116,8 @@ public class UpdateAllDataService {
                             RecordManager.getInstance().addLogRecord("数据接收", url+"-成功");
                             List<BPA_PROCESS> processeList = new ArrayList<>();
                             List<BPA_PROCESSModel> processModelList = new ArrayList<>();
+                            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_PROCESS.class,null);
+                            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_PROCESSModel.class,null);
 
                             ProcessModelBean processModelBean = response.body();
                             int pos = 1;
diff --git a/app/src/main/java/com/bonait/bnframework/newui/http/UpdateDataService.java b/app/src/main/java/com/bonait/bnframework/newui/http/UpdateDataService.java
index 39b99a3c..372d1747 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/http/UpdateDataService.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/http/UpdateDataService.java
@@ -18,6 +18,7 @@ import com.bonait.bnframework.Model.upload.UpResData;
 import com.bonait.bnframework.Model.upload.UploadRes;
 import com.bonait.bnframework.business.RecordManager;
 import com.bonait.bnframework.common.constant.ConfigName;
+import com.bonait.bnframework.common.db.QueryDB;
 import com.bonait.bnframework.common.db.file.DBHelper;
 import com.bonait.bnframework.common.db.mode.BPA_ATTRIBUTE;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS;
@@ -29,6 +30,7 @@ import com.bonait.bnframework.common.db.mode.BPA_MATERIAL_TYPE;
 import com.bonait.bnframework.common.db.mode.BPA_PROCESS;
 import com.bonait.bnframework.common.db.mode.BPA_PROCESSModel;
 import com.bonait.bnframework.common.db.mode.BPA_PROPERTY_CLASSIFY;
+import com.bonait.bnframework.common.db.mode.BPA_SILOS;
 import com.bonait.bnframework.common.db.mode.BPA_SUBATTRIBUTE;
 import com.bonait.bnframework.common.db.util.AttributeDBUtil;
 import com.bonait.bnframework.common.db.util.GoodsClassifyDBUtil;
@@ -124,6 +126,8 @@ public class UpdateDataService {
                             RecordManager.getInstance().addLogRecord("数据接收", url+"-成功");
                             List<BPA_PROCESS> processeList = new ArrayList<>();
                             List<BPA_PROCESSModel> processModelList = new ArrayList<>();
+                            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_PROCESS.class,null);
+                            DBHelper.getInstance(MainApplication.getContext()).DeleteCreateTables(BPA_PROCESSModel.class,null);
 
                             ProcessModelBean processModelBean = response.body();
                             int pos = 1;
diff --git a/app/src/main/java/com/bonait/bnframework/newui/viewmodel/HomeGoodsViewModel.java b/app/src/main/java/com/bonait/bnframework/newui/viewmodel/HomeGoodsViewModel.java
index 08a518cc..b72a2e29 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/viewmodel/HomeGoodsViewModel.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/viewmodel/HomeGoodsViewModel.java
@@ -78,7 +78,7 @@ public class HomeGoodsViewModel extends ViewModel {
 
             }));
             if(!UpdateDataService.isDownProcessModel){
-                UpdateDataService.downLoadProcessModel(null,null);
+                UpdateDataService.downLoadProcessModel(null,context);
             }
         }
     }
diff --git a/app/src/main/java/com/bonait/bnframework/newui/widget/FoodPosSetView.java b/app/src/main/java/com/bonait/bnframework/newui/widget/FoodPosSetView.java
index f3db7bc3..4a4fa5c4 100644
--- a/app/src/main/java/com/bonait/bnframework/newui/widget/FoodPosSetView.java
+++ b/app/src/main/java/com/bonait/bnframework/newui/widget/FoodPosSetView.java
@@ -9,10 +9,12 @@ import android.widget.ArrayAdapter;
 import android.widget.FrameLayout;
 
 import com.bonait.bnframework.R;
+import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS_PROCESS_DETAIL;
 import com.bonait.bnframework.common.db.util.GoodsProcessDetailDBUtil;
 import com.bonait.bnframework.common.utils.DisplayManager;
 import com.bonait.bnframework.databinding.ViewFoodPosSetBinding;
+import com.bonait.bnframework.newui.fragment.setting.SceneSetFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -105,7 +107,9 @@ public class FoodPosSetView extends FrameLayout {
                     list.add("F3");
                     list.add("F4");
                     list.add("F5");
-                    list.add("F6");
+                    if(!ConfigName.getInstance().versionSelectionEnum.equals(SceneSetFragment.deviceName4)){
+                        list.add("F6");
+                    }
                     String value = detail.processvalue;
                     String[] res = value.split("\\|");
                     for (String s:res){
diff --git a/app/src/main/res/drawable/bg_round_white_btn.xml b/app/src/main/res/drawable/bg_round_white_btn.xml
new file mode 100644
index 00000000..87775504
--- /dev/null
+++ b/app/src/main/res/drawable/bg_round_white_btn.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="#FF9800"/>
+        </shape>
+
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#ffffff"/>
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/layout/item/layout/item_food_select.xml b/app/src/main/res/layout/item/layout/item_food_select.xml
new file mode 100644
index 00000000..ed7cb51e
--- /dev/null
+++ b/app/src/main/res/layout/item/layout/item_food_select.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:orientation="vertical"
+    >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:orientation="horizontal"
+        android:layout_height="@dimen/dp_100">
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_100"
+            tools:text="1.主料"
+            android:textSize="@dimen/sp_36"
+            android:gravity="center"
+            android:textColor="@color/blue_primary"
+            android:textStyle="bold"
+            android:background="@drawable/bg_round_white_btn"
+            />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/new/layout/dialog_chaoguo_control.xml b/app/src/main/res/layout/new/layout/dialog_chaoguo_control.xml
index e8bece8e..562e8df5 100644
--- a/app/src/main/res/layout/new/layout/dialog_chaoguo_control.xml
+++ b/app/src/main/res/layout/new/layout/dialog_chaoguo_control.xml
@@ -455,7 +455,7 @@
         <Spinner
             android:id="@+id/spinner_silos"
             style="@style/commonSpinnerStyle"
-            android:layout_width="350dp"
+            android:layout_width="400dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toTopOf="@id/edit_silos_weight"
             android:layout_marginBottom="10dp"
@@ -464,7 +464,7 @@
             android:layout_height="90dp" />
         <EditText
             android:id="@+id/edit_silos_weight"
-            android:layout_width="@dimen/dp_350"
+            android:layout_width="400dp"
             android:layout_height="90dp"
             android:inputType="number"
             android:padding="3dp"
@@ -472,6 +472,7 @@
             android:background="@drawable/input_bj"
             android:layout_marginBottom="10dp"
             android:hint="液料重量"
+            android:gravity="center"
             android:textColorHint="@color/gray_light"
             android:layout_marginEnd="10dp"
             android:maxLines="1"
@@ -488,7 +489,7 @@
             android:layout_marginTop="3dp"
             android:layout_gravity="center_horizontal"
             android:contentDescription="true"
-            android:layout_marginEnd="80dp"
+            android:layout_marginEnd="105dp"
             style="@style/TextView_btn_dialog"
             android:text="料仓出料"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/new/layout/dialog_food_pos_select.xml b/app/src/main/res/layout/new/layout/dialog_food_pos_select.xml
new file mode 100644
index 00000000..7c879add
--- /dev/null
+++ b/app/src/main/res/layout/new/layout/dialog_food_pos_select.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:background="@color/transparent"
+    tools:background="@color/gray"
+    tools:layout_width="match_parent"
+    tools:layout_height="match_parent"
+    android:layout_height="wrap_content">
+
+   <LinearLayout
+       android:layout_width="800dp"
+       android:orientation="vertical"
+       android:background="@drawable/bg_round25_white"
+       android:layout_height="wrap_content">
+
+      <RelativeLayout
+          android:layout_width="match_parent"
+          android:layout_height="100dp">
+         <TextView
+             android:id="@+id/title"
+             android:textSize="36sp"
+             android:textColor="@color/black"
+             tools:text="主料名称"
+             android:layout_gravity="center"
+             android:gravity="center"
+             android:textStyle="bold"
+             android:layout_width="match_parent"
+             android:layout_height="100dp"/>
+
+         <ImageView
+             android:id="@+id/btn_close"
+             android:layout_width="@dimen/dp_100"
+             android:layout_height="@dimen/dp_100"
+             style="@style/TextView_btn_dialog"
+             android:layout_marginEnd="20dp"
+             android:layout_alignParentEnd="true"
+             android:background="@mipmap/file_picker_delete"
+             app:layout_constraintTop_toTopOf="parent"
+             app:layout_constraintEnd_toEndOf="parent"
+             />
+      </RelativeLayout>
+
+
+      <TextView
+          android:layout_width="match_parent"
+          android:layout_height="2dp"
+          android:background="@color/gray"
+          />
+
+      <androidx.recyclerview.widget.RecyclerView
+          android:layout_marginTop="20dp"
+          android:layout_marginBottom="20dp"
+          android:layout_marginStart="20dp"
+          android:layout_marginEnd="20dp"
+          android:id="@+id/recycle_view"
+          app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+          android:orientation="vertical"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"/>
+   </LinearLayout>
+
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/new/layout/fragment_cloud_goods_h.xml b/app/src/main/res/layout/new/layout/fragment_cloud_goods_h.xml
index 33cb9196..add7fabf 100644
--- a/app/src/main/res/layout/new/layout/fragment_cloud_goods_h.xml
+++ b/app/src/main/res/layout/new/layout/fragment_cloud_goods_h.xml
@@ -76,7 +76,21 @@
             android:layout_height="@dimen/dp_3"
             android:background="@color/color3"
             />
-
+        <EditText
+            android:id="@+id/edittext"
+            android:layout_width="@dimen/dp_400"
+            android:layout_height="60dp"
+            android:inputType="text"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textColor="@color/foreground"
+            android:background="@drawable/input_bj"
+            android:hint=" 筛选"
+            android:layout_marginTop="10dp"
+            android:maxLines="1"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="470dp"
+            android:textSize="@dimen/sp_26"/>
         <androidx.recyclerview.widget.RecyclerView
             android:layout_marginLeft="@dimen/dp_270"
             android:id="@+id/recycler_goods"
diff --git a/app/src/main/res/layout/new/layout/fragment_good_edit_classify.xml b/app/src/main/res/layout/new/layout/fragment_good_edit_classify.xml
index f203c7c3..bf37982c 100644
--- a/app/src/main/res/layout/new/layout/fragment_good_edit_classify.xml
+++ b/app/src/main/res/layout/new/layout/fragment_good_edit_classify.xml
@@ -94,16 +94,35 @@
             android:background="@color/color3"
             />
 
-
+        <EditText
+            android:id="@+id/edittext"
+            android:layout_width="@dimen/dp_600"
+            android:layout_height="60dp"
+            android:inputType="text"
+            android:layout_marginStart="20dp"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textColor="@color/foreground"
+            android:background="@drawable/input_bj"
+            android:hint=" 筛选"
+            android:layout_marginTop="120dp"
+            android:maxLines="1"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="470dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:textSize="@dimen/sp_26"/>
         <androidx.recyclerview.widget.RecyclerView
             android:layout_marginLeft="@dimen/dp_21"
-            android:layout_marginTop="120dp"
+            android:layout_marginTop="10dp"
             android:id="@+id/recycler_goods"
             android:layout_width="match_parent"
             android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/edittext"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:spanCount="3"
-            android:layout_height="match_parent">
+            app:spanCount="5"
+            android:layout_height="0dp">
         </androidx.recyclerview.widget.RecyclerView>
 
 
diff --git a/app/src/main/res/layout/new/layout/fragment_local_goods_h.xml b/app/src/main/res/layout/new/layout/fragment_local_goods_h.xml
index 67d3017b..b006f909 100644
--- a/app/src/main/res/layout/new/layout/fragment_local_goods_h.xml
+++ b/app/src/main/res/layout/new/layout/fragment_local_goods_h.xml
@@ -104,6 +104,21 @@
             android:background="@color/color3"
             />
 
+        <EditText
+            android:id="@+id/edittext"
+            android:layout_width="@dimen/dp_400"
+            android:layout_height="60dp"
+            android:inputType="text"
+            android:paddingStart="5dp"
+            android:paddingEnd="5dp"
+            android:textColor="@color/foreground"
+            android:background="@drawable/input_bj"
+            android:hint=" 筛选"
+            android:layout_marginTop="10dp"
+            android:maxLines="1"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="470dp"
+            android:textSize="@dimen/sp_26"/>
         <androidx.recyclerview.widget.RecyclerView
             android:layout_marginLeft="@dimen/dp_21"
             android:layout_marginTop="80dp"
@@ -123,7 +138,6 @@
             android:layout_marginStart="685dp"
             android:visibility="gone"
             tools:visibility="visible"
-            android:layout_toRightOf="@id/recycler_classify"
             android:background="@drawable/all_edit_btn"
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="20dp">