011 代码上传

BusinessAirFryer/src/main/assets/config_000B.json

@@ -145,8 +145,8 @@
     {
       "type": "WIGHT",
       "name": "wight",
-      "bg": "ic_mode_weight",
-      "icon": "ic_grid_weight",
+      "bg": "ic_mode_weight_054",
+      "icon": "ic_grid_weight_054",
       "devMode": "AIR_FRYER",
       "listShow": true
     },

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

@@ -659,6 +659,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             "MRK-48P"
         }else if (sn.startsWith("011E")){
             "MRK-58"
+        }else if (sn.startsWith("011F")){
+            "TRM-01"
         }else{
             "MRK-48"
         }

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

@@ -60,7 +60,7 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
 
         val bannerAdapter = ScreenBannerAdapter(
             if (sn.startsWith("011A")) dataList011A
-            else if (sn.startsWith("011D")) dataList011D
+            else if (sn.startsWith("011D")||sn.startsWith("011F")) dataList011D
             else if (sn.startsWith("011E")) dataList011E
             else if (sn.startsWith("054")) dataList054
             else if (sn.startsWith("045")) dataList045

app/build.gradle

@@ -15,20 +15,18 @@ plugins {
 }
 
 
-
 ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="054A"
-    brandCode = "010H"
+    brandCode = "011F"
 //    model = "5037"
     model = "1039"
 
 }
 
 
