Browse Source

077 代码上传

zhangshenjie 4 months ago
parent
commit
744f420ecb

+ 10 - 8
BusinessAirFryer/src/main/assets/config_077.json

@@ -41,14 +41,7 @@
       "devMode": "SOUP",
       "listShow": false
     },
-    {
-      "type": "WIGHT",
-      "name": "wight",
-      "bg": "ic_mode_weight_054",
-      "icon": "ic_grid_weight_054",
-      "devMode": "SOUP",
-      "listShow": false
-    },
+
     {
       "type": "SLOW_COOK",
       "name": "slow_cook",
@@ -83,6 +76,15 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight_054",
+      "icon": "ic_grid_weight_054",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
 
     {
       "type": "DICING",

+ 7 - 0
BusinessSetting/src/main/java/com/develop/setting/ui/AboutActivity.kt

@@ -43,6 +43,7 @@ import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBVMActivity
 import com.develop.common.utils.AppVersionUtil
 import com.develop.common.utils.StringUtils
+import com.develop.common.utils.TuyaUtils
 import com.develop.common.utils.UpdateUtil
 import com.develop.common.widget.PwdLayout
 import com.develop.setting.databinding.ActivityAboutBinding
@@ -364,6 +365,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
 
         binding.ivLogo.setOnClickListener {
+            getAstop()
+
             weightAlignCount++
             if (weightAlignCount >= 7) {
                 weightAlignCount = 0
@@ -552,6 +555,10 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
         }
     }
 
+    fun getAstop(){
+        TuyaUtils.ioTSDKManager.httpRequest("tuya.device.menu.category.list_1.0", TuyaUtils.version, "{\"lang\":\"es\"}")
+    }
+
     private fun addApkToSession(file: File, session: PackageInstaller.Session) {
         file.inputStream().use { inputStream ->
             session.openWrite("COSU", 0, -1).use { outputStream ->

+ 15 - 15
app/build.gradle

@@ -733,13 +733,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\"")
@@ -918,14 +918,14 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
-            manifestPlaceholders = [channelName: "brand025ATuya"]
-            buildConfigField("String", "UpdatePlatform", "\"night\"")
-            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-            buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"025A\"")
-            //appCode 1.01 指向bug修复,2.01指向功能变更
-            buildConfigField("String", "appCode", "\"1.01\"")
-            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
+//            manifestPlaceholders = [channelName: "brand025ATuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"night\"")
+//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"025A\"")
+//            //appCode 1.01 指向bug修复,2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
 
 //            manifestPlaceholders = [channelName: "brand077ATuya"]

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

@@ -217,13 +217,13 @@ fun getSN(): String {
 //        return "000A30150020123010190001"
 //     return "000A10390020123010170001"
 //     return "000A10390020123010190001"
-        return "025A10390020123010190001"
+//        return "025A10390020123010190001"
 //        return "054A50370020123010190001"
 //        return "054A10390020123010190001"
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
-//        return "011A10390020123010190001"
+        return "011A10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"