011F配置上传

app/build.gradle

@@ -21,9 +21,9 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="054A"
-    brandCode = "011F"
+    brandCode = "011D"
 //    model = "5037"
-    model = "1059"
+    model = "1039"
 
 }
 
@@ -790,24 +790,24 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
-            manifestPlaceholders = [channelName: "brand011FTuya"]
-            buildConfigField("String", "UpdatePlatform", "\"011\"")
-            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"]
+//            manifestPlaceholders = [channelName: "brand011FTuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"011\"")
-//            resValue("string", "app_theme", "@style/Splash011DTheme")
+//            resValue("string", "app_theme", "@style/Splash011FTheme")
 //            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"011D\"")
+//            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")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"011D\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+
 //            manifestPlaceholders = [channelName: "brand032DTuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/Splash032DTheme")

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

@@ -225,12 +225,12 @@ fun getSN(): String {
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190002"
 //        return "011A10390020123010190002"
-//        return  "011D10390020123010190021" //app用
+        return  "011D10390020123010190021" //app用
 //        return  "011D10390020123010190088"
 
 
 //        return  "011D10390020123010190019"
-        return "011F10590020123010190003"
+//        return "011F10590020123010190003" //1059测试
 //        return  "011D10390020123010190003"
 //        return  "011A10390020123010190188"
 //        returffn "011A10390020123010190099"