-
 android {
     compileSdk 31
 
@@ -43,7 +41,7 @@ android {
         minSdk 21
         targetSdk 31
         versionCode project.ext.versionCode
-        versionName  "${project.ext.model}.${project.ext.brandCode}.${project.ext.versionCode}"
+        versionName "${project.ext.model}.${project.ext.brandCode}.${project.ext.versionCode}"
         archivesBaseName = "cofar-cooking_${versionName}"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -71,8 +69,6 @@ android {
     }
 
 
-
-
     flavorDimensions "platform"
     productFlavors {
 
@@ -87,7 +83,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand000BTuya {
@@ -101,7 +97,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand000A5037Tuya {
@@ -115,7 +111,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand000B5037Tuya {
@@ -129,7 +125,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
 
@@ -144,7 +140,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand045ATuya {
@@ -157,7 +153,7 @@ android {
             buildConfigField("String", "brandCode", "\"045A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
 //        brand011ATuya {
@@ -178,7 +174,7 @@ android {
             buildConfigField("String", "brandCode", "\"011A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
         brand011A5037Tuya {
@@ -192,7 +188,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand011DTuya {
@@ -205,9 +201,24 @@ android {
             buildConfigField("String", "brandCode", "\"011D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
+
+        }
+
+        brand011FTuya {
+            manifestPlaceholders = [channelName: "brand011FTuya"]
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"011\"")
+            resValue("string", "app_theme", "@style/Splash011DTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"011F\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
+
         brand011ETuya {
             manifestPlaceholders = [channelName: "brand011ETuya"]
             dimension "platform"
@@ -218,7 +229,7 @@ android {
             buildConfigField("String", "brandCode", "\"011E\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
         brand014ATuya {
@@ -231,7 +242,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
 
@@ -243,7 +254,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand030ATuya {
@@ -256,7 +267,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
 
         }
@@ -271,7 +282,7 @@ android {
             buildConfigField("String", "brandCode", "\"029C\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
         brand029C5037Tuya {
             dimension "platform"
@@ -282,7 +293,7 @@ android {
             buildConfigField("String", "brandCode", "\"029C\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand036I {
@@ -295,7 +306,7 @@ android {
             resValue("string", "app_theme", "@style/SplashThemeNotLogo")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
 
@@ -309,7 +320,7 @@ android {
             buildConfigField("String", "brandCode", "\"036I\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
 
@@ -324,7 +335,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
         brand033ITuya {
             manifestPlaceholders = [channelName: "brand033ITuya"]
@@ -337,7 +348,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand033KTuya {
@@ -351,7 +362,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
 
@@ -366,7 +377,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
 
@@ -381,7 +392,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand000A {
@@ -393,7 +404,7 @@ android {
             buildConfigField("String", "brandCode", "\"000A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand010D {
@@ -406,7 +417,7 @@ android {
             buildConfigField("String", "brandCode", "\"010D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
         brand010H {
             manifestPlaceholders = [channelName: "brand010H"]
@@ -418,7 +429,7 @@ android {
             buildConfigField("String", "brandCode", "\"010H\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
         brand010I {
             manifestPlaceholders = [channelName: "brand010I"]
@@ -430,7 +441,7 @@ android {
             buildConfigField("String", "brandCode", "\"010I\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand010F {
@@ -442,7 +453,7 @@ android {
             buildConfigField("String", "brandCode", "\"010F\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand010DUpdate {
@@ -454,7 +465,7 @@ android {
             buildConfigField("String", "brandCode", "\"010D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand010FUpdate {
@@ -466,7 +477,7 @@ android {
             buildConfigField("String", "brandCode", "\"010F\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand025ATuya {
@@ -479,7 +490,7 @@ android {
             buildConfigField("String", "brandCode", "\"025A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
 
@@ -493,7 +504,7 @@ android {
             buildConfigField("String", "brandCode", "\"030A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand032DTuya {
@@ -507,7 +518,7 @@ android {
             buildConfigField("String", "brandCode", "\"032D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
 
@@ -518,7 +529,7 @@ android {
             resValue("string", "app_theme", "@style/Splash032DTheme")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
         brand032ETuya {
@@ -532,7 +543,7 @@ android {
             buildConfigField("String", "brandCode", "\"032E\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
         }
 
@@ -546,11 +557,10 @@ android {
             buildConfigField("String", "brandCode", "\"002D\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
 
-
         brand007DTuya {
             dimension "platform"
             applicationId "com.develop.foodcooking"
@@ -558,7 +568,7 @@ android {
             resValue("string", "app_theme", "@style/Splash007DTheme")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
 
@@ -572,7 +582,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
             buildConfigField("String", "brandCode", "\"049B\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand053A {
@@ -585,7 +595,7 @@ android {
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
             buildConfigField("String", "brandCode", "\"053A\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand054ATuya {
@@ -598,7 +608,7 @@ android {
             buildConfigField("String", "brandCode", "\"054A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand054A5037Tuya {
@@ -611,7 +621,7 @@ android {
             buildConfigField("String", "brandCode", "\"054A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
         }
 
         brand058A {
@@ -624,7 +634,7 @@ android {
             buildConfigField("String", "brandCode", "\"058A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
         brand062ATuya {
@@ -637,7 +647,7 @@ android {
             buildConfigField("String", "brandCode", "\"062A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
         brand063ATuya {
@@ -649,7 +659,7 @@ android {
             buildConfigField("String", "brandCode", "\"063A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
 
@@ -663,7 +673,7 @@ android {
             buildConfigField("String", "brandCode", "\"063B\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
 
@@ -677,7 +687,7 @@ android {
             buildConfigField("String", "brandCode", "\"077A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
     }
@@ -711,8 +721,6 @@ android {
 //    }
 
 
-
-
     signingConfigs {
         debug {
             storeFile file('..\\signature\\rk.jks')
@@ -797,14 +805,25 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
+
+//            manifestPlaceholders = [channelName: "brand000B5037Tuya"]
+//            resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "UpdatePlatform", "\"night\"")
+//            buildConfigField("String", "model", "\"5037\"")
+//            buildConfigField("String", "brandCode", "\"000B\"")
+//            //versionCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+////            buildConfigField("String", "appCode", "\"2.01\"")
+
+
 //
-            manifestPlaceholders = [channelName: "brand000ATuya"]
-            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            resValue("string", "app_theme", "@style/SplashTheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"000A\"")
-            //appCode 1.01 指向bug修复，2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            manifestPlaceholders = [channelName: "brand000ATuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"000A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
 
 //            manifestPlaceholders = [channelName: "brand000ATuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
@@ -822,6 +841,15 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
+            manifestPlaceholders = [channelName: "brand011FTuya"]
+            buildConfigField("String", "UpdatePlatform", "\"011\"")
+            resValue("string", "app_theme", "@style/Splash011DTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"011F\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+
+
 //            manifestPlaceholders = [channelName: "brand011DTuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"011\"")
 //            resValue("string", "app_theme", "@style/Splash011DTheme")
@@ -861,8 +889,6 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
-
-
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashTheme")
 //            buildConfigField("String", "model", "\"1039\"")
@@ -871,8 +897,6 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
-
-
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
 //            buildConfigField("String", "model", "\"1039\"")

app/src/brand011FTuya/res/values-en/strings.xml

@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="not_a_member_yet">Not a %1s yet?</string>
+    <string name="member">member</string>
+    <string name="select_language">Select Language</string>
+    <string name="next">NEXT</string>
+    <string name="english">English</string>
+    <string name="chinese">简体中文</string>
+    <string name="france">Français</string>
+    <string name="japan">日本語</string>
+    <string name="skip"><![CDATA[SKIP >>]]></string>
+    <string name="recipes">RECIPES</string>
+    <string name="mode">MODE</string>
+    <string name="sunday">Sunday</string>
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="resume">RESUME</string>
+    <string name="privacy_policy">Privacy policy</string>
+    <string name="privacy_policy_content">1.How do we collect and use your personal information
+Nanfang plus client is an online information platform developed and operated by Guangdong Nanfang newspaper mobile media Co.,Ltd.(hereinafter referred to as"we").In theprocess of using the southern plus client service,we will collect the information you actively provide when using the service or arising from using the service in the following ways to provide you with services,optimize our services and ensure the security of your account.</string>
+    <string name="i_agree">I Agree</string>
+    <string name="i_have_read_the_privacy_policy">I have read the privacy policy</string>
+    <string name="second">Second</string>
+    <string name="wifi">WIFI</string>
+    <string name="off_line">OFF-LINE</string>
+    <string name="ok">OK</string>
+    <string name="on_line">ON-LINE</string>
+    <string name="pwd_can_not_be_empty">pwd can not be empty!</string>
+    <string name="skin_for_now">Skin for now</string>
+    <string name="login">Login</string>
+    <string name="online_recipes">Online Recipes</string>
+    <string name="cook_history">Cooking history</string>
+    <string name="favourite_recipes">Favourite recipes</string>
+    <string name="settings">Settings</string>
+    <string name="grid_view">Grid view</string>
+    <string name="list_view">List view</string>
+    <string name="adapted_cooking">ADAPTED COOKING</string>
+    <string name="scales">SCALES</string>
+    <string name="boil_water">Boil</string>
+    <string name="chop">Chop</string>
+    <string name="ferment">FERMENT</string>
+    <string name="slow_cook">SLOW COOK</string>
+    <string name="knead_dough">Knead</string>
+    <string name="steam">Steam</string>
+    <string name="food_processor">Food processor</string>
+    <string name="turbo">TURBO</string>
+    <string name="citrus_juicer">CITRUS_JUICER</string>
+    <string name="dicing">DICING</string>
+    <string name="potato_peeler">POTARO PEELER</string>
+
+    <string name="steam_010">Steam</string>
+    <string name="knead_dough_010">KNEAD DOUGH</string>
+    <string name="slow_cook_010">SLOW COOK</string>
+    <string name="ferment_010">FERMENT</string>
+    <string name="mulsify_010">MULSIFY</string>
+    <string name="food_processor_010">FOOD PROCESSOR</string>
+    <string name="chop_010">CHOP</string>
+    <string name="wight_010">WEIGHT</string>
+    <string name="auto_clean_010">AUTO CLEAN</string>
+    <string name="turbo_010">TURBO</string>
+
+
+
+
+
+
+    <string name="language">LANGUAGE</string>
+    <string name="sound">SOUND</string>
+    <string name="brightness">BRIGHTNESS</string>
+    <string name="user_account">USER ACCOUNT</string>
+    <string name="storage">STORAGE</string>
+    <string name="reset">Resume to default setting</string>
+    <string name="about">ABOUT</string>
+    <string name="tuya">App  Download</string>
+
+
+
+    <string name="tuya_app_title">With Tuya</string>
+    <string name="tuya_app_content">Please use app (with Tuya ) to scan the QR code</string>
+    <string name="tuya_sn_title">Cobotmix</string>
+    <string name="tuya_sn_content">Please use cobotmix app to scan the QR code</string>
+
+    <string name="weight">WEIGHT</string>
+    <string name="local_recipes">Local recipes</string>
+    <string name="download">Download</string>
+    <string name="downloading">Downloading</string>
+    <string name="enter_search">Enter search</string>
+    <string name="search">Search</string>
+    <string name="all_name">Alphabetical (A-Z)</string>
+    <string name="most_popular">Favourites</string>
+
+
+    <string name="newest">The latest</string>
+    <string name="the_most_commonly_searched">The most commonly searched</string>
+    <string name="notice">Notice</string>
+    <string name="all">ALL</string>
+    <string name="Recipes">Recipes</string>
+    <string name="ingredients">Ingredients</string>
+    <string name="Brightness">Brightness</string>
+    <string name="screen_lock_time">Screen lock time</string>
+    <string name="time_3min">3Min</string>
+    <string name="time_5min">5Min</string>
+    <string name="time_10min">10Min</string>
+    <string name="time_20min">20Min</string>
+    <string name="time_30min">30Min</string>
+    <string name="Sound">Sound</string>
+    <string name="text_to_speech">Text to speech</string>
+    <string name="Language">Language</string>
+    <string name="Continue">CONTINUE</string>
+    <string name="start_cooking">START COOKING</string>
+    <string name="off">OFF</string>
+    <string name="on">ON</string>
+    <string name="update_the_recipes">Update the recipes</string>
+    <string name="apk">APK</string>
+    <string name="mcu">MCU</string>
+    <string name="tp">FW</string>
+    <string name="serial_number">SN</string>
+    <string name="standby_time">MODEL</string>
+    <string name="update">Update</string>
+    <string name="About">About</string>
+    <string name="are_you_sure_to_restore_factory_settings">Are you sure to restore factory settings?</string>
+    <string name="yes">YES</string>
+    <string name="restore_factory_settings">Resume to default setting</string>
+    <string name="connected_successfully">connected successfully</string>
+    <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
+    <string name="network_wifi_status_saved">Saved</string>
+    <string name="network_wifi_status_idle" />
+    <string name="network_wifi_status_disabled">"Stopped"</string>
+    <string name="network_wifi_status_network_failure">"IP address configuration failure"</string>
+    <string name="network_wifi_status_wifi_failure">"WLAN connection failure"</string>
+    <string name="network_wifi_status_password_failure">"There is a problem with authentication"</string>
+    <string name="network_wifi_status_scanning">Scanning...</string>
+    <string name="network_wifi_status_connecting">Connecting…</string>
+    <string name="network_wifi_status_authenticating">Authentication in progress…</string>
+    <string name="network_wifi_status_obtaining_ip_address">obtaining IP address…</string>
+    <string name="network_wifi_status_connected">Connected</string>
+    <string name="network_wifi_status_suspended">Suspended</string>
+    <string name="network_wifi_status_disconnecting">Disconnecting…</string>
+    <string name="network_wifi_status_disconnected">Disconnected</string>
+    <string name="network_wifi_status_failed">Failed</string>
+    <string name="network_wifi_status_blocked">Blocked</string>
+    <string name="network_wifi_status_verifying_poor_link">Temporarily shut down (bad network condition)</string>
+    <string name="wifi_loading_text">Connecting…</string>
+    <string name="start">START</string>
+    <string name="pause">PAUSE</string>
+    <string name="cancel">CANCEL</string>
+    <string name="confirm">CONFIRM</string>
+    <string name="stop">STOP</string>
+    <string name="turn_right">Right</string>
+    <string name="turn_left">Left</string>
+    <string name="temperature">TEMPERATURE</string>
+    <string name="time">TIME</string>
+    <string name="speed">SPEED</string>
+    <string name="direction">Rotation </string>
+    <string name="bad">Bad</string>
+    <string name="imperfect">Imperfect</string>
+    <string name="ordinary">Ordinary</string>
+    <string name="good">Good</string>
+    <string name="perfect">Perfect</string>
+    <string name="are_you_sure_to_delete">Are you sure to delete?</string>
+    <string name="no">NO</string>
+    <string name="easy">easy</string>
+    <string name="medium">medium</string>
+    <string name="hard">hard</string>
+    <string name="grade">GRADE</string>
+
+    <string name="srl_footer_finish">Load Success</string>
+    <string name="srl_footer_loading">Loading…</string>
+    <string name="current_cooking_dialog_title">Overwrite current cooking process?\nBy overwriting,your current progress will got lost.</string>
+    <string name="unset_param_tips">Please set the operation parameters</string>
+    <string name="pmpt_confirm">Confirm</string>
+    <string name="pmpt_cancel">Cancel</string>
+    <string name="pmpt_msg">Tips</string>
+    <string name="dev_end_of_run_tips">Finish!</string>
+    <string name="dev_not_orange_parts">Please install the Twisted Orange accessory to start the Twisted Orange program。</string>
+    <string name="dev_remove_orange_parts">The machine is in twisted orange mode, please remove the current accessory.</string>
+    <string name="dev_dice_and_peel_tips">In order to use the program, it is necessary to have and install the appropriate attachment.</string>
+
+    <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure to continue?</string>
+    <string name="hight_temp_turbo_tips">The current temperature exceeds 60, turbo function cannot be operated</string>
+    <string name="update_msg">System updating, please wait～</string>
+    <string name="update_title">Do you want to upgrade to the new version?</string>
+    <string name="finish_download">Downloaded</string>
+    <string name="download_fail">Download failure</string>
+    <string name="start_download">Start to download</string>
+    <string name="weight_overload_tips">Weighing overload</string>
+    <string name="forgot_password">Forgotten password</string>
+    <string name="enter_email_id">Enter Email ID</string>
+    <string name="enter_password">Enter Password</string>
+    <string name="register">Register</string>
+    <string name="launch_detail">Join us today and enjoy the ultimate cooking expenence</string>
+    <string name="login_sign_up">Login / Sign up</string>
+    <string name="skip_for_now">Skip for now</string>
+    <string name="reset_password">Reset Password</string>
+    <string name="enter_captcha">Enter Captcha</string>
+    <string name="send_email">Send Email</string>
+    <string name="enter_password_again">Enter Password Again</string>
+    <string name="enter_the_captcha_obtained_from_the_mail">Enter the Captcha obtained from the mail</string>
+    <string name="nickname">Nickname</string>
+    <string name="enter_nickname">Enter Nickname</string>
+    <string name="Gender">Gender</string>
+    <string name="male">Male</string>
+    <string name="age">Age</string>
+    <string name="save">Save</string>
+    <string name="cancellation_of_account">Cancellation of account</string>
+    <string name="sign_up_it_s_free">Sign up, it\'s FREE</string>
+    <string name="pwd_requirement">Composed of letters and numbers,with no less than 8 digits.</string>
+    <string name="please_select_age">Please select age</string>
+    <string name="cancel_lower">Cancel</string>
+    <string name="female">Female</string>
+    <string name="tare">TARE</string>
+
+    <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
+    <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
+    <string name="reset_button">RESET</string>
+    <string name="finish">Finish!</string>
+    <string name="error">Error</string>
+    <string name="download_failed">Download failed</string>
+    <string name="warning">Warning!</string>
+    <string name="lid_unlock">Lid unlock</string>
+    <string name="share_with_more_people">Share with more people</string>
+    <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
+    <string name="enter_what_you_want_to_say">Enter what you want to say</string>
+    <string name="note_title">NOTE TITLE</string>
+
+    <string name="type_your_notes_here">Type your notes here</string>
+    <string name="make_1_jar">MAKES 1 JAR</string>
+    <string name="make_n_jars">MAKES %1s JARS</string>
+    <string name="per_serving">Per serving</string>
+    <string name="preparation">Preparation:</string>
+    <string name="hours">h</string>
+    <string name="min">min</string>
+
+    <string name="food_hour">hour</string>
+    <string name="food_minutes">minutes</string>
+
+
+    <string name="ready_in">Ready in:</string>
+    <string name="jar">JAR</string>
+    <string name="serving_sizes">Serving sizes</string>
+    <string name="score">Score</string>
+    <string name="share">Share</string>
+    <string name="delete">Delete</string>
+    <string name="recipe_update_tips">A total of {{num}} recipes have been found. Do you want to download them?</string>
+    <string name="no_recipe_update_tips">No new recipe data package \n Currently the latest version</string>
+    <string name="recipe_update_process_tips">({{progress}})Recipe data downloading…</string>
+    <string name="recipe_update_finish">Recipe data update completed</string>
+    <string name="update_recipe_title">Recipe update</string>
+    <string name="restore_confirm_tips">Are you sure to restore to the factory settings?</string>
+    <string name="change_lang_tips">The program is running, please close the program to perform this operation again!</string>
+    <string name="recipe_not_language">The recipe language does not match, please switch languages</string>
+    <string name="exit_weight_align">Exit calibration</string>
+    <string name="weight_aligning">Calibrating..</string>
+    <string name="weight_one_kg_tips">Please put on weight 1 KGS</string>
+    <string name="weight_two_kg_tips">Please put on weight 2 KGS</string>
+    <string name="weight_align_success">Calibrate successfully!</string>
+    <string name="change_lang_tips2">After switch the language, recipe languages will change at the same time and restart. Are you sure to switch the language? </string>
+    <string name="pot_clover_not_clost_tips">The lid is unlocked. Please lock the lid first and start.</string>
+    <string name="screen_saver_title">Do you want to enter the breath screen?</string>
+    <string name="sex">Sex</string>
+    <string name="wight">Scales</string>
+    <string name="running_block_tips">Please stop the running program and start new programs.</string>
+    <string name="unset_target_time">Time has not been set.</string>
+    <string name="empty_notice">Empty Notice</string>
+    <string name="network_error">network error</string>
+    <string name="help">Help</string>
+    <string name="evaluate_successfully">Evaluate successfully</string>
+    <string name="reset_to_default_settings">Reset to default settings</string>
+    <string name="home_auth"><![CDATA[HOME >>]]></string>
+    <string name="rating">rating</string>
+    <string name="loading">Loading</string>
+    <string name="Min20">20Min</string>
+    <string name="enjoy_your_meal">ENJOY YOUR MEAL</string>
+
+    <string name="gan_sao_yi_chan">Attention\n· High temperature\n· No contents in bowl when heating\n· Add ingredients, liquids</string>
+
+    <string name="zhuan_su_fan_kui_yi_chan">Warning\n· Bowl lid not fully engaged\n· Motor overload, allow machine to cool down, Restart with less bowl contents.</string>
+    <string name="dian_zi_cheng_tong_xin_yi_chan">Attention\n· Weight was not measured, scale error\n· Scale faulty </string>
+    <string name="ntc_yi_chan"> Attention: NTC is not working properly, please contact technical service.</string>
+    <string name="mei_fang_guo_yi_chan">Attention\n· Mixing bowl not engaged, reposition bowl</string>
+    <string name="dev_error">Attention: The device is abnormal, please check the device</string>
+    <string name="login_expire_tips">Failed to login, please try again</string>
+    <string name="no_net_error">Please connect to Wifi</string>
+    <string name="no_login">Please enter the fields above to login</string>
+    <string name="enjoy_your_meal_desc">enjoy your meal</string>
+    <string name="wrong_captcha">Wrong captcha</string>
+    <string name="none">None</string>
+    <string name="please_fill_in_nickname">Please fill in nickname</string>
+
+
+    <string name="recipe_complete">RECIPE COMPLETED</string>
+    <string name="engjoy_your_meal">ENJOY YOUR MEAL!</string>
+
+    <string name="press_the_button">Press the button</string>
+    <string name="please_fill_in">Please fill in</string>
+    <string name="Password_is_not_the_same">Password is not the same</string>
+    <string name="enter">ENTER</string>
+    <string name="repeat">REPEAT</string>
+    <string name="automatic_recipes">Automatic\nRecipes</string>
+    <string name="automatic_programmes">Automatic\nProgrammes</string>
+    <string name="manual_cooking">Manual\nCooking</string>
+    <string name="download_new_recipes">Download\nnew recipes</string>
+    <string name="home">HOME</string>
+    <string name="back">BACK</string>
+    <string name="historical_search">Historical search</string>
+
+    <string name="Automatic_recipes">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes">AUTOMATIC PROGRAMMES</string>
+    <string name="Manual_cooking">MANUAL COOKING</string>
+    <string name="Download_new_recipes">DOWNLOAD NEW RECIPES</string>
+    <string name="account_or_pwd_error">Incorrect account number or password</string>
+    <string name="login_faild">Incorrect account number or password</string>
+
+    <string name="Automatic_recipes_32">AUTOMATIC RECIPES</string>
+    <string name="Automatic_programmes_32">AUTOMATIC PROGRAMS</string>
+    <string name="Manual_cooking_32">MANUAL\nMODE</string>
+    <string name="Download_new_recipes_32">DOWNLOAD RECIPES</string>
+
+
+
+    <!-- 空炸模式 -->
+    <string name="air_fryer">AIR FRYER</string>
+    <string name="meat">MEAT</string>
+    <string name="fish">FISH</string>
+    <string name="bakc">BAKC</string>
+    <string name="drumsticks">DRUMSTICKS</string>
+    <string name="chicken_wing">CHICKEN WING</string>
+    <string name="vegetable">VEGETABLE</string>
+    <string name="shrimp">SHRIMP</string>
+    <string name="pizza">PIZZA</string>
+    <string name="dehydrate">DEHYDRATE</string>
+    <string name="confirm_change_dev_mode">Confirm change dev mode ?</string>
+    <string name="water_spary">WATER SPARY</string>
+    <string name="error_pot_clover_tips">The current cooking mode is not consistent with the type of pot cover. Do you want to switch to the corresponding cooking mode?</string>
+
+    <string name="egg_msg">Put 500ml of cold water into the main pot and cook up to 5-6 eggs in the steaming basket inside the pot. After cooking, keep it under cold water for about 20 seconds and stop the boiling process.</string>
+    <string name="cook_eggs">COOK EGGS</string>
+    <string name="cook_rice">Rice cookingE</string>
+    <string name="mulsify">MULSIFY</string>
+    <string name="puree">PUREE</string>
+    <string name="roast">ROAST</string>
+    <string name="smoothie">Smoothie</string>
+    <string name="sovs_vide">SOVS VIDE</string>
+    <string name="auto_clean">Autowash</string>
+    <string name="apk_version_latest">Current version is the latest version.</string>
+    <string name="installing">Installing...</string>
+    <string name="save_success">Save success</string>
+    <string name="reset_password_success">Reset password success!</string>
+    <string name="email_send">Email send</string>
+    <string name="email_not_send">Email not send</string>
+    <string name="send_no_email">Please fill in your  email</string>
+    <string name="the_email_has_been_already_registered">The email has been already registered</string>
+    <string name="please_fill_in_your_email">Please fill in your email</string>
+    <string name="please_fill_in_the_captcha">Please fill in the captcha</string>
+    <string name="please_fill_in_the_password">Please fill in the password</string>
+    <string name="password_uncorrect">Password uncorrect</string>
+    <string name="password">Password</string>
+    <string name="add_to_favourite">Add to favourite</string>
+    <string name="step_pot_error">Please switch the corresponding pot and start again</string>
+    <string name="verify_code_uncorrect">Verify code uncorrect</string>
+    <string name="success">Success</string>
+
+    <string name="e7_errCode">Motor heat dissipation abnormal</string>
+    <string name="e8_errCode">Plug in air fryer attachment</string>
+    <string name="e9_errCode">Air fryer NTC abnormal</string>
+    <string name="e10_errCode">Put air fryer lid into place</string>
+    <string name="e11_errCode">Put air fryer bowl into place</string>
+    <string name="e12_errCode">Air fryer attachment overheat protection. Pls use it after cool down.</string>
+    <string name="e13_errCode">Air fryer water pump abnormal</string>
+    <string name="e14_errCode">Unplug air fryer attachment when in robot cooker mode</string>
+    <string name="e15_errCode">TFT screen dissipation abnormal</string>
+    <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
+
+
+
+    <!-- 011兼容翻译 -->
+    <string name="language_011">LANGUAGE</string>
+    <string name="brightness_011">Screen lock time</string>
+    <string name="reset_011">Resume to default setting</string>
+    <string name="mei_fang_guo_yi_chan_011">Note: No mixing bowl detected</string>
+    <string name="lid_unlock_011">Mixing bowl lid not locked properly</string>
+    <string name="notice_011">Notification</string>
+    <string name="empty_notice_011">No notifications</string>
+    <string name="press_the_button_011">Press and hold the button</string>
+    <string name="direction_011">Rotation</string>
+
+
+    <string name="automatic_recipes_011">Recipes</string>
+    <string name="automatic_programmes_011">Automatic\nprograms</string>
+    <string name="manual_cooking_011">Manual\ncooking</string>
+    <string name="download_new_recipes_011">Download</string>
+
+
+    <string name="adapted_cooking_011">Manual cooking</string>
+    <string name="knead_011">Knead</string>
+    <string name="steam_011">Steam</string>
+    <string name="boil_water_011">Boil</string>
+    <string name="sovs_vide_011">Sous-vide</string>
+    <string name="cook_rice_011">Rice cooking</string>
+    <string name="food_processor_011">Food processor</string>
+    <string name="chop_011">Chop</string>
+    <string name="turbo_011">Turbo</string>
+    <string name="smoothie_011">Smoothie</string>
+    <string name="auto_clean_011">Autowash</string>
+    <string name="wight_011">Scales</string>
+    <string name="dicing_011">Dicing</string>
+    <string name="citrus_juicer_011">Citrus juicer</string>
+    <string name="potato_peeler_011">Potato peeler</string>
+
+
+
+
+    <string name="hours_011">h</string>
+    <string name="min_011">min</string>
+    <string name="sec_011">sec</string>
+
+    <string name="note_title_011">My notes</string>
+    <string name="tare_011">Tare</string>
+    <string name="newest_011">The latest</string>
+    <string name="most_popular_011">Favourites</string>
+    <!-- 修改turn_left_011/turn_right_011  记得同步修改 turn_left /turn_right -->
+    <string name="turn_right_011">Right</string>
+    <string name="turn_left_011">Left</string>
+    <string name="preparation_011">Preparation:</string>
+    <string name="ready_in_011">Cooking time:</string>
+
+</resources>

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

@@ -216,7 +216,8 @@ fun getSN(): String {
 //        return "045A50370020123010190001"
 //        return "000A30150020123010190001"
 //     return "000A10390020123010170001"
-     return "000A10390020123010190001"
+//     return "000A10390020123010190001"
+//        return "000B50370020123010190001"
 //        return "000B10390020123010190001"
 //        return "025A10390020123010190001"
 //        return "054A50370020123010190001"
@@ -225,6 +226,7 @@ fun getSN(): String {
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190001"
+        return "011F10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
@@ -289,19 +291,19 @@ fun getSN(): String {
 }
 
 
-
 fun getGoneLogin(): Boolean {
     var sn = getSN()
-    return sn.startsWith("032D") ||sn.startsWith("032E") || sn.startsWith("011")
+    return sn.startsWith("032D") || sn.startsWith("032E") || sn.startsWith("011")
             || sn.startsWith("030A") || sn.startsWith("010F")
             || sn.startsWith("033")
 }
 
 fun getGoneTuYa(): Boolean {
     var sn = getSN()
-    return sn.startsWith("010D") || sn.startsWith("010I") || sn.startsWith("010F")|| sn.startsWith("010H")
+    return sn.startsWith("010D") || sn.startsWith("010I")
+            || sn.startsWith("010F") || sn.startsWith("010H")
             || sn.startsWith("032D") || sn.startsWith("033")
-            || sn.startsWith("011A") || sn.startsWith("036I")
+            || sn.startsWith("011") || sn.startsWith("036I")
 //            || sn.startsWith("053A")
             || sn.startsWith("058A") || sn.startsWith("058B")
 }
@@ -433,10 +435,11 @@ fun getOtaFileMd5(): String {
     return MMkvUtils.getString("isOtaZipMd5") ?: ""
 }
 
-fun setUpdateRecipeTime(time :String) {
+fun setUpdateRecipeTime(time: String) {
     MMkvUtils.save("isUpdateTime", time)
 }
-fun getUpdateRecipeTime():String {
+
+fun getUpdateRecipeTime(): String {
     return MMkvUtils.getString("isUpdateTime") ?: ""
 }