5037 000A问题解决，wifi列表滑动问题，替换空炸图片

BusinessAirFryer/src/main/assets/config_010.json

@@ -88,6 +88,109 @@
       "icon": "ic_grid_turbo",
       "devMode": "SOUP",
       "listShow": true
+    },{
+      "type": "AF_DIY",
+      "name": "af_diy",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_AIR_FRYER",
+      "name": "af_air_fryer",
+      "bg": "af_air_fryer_bg",
+      "icon": "af_air_fryer",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_BAKE",
+      "name": "af_bake",
+      "bg": "af_bake_bg",
+      "icon": "af_bake",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DRUMSTICKS",
+      "name": "af_drumsticks",
+      "bg": "af_drumsticks_bg",
+      "icon": "af_drumsticks",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_EGG_TART",
+      "name": "af_egg_tart",
+      "bg": "af_egg_tart_bg",
+      "icon": "af_egg_tart",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_PIZZA",
+      "name": "af_pizza",
+      "bg": "af_pizza_bg",
+      "icon": "af_pizza",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DEHYDRATE",
+      "name": "af_dehydrate",
+      "bg": "af_dehydrate_bg",
+      "icon": "af_dehydrate",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_REHEAT",
+      "name": "af_reheat",
+      "bg": "af_reheat_bg",
+      "icon": "af_reheat",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_CHICKEN_WING",
+      "name": "af_chicken_wing",
+      "bg": "af_chicken_wing_bg",
+      "icon": "af_chicken_wing",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_STEAK",
+      "name": "af_steak",
+      "bg": "af_steak_bg",
+      "icon": "af_steak",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_SEA_FOOD",
+      "name": "af_sea_food",
+      "bg": "af_sea_food_bg",
+      "icon": "af_sea_food",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_VEGETABLE",
+      "name": "af_vegetable",
+      "bg": "af_vegetable_bg",
+      "icon": "af_vegetable",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_MUTTON_CHOP",
+      "name": "af_mutton_chop",
+      "bg": "af_mutton_chop_bg",
+      "icon": "af_mutton_chop",
+      "devMode": "AIR_FRYER",
+      "listShow": true
     }
   ]
 }

BusinessAirFryer/src/main/assets/config_029.json

