From 011d6bdfb3a9f82d4b40536e333bc14f9d7e450d Mon Sep 17 00:00:00 2001
From: liup <1454939542@qq.com>
Date: Wed, 11 Sep 2024 18:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml            |   4 +-
 app/src/main/AndroidManifest.xml              |   2 +-
 .../bonait/bnframework/business/MainInit.java |   3 -
 .../bnframework/common/API/APIHelper.java     |   5 +-
 .../common/constant/ConfigName.java           | 110 ++++++++++++++----
 .../common/helper/LogcatHelper.java           |   6 +-
 .../common/image/MyBitmapUtils.java           |   2 +-
 .../common/image/utils/LocalCacheUtils.java   |   2 +-
 .../bonait/bnframework/glide/GlideUtil.java   |   2 +
 .../fragment/from/BunkerSetupActivity.java    |   2 +
 .../fragment/SystemSeasoningsetFragment.java  |  24 +++-
 .../fragment/SystemSystemsetFragment.java     |   9 +-
 .../welcome/activity/WelcomeActivity.java     |  12 +-
 .../ui/activity/DiyProcessActivity.java       |   9 +-
 .../ui/activity/GoodEditClassifyFragment.java |  20 +++-
 .../ui/activity/PropEditClassifyFragment.java |  19 ++-
 .../classify/ClassifySpinnerAdapter.java      |   5 +-
 .../adapter/classify/GoodClassifyAdapter.java |   5 +-
 .../classify/SelectAttributeListAdapter.java  |   5 +-
 .../classify/SelectSubAttributeAdapter.java   |   5 +-
 .../ui/adapter/classify/Spinner36Adapter.java |  11 +-
 .../ui/adapter/goods/CloudGoodsAdapter.java   |  17 ++-
 .../ui/adapter/goods/LocalGoodsAdapter.java   |  14 ++-
 .../adapter/record/DeviceRecordAdapter.java   |  48 --------
 .../ui/adapter/record/LocalLogAdapter.java    |  77 ------------
 .../ui/adapter/record/OrderAdapter.java       |   5 +-
 .../ui/adapter/record/SubOrderAdapter.java    |   5 +-
 .../ui/adapter/step/DiyStepAdapter.java       |   5 +-
 .../ui/adapter/step/StepAdapter.java          |  76 ------------
 .../ui/fragment/goods/LocalGoodsFragment.java |   5 +
 .../ui/viewmodel/HomeGoodsViewModel.java      |   2 +-
 .../ui/viewmodel/UpdateAllDataService.java    |   2 +-
 .../ui/viewmodel/UpdateDataService.java       |   2 +-
 .../layout/activity_bottom_navigation2.xml    |  32 ++---
 .../layout/activity_bottom_navigation_new.xml |  28 ++---
 .../main/res/layout/activity_bunkersetup.xml  |   3 +-
 .../res/layout/activity_edit_classify_tab.xml |  19 +--
 app/src/main/res/layout/activity_login.xml    |   4 +-
 app/src/main/res/layout/activity_sz.xml       |   2 +-
 app/src/main/res/layout/fragment_home2.xml    |  43 ++++---
 .../main/res/layout/fragment_local_goods.xml  |   2 +-
 .../res/layout/fragment_system_systemset.xml  |   4 +-
 .../layout/dialog_with_cancel_confirm.xml     |  12 +-
 .../layout/item/layout/item_cloud_goods.xml   |   3 +-
 .../layout/item/layout/item_local_goods.xml   |   2 +-
 .../item/layout/item_spinner_text36.xml       |   1 -
 app/src/main/res/values/dimens.xml            |   3 +-
 47 files changed, 322 insertions(+), 356 deletions(-)
 delete mode 100644 app/src/main/java/com/bonait/bnframework/ui/adapter/record/DeviceRecordAdapter.java
 delete mode 100644 app/src/main/java/com/bonait/bnframework/ui/adapter/record/LocalLogAdapter.java
 delete mode 100644 app/src/main/java/com/bonait/bnframework/ui/adapter/step/StepAdapter.java

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index e9ca31d9..996918f8 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-08-19T06:05:44.263962500Z">
+        <DropdownSelection timestamp="2024-09-11T10:44:13.742879300Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=127.0.0.1:7555;connection=2f03a5eb" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=f53c72a8" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c135851e..25d619d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -199,7 +199,7 @@
             android:theme="@style/AppTheme.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
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 bda2db13..cd19c7d5 100644
--- a/app/src/main/java/com/bonait/bnframework/business/MainInit.java
+++ b/app/src/main/java/com/bonait/bnframework/business/MainInit.java
@@ -76,9 +76,6 @@ public class MainInit {
      */
     public static void Init(Application app)
     {
-        if(ConfigName.getInstance().isPhoneVersion){
-            ConfigName.getInstance().scale = 1.5;
-        }
         //0.全局异常捕获,保存为SD卡本级目录 crash
         CrashHandler.getInstance().init(app);
 
diff --git a/app/src/main/java/com/bonait/bnframework/common/API/APIHelper.java b/app/src/main/java/com/bonait/bnframework/common/API/APIHelper.java
index 89b484cd..a46861b0 100644
--- a/app/src/main/java/com/bonait/bnframework/common/API/APIHelper.java
+++ b/app/src/main/java/com/bonait/bnframework/common/API/APIHelper.java
@@ -30,9 +30,6 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class APIHelper {
-
-    private static String key="64059261-1599-472c-b418-3c18b4e3883e";
-
     /**
      * 获取加密后的签名
      * @param t
@@ -440,7 +437,7 @@ public class APIHelper {
                 //设置请求头
                 connection.setRequestProperty("key", signkey);
                 connection.setRequestProperty("sign", sign);
-                LogUtils.d("PostT sign="+sign +";key="+key+":url="+url);
+                LogUtils.d("PostT sign="+sign +";key="+signkey+":url="+url);
 
 
                 //设置请求 body
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 99d5aace..25ddc92a 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
@@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class ConfigName {
     public static boolean isTEST = false;
     public boolean is800WithFeeding = false;//是否是800带投料版    有5个投料位
-    public boolean isPhoneVersion = false;//是否适配手机
+    public boolean isPhoneVersion = true;//是否适配手机
     public boolean isHighVersion = false;//是否适配高版本
     public double scale = 1;
 
@@ -418,12 +418,12 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
         add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
         //todo
-        add(new Res_PLCADDRESS("料仓5校准开关", "M13.5", 0, 1));
-        add(new Res_PLCADDRESS("料仓5校准值", "VW120", 1, 1));
-        add(new Res_PLCADDRESS("料仓6校准开关", "M13.5", 0, 1));
-        add(new Res_PLCADDRESS("料仓6校准值", "VW120", 1, 1));
-        add(new Res_PLCADDRESS("料仓7校准开关", "M13.5", 0, 1));
-        add(new Res_PLCADDRESS("料仓7校准值", "VW120", 1, 1));
+        add(new Res_PLCADDRESS("料仓5校准开关", "M101.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓5校准值", "VW550", 1, 1));
+        add(new Res_PLCADDRESS("料仓6校准开关", "M101.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓6校准值", "VW554", 1, 1));
+        add(new Res_PLCADDRESS("料仓7校准开关", "M101.2", 0, 1));
+        add(new Res_PLCADDRESS("料仓7校准值", "VW558", 1, 1));
 
         add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));
 
@@ -437,12 +437,12 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
         add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));
         //todo
-        add(new Res_PLCADDRESS("料仓5需求值", "VW122", 1, 1));
-        add(new Res_PLCADDRESS("料仓5下料", "M13.4", 0, 1));
-        add(new Res_PLCADDRESS("料仓6需求值", "VW122", 1, 1));
-        add(new Res_PLCADDRESS("料仓6下料", "M13.4", 0, 1));
-        add(new Res_PLCADDRESS("料仓7需求值", "VW122", 1, 1));
-        add(new Res_PLCADDRESS("料仓7下料", "M13.4", 0, 1));
+        add(new Res_PLCADDRESS("料仓5需求值", "VW552", 1, 1));
+        add(new Res_PLCADDRESS("料仓5下料", "M100.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓6需求值", "VW556", 1, 1));
+        add(new Res_PLCADDRESS("料仓6下料", "M100.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓7需求值", "VW560", 1, 1));
+        add(new Res_PLCADDRESS("料仓7下料", "M100.2", 0, 1));
 
         add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
@@ -450,9 +450,9 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
         add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));
         //todo
-        add(new Res_PLCADDRESS("料仓5手动开关", "M13.3", 1, 1));
-        add(new Res_PLCADDRESS("料仓6手动开关", "M10.7", 1, 1));
-        add(new Res_PLCADDRESS("料仓7手动开关", "M13.3", 1, 1));
+        add(new Res_PLCADDRESS("料仓5手动开关", "M102.0", 1, 1));
+        add(new Res_PLCADDRESS("料仓6手动开关", "M102.1", 1, 1));
+        add(new Res_PLCADDRESS("料仓7手动开关", "M102.2", 1, 1));
 
         //上下限
         add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
@@ -506,9 +506,9 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
         add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
         //todo
-        add(new Res_PLCADDRESS("料仓5下料完成", "M42.0", 1, 0));
-        add(new Res_PLCADDRESS("料仓6下料完成", "M42.0", 1, 0));
-        add(new Res_PLCADDRESS("料仓7下料完成", "M42.0", 1, 0));
+        add(new Res_PLCADDRESS("料仓5下料完成", "M105.0", 1, 0));
+        add(new Res_PLCADDRESS("料仓6下料完成", "M105.1", 1, 0));
+        add(new Res_PLCADDRESS("料仓7下料完成", "M105.2", 1, 0));
 
         add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
         add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
@@ -628,6 +628,13 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
         add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
         add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));
+        //todo
+        add(new Res_PLCADDRESS("料仓5校准开关", "M101.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓5校准值", "VW550", 1, 1));
+        add(new Res_PLCADDRESS("料仓6校准开关", "M101.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓6校准值", "VW554", 1, 1));
+        add(new Res_PLCADDRESS("料仓7校准开关", "M101.2", 0, 1));
+        add(new Res_PLCADDRESS("料仓7校准值", "VW558", 1, 1));
 
         add(new Res_PLCADDRESS("料仓自动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1需求值", "VW106", 1, 1));
@@ -638,13 +645,22 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓3下料", "M11.3", 0, 1));
         add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
         add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));
-
+        //todo
+        add(new Res_PLCADDRESS("料仓5需求值", "VW552", 1, 1));
+        add(new Res_PLCADDRESS("料仓5下料", "M100.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓6需求值", "VW556", 1, 1));
+        add(new Res_PLCADDRESS("料仓6下料", "M100.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓7需求值", "VW560", 1, 1));
+        add(new Res_PLCADDRESS("料仓7下料", "M100.2", 0, 1));
         add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
         add(new Res_PLCADDRESS("料仓2手动开关", "M13.2", 1, 1));
         add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
         add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));
-
+//todo
+        add(new Res_PLCADDRESS("料仓5手动开关", "M102.0", 1, 1));
+        add(new Res_PLCADDRESS("料仓6手动开关", "M102.1", 1, 1));
+        add(new Res_PLCADDRESS("料仓7手动开关", "M102.2", 1, 1));
         //上下限
         add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
         add(new Res_PLCADDRESS("原点位置下限", "VD150", 1, 1));
@@ -748,6 +764,10 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2下料完成", "M41.3", 1, 0));
         add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
         add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
+        //todo
+        add(new Res_PLCADDRESS("料仓5下料完成", "M105.0", 1, 0));
+        add(new Res_PLCADDRESS("料仓6下料完成", "M105.1", 1, 0));
+        add(new Res_PLCADDRESS("料仓7下料完成", "M105.2", 1, 0));
         add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
         add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
         add(new Res_PLCADDRESS("炒锅倒菜减速位", "M41.7", 1, 0));
@@ -877,6 +897,13 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
         add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
         add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));
+        //todo
+        add(new Res_PLCADDRESS("料仓5校准开关", "M101.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓5校准值", "VW550", 1, 1));
+        add(new Res_PLCADDRESS("料仓6校准开关", "M101.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓6校准值", "VW554", 1, 1));
+        add(new Res_PLCADDRESS("料仓7校准开关", "M101.2", 0, 1));
+        add(new Res_PLCADDRESS("料仓7校准值", "VW558", 1, 1));
 
         add(new Res_PLCADDRESS("料仓自动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1需求值", "VW106", 1, 1));
@@ -887,13 +914,22 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓3下料", "M11.3", 0, 1));
         add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
         add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));
-
+        //todo
+        add(new Res_PLCADDRESS("料仓5需求值", "VW552", 1, 1));
+        add(new Res_PLCADDRESS("料仓5下料", "M100.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓6需求值", "VW556", 1, 1));
+        add(new Res_PLCADDRESS("料仓6下料", "M100.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓7需求值", "VW560", 1, 1));
+        add(new Res_PLCADDRESS("料仓7下料", "M100.2", 0, 1));
         add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
         add(new Res_PLCADDRESS("料仓2手动开关", "M13.2", 1, 1));
         add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
         add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));
-
+//todo
+        add(new Res_PLCADDRESS("料仓5手动开关", "M102.0", 1, 1));
+        add(new Res_PLCADDRESS("料仓6手动开关", "M102.1", 1, 1));
+        add(new Res_PLCADDRESS("料仓7手动开关", "M102.2", 1, 1));
         //上下限
         add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
         add(new Res_PLCADDRESS("原点位置下限", "VD150", 1, 1));
@@ -1003,6 +1039,10 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2下料完成", "M41.3", 1, 0));
         add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
         add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
+        //todo
+        add(new Res_PLCADDRESS("料仓5下料完成", "M105.0", 1, 0));
+        add(new Res_PLCADDRESS("料仓6下料完成", "M105.1", 1, 0));
+        add(new Res_PLCADDRESS("料仓7下料完成", "M105.2", 1, 0));
         add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
         add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
         add(new Res_PLCADDRESS("炒锅倒菜减速位", "M41.7", 1, 0));
@@ -1292,6 +1332,13 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓4校准开关", "M13.5", 0, 1));
         add(new Res_PLCADDRESS("料仓4校准值", "VW120", 1, 1));
         add(new Res_PLCADDRESS("开始校正", "M12.6", 0, 1));
+        //todo
+        add(new Res_PLCADDRESS("料仓5校准开关", "M101.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓5校准值", "VW550", 1, 1));
+        add(new Res_PLCADDRESS("料仓6校准开关", "M101.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓6校准值", "VW554", 1, 1));
+        add(new Res_PLCADDRESS("料仓7校准开关", "M101.2", 0, 1));
+        add(new Res_PLCADDRESS("料仓7校准值", "VW558", 1, 1));
 
         add(new Res_PLCADDRESS("料仓自动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1需求值", "VW106", 1, 1));
@@ -1302,13 +1349,22 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓3下料", "M11.3", 0, 1));
         add(new Res_PLCADDRESS("料仓4需求值", "VW122", 1, 1));
         add(new Res_PLCADDRESS("料仓4下料", "M13.4", 0, 1));
-
+        //todo
+        add(new Res_PLCADDRESS("料仓5需求值", "VW552", 1, 1));
+        add(new Res_PLCADDRESS("料仓5下料", "M100.0", 0, 1));
+        add(new Res_PLCADDRESS("料仓6需求值", "VW556", 1, 1));
+        add(new Res_PLCADDRESS("料仓6下料", "M100.1", 0, 1));
+        add(new Res_PLCADDRESS("料仓7需求值", "VW560", 1, 1));
+        add(new Res_PLCADDRESS("料仓7下料", "M100.2", 0, 1));
         add(new Res_PLCADDRESS("料仓手动", "-------------", 0, 0));
         add(new Res_PLCADDRESS("料仓1手动开关", "M13.1", 1, 1));
         add(new Res_PLCADDRESS("料仓2手动开关", "M13.2", 1, 1));
         add(new Res_PLCADDRESS("料仓3手动开关", "M13.3", 1, 1));
         add(new Res_PLCADDRESS("料仓4手动开关", "M10.7", 1, 1));
-
+//todo
+        add(new Res_PLCADDRESS("料仓5手动开关", "M102.0", 1, 1));
+        add(new Res_PLCADDRESS("料仓6手动开关", "M102.1", 1, 1));
+        add(new Res_PLCADDRESS("料仓7手动开关", "M102.2", 1, 1));
         //上下限
         add(new Res_PLCADDRESS("位置上下限", "-------------", 0, 0));
         add(new Res_PLCADDRESS("原点位置下限", "VD150", 1, 1));
@@ -1409,6 +1465,10 @@ public class ConfigName {
         add(new Res_PLCADDRESS("料仓2下料完成", "M41.3", 1, 0));
         add(new Res_PLCADDRESS("料仓3下料完成", "M41.4", 1, 0));
         add(new Res_PLCADDRESS("料仓4下料完成", "M42.0", 1, 0));
+        //todo
+        add(new Res_PLCADDRESS("料仓5下料完成", "M105.0", 1, 0));
+        add(new Res_PLCADDRESS("料仓6下料完成", "M105.1", 1, 0));
+        add(new Res_PLCADDRESS("料仓7下料完成", "M105.2", 1, 0));
         add(new Res_PLCADDRESS("炒锅清洗反馈", "M41.5", 1, 0));
         add(new Res_PLCADDRESS("出餐启动反馈", "M41.6", 1, 0));
         add(new Res_PLCADDRESS("炒锅倒菜减速位", "M41.7", 1, 0));
diff --git a/app/src/main/java/com/bonait/bnframework/common/helper/LogcatHelper.java b/app/src/main/java/com/bonait/bnframework/common/helper/LogcatHelper.java
index 77e647c5..d4b43d3e 100644
--- a/app/src/main/java/com/bonait/bnframework/common/helper/LogcatHelper.java
+++ b/app/src/main/java/com/bonait/bnframework/common/helper/LogcatHelper.java
@@ -95,7 +95,11 @@ public class LogcatHelper {
     public void start() {
         if (mLogThread == null)
             mLogThread = new LogThread(String.valueOf(mPId), pathLogcat);
-        mLogThread.start();
+        try{
+            mLogThread.start();
+        }catch (Exception e){
+
+        }
     }
 
     public void stop() {
diff --git a/app/src/main/java/com/bonait/bnframework/common/image/MyBitmapUtils.java b/app/src/main/java/com/bonait/bnframework/common/image/MyBitmapUtils.java
index 54229203..fd4ca394 100644
--- a/app/src/main/java/com/bonait/bnframework/common/image/MyBitmapUtils.java
+++ b/app/src/main/java/com/bonait/bnframework/common/image/MyBitmapUtils.java
@@ -47,7 +47,7 @@ public class MyBitmapUtils {
             }
 
             //网络缓存
-            if(url.contains("http"))
+            if(url.contains("http")&&(url.contains("png")||url.contains("jpg")))
             {
                 Log.d("MyBitmapUtils","disPlay getBitmapFromNet  url="+url);
                 mNetCacheUtils.getBitmapFromNet(ivPic,url);
diff --git a/app/src/main/java/com/bonait/bnframework/common/image/utils/LocalCacheUtils.java b/app/src/main/java/com/bonait/bnframework/common/image/utils/LocalCacheUtils.java
index a5e008d3..265485ac 100644
--- a/app/src/main/java/com/bonait/bnframework/common/image/utils/LocalCacheUtils.java
+++ b/app/src/main/java/com/bonait/bnframework/common/image/utils/LocalCacheUtils.java
@@ -74,7 +74,7 @@ public class LocalCacheUtils {
             } catch (OutOfMemoryError e) {
                 e.printStackTrace();
             } catch (IllegalArgumentException ex) {
-                System.out.println("界面已经销毁.....");
+                System.out.println("从本地获取图片啦.....");
             }
         }
         return false;
diff --git a/app/src/main/java/com/bonait/bnframework/glide/GlideUtil.java b/app/src/main/java/com/bonait/bnframework/glide/GlideUtil.java
index cb7a98f0..8659b938 100644
--- a/app/src/main/java/com/bonait/bnframework/glide/GlideUtil.java
+++ b/app/src/main/java/com/bonait/bnframework/glide/GlideUtil.java
@@ -75,6 +75,8 @@ public class GlideUtil {
                     }
                 })
                 .placeholder(placeId)
+                .error(placeId)
+                .apply(new RequestOptions().transform(new FitXYRoundRadiusTransform(10)))
                 .transition(DrawableTransitionOptions.withCrossFade(CROSS_FADE_DURATION))
                 .into(imageView);
     }
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/BunkerSetupActivity.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/BunkerSetupActivity.java
index d01ed036..724e0ee7 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/BunkerSetupActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/BunkerSetupActivity.java
@@ -83,10 +83,12 @@ public class BunkerSetupActivity extends BaseActivity {
         if(ConfigName.getInstance().silosAuto){
             binding.llSilos.setVisibility(View.GONE);
             binding.llSilos3.setVisibility(View.GONE);
+            binding.scrollView.setVisibility(View.VISIBLE);
             binding.llSilosAuto.setVisibility(View.VISIBLE);
         }else {
             binding.llSilos.setVisibility(View.VISIBLE);
             binding.llSilos3.setVisibility(View.VISIBLE);
+            binding.scrollView.setVisibility(View.GONE);
             binding.llSilosAuto.setVisibility(View.GONE);
         }
 
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSeasoningsetFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSeasoningsetFragment.java
index d55f7946..1ae79753 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSeasoningsetFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSeasoningsetFragment.java
@@ -30,6 +30,7 @@ import com.bonait.bnframework.common.db.mode.BPA_PROCESS;
 import com.bonait.bnframework.common.db.mode.BPA_SILOSANDMATERIAL;
 import com.bonait.bnframework.common.db.res.lcMode;
 import com.bonait.bnframework.common.helper.I.MyClickListener;
+import com.bonait.bnframework.common.thread.ThreadManager;
 import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.common.utils.NetworkUtils;
 import com.bonait.bnframework.common.utils.ToastUtils;
@@ -208,9 +209,14 @@ public class SystemSeasoningsetFragment extends BaseFragment implements MyClickL
                                 @Override
                                 public void onClick(QMUIDialog dialog, int index) {
                                     if(ConfigName.isTEST){
-                                        HomeGoodsViewModel.GetMaterialInfo();
-                                        HomeGoodsViewModel.GetMaterialType();
-                                        UpdateDataService.downLoadProcessModel("",getContext());
+                                        ThreadManager.get().execute(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                HomeGoodsViewModel.GetMaterialInfo();
+                                                HomeGoodsViewModel.GetMaterialType();
+                                                UpdateDataService.downLoadProcessModel("",getContext());
+                                            }
+                                        });
                                         dialog.dismiss();
                                         return;
                                     }
@@ -218,9 +224,15 @@ public class SystemSeasoningsetFragment extends BaseFragment implements MyClickL
                                     if (text != null && text.length() > 0) {
                                         if (text.toString().equals(ConfigName.getInstance().user.pass)) {
 //                                            ConfigData.getInstance().SyncDataInTheCloud(context,mHandler);
-                                            HomeGoodsViewModel.GetMaterialInfo();
-                                            HomeGoodsViewModel.GetMaterialType();
-                                            UpdateDataService.downLoadProcessModel("",getContext());
+                                            ThreadManager.get().execute(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    HomeGoodsViewModel.GetMaterialInfo();
+                                                    HomeGoodsViewModel.GetMaterialType();
+                                                    UpdateDataService.downLoadProcessModel("",getContext());
+                                                }
+                                            });
+
                                             dialog.dismiss();
                                         } else {
                                             ToastUtils.info("权限密码不正确！","The permission password is incorrect!");
diff --git a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java
index f8bd2c3b..57efd7b2 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/home/fragment/from/fragment/SystemSystemsetFragment.java
@@ -32,6 +32,7 @@ import com.bonait.bnframework.common.utils.PreferenceUtils;
 import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.ui.viewmodel.HomeGoodsViewModel;
 import com.bonait.bnframework.ui.viewmodel.UpdateDataService;
+import com.bonait.bnframework.ui.widget.NewToastUtil;
 import com.orhanobut.logger.Logger;
 
 import java.util.ArrayList;
@@ -311,6 +312,10 @@ public class SystemSystemsetFragment extends BaseFragment {
                         ArrayList<BPA_SILOSANDMATERIAL> silosandmaterials = QueryDB.GetSilosAndMaterialALL();
                         if (!silosArrayList.isEmpty()) {
                             int size = silosArrayList.size();
+                            if(edittextSilos.getText().toString().isEmpty()){
+                                NewToastUtil.getInstance().showToastError("料仓数量不能为空");
+                                return;
+                            }
                             int newSize = Integer.parseInt(edittextSilos.getText().toString());
 
                             if(size>newSize){
@@ -336,7 +341,9 @@ public class SystemSystemsetFragment extends BaseFragment {
                     }
                 }
                 ConfigName.getInstance().silosAuto = cb_autoSilos.isChecked();
-                ConfigName.getInstance().silosNum = Integer.parseInt(edittextSilos.getText().toString());
+                if(!edittextSilos.getText().toString().isEmpty()){
+                    ConfigName.getInstance().silosNum = Integer.parseInt(edittextSilos.getText().toString());
+                }
 
                 UpdateDataService.key = edittext103.getText().toString();
 
diff --git a/app/src/main/java/com/bonait/bnframework/modules/welcome/activity/WelcomeActivity.java b/app/src/main/java/com/bonait/bnframework/modules/welcome/activity/WelcomeActivity.java
index 1377ec83..50b01b35 100644
--- a/app/src/main/java/com/bonait/bnframework/modules/welcome/activity/WelcomeActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/modules/welcome/activity/WelcomeActivity.java
@@ -53,10 +53,18 @@ public class WelcomeActivity extends BaseActivity {
         float mfScreenDensity = dm.density;
         LogUtils.d(" 屏幕宽高   "+"miDisplayWidth=" + miDisplayWidth + ",miDisplayHeight="
                 + miDisplayHeight+ "mfFontDensity=" + mfFontDensity+ "mfScreenDensity=" + mfScreenDensity+"densityDpi=" + dm.densityDpi);
+        if(ConfigName.getInstance().isPhoneVersion){
+            ConfigName.getInstance().scale = (double) miDisplayWidth /800;
+        }
         initScaleViewDefaultValue();
         initWelcome();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+    }
 
     /**
      * 初始化应用界面视图适配基准值
@@ -113,8 +121,7 @@ public class WelcomeActivity extends BaseActivity {
      */
     public void PermissionCheck() {
 
-        String[] params = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA
-                };
+        String[] params = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA};
         //String[] params = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
         //判断是否获取权限
         if (EasyPermissions.hasPermissions(this, params)) {
@@ -225,6 +232,7 @@ public class WelcomeActivity extends BaseActivity {
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         startActivity(intent);
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+        finish();
         // 结束所有Activity
         ActivityLifecycleManager.get().finishAllActivity();
     }
diff --git a/app/src/main/java/com/bonait/bnframework/ui/activity/DiyProcessActivity.java b/app/src/main/java/com/bonait/bnframework/ui/activity/DiyProcessActivity.java
index 5d2b4534..1ba0e74a 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/activity/DiyProcessActivity.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/activity/DiyProcessActivity.java
@@ -521,10 +521,11 @@ public class DiyProcessActivity extends BaseActivity {
     public BPA_GOODS_PROCESS_DETAIL getSelectItemFromValue() {
         BPA_GOODS_PROCESS_DETAIL processDetail = new BPA_GOODS_PROCESS_DETAIL();
         try {
-            ArrayList<BPA_PROCESS> data_1 = QueryDB.GetProcessALL();
-            processDetail.goodsSubAttributeGroupId = subAttributeGroupId;
-            long t= viewBinding.spinnerProcess.getSelectedItemId();
-            String name = data_1.get((int) t).name;
+//            ArrayList<BPA_PROCESS> data_1 = QueryDB.GetProcessALL();
+//            processDetail.goodsSubAttributeGroupId = subAttributeGroupId;
+//            long t= viewBinding.spinnerProcess.getSelectedItemId();
+//            String name = data_1.get((int) t).name;
+            String name = viewBinding.spinnerProcess.getSelectedItem().toString();
             /*String name = viewBinding.spinnerProcess.getSelectedItem().toString();*/
             boolean IsVerify = true;
             StringBuilder description = new StringBuilder();
diff --git a/app/src/main/java/com/bonait/bnframework/ui/activity/GoodEditClassifyFragment.java b/app/src/main/java/com/bonait/bnframework/ui/activity/GoodEditClassifyFragment.java
index 537bfcb3..4def1fc5 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/activity/GoodEditClassifyFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/activity/GoodEditClassifyFragment.java
@@ -1,5 +1,7 @@
 package com.bonait.bnframework.ui.activity;
 
+import static com.bonait.bnframework.MainApplication.getContext;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Rect;
@@ -31,6 +33,7 @@ import com.bonait.bnframework.common.utils.AlertDialogUtils;
 import com.bonait.bnframework.databinding.DialogAddClassifyBinding;
 import com.bonait.bnframework.databinding.DialogDeleteClassifyBinding;
 import com.bonait.bnframework.databinding.FragmentGoodEditClassifyBinding;
+import com.bonait.bnframework.ui.adapter.classify.Spinner36Adapter;
 import com.bonait.bnframework.ui.adapter.goods.LocalGoodsAdapter;
 import com.bonait.bnframework.ui.util.DimensUtil;
 import com.bonait.bnframework.ui.util.DisplayManager;
@@ -58,7 +61,8 @@ public class GoodEditClassifyFragment extends BaseFragment {
     /**
      * 下拉列表
      */
-    private ArrayAdapter<String> spinnerAdapter;//
+//    private ArrayAdapter<String> spinnerAdapter;//
+    private Spinner36Adapter spinnerAdapter;//
     private final Map<String, String> classifyList = new LinkedHashMap<>();
     private final List<String> classifyNameList = new ArrayList<>();
     private boolean isUserClicked = false;
@@ -141,10 +145,18 @@ public class GoodEditClassifyFragment extends BaseFragment {
         //下拉选择
         classifyNameList.clear();
         classifyNameList.addAll(classifyList.keySet());
-        spinnerAdapter = new ArrayAdapter<>(context, R.layout.spinner_text_item32, classifyNameList);
-        LogUtils.d(" initView classifyNameList="+classifyNameList);
-        spinnerAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item32);
+        spinnerAdapter = new Spinner36Adapter(getContext(),  classifyNameList);
         viewBinding.spinnerClassify.setAdapter(spinnerAdapter);
+//        if(ConfigName.getInstance().isPhoneVersion){
+//            spinnerAdapter = new Spinner36Adapter(getContext(),  classifyNameList);
+//            viewBinding.spinnerClassify.setAdapter(spinnerAdapter);
+//        }else {
+//            spinnerAdapter = new ArrayAdapter<>(context, R.layout.spinner_text_item32, classifyNameList);
+//            LogUtils.d(" initView classifyNameList="+classifyNameList);
+//            spinnerAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item32);
+//            viewBinding.spinnerClassify.setAdapter(spinnerAdapter);
+//        }
+
         viewBinding.spinnerClassify.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
diff --git a/app/src/main/java/com/bonait/bnframework/ui/activity/PropEditClassifyFragment.java b/app/src/main/java/com/bonait/bnframework/ui/activity/PropEditClassifyFragment.java
index 679e7088..cc102ffb 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/activity/PropEditClassifyFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/activity/PropEditClassifyFragment.java
@@ -34,6 +34,7 @@ import com.bonait.bnframework.databinding.DialogAddClassifyBinding;
 import com.bonait.bnframework.databinding.DialogDeleteClassifyBinding;
 import com.bonait.bnframework.databinding.FragmentPropEditClassifyBinding;
 import com.bonait.bnframework.ui.adapter.classify.AttributeAdapter;
+import com.bonait.bnframework.ui.adapter.classify.Spinner36Adapter;
 import com.bonait.bnframework.ui.adapter.classify.SubattributeAdapter;
 import com.bonait.bnframework.ui.util.DisplayManager;
 import com.bonait.bnframework.ui.widget.NewToastUtil;
@@ -70,7 +71,8 @@ public class PropEditClassifyFragment extends BaseFragment {
     /**
      * 下拉列表
      */
-    private ArrayAdapter<String> spinnerAdapter;//
+//    private ArrayAdapter<String> spinnerAdapter;//
+    private Spinner36Adapter spinnerAdapter;//
     private final Map<String, String> classifyList = new LinkedHashMap<>();
     private final List<String> classifyNameList = new ArrayList<>();
     private boolean isUserClicked = false;
@@ -230,10 +232,19 @@ public class PropEditClassifyFragment extends BaseFragment {
         //下拉选择
         classifyNameList.clear();
         classifyNameList.addAll(classifyList.keySet());
-        spinnerAdapter = new ArrayAdapter<>(context, R.layout.spinner_text_item32, classifyNameList);
-        LogUtils.d(" initView classifyNameList="+classifyNameList);
-        spinnerAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item32);
+
+        spinnerAdapter = new Spinner36Adapter(getContext(),  classifyNameList);
         viewBinding.spinnerClassify.setAdapter(spinnerAdapter);
+//        if(ConfigName.getInstance().isPhoneVersion){
+//            spinnerAdapter2 = new Spinner36Adapter(getContext(),  classifyNameList);
+//            viewBinding.spinnerClassify.setAdapter(spinnerAdapter2);
+//        }else {
+//            spinnerAdapter = new ArrayAdapter<>(context, R.layout.spinner_text_item32, classifyNameList);
+//            LogUtils.d(" initView classifyNameList="+classifyNameList);
+//            spinnerAdapter.setDropDownViewResource(R.layout.spinner_dropdown_item32);
+//            viewBinding.spinnerClassify.setAdapter(spinnerAdapter);
+//        }
+
         viewBinding.spinnerClassify.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View view, MotionEvent motionEvent) {
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/ClassifySpinnerAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/ClassifySpinnerAdapter.java
index e0d8c653..3d717cb0 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/ClassifySpinnerAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/ClassifySpinnerAdapter.java
@@ -53,7 +53,10 @@ public class ClassifySpinnerAdapter extends BaseAdapter {
         }
         TextView textView = convertView.findViewById(R.id.textViewCustom);
         textView.setText(getItem(position));
-        if(textView.getTextSize()>34* ConfigName.getInstance().scale||textView.getTextSize()<30*ConfigName.getInstance().scale){
+//        if(textView.getTextSize()>34* ConfigName.getInstance().scale||textView.getTextSize()<30*ConfigName.getInstance().scale){
+//            DisplayManager.scaleViewGroup(convertView.findViewById(R.id.root));
+//        }
+        if(convertView.findViewById(R.id.root).getWidth()==0){
             DisplayManager.scaleViewGroup(convertView.findViewById(R.id.root));
         }
 
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/GoodClassifyAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/GoodClassifyAdapter.java
index 4d32301d..4ed4c9ae 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/GoodClassifyAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/GoodClassifyAdapter.java
@@ -30,7 +30,10 @@ public abstract class GoodClassifyAdapter extends BaseAdapter<BPA_GOODS_CLASSIFY
     @SuppressLint("SetTextI18n")
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
-        if(holder.binding.name.getTextSize()> 34* ConfigName.getInstance().scale || holder.binding.name.getTextSize()< 30*ConfigName.getInstance().scale){
+//        if(holder.binding.name.getTextSize()> 34* ConfigName.getInstance().scale || holder.binding.name.getTextSize()< 30*ConfigName.getInstance().scale){
+//            DisplayManager.scaleViewGroup(holder.binding.getRoot());
+//        }
+        if(holder.binding.getRoot().getWidth()==0){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
         holder.binding.name.setText(mData.get(position).name+"");
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectAttributeListAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectAttributeListAdapter.java
index 60075bf9..3d6adbe6 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectAttributeListAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectAttributeListAdapter.java
@@ -64,7 +64,10 @@ public class SelectAttributeListAdapter extends ArrayAdapter<BPA_ATTRIBUTE> {
             //分别获取 image view 和 textview 的实例
             TextView name = view.findViewById(R.id.attribute_name);
             RecyclerView recyclerView = view.findViewById(R.id.recycle_sub_attribute);
-            if(name.getTextSize()>34* ConfigName.getInstance().scale||name.getTextSize()<30*ConfigName.getInstance().scale){
+//            if(name.getTextSize()>34* ConfigName.getInstance().scale||name.getTextSize()<30*ConfigName.getInstance().scale){
+//                DisplayManager.scaleViewGroup(view.findViewById(R.id.root));
+//            }
+            if(view.findViewById(R.id.root).getWidth()==0){
                 DisplayManager.scaleViewGroup(view.findViewById(R.id.root));
             }
             name.setText(bean.name+":");
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectSubAttributeAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectSubAttributeAdapter.java
index 860bd2af..2a3ff9a9 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectSubAttributeAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/SelectSubAttributeAdapter.java
@@ -45,7 +45,10 @@ public class SelectSubAttributeAdapter extends BaseAdapter<BPA_SUBATTRIBUTE,Sele
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            if(holder.binding.name.getTextSize()>34* ConfigName.getInstance().scale||holder.binding.name.getTextSize()<30*ConfigName.getInstance().scale){
+//            if(holder.binding.name.getTextSize()>34* ConfigName.getInstance().scale||holder.binding.name.getTextSize()<30*ConfigName.getInstance().scale){
+//                DisplayManager.scaleViewGroup(holder.binding.getRoot());
+//            }
+            if(holder.binding.getRoot().getWidth()==0){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
             BPA_SUBATTRIBUTE subattribute = mData.get(position);
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/Spinner36Adapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/Spinner36Adapter.java
index 029e5ec2..5a815955 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/Spinner36Adapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/classify/Spinner36Adapter.java
@@ -10,6 +10,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.apkfuns.logutils.LogUtils;
 import com.bonait.bnframework.R;
 import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.ui.util.DisplayManager;
@@ -51,10 +52,16 @@ public class Spinner36Adapter extends BaseAdapter {
             convertView = LayoutInflater.from(context).inflate(R.layout.item_spinner_text36, null);
         }
         TextView textView = convertView.findViewById(R.id.textViewCustom);
-        textView.setText(getItem(position));
-        if(textView.getTextSize()>38* ConfigName.getInstance().scale||textView.getTextSize()<34*ConfigName.getInstance().scale){
+        if(convertView.findViewById(R.id.root).getWidth()==0&&textView.getText().toString().isEmpty()){
             DisplayManager.scaleViewGroup(convertView.findViewById(R.id.root));
+            LogUtils.d("  Spinner36Adapter // 1 "+position);
         }
+        textView.setText(getItem(position));
+//        if(textView.getTextSize()>38* ConfigName.getInstance().scale||textView.getTextSize()<34*ConfigName.getInstance().scale){
+//            DisplayManager.scaleViewGroup(convertView.findViewById(R.id.root));
+//            LogUtils.d("  Spinner36Adapter // 2 "+position);
+//        }
+
 
         return convertView;
     }
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/CloudGoodsAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/CloudGoodsAdapter.java
index 17f7340c..a9eece8e 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/CloudGoodsAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/CloudGoodsAdapter.java
@@ -16,8 +16,10 @@ import com.bonait.bnframework.common.db.mode.BPA_GOODS;
 import com.bonait.bnframework.common.db.util.GoodsDBUtil;
 import com.bonait.bnframework.common.image.MyBitmapUtils;
 
+import com.bonait.bnframework.common.utils.NetworkUtils;
 import com.bonait.bnframework.common.utils.ToastUtils;
 import com.bonait.bnframework.databinding.ItemCloudGoodsBinding;
+import com.bonait.bnframework.glide.GlideUtil;
 import com.bonait.bnframework.ui.adapter.BaseAdapter;
 import com.bonait.bnframework.ui.util.DisplayManager;
 
@@ -39,11 +41,16 @@ public abstract class CloudGoodsAdapter extends BaseAdapter<BPA_GOODS,CloudGoods
     @Override
     public void onBindViewHolder(@NonNull GoodsViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            LogUtils.d(" holder.binding.name.getTextSize()="+holder.binding.name.getTextSize());
-            if(holder.binding.name.getTextSize()>34*ConfigName.getInstance().scale||holder.binding.name.getTextSize()<30*ConfigName.getInstance().scale){
+            LogUtils.d(" holder.binding.name.getTextSize()="+holder.binding.name.getTextSize()+"  width="+holder.binding.getRoot().getWidth());
+            LogUtils.d(" holder.binding.name.getImagesize()="+holder.binding.name.getWidth());
+//            if(holder.binding.name.getTextSize()>34*ConfigName.getInstance().scale||holder.binding.name.getTextSize()<30*ConfigName.getInstance().scale){
+//                DisplayManager.scaleViewGroup(holder.binding.getRoot());
+//            }
+            if(holder.binding.getRoot().getWidth()==0){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
-            LogUtils.d("DisplayManager holder.binding.name.getTextSize()="+holder.binding.name.getTextSize());
+            LogUtils.d(" holder.binding.name.getTextSize()="+holder.binding.name.getTextSize()+"  width="+holder.binding.getRoot().getWidth());
+
             holder.binding.add.setVisibility(View.GONE);
 
             BPA_GOODS goods = mData.get(position);
@@ -53,7 +60,9 @@ public abstract class CloudGoodsAdapter extends BaseAdapter<BPA_GOODS,CloudGoods
             if(url!=null && !url.isEmpty() &&!url.equals("未知"))
             {
                 myBitmapUtils.disPlay(holder.binding.image,url);
-//                GlideUtil.showImage(holder.binding.image.getContext(),url,holder.binding.image,R.mipmap.loading123);
+                if (NetworkUtils.checkNetworkAvailable(holder.binding.image.getContext())) {
+                    GlideUtil.showImage(holder.binding.image.getContext(),url,holder.binding.image,R.mipmap.loading123);
+                }
             }else {
                 holder.binding.image.setImageResource(R.mipmap.loading123);
             }
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/LocalGoodsAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/LocalGoodsAdapter.java
index e10f9cfd..50a3e344 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/LocalGoodsAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/goods/LocalGoodsAdapter.java
@@ -16,6 +16,7 @@ import com.bonait.bnframework.common.constant.ConfigName;
 import com.bonait.bnframework.common.db.mode.BPA_GOODS;
 import com.bonait.bnframework.common.image.MyBitmapUtils;
 
+import com.bonait.bnframework.common.utils.NetworkUtils;
 import com.bonait.bnframework.databinding.ItemLocalGoodsBinding;
 import com.bonait.bnframework.glide.GlideUtil;
 import com.bonait.bnframework.ui.adapter.BaseAdapter;
@@ -48,11 +49,14 @@ public abstract class LocalGoodsAdapter extends BaseAdapter<BPA_GOODS,LocalGoods
     @Override
     public void onBindViewHolder(@NonNull GoodsViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            LogUtils.d(" holder.binding.name.getTextSize()="+holder.binding.name.getTextSize());
-            if(holder.binding.name.getTextSize()> 30*ConfigName.getInstance().scale || holder.binding.name.getTextSize()< 26*ConfigName.getInstance().scale){
+            LogUtils.d(" holder.binding.name.getTextSize()="+holder.binding.name.getTextSize()+"  width="+holder.binding.getRoot().getWidth());
+//            if(holder.binding.name.getTextSize()> 30*ConfigName.getInstance().scale || holder.binding.name.getTextSize()< 26*ConfigName.getInstance().scale){
+//                DisplayManager.scaleViewGroup(holder.binding.getRoot());
+//            }
+            if(holder.binding.getRoot().getWidth()==0){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
-            LogUtils.d("DisplayManager holder.binding.name.getTextSize()="+holder.binding.name.getTextSize());
+            LogUtils.d(" holder.binding.name.getTextSize()="+holder.binding.name.getTextSize()+"  width="+holder.binding.getRoot().getWidth());
 
             holder.binding.add.setVisibility(View.GONE);
             if(isEdit){
@@ -78,7 +82,9 @@ public abstract class LocalGoodsAdapter extends BaseAdapter<BPA_GOODS,LocalGoods
             if(url!=null && !url.isEmpty() &&!url.equals("未知"))
             {
                 myBitmapUtils.disPlay(holder.binding.image,url);
-                GlideUtil.showImage(holder.binding.image.getContext(),url,holder.binding.image,R.mipmap.loading123);
+                if (NetworkUtils.checkNetworkAvailable(holder.binding.image.getContext())) {
+                    GlideUtil.showImage(holder.binding.image.getContext(),url,holder.binding.image,R.mipmap.loading123);
+                }
             }else {
                 holder.binding.image.setImageResource(R.mipmap.loading123);
             }
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/DeviceRecordAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/record/DeviceRecordAdapter.java
deleted file mode 100644
index fe25e560..00000000
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/DeviceRecordAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.bonait.bnframework.ui.adapter.record;
-
-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.model.DeviceRecordBean;
-import com.bonait.bnframework.databinding.ItemDeviceRecordBinding;
-import com.bonait.bnframework.ui.adapter.BaseAdapter;
-
-/**
- * @author: liup
- * @description:
- * @date: 2024/6/11 11:23.
- */
-public class DeviceRecordAdapter extends BaseAdapter<DeviceRecordBean,DeviceRecordAdapter.ViewHolder> {
-
-    @Override
-    protected void onItemClick(View v, int position) {
-
-    }
-
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new ViewHolder(ItemDeviceRecordBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.binding.name.setText(mData.get(position).getName()+"");
-        holder.binding.value.setText(mData.get(position).getValue()+"");
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        private ItemDeviceRecordBinding binding;
-
-
-        public ViewHolder(ItemDeviceRecordBinding view) {
-            super(view.getRoot());
-            binding = view;
-        }
-    }
-}
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/LocalLogAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/record/LocalLogAdapter.java
deleted file mode 100644
index 5959bd2a..00000000
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/LocalLogAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.bonait.bnframework.ui.adapter.record;
-
-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.constant.ConfigName;
-import com.bonait.bnframework.common.db.mode.BPA_LOG_RECORD;
-
-import com.bonait.bnframework.databinding.ItemLogBinding;
-import com.bonait.bnframework.ui.adapter.BaseAdapter;
-import com.bonait.bnframework.ui.util.DisplayManager;
-
-/**
- * @author: liup
- * @description: 日志
- * @date: 2024/6/3 15:46.
- */
-public class LocalLogAdapter extends BaseAdapter<BPA_LOG_RECORD, LocalLogAdapter.ViewHolder> {
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new ViewHolder(ItemLogBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
-    }
-
-    @SuppressLint("SetTextI18n")
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
-        BPA_LOG_RECORD log =  mData.get(position);
-        if(holder.binding.type.getTextSize()>28* ConfigName.getInstance().scale||holder.binding.type.getTextSize()<24*ConfigName.getInstance().scale){
-            DisplayManager.scaleViewGroup(holder.binding.getRoot());
-        }
-        holder.binding.type.setText(log.typeName+"");
-        holder.binding.time.setText(log.createTime+"");
-
-        if(log.userName!=null){
-            holder.binding.desc.setText(log.userName+"-"+log.describe+"");
-        }else {
-            holder.binding.desc.setText(log.describe+"");
-        }
-        holder.binding.desc.setOnClickListener(v->{
-            if(callBack!=null){
-                callBack.onDescClick(v,position);
-            }
-        });
-    }
-
-    @Override
-    protected void onItemClick(View v, int position) {
-
-    }
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        private ItemLogBinding binding;
-
-
-        public ViewHolder(ItemLogBinding view) {
-            super(view.getRoot());
-            binding = view;
-        }
-    }
-    private ClickCallBack callBack;
-
-    public void setCallBack(ClickCallBack callBack) {
-        this.callBack = callBack;
-    }
-
-    public interface ClickCallBack{
-        void onDescClick(View v,int position);
-    }
-}
-
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/OrderAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/record/OrderAdapter.java
index 45973ad6..db3154f7 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/OrderAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/record/OrderAdapter.java
@@ -31,7 +31,10 @@ public abstract class OrderAdapter extends BaseAdapter<BPA_ORDER_RECORD, OrderAd
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         BPA_ORDER_RECORD order =  mData.get(position);//得到当前项选中item实例
-        if(holder.binding.name.getTextSize()>28* ConfigName.getInstance().scale||holder.binding.name.getTextSize()<24*ConfigName.getInstance().scale){
+//        if(holder.binding.name.getTextSize()>28* ConfigName.getInstance().scale||holder.binding.name.getTextSize()<24*ConfigName.getInstance().scale){
+//            DisplayManager.scaleViewGroup(holder.binding.getRoot());
+//        }
+        if(holder.binding.getRoot().getWidth()==0){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
 
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/SubOrderAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/record/SubOrderAdapter.java
index d8dd11ca..faa18b2d 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/record/SubOrderAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/record/SubOrderAdapter.java
@@ -32,7 +32,10 @@ public abstract class SubOrderAdapter extends BaseAdapter<BPA_SUBORDER_RECORD, S
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         BPA_SUBORDER_RECORD order =  mData.get(position);//得到当前项选中item实例
-        if(holder.binding.name.getTextSize()>28*ConfigName.getInstance().scale||holder.binding.name.getTextSize()<24*ConfigName.getInstance().scale){
+//        if(holder.binding.name.getTextSize()>28*ConfigName.getInstance().scale||holder.binding.name.getTextSize()<24*ConfigName.getInstance().scale){
+//            DisplayManager.scaleViewGroup(holder.binding.getRoot());
+//        }
+        if(holder.binding.getRoot().getWidth()==0){
             DisplayManager.scaleViewGroup(holder.binding.getRoot());
         }
         if(order.subNames!=null && !order.subNames.isEmpty()){
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/step/DiyStepAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/step/DiyStepAdapter.java
index 6fefeafb..33fe6cba 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/step/DiyStepAdapter.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/adapter/step/DiyStepAdapter.java
@@ -30,7 +30,10 @@ public abstract class DiyStepAdapter extends BaseAdapter<BPA_GOODS_PROCESS_DETAI
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
         try {
-            if(holder.binding.name.getTextSize()> 34 *ConfigName.getInstance().scale|| holder.binding.name.getTextSize()< 30*ConfigName.getInstance().scale){
+//            if(holder.binding.name.getTextSize()> 34 *ConfigName.getInstance().scale|| holder.binding.name.getTextSize()< 30*ConfigName.getInstance().scale){
+//                DisplayManager.scaleViewGroup(holder.binding.getRoot());
+//            }
+            if(holder.binding.getRoot().getWidth()==0){
                 DisplayManager.scaleViewGroup(holder.binding.getRoot());
             }
 
diff --git a/app/src/main/java/com/bonait/bnframework/ui/adapter/step/StepAdapter.java b/app/src/main/java/com/bonait/bnframework/ui/adapter/step/StepAdapter.java
deleted file mode 100644
index b18df668..00000000
--- a/app/src/main/java/com/bonait/bnframework/ui/adapter/step/StepAdapter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.bonait.bnframework.ui.adapter.step;
-
-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.constant.ConfigName;
-import com.bonait.bnframework.common.db.mode.BPA_GOODS_PROCESS_DETAIL;
-
-import com.bonait.bnframework.databinding.ItemStepDescBinding;
-import com.bonait.bnframework.ui.adapter.BaseAdapter;
-import com.bonait.bnframework.ui.util.DisplayManager;
-
-/**
- * @author: liup
- * @description: 步骤列表
- * @date: 2024/5/8 15:36.
- */
-public class StepAdapter extends BaseAdapter<BPA_GOODS_PROCESS_DETAIL, StepAdapter.ViewHolder> {
-
-    @NonNull
-    @Override
-    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new ViewHolder(ItemStepDescBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull ViewHolder holder, @SuppressLint("RecyclerView") int position) {
-        try {
-            if(holder.binding.name.getTextSize()> 34* ConfigName.getInstance().scale || holder.binding.name.getTextSize()< 30*ConfigName.getInstance().scale){
-                DisplayManager.scaleViewGroup(holder.binding.getRoot());
-            }
-
-            holder.binding.root.setSelected(mCurrentPosition == position);
-            String name = mData.get(position).processms;//mData.get(position).processname +"  "+
-            holder.binding.name.setText((position+1)+"."+name);
-
-            holder.binding.root.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-//                    int last = mCurrentPosition;
-//                    mCurrentPosition = position;
-//                    notifyItemChanged(last);
-//                    notifyItemChanged(mCurrentPosition);
-//                    onItemClick(view,position);
-                }
-            });
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    protected void onItemClick(View v, int position) {
-
-    }
-
-
-    public static class ViewHolder extends RecyclerView.ViewHolder {
-        private ItemStepDescBinding binding;
-
-
-        public ViewHolder(ItemStepDescBinding view) {
-            super(view.getRoot());
-            binding = view;
-        }
-    }
-
-}
-
-
diff --git a/app/src/main/java/com/bonait/bnframework/ui/fragment/goods/LocalGoodsFragment.java b/app/src/main/java/com/bonait/bnframework/ui/fragment/goods/LocalGoodsFragment.java
index 23ca2e1c..ba4de6a0 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/fragment/goods/LocalGoodsFragment.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/fragment/goods/LocalGoodsFragment.java
@@ -348,6 +348,11 @@ public class LocalGoodsFragment extends BaseFragment {
                         NewToastUtil.getInstance().showToast("请先创建属性分类","Please create attribute classification first");
                         return;
                     }
+                    List<BPA_GOODS_CLASSIFY> goodsClassify= GoodsClassifyDBUtil.getAll();
+                    if (goodsClassify.isEmpty()){
+                        NewToastUtil.getInstance().showToast("请先创建商品分类","Please create attribute classification first");
+                        return;
+                    }
                     addGoodsDialog();
                 }
             }
diff --git a/app/src/main/java/com/bonait/bnframework/ui/viewmodel/HomeGoodsViewModel.java b/app/src/main/java/com/bonait/bnframework/ui/viewmodel/HomeGoodsViewModel.java
index 268ef7a9..50113548 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/viewmodel/HomeGoodsViewModel.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/viewmodel/HomeGoodsViewModel.java
@@ -163,7 +163,7 @@ public class HomeGoodsViewModel extends ViewModel {
      */
     public static void GetMaterialInfo(){
         String url = UpdateDataService.path+"/api/ExternalPlatform/Material/GetMaterialPageList";//saasbase
-        LogUtils.d("GetMaterialInfo url="+url);
+        LogUtils.d("GetMaterialInfo url="+url+" UpdateDataService.key="+UpdateDataService.key);
         String key =UpdateDataService.key;
         RecordManager.getInstance().addLogRecord("数据接收", "接收物料信息-"+url);
         APIHelper.PostT(url,new MaterialRequestPar(1,100),key,new TypeReference<APIResultT<MaterialData>>(){}).OnSource(s->{
diff --git a/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateAllDataService.java b/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateAllDataService.java
index 7a5b24e1..fc8be103 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateAllDataService.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateAllDataService.java
@@ -388,7 +388,7 @@ public class UpdateAllDataService {
                     String imgUrl = "";
                     if(good.url!=null){
                         String path = ConfigName.getFileRoot(MainApplication.getContext())+ ConfigName.dataPath+"/WebImage/";
-                        imgUrl = "https://bpa.oss-cn-chengdu.aliyuncs.com/hkerp/test/goods//"+good.url.replace(path,"");
+                        imgUrl = "";//"https://bpa.oss-cn-chengdu.aliyuncs.com/hkerp/test/goods//"+good.url.replace(path,"");
                     }
                     upMaterialBean.add(new GoodsDataInfo(good.id,good.name,"",imgUrl,"0",false,good.propClassifyId,classify.name));
                 }
diff --git a/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java b/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java
index 1dccc50c..5642bb59 100644
--- a/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java
+++ b/app/src/main/java/com/bonait/bnframework/ui/viewmodel/UpdateDataService.java
@@ -428,7 +428,7 @@ public class UpdateDataService {
             String imgUrl = "";
             if(goods.url!=null){
                 String path = ConfigName.getFileRoot(MainApplication.getContext())+ ConfigName.dataPath+"/WebImage/";
-                imgUrl = "https://bpa.oss-cn-chengdu.aliyuncs.com/hkerp/test/goods//"+goods.url.replace(path,"");
+                imgUrl = "";//"https://bpa.oss-cn-chengdu.aliyuncs.com/hkerp/test/goods//"+goods.url.replace(path,"");
             }
             upMaterialBean.add(new GoodsDataInfo(goods.id,goods.name,"",imgUrl,"0",false,goods.propClassifyId,
                     classify.name));
diff --git a/app/src/main/res/layout/activity_bottom_navigation2.xml b/app/src/main/res/layout/activity_bottom_navigation2.xml
index c6f20c02..51b246bc 100644
--- a/app/src/main/res/layout/activity_bottom_navigation2.xml
+++ b/app/src/main/res/layout/activity_bottom_navigation2.xml
@@ -12,32 +12,32 @@
         android:background="?attr/app_content_bg_color"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="@dimen/home_tab_height"
+        android:layout_marginBottom="@dimen/home_bottom_height"
         android:fitsSystemWindows="true"/>
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/navigation"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/home_tab_height"
+        android:layout_height="@dimen/home_bottom_height"
         android:layout_gravity="bottom"
         android:background="@drawable/qmui_list_item_bg_with_border_top"
         app:itemHorizontalTranslationEnabled="false"
         app:labelVisibilityMode="labeled"
         app:menu="@menu/navigation" />
 
-    <com.bonait.bnframework.common.watermark.WaterMarkView
-        android:singleLine="false"
-        android:id="@+id/wm"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:water_mark_align="CENTER"
-        app:water_mark_degree="-30"
-        app:water_mark_dx="300px"
-        app:water_mark_dy="340px"
-        app:water_mark_sync="true"
-        app:water_mark_text=""
-        app:water_mark_textColor="@color/watermarkcolor"
-        app:water_mark_textBold="true"
-        app:water_mark_textSize="14px" />
+<!--    <com.bonait.bnframework.common.watermark.WaterMarkView-->
+<!--        android:singleLine="false"-->
+<!--        android:id="@+id/wm"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        app:water_mark_align="CENTER"-->
+<!--        app:water_mark_degree="-30"-->
+<!--        app:water_mark_dx="300px"-->
+<!--        app:water_mark_dy="340px"-->
+<!--        app:water_mark_sync="true"-->
+<!--        app:water_mark_text=""-->
+<!--        app:water_mark_textColor="@color/watermarkcolor"-->
+<!--        app:water_mark_textBold="true"-->
+<!--        app:water_mark_textSize="14px" />-->
 
 </com.qmuiteam.qmui.widget.QMUIWindowInsetLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bottom_navigation_new.xml b/app/src/main/res/layout/activity_bottom_navigation_new.xml
index 65099015..c0b3bdc0 100644
--- a/app/src/main/res/layout/activity_bottom_navigation_new.xml
+++ b/app/src/main/res/layout/activity_bottom_navigation_new.xml
@@ -23,20 +23,20 @@
     </com.bonait.bnframework.common.view.BottomNavigationBar>
 
 
-    <com.bonait.bnframework.common.watermark.WaterMarkView
-        android:singleLine="false"
-        android:id="@+id/wm"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:water_mark_align="CENTER"
-        app:water_mark_degree="-30"
-        app:water_mark_dx="300px"
-        app:water_mark_dy="340px"
-        app:water_mark_sync="true"
-        app:water_mark_text=""
-        app:water_mark_textColor="@color/watermarkcolor"
-        app:water_mark_textBold="true"
-        app:water_mark_textSize="14px" />
+<!--    <com.bonait.bnframework.common.watermark.WaterMarkView-->
+<!--        android:singleLine="false"-->
+<!--        android:id="@+id/wm"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        app:water_mark_align="CENTER"-->
+<!--        app:water_mark_degree="-30"-->
+<!--        app:water_mark_dx="300px"-->
+<!--        app:water_mark_dy="340px"-->
+<!--        app:water_mark_sync="true"-->
+<!--        app:water_mark_text=""-->
+<!--        app:water_mark_textColor="@color/watermarkcolor"-->
+<!--        app:water_mark_textBold="true"-->
+<!--        app:water_mark_textSize="14px" />-->
 
 
     <com.bonait.bnframework.modules.home.fragment.from.CookingActivity
diff --git a/app/src/main/res/layout/activity_bunkersetup.xml b/app/src/main/res/layout/activity_bunkersetup.xml
index 45537675..008ffb64 100644
--- a/app/src/main/res/layout/activity_bunkersetup.xml
+++ b/app/src/main/res/layout/activity_bunkersetup.xml
@@ -129,7 +129,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:layout_marginTop="100dp"
+                        android:layout_marginTop="80dp"
                         >
                         <com.bonait.bnframework.modules.home.fragment.mode.jingdutiao1
                             android:id="@+id/silos1"
@@ -161,6 +161,7 @@
                             android:tag="水"/>
                     </LinearLayout>
                     <ScrollView
+                        android:id="@+id/scrollView"
                         android:layout_width="match_parent"
                         android:layout_marginTop="100dp"
                         android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/activity_edit_classify_tab.xml b/app/src/main/res/layout/activity_edit_classify_tab.xml
index 21d2f1cb..4101a15d 100644
--- a/app/src/main/res/layout/activity_edit_classify_tab.xml
+++ b/app/src/main/res/layout/activity_edit_classify_tab.xml
@@ -22,12 +22,20 @@
 <!--        app:itemIconTint="@null"-->
 <!--        app:itemIconSize="0dp"-->
 <!--        android:fitsSystemWindows="true"/>-->
+
+    <com.qmuiteam.qmui.widget.QMUIViewPager
+        android:id="@+id/viewpager"
+        android:layout_marginTop="@dimen/home_tab_height"
+        android:paddingTop="@dimen/dp_80"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/app_content_bg_color" />
     <LinearLayout
         android:id="@+id/ll_tab"
-        android:layout_marginTop="60dp"
+        android:layout_marginTop="@dimen/home_tab_height"
         android:layout_width="match_parent"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/dp_5"
+        android:paddingTop="@dimen/dp_10"
         android:layout_marginLeft="@dimen/dp_25"
         android:layout_marginRight="@dimen/dp_25"
         android:layout_height="@dimen/dp_70">
@@ -57,13 +65,6 @@
             />
 
     </LinearLayout>
-    <com.qmuiteam.qmui.widget.QMUIViewPager
-        android:id="@+id/viewpager"
-        android:layout_marginTop="135dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/app_content_bg_color" />
-
     <com.qmuiteam.qmui.widget.QMUITopBarLayout
         android:id="@+id/topbar"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index c05eeb14..8b2c67df 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -58,9 +58,9 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginLeft="100dp"
+                        android:layout_marginLeft="50dp"
                         android:layout_marginTop="100dp"
-                        android:layout_marginRight="100dp"
+                        android:layout_marginRight="50dp"
                         android:orientation="vertical">
 
                         <LinearLayout
diff --git a/app/src/main/res/layout/activity_sz.xml b/app/src/main/res/layout/activity_sz.xml
index d495cbd3..0d4b3c3d 100644
--- a/app/src/main/res/layout/activity_sz.xml
+++ b/app/src/main/res/layout/activity_sz.xml
@@ -14,7 +14,7 @@
         android:id="@+id/navigation"
         android:layout_marginTop="54dp"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/home_tab_height"
+        android:layout_height="@dimen/home_bottom_height"
         android:layout_gravity="top"
         android:background="@drawable/qmui_list_item_bg_with_border_bottom"
         app:itemHorizontalTranslationEnabled="false"
diff --git a/app/src/main/res/layout/fragment_home2.xml b/app/src/main/res/layout/fragment_home2.xml
index 7fe66405..2192a1cd 100644
--- a/app/src/main/res/layout/fragment_home2.xml
+++ b/app/src/main/res/layout/fragment_home2.xml
@@ -51,15 +51,15 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scrollbars="none"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:orientation="vertical">
-            <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+            <LinearLayout
                 android:id="@+id/kshr"
                 android:layout_width="match_parent"
                 android:layout_height="120dp"
+                android:gravity="center_vertical"
                 android:layout_marginTop="10dp"
                 android:background="@drawable/hr_bj">
                 <ImageView
@@ -67,16 +67,16 @@
                     android:layout_height="80dp"
                     android:src="@mipmap/hr"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="40dp"/>
+                    android:layout_marginLeft="10dp"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginLeft="150dp"
+                    android:layout_marginLeft="10dp"
                     android:text="开始烹饪"
                     android:textColor="@color/white"
                     android:textSize="@dimen/card_view_in_height" />
-            </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -98,27 +98,28 @@
                         android:layout_marginLeft="20dp"/>
                 </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
 
-                <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+                <LinearLayout
                     android:id="@+id/cp"
                     android:layout_width="match_parent"
                     android:layout_height="120dp"
                     android:layout_marginTop="10dp"
+                    android:gravity="center_vertical"
                     android:background="@drawable/cp_bj">
                     <ImageView
                         android:layout_width="80dp"
                         android:layout_height="80dp"
                         android:src="@mipmap/cp"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="20dp"/>
+                        android:layout_marginLeft="10dp"/>
                     <TextView
                         android:layout_width="200dp"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="120dp"
+                        android:layout_marginLeft="10dp"
                         android:text="菜谱"
                         android:textColor="@color/white"
                         android:textSize="@dimen/card_view_in_height" />
-                </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+                </LinearLayout>
 
             </LinearLayout>
 
@@ -126,11 +127,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
-                <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+                <LinearLayout
                     android:id="@+id/wh"
-                    android:layout_width="180dp"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
                     android:layout_height="120dp"
                     android:layout_marginTop="10dp"
+                    android:gravity="center_vertical"
                     android:background="@drawable/wh_bj">
                     <ImageView
                         android:layout_width="80dp"
@@ -142,17 +145,19 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="100dp"
+                        android:layout_marginLeft="10dp"
                         android:text="维护"
                         android:textColor="@color/white"
                         android:textSize="@dimen/card_view_in_height" />
-                </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+                </LinearLayout>
 
 
-                <com.qmuiteam.qmui.layout.QMUIRelativeLayout
+                <LinearLayout
                     android:id="@+id/sz"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
                     android:layout_height="120dp"
+                    android:gravity="center_vertical"
                     android:layout_marginTop="10dp"
                     android:layout_marginLeft="@dimen/dp_10"
                     android:background="@drawable/sz_bj">
@@ -166,11 +171,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="100dp"
+                        android:layout_marginLeft="10dp"
                         android:text="设置"
                         android:textColor="@color/white"
                         android:textSize="@dimen/card_view_in_height" />
-                </com.qmuiteam.qmui.layout.QMUIRelativeLayout>
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_local_goods.xml b/app/src/main/res/layout/fragment_local_goods.xml
index b93d042d..bfd19bc2 100644
--- a/app/src/main/res/layout/fragment_local_goods.xml
+++ b/app/src/main/res/layout/fragment_local_goods.xml
@@ -20,7 +20,7 @@
             android:paddingBottom="@dimen/dp_25"
             android:layout_marginBottom="2dp"
             android:ellipsize="middle"
-            android:textSize="22sp"
+            android:textSize="28sp"
             android:text="@string/btn_addclass"
             android:textColor="#823E17"
             android:gravity="center"
diff --git a/app/src/main/res/layout/fragment_system_systemset.xml b/app/src/main/res/layout/fragment_system_systemset.xml
index ea687565..caf0a850 100644
--- a/app/src/main/res/layout/fragment_system_systemset.xml
+++ b/app/src/main/res/layout/fragment_system_systemset.xml
@@ -310,12 +310,12 @@
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
                         android:background="@drawable/input_bj"
-                        android:hint="请输入序号"
+                        android:hint="料仓数量"
                         android:inputType="number"
                         android:maxLines="1"
                         android:padding="3dp"
                         android:textSize="12dp"
-                        tools:text="4"/>
+                        android:text="4"/>
                 </TableRow>
 
             </TableLayout>
diff --git a/app/src/main/res/layout/item/layout/dialog_with_cancel_confirm.xml b/app/src/main/res/layout/item/layout/dialog_with_cancel_confirm.xml
index 3e9c966e..a9134366 100644
--- a/app/src/main/res/layout/item/layout/dialog_with_cancel_confirm.xml
+++ b/app/src/main/res/layout/item/layout/dialog_with_cancel_confirm.xml
@@ -12,8 +12,8 @@
             android:orientation="vertical"
             android:layout_gravity="center"
             android:padding="@dimen/dp_20"
-            android:layout_marginStart="@dimen/dp_40"
-            android:layout_marginEnd="@dimen/dp_40"
+            android:layout_marginStart="@dimen/dp_30"
+            android:layout_marginEnd="@dimen/dp_30"
             >
 
             <TextView
@@ -22,7 +22,7 @@
                 android:layout_height="wrap_content"
                 tools:text="@string/tip_save_menu_title"
                 android:textStyle="bold"
-                android:textSize="42sp"
+                android:textSize="@dimen/sp_36"
                 android:textColor="@color/black"
                 />
 
@@ -31,7 +31,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="@string/tip_save_menu_content"
-                android:textSize="38sp"
+                android:textSize="@dimen/sp_32"
                 android:textColor="@color/gray_light"
                 android:layout_marginTop="40dp"
                 android:layout_marginLeft="@dimen/dp_10"
@@ -51,7 +51,7 @@
                     android:id="@+id/tv_cancel"
                     android:layout_width="wrap_content"
                     android:layout_height="100dp"
-                    android:textSize="@dimen/sp_38"
+                    android:textSize="@dimen/sp_36"
                     android:textColor="@color/blue_primary"
                     android:text="@string/btn_cancel"
                     android:layout_alignParentLeft="true"
@@ -62,7 +62,7 @@
                     android:id="@+id/tv_confirm"
                     android:layout_width="wrap_content"
                     android:layout_height="100dp"
-                    android:textSize="38sp"
+                    android:textSize="@dimen/sp_36"
                     android:textColor="@color/blue_primary"
                     android:text="@string/tip_save_confirm"
                     android:gravity="center"
diff --git a/app/src/main/res/layout/item/layout/item_cloud_goods.xml b/app/src/main/res/layout/item/layout/item_cloud_goods.xml
index f3527caa..e7c75754 100644
--- a/app/src/main/res/layout/item/layout/item_cloud_goods.xml
+++ b/app/src/main/res/layout/item/layout/item_cloud_goods.xml
@@ -15,9 +15,8 @@
             android:id="@+id/image"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
             android:scaleType="fitXY"
-            android:src="@mipmap/loading123"
+            tools:src="@mipmap/loading123"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item/layout/item_local_goods.xml b/app/src/main/res/layout/item/layout/item_local_goods.xml
index 8dbd5b9f..fe1645c7 100644
--- a/app/src/main/res/layout/item/layout/item_local_goods.xml
+++ b/app/src/main/res/layout/item/layout/item_local_goods.xml
@@ -17,7 +17,7 @@
             android:layout_height="0dp"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"
-            android:src="@mipmap/loading123"
+            tools:src="@mipmap/loading123"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item/layout/item_spinner_text36.xml b/app/src/main/res/layout/item/layout/item_spinner_text36.xml
index 8be6803f..5e5073a4 100644
--- a/app/src/main/res/layout/item/layout/item_spinner_text36.xml
+++ b/app/src/main/res/layout/item/layout/item_spinner_text36.xml
@@ -15,7 +15,6 @@
         android:gravity="center_vertical"
         tools:text="请选择"
         android:textSize="@dimen/sp_36"
-        android:background="@color/activity_background"
         android:textColor="@color/black">
     </CheckedTextView>
 </LinearLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d04fd400..4114e486 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-    <dimen name="home_tab_height">56dp</dimen>
+    <dimen name="home_tab_height">80dp</dimen>
+    <dimen name="home_bottom_height">56dp</dimen>
     <dimen name="common_content_spacing">@dimen/qmui_content_spacing_horizontal</dimen>
 
     <!-- ListView -->