053代码上传

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

@@ -86,8 +86,8 @@
     <string name="apk">APK</string>
     <string name="mcu">MCU</string>
     <string name="tp">TP</string>
-    <string name="serial_number">Серийный номер</string>
-    <string name="standby_time">Время работы в режиме ожидания</string>
+    <string name="serial_number">SN</string>
+    <string name="standby_time">MODEL</string>
     <string name="update">Обновить</string>
     <string name="About">Около</string>
     <string name="are_you_sure_to_restore_factory_settings">Вы уверены, что хотите вернуться к заводским настройкам?</string>

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

@@ -277,7 +277,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 binding.ivLogo.setImageResource(com.develop.common.R.drawable.ic_logo_011)
 //                ivLogoParam.width = dimenRes(com.develop.common.R.dimen.convert_180px)
 //                ivLogoParam.height = dimenRes(com.develop.common.R.dimen.convert_180px)
-            }else if (sn.startsWith("025")||sn.startsWith("077")){
+            }else if (sn.startsWith("025")||sn.startsWith("077")||sn.startsWith("053")){
                 ivLogoParam.apply {
                     width = dimenRes(com.develop.common.R.dimen.convert_180px)
                     height = dimenRes(com.develop.common.R.dimen.convert_180px)

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

@@ -58,7 +58,7 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
             com.develop.common.R.drawable.ic_screensaver_000
         )
 
-        val bannerAdapter = ScreenBannerAdapter(if (sn.startsWith("011A")) dataList011A else if (sn.startsWith("011D")) dataList011D else if (sn.startsWith("011E")) dataList011E else if (sn.startsWith("054")) dataList054 else if (sn.startsWith("045")) dataList045 else if (sn.startsWith("077")||sn.startsWith("025")) dataList000 else dataList)
+        val bannerAdapter = ScreenBannerAdapter(if (sn.startsWith("011A")) dataList011A else if (sn.startsWith("011D")) dataList011D else if (sn.startsWith("011E")) dataList011E else if (sn.startsWith("054")) dataList054 else if (sn.startsWith("045")) dataList045 else if (sn.startsWith("077")||sn.startsWith("025")||sn.startsWith("053")) dataList000 else dataList)
         binding.bannerView.adapter = bannerAdapter
         binding.circleRecycler.apply {
             linear(RecyclerView.HORIZONTAL)

app/build.gradle

@@ -21,7 +21,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="054A"
-    brandCode = "049B"
+    brandCode = "053A"
 //    model = "5037"
     model = "1039"
 
@@ -765,13 +765,13 @@ 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: "brand011DTuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"011\"")
@@ -933,13 +933,13 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 //
-//            manifestPlaceholders = [channelName: "brand053A"]
-//            buildConfigField("String", "UpdatePlatform", "\"night\"")
-//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"053A\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
+            manifestPlaceholders = [channelName: "brand053A"]
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"053A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 
 //            manifestPlaceholders = [channelName: "brand054ATuya"]
 //            buildConfigField("String", "UpdatePlatform", "\"night\"")

app/src/brand053A/res/values-ru/strings.xml

@@ -86,8 +86,8 @@
     <string name="apk">APK</string>
     <string name="mcu">MCU</string>
     <string name="tp">TP</string>
-    <string name="serial_number">Серийный номер</string>
-    <string name="standby_time">Время работы в режиме ожидания</string>
+    <string name="serial_number">SN</string>
+    <string name="standby_time">MODEL</string>
     <string name="update">Обновить</string>
     <string name="About">Около</string>
     <string name="are_you_sure_to_restore_factory_settings">Вы уверены, что хотите вернуться к заводским настройкам?</string>

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

@@ -223,7 +223,7 @@ fun getSN(): String {
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
-        return "011A10390020123010190001"
+//        return "011A10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
@@ -256,7 +256,7 @@ fun getSN(): String {
 //        return  "063B10390020123010190001"
 //        return  "063B20030020123010190015"
 //        return "063B21050020123010190001"
-//        return  "049B10390020123010190001"
+        return  "049B10390020123010190001"
 //        return "000A50370020123010190017"
 //        return  "053A10390020123010190088"
 //          return "053A10390020123010190001"
@@ -301,7 +301,7 @@ fun getGoneTuYa(): Boolean {
     return sn.startsWith("010D") || sn.startsWith("010I") || sn.startsWith("010F")
             || sn.startsWith("032D") || sn.startsWith("033")
             || sn.startsWith("011A") || sn.startsWith("036I")
-            || sn.startsWith("053A")
+//            || sn.startsWith("053A")
             || sn.startsWith("058A") || sn.startsWith("058B")
 }