@@ -0,0 +1,238 @@
+{
+  "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
+  "workModes": [
+    {
+      "type": "ADAPTED_COOKING",
+      "name": "adapted_cooking",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "BOIL_WATER",
+      "name": "boil_water",
+      "bg": "ic_mode_boil_water",
+      "icon": "ic_grid_boil_water",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "CHOP",
+      "name": "chop",
+      "bg": "ic_mode_chop",
+      "icon": "ic_grid_chop",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SLOW_COOK",
+      "name": "slow_cook",
+      "bg": "ic_mode_slow_cook",
+      "icon": "ic_grid_slow_cook",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "KNEAD_TOUGH",
+      "name": "knead_dough",
+      "bg": "ic_mode_knead_dough",
+      "icon": "ic_grid_knead_dough",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "STEAM",
+      "name": "steam",
+      "bg": "ic_mode_steam",
+      "icon": "ic_grid_steam",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "FOOD_PROCESSOR",
+      "name": "food_processor",
+      "bg": "ic_mode_food_processor",
+      "icon": "ic_grid_food_processor",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "TURBO",
+      "name": "turbo",
+      "bg": "ic_mode_turbo",
+      "icon": "ic_grid_turbo",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+    {
+      "type": "COOK_EGGS",
+      "name": "cook_eggs",
+      "bg": "cm_icon_cook_eggs",
+      "icon": "cm_icon_cook_eggs",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+
+    {
+      "type": "COOK_RICE",
+      "name": "cook_rice",
+      "bg": "cm_icon_cook_rice",
+      "icon": "cm_icon_cook_rice",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "MULSIFY",
+      "name": "mulsify",
+      "bg": "cm_icon_mulsify",
+      "icon": "cm_icon_mulsify",
+      "devMode": "SOUP",
+      "listShow": true
+    }, {
+      "type": "PUREE",
+      "name": "puree",
+      "bg": "cm_icon_puree",
+      "icon": "cm_icon_puree",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "ROAST",
+      "name": "roast",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SMOOTHIE",
+      "name": "smoothie",
+      "bg": "cm_icon_smoothie",
+      "icon": "cm_icon_smoothie",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "SOVS_VIDE",
+      "name": "sovs_vide",
+      "bg": "cm_icon_sovs_vide",
+      "icon": "cm_icon_sovs_vide",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+    {
+      "type": "AF_DIY",
+      "name": "af_diy",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
+      "devMode": "AIR_FRYER",
+      "listShow": false
+    },
+    {
+      "type": "AF_AIR_FRYER",
+      "name": "af_air_fryer",
+       "bg": "af_air_fryer_bg",
+      "icon": "af_air_fryer",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_BAKE",
+      "name": "af_bake",
+      "bg": "af_bake_bg",
+      "icon": "af_bake",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DRUMSTICKS",
+      "name": "af_drumsticks",
+      "bg": "af_drumsticks_bg",
+      "icon": "af_drumsticks",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_EGG_TART",
+      "name": "af_egg_tart",
+      "bg": "af_egg_tart_bg",
+      "icon": "af_egg_tart",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_PIZZA",
+      "name": "af_pizza",
+      "bg": "af_pizza_bg",
+      "icon": "af_pizza",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_DEHYDRATE",
+      "name": "af_dehydrate",
+      "bg": "af_dehydrate_bg",
+      "icon": "af_dehydrate",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_REHEAT",
+      "name": "af_reheat",
+      "bg": "af_reheat_bg",
+      "icon": "af_reheat",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_CHICKEN_WING",
+      "name": "af_chicken_wing",
+      "bg": "af_chicken_wing_bg",
+      "icon": "af_chicken_wing",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_STEAK",
+      "name": "af_steak",
+      "bg": "af_steak_bg",
+      "icon": "af_steak",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_SEA_FOOD",
+      "name": "af_sea_food",
+      "bg": "af_sea_food_bg",
+      "icon": "af_sea_food",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_VEGETABLE",
+      "name": "af_vegetable",
+      "bg": "af_vegetable_bg",
+      "icon": "af_vegetable",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    },
+    {
+      "type": "AF_MUTTON_CHOP",
+      "name": "af_mutton_chop",
+      "bg": "af_mutton_chop_bg",
+      "icon": "af_mutton_chop",
+      "devMode": "AIR_FRYER",
+      "listShow": true
+    }
+  ]
+}

BusinessAirFryer/src/main/assets/config_054.json

@@ -15,7 +15,7 @@
       "bg": "cm_icon_cook_eggs_bg",
       "icon": "cm_icon_cook_eggs",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
     {
       "type": "WIGHT",

BusinessAirFryer/src/main/java/com/develop/airfryer/ui/DevModeView.kt

@@ -70,51 +70,58 @@ class DevModeView(context: Context, attrs: AttributeSet) : ConstraintLayout(cont
     }
 
     private fun updateUI() {
-        //判断模式
-        if (mode == DevModes.AIR_FRYER) {
-            binding.dfbAtive.visibility = View.GONE;
-            binding.dfbUnactive.visibility = View.VISIBLE;
-            binding.kqzgActive.visibility = View.VISIBLE;
-            binding.kqzgUnactive.visibility = View.GONE;
-
-
-            if (CofarSDK.devInfo().potCloverStatus.toInt() == 0) {
-                binding.kqzgCoverOpen.visibility = View.GONE
-                binding.kqzgCoverClose.visibility = View.VISIBLE
-                binding.kqzgCoverOpen.clearAnimation()
-
-            } else {
-                binding.kqzgCoverOpen.visibility = View.VISIBLE
-                binding.kqzgCoverClose.visibility = View.GONE
-                binding.kqzgCoverOpen.startAnimation(alphaAnimation)
-
-            }
-
-
-        } else {
-
-
-            if (PotStatus.UNEXIST == CofarSDK.devInfo().potStatus) {
+        //  //devInfo.potStatus 0是有锅  1是没锅
+//      //devInfo.potCloverStatus 0是合盖，1是没盒盖
+        if (CofarSDK.devInfo().potStatus.toInt()==0){
+            //判断模式
+            if (mode == DevModes.AIR_FRYER) {
                 binding.dfbAtive.visibility = View.GONE;
                 binding.dfbUnactive.visibility = View.VISIBLE;
-                binding.kqzgActive.visibility = View.GONE;
-                binding.kqzgUnactive.visibility = View.VISIBLE;
+                binding.kqzgActive.visibility = View.VISIBLE;
+                binding.kqzgUnactive.visibility = View.GONE;
+                if (CofarSDK.devInfo().potCloverStatus.toInt() == 0) {
+                    binding.kqzgCoverOpen.visibility = View.GONE
+                    binding.kqzgCoverClose.visibility = View.VISIBLE
+                    binding.kqzgCoverOpen.clearAnimation()
+                } else {
+                    binding.kqzgCoverOpen.visibility = View.VISIBLE
+                    binding.kqzgCoverClose.visibility = View.GONE
+                    binding.kqzgCoverOpen.startAnimation(alphaAnimation)
+                }
             } else {
-                binding.dfbAtive.visibility = View.VISIBLE;
-                binding.dfbUnactive.visibility = View.GONE;
-                binding.kqzgActive.visibility = View.GONE;
-                binding.kqzgUnactive.visibility = View.VISIBLE;
+                if (PotStatus.UNEXIST == CofarSDK.devInfo().potStatus) {
+                    binding.dfbAtive.visibility = View.GONE;
+                    binding.dfbUnactive.visibility = View.VISIBLE;
+                    binding.kqzgActive.visibility = View.GONE;
+                    binding.kqzgUnactive.visibility = View.VISIBLE;
+                } else {
+                    binding.dfbAtive.visibility = View.VISIBLE;
+                    binding.dfbUnactive.visibility = View.GONE;
+                    binding.kqzgActive.visibility = View.GONE;
+                    binding.kqzgUnactive.visibility = View.VISIBLE;
+                }
+
+                if (CofarSDK.devInfo().potCloverStatus.toInt() == 0) {
+                    binding.tgCoverOpen.visibility = View.GONE
+                    binding.tgCoverClose.visibility = View.VISIBLE
+                    binding.tgCoverOpen.clearAnimation()
+                } else {
+                    binding.tgCoverOpen.visibility = View.VISIBLE
+                    binding.tgCoverClose.visibility = View.GONE
+                    binding.tgCoverOpen.startAnimation(alphaAnimation)
+                }
             }
-
-            if (CofarSDK.devInfo().potCloverStatus.toInt() == 0) {
-                binding.tgCoverOpen.visibility = View.GONE
-                binding.tgCoverClose.visibility = View.VISIBLE
-            } else {
-                binding.tgCoverOpen.visibility = View.VISIBLE
-                binding.tgCoverClose.visibility = View.GONE
-            }
-
+        }else{
+            binding.dfbAtive.visibility = View.VISIBLE;
+            binding.dfbUnactive.visibility = View.GONE;
+            binding.kqzgActive.visibility = View.GONE;
+            binding.kqzgUnactive.visibility = View.VISIBLE;
+
+            binding.tgCoverOpen.visibility = View.VISIBLE
+            binding.tgCoverClose.visibility = View.GONE
+            binding.tgCoverOpen.startAnimation(alphaAnimation)
         }
+
     }
 
     private fun setupClickListener() {

BusinessAirFryer/src/main/res/drawable/dev_mode_bg.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:startColor="#FFFFFF"
-    android:endColor="#8F8C8C"
+    android:endColor="#C8C6C6"
     android:angle="45"
     android:type="linear" />
 </shape>

BusinessAirFryer/src/main/res/drawable/dev_mode_view_bg.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:startColor="#FFFFFF"
-    android:endColor="#E6E6E6"
+    android:endColor="#F1EEEE"
     android:angle="90"
     android:type="linear" />
 </shape>

BusinessAirFryer/src/main/res/layout/dev_mode_view.xml

@@ -19,7 +19,6 @@
 
                 <LinearLayout
                     android:background="@drawable/dev_mode_view_bg"
-
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content">
 

BusinessAuth/src/main/java/com/develop/auth/ui/MemberLoginFragment.kt

@@ -52,18 +52,21 @@ class MemberLoginFragment : CommonBVMFragment<FragmentMemberLoginBinding, Member
         }
         KeyboardUtils.registerSoftInputChangedListener(requireActivity(), this)
 
-        if (getSN().startsWith("010D")) {
-            val digits = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@#€%&-+()~`|•√π÷׶∆}{=°^¢\$¥£\\©®™℅[]¡¿.><,:;?*'!\""
-            binding.etPassword.keyListener = object : DigitsKeyListener() {
-                override fun getInputType(): Int {
-                    return InputType.TYPE_TEXT_VARIATION_PASSWORD
-                }
 
-                override fun getAcceptedChars(): CharArray {
-                    return digits.toCharArray()
-                }
-            }
-        }
+
+        //所有都可以输入其他符号
+//        if (getSN().startsWith("010D")) {
+//            val digits = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@#€%&-+()~`|•√π÷׶∆}{=°^¢\$¥£\\©®™℅[]¡¿.><,:;?*'!\""
+//            binding.etPassword.keyListener = object : DigitsKeyListener() {
+//                override fun getInputType(): Int {
+//                    return InputType.TYPE_TEXT_VARIATION_PASSWORD
+//                }
+//
+//                override fun getAcceptedChars(): CharArray {
+//                    return digits.toCharArray()
+//                }
+//            }
+//        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {

BusinessAuth/src/main/java/com/develop/auth/ui/MemberProfileFragment.kt

@@ -53,6 +53,17 @@ class MemberProfileFragment : CommonBVMFragment<FragmentMemberProfileBinding, Me
                 } else {
                     index + 19
                 }
+
+                //if (index == 0) {
+                //                    "<20"
+                //                } else if (index == 1) {
+                //                    "20-40"
+                //                } else if (index == 2) {
+                //                    "41-60"
+                //                }else if (index == 3) {
+                //                    ">60"
+                //                }
+
                 binding.tvChooseAge.text = selectAge.toString()
                 binding.tvChooseAge.setTextColor(Color.BLACK)
             }.showDialog(childFragmentManager, "AgeSelectDialog")

BusinessAuth/src/main/java/com/develop/auth/ui/MemberRegisterFragment.kt

@@ -43,27 +43,29 @@ class MemberRegisterFragment : CommonBVMFragment<FragmentMemberRegisterBinding,
                 viewModel.fragmentChangeLiveData.postValue(FragmentTag.MEMBER_PROFILE)
             }
         }
-        if (getSN().startsWith("010D")) {
-            val digits = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@#€%&-+()~`|•√π÷׶∆}{=°^¢\$¥£\\©®™℅[]¡¿.><,:;?*'!\""
-            binding.etPassword.keyListener = object : DigitsKeyListener() {
-                override fun getInputType(): Int {
-                    return InputType.TYPE_TEXT_VARIATION_PASSWORD
-                }
 
-                override fun getAcceptedChars(): CharArray {
-                    return digits.toCharArray()
-                }
-            }
-            binding.etPasswordAgain.keyListener = object : DigitsKeyListener() {
-                override fun getInputType(): Int {
-                    return InputType.TYPE_TEXT_VARIATION_PASSWORD
-                }
 
-                override fun getAcceptedChars(): CharArray {
-                    return digits.toCharArray()
-                }
-            }
-        }
+//        if (getSN().startsWith("010D")) {
+//            val digits = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@#€%&-+()~`|•√π÷׶∆}{=°^¢\$¥£\\©®™℅[]¡¿.><,:;?*'!\""
+//            binding.etPassword.keyListener = object : DigitsKeyListener() {
+//                override fun getInputType(): Int {
+//                    return InputType.TYPE_TEXT_VARIATION_PASSWORD
+//                }
+//
+//                override fun getAcceptedChars(): CharArray {
+//                    return digits.toCharArray()
+//                }
+//            }
+//            binding.etPasswordAgain.keyListener = object : DigitsKeyListener() {
+//                override fun getInputType(): Int {
+//                    return InputType.TYPE_TEXT_VARIATION_PASSWORD
+//                }
+//
+//                override fun getAcceptedChars(): CharArray {
+//                    return digits.toCharArray()
+//                }
+//            }
+//        }
     }
 
     private fun checkInputs(): Boolean {

BusinessAuth/src/main/res/layout/fragment_member_login.xml

@@ -60,7 +60,6 @@
             android:hint="@string/enter_password"
             android:textSize="@dimen/convert_30px"
             android:singleLine="true"
-            android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
             android:background="@drawable/forgot_input_stroke"
             android:layout_marginTop="@dimen/convert_24px"
             android:layout_gravity="center_horizontal"

BusinessAuth/src/main/res/layout/fragment_member_register.xml

@@ -42,7 +42,6 @@
             android:layout_marginHorizontal="@dimen/convert_40px"
             android:layout_marginTop="@dimen/convert_20px"
             android:background="@drawable/forgot_input_stroke"
-            android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
             android:hint="@string/enter_password"
             android:inputType="textPassword"
             android:paddingHorizontal="@dimen/convert_40px"
@@ -57,7 +56,6 @@
             android:layout_marginHorizontal="@dimen/convert_40px"
             android:layout_marginTop="@dimen/convert_20px"
             android:background="@drawable/forgot_input_stroke"
-            android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
             android:hint="@string/enter_password_again"
             android:inputType="textPassword"
             android:paddingHorizontal="@dimen/convert_40px"

BusinessCommon/src/main/java/com/develop/common/bean/TuyaConfig.kt

@@ -1,4 +1,4 @@
 package com.develop.common.bean
 
 
-data class TuyaConfig(var licences: Map<String,Map<String,String>>)
+data class TuyaConfig(var licences: Map<String, Map<String, String>>)

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -233,12 +233,13 @@ object DataFactory {
             SettingType.RESTORE_FACTORY_SETTINGS, SettingType.ABOUT
         )
 
-        var tuyaConfig =  ConfigUtils.loadTuyaConfig()
-        if(tuyaConfig != null){
-            settingTypeList.add(SettingType.TUYA)
-            nameList.add(resource.getString(R.string.tuya))
-            resIdList.add(R.drawable.ic_setting_tuya)
-        }
+        //2024.01.10  032D客户不需要涂鸦功能
+//        var tuyaConfig =  ConfigUtils.loadTuyaConfig()
+//        if(tuyaConfig != null){
+//            settingTypeList.add(SettingType.TUYA)
+//            nameList.add(resource.getString(R.string.tuya))
+//            resIdList.add(R.drawable.ic_setting_tuya)
+//        }
 
         for (i in resIdList.indices) {
             result.add(SettingModel(resIdList[i], nameList[i], settingTypeList[i]))

BusinessCommon/src/main/java/com/develop/common/dialog/AgeSelectDialog.kt

@@ -57,6 +57,10 @@ class AgeSelectDialog(
         for (index in 20..80) {
             list.add(index.toString())
         }
+        // list.add(0,"<20")
+        //        list.add(1,"20-40")
+        //        list.add(2,"41-60")
+        //        list.add(3,">60")
         return list
     }
 }

BusinessCommon/src/main/java/com/develop/common/food_sdk/FloatWindowManager.kt

@@ -7,10 +7,12 @@ import android.widget.RelativeLayout
 import androidx.appcompat.widget.AppCompatTextView
 import com.blankj.utilcode.util.ScreenUtils.getScreenHeight
 import com.blankj.utilcode.util.ScreenUtils.getScreenWidth
+import com.bumptech.glide.Glide
 import com.develop.base.ext.*
 import com.develop.base.util.ThreadUtils
 import com.develop.base.util.TopResumedAtyHolder
 import com.develop.common.R
+import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.dialog.CancelConfirmDialog
 import com.develop.common.event.CookStepEvent
 import com.develop.common.router.Screens
@@ -86,13 +88,19 @@ object FloatWindowManager {
                 if(coverPath is Int){
                     ivFood?.src = coverPath as Int
                 }else{
-                    ivFood?.load(coverPath)
+                    if (isMode){
+                        ivFood?.load(coverPath)
+                    }else{
+                        ivFood?.load( FoodDataProvider.getResourcePath(coverPath as String))
+
+                    }
                 }
 
                 if (isMode) {
                     //当前是模式
                     tvStep?.text = modeName
                 } else {
+//                    tvStep?.text = modeName
                     //当前是菜谱
                     tvStep?.text = "Step ${step + 1}"
                 }
@@ -155,7 +163,18 @@ object FloatWindowManager {
         step = event.step
         isMode = event.isMode
         modeName = event.modeName
-        ivFood?.load(coverPath)
+        ivFood?.apply {
+            if (coverPath is String){
+                if (isMode){
+                    this.load(coverPath)
+                }else{
+                    this.load(FoodDataProvider.getResourcePath(coverPath as String))
+                }
+            } else {
+                src = coverPath as Int
+            }
+        }
+//        ivFood?.load(coverPath)
         if (isMode) {
             tvStep?.text = modeName
         } else {

BusinessCommon/src/main/java/com/develop/common/food_sdk/GlobalDevEvent.kt

@@ -44,7 +44,7 @@ object GlobalDevEvent {
                 //errcode 为0得时候，是有故障
                 //合盖
                 //devInfo.potStatus 0是有锅  1是没锅
-//            //devInfo.potCloverStatus 0是合盖，1是没盒盖
+//              //devInfo.potCloverStatus 0是合盖，1是没盒盖
                 if (event.devInfo.potStatus.toInt() == 0) {
                     if (event.devInfo.potCloverStatus.toInt() == 0) {
                         CofarSDK.flashWhiteRedLed()

BusinessCommon/src/main/java/com/develop/common/utils/FoucsLinearLayoutManager.java

@@ -0,0 +1,63 @@
+package com.develop.common.utils;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class FoucsLinearLayoutManager extends LinearLayoutManager {
+
+    public FoucsLinearLayoutManager(Context context) {
+        super(context);
+    }
+
+    public FoucsLinearLayoutManager(Context context, int orientation, boolean reverseLayout) {
+        super(context, orientation, reverseLayout);
+    }
+
+    public FoucsLinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+
+    /**
+     * 　　public boolean requestChildRectangleOnScreen (View child, Rect rectangle, boolean immediate)
+     * <p>
+     * 　　当组里的某个子视图需要被定位在屏幕的某个矩形范围时，调用此方法。重载此方法的ViewGroup可确认以下几点：
+     * <p>
+     * 　　* 子项目将是组里的直系子项
+     * 　　* 矩形将在子项目的坐标体系中
+     * 　　重载此方法的ViewGroup应该支持以下几点：
+     * 　　* 若矩形已经是可见的，则没有东西会改变
+     * 　　* 为使矩形区域全部可见，视图将可以被滚动显示
+     * 　　参数
+     * 　　child        发出请求的子视图
+     * 　　rectangle    子项目坐标系内的矩形，即此子项目希望在屏幕上的定位
+     * 　　immediate   设为true，则禁止动画和平滑移动滚动条
+     * <p>
+     * 　　返回值
+     * 　　进行了滚动操作的这个组（group），是否处理此操作。
+     *
+     * @param parent
+     * @param child
+     * @param rect
+     * @param immediate
+     * @return
+     */
+    @Override
+    public boolean requestChildRectangleOnScreen(RecyclerView parent, View child, Rect rect, boolean immediate) {
+
+//这里的child 是整个HeadView 而不是某个具体的editText
+        return false;
+    }
+
+    @Override
+    public boolean requestChildRectangleOnScreen(RecyclerView parent, View child, Rect rect, boolean immediate, boolean focusedChildVisible) {
+
+//这里的child 是整个HeadView 而不是某个具体的editText
+        return false;
+    }
+}

BusinessCommon/src/main/java/com/develop/common/widget/WifiContentView.kt

@@ -46,6 +46,7 @@ class WifiContentView : RelativeLayout {
             } else {
                 binding.etPwd.transformationMethod = HideReturnsTransformationMethod.getInstance()
             }
+            binding.etPwd.setSelection(binding.etPwd.text.toString().length)
         }
 
         binding.tvOk.setOnClickListener {

BusinessCommon/src/main/res/layout/step_float_window.xml

@@ -31,7 +31,7 @@
         android:layout_toEndOf="@id/iv_food"
         android:layout_alignParentBottom="true"
         android:includeFontPadding="false"
-        android:text="Step 7"
+        android:text="Step"
         android:layout_marginBottom="@dimen/convert_17px"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

BusinessCommon/src/main/res/values-de/strings.xml

@@ -26,7 +26,7 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="i_agree">Ich stimme zu</string>
     <string name="i_have_read_the_privacy_policy">Ich habe die Datenschutzerklärung gelesen</string>
     <string name="second">Zweiter</string>
-    <string name="wifi">Drahtlose netzwerke.</string>
+    <string name="wifi">DRAHTLOSE NETZWERKE</string>
     <string name="off_line">OFF-LINE</string>
     <string name="ok">OK</string>
     <string name="on_line">ON-LINE</string>
@@ -51,7 +51,7 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="turbo">TURBO</string>
     <string name="language">SPRACHE</string>
     <string name="sound">SAUM</string>
-    <string name="brightness">Helligkeit</string>
+    <string name="brightness">HELLIGKEIT</string>
     <string name="user_account">BENUTZERKONTO</string>
     <string name="storage">LAGERUNG</string>
     <string name="reset">EINSTELLUNGEN DER RESTORFABRIK</string>
@@ -258,6 +258,20 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="error_pot_clover_tips">Der aktuelle Kochmodus stimmt nicht mit der Art der Topfdeckel überein. Möchten Sie in den entsprechenden Kochmodus wechseln?</string>
 
 
+    <string name="af_diy">DIY</string>
+    <string name="af_egg_tart">EGG TART</string>
+    <string name="af_reheat">REHEAT</string>
+    <string name="af_steak">STEAK</string>
+    <string name="af_sea_food">SEAFOOD</string>
+    <string name="af_mutton_chop">MUTTON CHOP</string>
+    <string name="af_air_fryer">Luftfräse</string>
+    <string name="af_drumsticks">DRUMSTICKS</string>
+    <string name="af_chicken_wing">Hühnerflügel</string>
+    <string name="af_vegetable">Gemüse</string>
+    <string name="af_pizza">PIZZA</string>
+    <string name="af_dehydrate">DEHYDRAT</string>
+
+
     <string name="cook_eggs">Eier kochen</string>
     <string name="cook_rice">COOK RICE</string>
     <string name="mulsify">MULSIFY</string>

BusinessCommon/src/main/res/values-es/strings.xml

@@ -256,7 +256,12 @@ El cliente Southern plus es una plataforma de información en línea desarrollad
     <string name="water_spary">Rociar agua</string>
     <string name="error_pot_clover_tips">El modo de cocción actual no coincide con el tipo de tapa de la olla. ¿¿ quieres cambiar al modo de cocción correspondiente?</string>
 
-
+    <string name="af_air_fryer">Freidora de aire</string>
+    <string name="af_drumsticks">Mazo de tambor</string>
+    <string name="af_chicken_wing">Alitas de pollo</string>
+    <string name="af_vegetable">Verduras</string>
+    <string name="af_pizza">PIZZA</string>
+    <string name="af_dehydrate">Deshidratación</string>
 
     <string name="cook_eggs">Huevos duros</string>
     <string name="cook_rice">Cocinar</string>

BusinessCommon/src/main/res/values-it/strings.xml

@@ -55,7 +55,7 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="user_account">CONTO UTENTE</string>
     <string name="storage">CONSERVAZIONE</string>
     <string name="reset">IMPOSTAZIONI DELLA FABBRICA DI RESTAURO</string>
-    <string name="about">A proposito</string>
+    <string name="about">A PROPOSITO</string>
     <string name="weight">PESO</string>
     <string name="local_recipes">Ricette locali</string>
     <string name="download">Scarica</string>

BusinessCommon/src/main/res/values/themes.xml

@@ -23,7 +23,13 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
     </style>
-
+    <style name="SplashThemeNotLogo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- 这里的trans自己写一个#00000000即可-->
+        <item name="android:windowBackground">@color/color_fff</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
     <style name="Splash017Theme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- 这里的trans自己写一个#00000000即可-->
         <item name="android:windowBackground">@drawable/splash_logo_017</item>

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

@@ -122,13 +122,15 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
         }
         binding.favouriteLayout.background_drawable =
             com.develop.common.R.drawable.home_menu_corners
-        if (isFrLanguage()) {
-            binding.tvFavourite.textSize = dp20
-            binding.tvSetting.textSize = dp20
-            binding.tvHistory.textSize = dp20
-            binding.tvPolicy.textSize = dp20
-            binding.tvHelp.textSize = dp20
-        }
+
+        //2024.01.04 客户需要把法语的字体变回来
+//        if (isFrLanguage()) {
+//            binding.tvFavourite.textSize = dp20
+//            binding.tvSetting.textSize = dp20
+//            binding.tvHistory.textSize = dp20
+//            binding.tvPolicy.textSize = dp20
+//            binding.tvHelp.textSize = dp20
+//        }
     }
 
     private fun initCallbackAndListener() {

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

@@ -495,13 +495,15 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                 showLoading()
             }
         }
-        if (isFrLanguage()) {
-            binding.tvFavourite.textSize = HomeActivity.dp20
-            binding.tvSetting.textSize = HomeActivity.dp20
-            binding.tvHistory.textSize = HomeActivity.dp20
-            binding.tvPolicy.textSize = HomeActivity.dp20
-            binding.tvHelp.textSize = HomeActivity.dp20
-        }
+
+            //2024.01.04 客户需要把法语的字体变回来
+//        if (isFrLanguage()) {
+//            binding.tvFavourite.textSize = HomeActivity.dp20
+//            binding.tvSetting.textSize = HomeActivity.dp20
+//            binding.tvHistory.textSize = HomeActivity.dp20
+//            binding.tvPolicy.textSize = HomeActivity.dp20
+//            binding.tvHelp.textSize = HomeActivity.dp20
+//        }
 
         //032客户需要隐藏登录和注册
         if (getSN().startsWith("032D")){

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

@@ -845,11 +845,8 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         if (needRefresh) {
 
             if (viewModel.recipesType == RecipesType.ONLINE) {
-                Log.d("TAG updateSortName", "ONLINE -:")
                 viewModel.getOnLineRecipeList(viewModel.categoryCode, "")
             } else {
-                Log.d("TAG updateSortName", "updateSortName")
-
                 isRefresh = true
                 binding.page.resetNoMoreData()
                 viewModel.queryLocalRecipes(viewModel.categoryCode)

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

@@ -30,6 +30,7 @@ import com.develop.common.event.FinishAtyEvent
 import com.develop.common.router.Screens
 import com.develop.common.tag.WIFI_FROM_MAIN_SETTING
 import com.develop.common.ui.CommonBindingActivity
+import com.develop.common.utils.FoucsLinearLayoutManager
 import com.develop.common.widget.HomeFunctionTopBar.Companion.dp60
 import com.develop.common.widget.WifiContentView
 import com.develop.setting.R
@@ -105,7 +106,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         }
 
         binding.wifiRecycler.apply {
-
+            this.layoutManager = FoucsLinearLayoutManager(this@WifiListActivity)
             addItemDecoration(object : RecyclerView.ItemDecoration() {
                 override fun getItemOffsets(
                     outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State
@@ -120,7 +121,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
                     outRect.bottom = dp50
                 }
             })
-            linear()
+//            linear()
             setup {
 
                 addType<WifiData>(R.layout.item_wifi_info)

BusinessSetting/src/main/java/com/develop/setting/ui/viewmodel/AboutViewModel.kt

@@ -18,6 +18,7 @@ class AboutViewModel : BaseViewModel() {
         val result = Post<DevInfoResult>(Api.DEV_INFO) {
             body = DeviceInfoBody.genDeviceInfoBody()
         }.await()
+
         devInfoLiveData.postValue(result)
     }.catch {
         errorCallBack.postValue(it.message?:"")

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

@@ -11,7 +11,6 @@ import android.view.KeyEvent.ACTION_DOWN
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
-import android.widget.ImageView
 import android.widget.RelativeLayout
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.core.graphics.drawable.DrawableCompat
@@ -30,8 +29,8 @@ import com.develop.base.widgets.CommonPopupWindow
 import com.develop.common.bean.TuyaEvent
 import com.develop.common.bean.WorkMode
 import com.develop.common.data_repo.db.ModesType
-import com.develop.common.data_repo.db.entity.DevRecipeCategory
 import com.develop.common.dialog.CancelConfirmDialog
+import com.develop.common.dialog.PotCoverUnlockedDialog
 import com.develop.common.event.CookStepEvent
 import com.develop.common.food_sdk.FloatWindowManager
 import com.develop.common.food_sdk.FoodSdkUtils
@@ -46,16 +45,11 @@ import com.develop.common.utils.ConfigUtils
 import com.develop.common.utils.getTimeStr
 import com.develop.common.widget.DirectionView
 import com.develop.common.widget.EggsSelectorLayout
-import com.develop.common.widget.FilterSortViewLayout
 import com.develop.common.widget.RingControlView
 import com.develop.common.widget.TimePickerView
 import com.develop.step.CookSettingType
-import com.develop.step.R
 import com.develop.step.databinding.ActivityModeDetailBinding
 import com.develop.step.viewmodel.ModesViewMode
-import com.drake.brv.utils.linear
-import com.drake.brv.utils.models
-import com.drake.brv.utils.setup
 import com.drake.net.time.Interval
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.CommonEventTypes
 import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevModes
@@ -66,10 +60,8 @@ import com.kuyuntech.cofarcooking.device.sdk.eventbus.core.DevInfo
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevCommonEvent
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevStatusEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
-import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import java.util.Objects
 import java.util.concurrent.TimeUnit
 
 /**
@@ -1873,17 +1865,12 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
      * 点击开始操作
      */
     private fun startClick(showStopTips: Boolean = true) {
-        if (mRunningInstId != mSettingInstId) {
+        if (CofarSDK.devInfo().potCloverStatus.toInt() == 1) {
+            showPotCloverDialog()
+        }else if (mRunningInstId != mSettingInstId) {
             overrideModeDialog.showDialog(supportFragmentManager, "overrideModeDialog")
             overrideModeDialog.onConfirmClick()
         } else {
-
-            //煮鸡蛋前需要设置时间，由于SDK没有设置转速，我这边用转速判断  COOK_EGGS 这里需要空格，sdk里面判断加了个空格
-//            if ("COOK_EGGS " == viewModel.modeType && currDevInfo.motorGear.toInt() == 0) {
-////                overrideModeDialog.showDialog(supportFragmentManager, "overrideModeDialog")
-//                return
-//            }
-
             userChanging = false
             CofarSDK.cancel()
             CofarSDK.devInfo().runningRecipeId = null
@@ -1895,7 +1882,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         }
     }
 
-
+    private fun showPotCloverDialog() {
+        val warnDialog = PotCoverUnlockedDialog()
+        warnDialog.showDialog(supportFragmentManager, "PotCloverDialog")
+    }
     /**
      * 点击恢复操作
      */

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

@@ -7,12 +7,10 @@ import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
 import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.view.isInvisible
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.blankj.utilcode.util.LogUtils
-import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.getSN
 import com.develop.base.ext.isNightTheme
@@ -20,7 +18,6 @@ import com.develop.base.ext.navigateTo
 import com.develop.base.ext.setGone
 import com.develop.base.ext.setVisible
 import com.develop.base.ext.src
-import com.develop.base.ext.toJson
 import com.develop.base.ext.updateText
 import com.develop.base.util.MusicBackPlayerUtil
 import com.develop.base.util.ThreadUtils
@@ -33,7 +30,6 @@ import com.develop.common.data_repo.db.ModesType
 import com.develop.common.data_repo.db.entity.UserFavoriteRecipes
 import com.develop.common.data_repo.db.entity.UserHistoryRecipes
 import com.develop.common.dialog.CancelConfirmDialog
-import com.develop.common.dialog.CookStepCompleteDialog
 import com.develop.common.dialog.PotCoverUnlockedDialog
 import com.develop.common.event.CookStepEvent
 import com.develop.common.event.RefreshLikeDataEvent
@@ -52,8 +48,6 @@ import com.kuyuntech.cofarcooking.device.sdk.constant.core.*
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.core.DevInfo
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevCommonEvent
 import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.io.File
@@ -90,7 +84,7 @@ class CookStepActivity : CookStepBaseActivity() {
     private var currTime = 0
     private var potCloverInterval: Interval? = null
     private var potCloverEleStatus = 0
-
+    private  var  photoPath:String? = ""
     private var currentBgId = R.drawable.pot_clover_ele_unlock //0是开锁图，1上锁图
     private fun turnDevModeUI() {
 
@@ -305,7 +299,7 @@ class CookStepActivity : CookStepBaseActivity() {
                     binding.ivNextStep.setVisible()
                 }
 
-                var photoPath = it.source.photoVideoFilePath;
+                 photoPath = it.source.photoVideoFilePath;
                 if (photoPath == null || photoPath == "") {
                     photoPath = viewModel.recipe?.photoPath;
                 }
@@ -398,7 +392,7 @@ class CookStepActivity : CookStepBaseActivity() {
                     binding.ivPrevStep.setVisible()
                     binding.ivNextStep.setVisible()
                 }
-                var photoPath = it.source.photoVideoFilePath;
+                 photoPath = it.source.photoVideoFilePath;
                 if (photoPath == null || photoPath == "") {
                     photoPath = viewModel.recipe?.photoPath;
                 }
@@ -426,12 +420,14 @@ class CookStepActivity : CookStepBaseActivity() {
                 override fun onConfirm() {
                     if (CofarSDK.devInfo().runningInstId != null) {
                         val info = CofarSDK.devInfo().runningInstId.split(":");
-
                         val cookStepEvent = CookStepEvent(
-                            info[0],
-                            coverPath as String,
-                            info[1].toInt(),
-                            isMode = false
+                           recipeNumber =  info[0],
+                           coverPath =  photoPath!!,
+                           step =   info[1].toInt(),
+                           isMode = false,
+                            modeName =  this@CookStepActivity.binding.tvTitleStep.text.toString()
+
+
                         )
                         FloatWindowManager.showStepFlowWindow(cookStepEvent)
                         finish()
@@ -460,7 +456,8 @@ class CookStepActivity : CookStepBaseActivity() {
                         recipeNumber ?: "",
                         coverPath as String,
                         viewModel.stepIndex,
-                        isMode = false
+                        isMode = false,
+                        modeName =  this@CookStepActivity.binding.tvTitleStep.text.toString()
                     )
                     FloatWindowManager.showStepFlowWindow(cookStepEvent)
                     recordRecipes()

app/build.gradle

@@ -13,8 +13,8 @@ ext{
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="036I"
-    brandCode="032D"
-    model="1039"
+    brandCode="010D"
+    model="5037"
 
 }
 
@@ -76,7 +76,7 @@ android {
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
         }
 
 //        brand011ATuya {
@@ -162,7 +162,12 @@ android {
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/Splash032DTheme")
         }
-
+        brand032D {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/Splash032DTheme")
+        }
         brand002DTuya {
             dimension "platform"
             applicationId "com.develop.foodcooking"
@@ -223,6 +228,7 @@ android {
             productFlavors.brand000A.signingConfig signingConfigs.release
             productFlavors.brand045ATuya.signingConfig signingConfigs.release
             productFlavors.brand032DTuya.signingConfig signingConfigs.release
+            productFlavors.brand032D.signingConfig signingConfigs.release
             productFlavors.brand002DTuya.signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
@@ -235,7 +241,7 @@ android {
 //            resValue("string", "app_theme", "@style/Splash054ATheme")
 
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
+            resValue("string", "app_theme", "@style/Splash029CTheme")
         }
     }
 

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

@@ -189,7 +189,7 @@ fun getSN(): String {
 
     if (BuildConfig.DEBUG) {
 //        return "045A21030020123010190001"
-//    return "000A30150020123010190001"
+    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
 //     return "000A10390020123010190001"
 //    return "010D10390020123010190001"
@@ -200,8 +200,10 @@ fun getSN(): String {
 //    return  "017A20060020123010190001"
 //    return "010D10390020123010190001"
 //    return "000A10390020123010190009"
-    return  "032D21060020123010190001"
+//    return  "032D21060020123010190001"
+//        return "000A50370020123010190011"
 //    return  "030A10390020123010190002"
+//        return "029C21010020123010190001"
     } else {
         //通过反射获取sn号
         try {