Browse Source

084用户新增

zhangshenjie 2 months ago
parent
commit
8fc28cd54d

+ 21 - 9
app/build.gradle

@@ -733,8 +733,8 @@ android {
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
 
-        brand084ATuya {
-            manifestPlaceholders = [channelName: "brand084ATuya"]
+        brand084A {
+            manifestPlaceholders = [channelName: "brand084A"]
             dimension "platform"
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
@@ -892,13 +892,14 @@ android {
 //            //appCode 1.01 指向bug修复,2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-            manifestPlaceholders = [channelName: "brand011ATuya"]
-            buildConfigField("String", "UpdatePlatform", "\"011\"")
-            resValue("string", "app_theme", "@style/Splash011ATheme")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"011A\"")
-            //appCode 1.01 指向bug修复,2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
+//            manifestPlaceholders = [channelName: "brand011ATuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"011\"")
+//            resValue("string", "app_theme", "@style/Splash011ATheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"011A\"")
+//            //appCode 1.01 指向bug修复,2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
 
 //            manifestPlaceholders = [channelName: "brand011FTuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"011F\"")
@@ -1140,6 +1141,17 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
+            manifestPlaceholders = [channelName: "brand084ATuya"]
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashTheme")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"084A\"")
+            //appCode 1.01 指向bug修复,2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
+
+
 
         }
     }

app/src/brand084ATuya/res/values-en/strings.xml → app/src/brand084A/res/values-en/strings.xml


app/src/brand084ATuya/res/values-ru/strings.xml → app/src/brand084A/res/values-ru/strings.xml


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

@@ -240,7 +240,7 @@ fun getSN(): String {
 //        return "010H10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
-        return "011A10390020123010190001"
+//        return "011A10390020123010190001"
 //        return "011F10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
@@ -254,7 +254,7 @@ fun getSN(): String {
 //        return  "017A10390020123010190001"
 //    return "010D10390020123010190001"
 //        return "083A10390020123010190001"
-
+        return "084A10390020123010190001"
 //        return "010I10390020123010190001"
 //        return "010D10390020123010190001"
 //    return "000A10390020123010190009"