036调整，032涂鸦显示

BusinessAirFryer/src/main/assets/config_000.json

@@ -278,7 +278,7 @@
       "bg": "ic_sm_shredder_bg",
       "icon": "ic_sm_shredder",
       "devMode": "STAND_MIXER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "SM_MEAT_GRUBDER",
@@ -286,7 +286,7 @@
       "bg": "ic_sm_meat_grubder_bg",
       "icon": "ic_sm_meat_grubder",
       "devMode": "STAND_MIXER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "SM_BLENDER",
@@ -294,7 +294,7 @@
       "bg": "ic_sm_blender_bg",
       "icon": "ic_sm_blender",
       "devMode": "STAND_MIXER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "SM_PASTA_MAKER",
@@ -302,7 +302,7 @@
       "bg": "ic_sm_pasta_maker_bg",
       "icon": "ic_sm_pasta_maker",
       "devMode": "STAND_MIXER",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "SM_TURBO",

BusinessAirFryer/src/main/assets/config_036.json

@@ -1,5 +1,5 @@
 {
-  "baseQrUrl": "https://icook.schneiderconsumer.com/h5/index.html",
+  "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
   "workModes": [
     {
       "type": "ADAPTED_COOKING",

BusinessMain/src/main/java/com/develop/main/ui/ModeEntranceActivity.kt

@@ -323,7 +323,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                     }
                 }
             }.models = DataFactory.get002DEntranceData()
-        } else if (getSN().startsWith("032D")) {
+        } else if (sn.startsWith("032D")||sn.startsWith("032E")) {
             binding.entranceRecycle.apply {
                 grid(2)
                 setup {

BusinessSetting/src/main/java/com/develop/setting/ui/SettingMainActivity.kt

@@ -109,11 +109,11 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         dataList.clear()
         dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (sn.startsWith("032D") ||sn.startsWith("032E") || sn.startsWith("010F") || sn.startsWith("033")) {
+        } else if (sn.startsWith("032D")  || sn.startsWith("010F") || sn.startsWith("033")) {
             DataFactory.genSetting032DModesList(resources)
         } else if (sn.startsWith("011")) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("030A")) {
+        } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
         } else if (sn.startsWith("036I")|| sn.startsWith("053A")|| sn.startsWith("058A") || sn.startsWith("058B")) {
             DataFactory.genSetting036IModesList(resources)
@@ -495,11 +495,11 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
         dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (sn.startsWith("032D")||sn.startsWith("032E") || sn.startsWith("010F") || sn.startsWith("033")) {
+        } else if (sn.startsWith("032D") || sn.startsWith("010F") || sn.startsWith("033")) {
             DataFactory.genSetting032DModesList(resources)
         } else if (sn.startsWith("011")) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("030A")) {
+        } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
         } else if (sn.startsWith("036I")|| sn.startsWith("053A")|| sn.startsWith("058A") || sn.startsWith("058B")) {
             DataFactory.genSetting036IModesList(resources)

BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -227,6 +227,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             //  binding.ivTurbo.visibility = View.VISIBLE
             binding.clCookWater.visibility = View.GONE
             binding.clTextView.visibility = View.GONE
+            //中间要有个占位
+            binding.clTextViewOne.visibility = View.INVISIBLE
         }
 
 //        if (CofarSDK.devInfo().devMode=="AF_AIR_FRYER"){

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -148,6 +148,8 @@ class CookStepActivity : CookStepBaseActivity() {
             binding.controller.clCookSpeed.visibility = View.VISIBLE;
             binding.controller.clCookWater.visibility = View.GONE
             binding.controller.clTextView.visibility = View.GONE
+            //中间要有个占位
+            binding.controller.clTextViewOne.visibility = View.INVISIBLE
 
         }
 

BusinessStep/src/main/res/layout/activity_mode_detail.xml

@@ -308,7 +308,13 @@
                 android:layout_marginEnd="@dimen/convert_20px"
                 android:layout_marginRight="@dimen/convert_20px"
                 app:cardType="Cook_time" />
-
+            <View
+                android:visibility="gone"
+                android:id="@+id/cl_text_view_one"
+                android:layout_marginEnd="@dimen/convert_20px"
+                android:layout_marginRight="@dimen/convert_20px"
+                android:layout_width="@dimen/convert_280px"
+                android:layout_height="@dimen/convert_140px" />
 
             <com.develop.common.widget.CookCardView
                 android:id="@+id/cl_cook_speed"

BusinessStep/src/main/res/layout/item_cook_controller.xml

@@ -342,7 +342,12 @@
                 app:layout_constraintStart_toStartOf="parent" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-
+        <View
+            android:visibility="gone"
+            android:id="@+id/cl_text_view_one"
+            android:layout_marginEnd="@dimen/convert_20px"
+            android:layout_width="@dimen/convert_280px"
+            android:layout_height="@dimen/convert_140px" />
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/cl_cook_speed"
 

libBase/src/main/java/com/develop/base/ext/GlobaExt.kt

@@ -208,7 +208,7 @@ fun getSN(): String {
 //    return "011E50370020123010190001"
 //    return  "033H20020020123010190001"
 
-    return "032D21060020123010190001"
+//    return "032D21060020123010190001"
 
     if (BuildConfig.DEBUG) {
 //        return "002D10390020123010190001"
@@ -233,7 +233,8 @@ fun getSN(): String {
 //    return "010D10390020123010190001"
 //        return "010D10390020123010190001"
 //    return "000A10390020123010190009"
-        return "032D21060020123010190001"
+//        return "032E21060020123010190001"
+//        return "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //         return  "030A10390020123010190002"
 //        return  "033F20020020123010190001"
@@ -248,7 +249,7 @@ fun getSN(): String {
 //        return  "062A20030020123010190003"
 //        return "062A20030020123010190004"
 //        return  "063A10390020123010190015"
-//        return  "063B10390020123010190001"
+        return  "063B10390020123010190001"
 //        return  "063B20030020123010190015"
 //        return "063B21050020123010190001"
 //        return  "049B10390020123010190001"