处理011F

BusinessAirFryer/src/main/assets/config_011F.json

@@ -112,7 +112,7 @@
       "bg": "ic_a_citrus_juicer_bg_011",
       "icon": "ic_a_citrus_juicer_011",
       "devMode": "SOUP",
-      "listShow": false
+      "listShow": true
     },
 
     {
@@ -121,7 +121,7 @@
       "bg": "ic_a_potato_peeler_bg_011",
       "icon": "ic_a_potato_peeler_011",
       "devMode": "SOUP",
-      "listShow": false
+      "listShow": true
     },
 
     {

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

@@ -57,12 +57,10 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         }
 
 
-        if (sn.startsWith("063B")){
-            binding.tvSound.visibility = View.VISIBLE
-            binding.sbBrightness.visibility = View.VISIBLE
-            binding.ivSoundOne.visibility = View.VISIBLE
-            binding.ivSoundTwo.visibility = View.VISIBLE
-        }
+        binding.tvSound.visibility = View.VISIBLE
+        binding.sbBrightness.visibility = View.VISIBLE
+        binding.ivSoundOne.visibility = View.VISIBLE
+        binding.ivSoundTwo.visibility = View.VISIBLE
 
 
         binding.rb3Min.text = "   " + resources.getString(com.develop.common.R.string.time_5min)
@@ -74,7 +72,7 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         setScreenManualMode()
 //        binding.sbBrightness.max = 255
         var org = getScreenBrightness()
-        Log.e("TAG sbBrightness","org: $org")
+        Log.e("TAG sbBrightness", "org: $org")
         binding.sbBrightness.progress = org
         var lastInt = 0
         var config = false
@@ -177,7 +175,7 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
     }
 
     fun setScreenBrightness(brightness: Int) {
-        MMkvUtils.save(BRIGHTNESS,brightness)
+        MMkvUtils.save(BRIGHTNESS, brightness)
 
         // 设置屏幕亮度
         Settings.System.putInt(contentResolver, Settings.System.SCREEN_BRIGHTNESS, brightness)

app/build.gradle

@@ -20,7 +20,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="000B"
-    brandCode = "011A"
+    brandCode = "011F"
 //    model = "5037"
     model = "1039"
 
@@ -871,13 +871,13 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-//            manifestPlaceholders = [channelName: "brand011FTuya"]
-//            buildConfigField("String", "UpdatePlatform", "\"011F\"")
-//            resValue("string", "app_theme", "@style/Splash011FTheme")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"011F\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
+            manifestPlaceholders = [channelName: "brand011FTuya"]
+            buildConfigField("String", "UpdatePlatform", "\"011F\"")
+            resValue("string", "app_theme", "@style/Splash011FTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"011F\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 
 
 //            manifestPlaceholders = [channelName: "brand011DTuya"]
@@ -1045,14 +1045,14 @@ android {
 //            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 ////
 
-            manifestPlaceholders = [channelName: "brand063BTuya"]
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"063B\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+//            manifestPlaceholders = [channelName: "brand063BTuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"063B\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 //
 
 

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

@@ -240,7 +240,7 @@ fun getSN(): String {
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190001"
-//        return "011F10390020123010190001"
+        return "011F10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
@@ -274,7 +274,7 @@ fun getSN(): String {
 //        return "062A20030020123010190004"
 //        return  "063A10390020123010190015"
 //        return  "063B10390020123010190002"
-        return  "063B10390020123010190001"
+//        return  "063B10390020123010190001"
 //        return  "063B20030020123010190015"
 //        return "063B21050020123010190001"
 //        return "058A10390020123010190001"