提交人：jtm

提交内容：029C

BusinessAirFryer/src/main/assets/lang_config_029.json

@@ -0,0 +1,179 @@
+{
+  "langs": [
+    {
+      "name": "Spanish(西班牙语)",
+      "value": "ES",
+      "icon": "icon_lang_es",
+      "showName": "Español",
+      "show": true
+    },
+    {
+      "name": "French(法语)",
+      "value": "FR",
+      "icon": "icon_lang_fr",
+      "showName": "Français",
+      "show": true
+    },
+    {
+      "name": "German(德语)",
+      "value": "DE",
+      "icon": "icon_lang_de",
+      "showName": "Deutsch",
+      "show": true
+    },
+    {
+      "name": "Italiano(意大利语)",
+      "value": "IT",
+      "icon": "icon_lang_it",
+      "showName": "Italiano",
+      "show": true
+    },
+    {
+      "name": "Portuguese(葡萄牙语)",
+      "value": "PT",
+      "icon": "icon_lang_pt",
+      "showName": "Português",
+      "show": true
+    },
+    {
+      "name": "Polish(波兰语)",
+      "value": "PL",
+      "icon": "icon_lang_pl",
+      "showName": "Polski",
+      "show": false
+    },
+    {
+      "name": "Dutch(荷兰语)",
+      "value": "NL",
+      "icon": "icon_lang_nl",
+      "showName": "Nederlands",
+      "show": false
+    },
+    {
+      "name": "English(英语)",
+      "value": "EN",
+      "icon": "icon_lang_en",
+      "showName": "English",
+      "show": true
+    },
+    {
+      "name": "Greek(希腊语)",
+      "value": "GR",
+      "icon": "icon_lang_gr",
+      "showName": "Ελληνικά",
+      "show": false
+    },
+    {
+      "name": "Russian(俄语)",
+      "value": "RU",
+      "icon": "icon_lang_ru",
+      "showName": "Русский",
+      "show": false
+    },
+    {
+      "name": "Romanian(罗马尼亚语)",
+      "value": "RO",
+      "icon": "icon_lang_ro",
+      "showName": "Română",
+      "show": false
+    },
+    {
+      "name": "Finnish(芬兰语)",
+      "value": "FI",
+      "icon": "icon_lang_fi",
+      "showName": "Suomi",
+      "show": false
+    },
+    {
+      "name": "Norsk(挪威语)",
+      "value": "NO",
+      "icon": "icon_lang_no",
+      "showName": "Norsk",
+      "show": false
+    },
+    {
+      "name": "Swedish(瑞典语)",
+      "value": "SE",
+      "icon": "icon_lang_se",
+      "showName": "Svenska",
+      "show": false
+    },
+    {
+      "name": "Danish(丹麦语)",
+      "value": "DK",
+      "icon": "icon_lang_dk",
+      "showName": "Dansk",
+      "show": false
+    },
+    {
+      "name": "Czech(捷克语)",
+      "value": "CZ",
+      "icon": "icon_lang_cz",
+      "showName": "Čeština",
+      "show": false
+    },
+    {
+      "name": "Estonki(爱沙尼亚语)",
+      "value": "EE",
+      "icon": "icon_lang_ee",
+      "showName": "Eesti keel",
+      "show": false
+    },
+    {
+      "name": "Slovak(斯洛伐克语)",
+      "value": "SK",
+      "icon": "icon_lang_sk",
+      "showName": "Slovenčina",
+      "show": false
+    },
+    {
+      "name": "Ukrainian(乌克兰语)",
+      "value": "UK",
+      "icon": "icon_lang_uk",
+      "showName": "Українська",
+      "show": false
+    },
+    {
+      "name": "Arabic(阿拉伯语)",
+      "value": "AR",
+      "icon": "icon_lang_ar",
+      "showName": "العربية",
+      "show": false
+    },
+    {
+      "name": "Lithuanian(立陶宛语)",
+      "value": "LT",
+      "icon": "icon_lang_lt",
+      "showName": "Lietuvių kalba",
+      "show": false
+    },
+    {
+      "name": "Farsi(波斯语)",
+      "value": "IR",
+      "icon": "icon_lang_ir",
+      "showName": "فارسی",
+      "show": false
+    },
+    {
+      "name": "Kazakh(哈萨克语)",
+      "value": "KZ",
+      "icon": "icon_lang_kz",
+      "showName": "Қазақша",
+      "show": false
+    },
+    {
+      "name": "Chinese(中文)",
+      "value": "ZH",
+      "icon": "icon_lang_zh",
+      "showName": "中文",
+      "show": false
+    },
+    {
+      "name": "Japanese(日语)",
+      "value": "JA",
+      "icon": "icon_lang_ja",
+      "showName": "日本語",
+      "show": false
+    }
+  ]
+}

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -209,6 +209,16 @@
       "pid": "lozjriuxwhwpaz4k",
       "uid": "uuiddd1bf831a6aecfae",
       "ak": "ko3JgbIIFmiNHyD7sPPq4jYyeycrbB6t"
+    },
+    "029C21010020123010190001": {
+      "pid": "vowpjhiaj5tyv2rd",
+      "uid": "uuidce031f7e9f636843",
+      "ak": "WxPYNPoBopk4EkMLd9QViOpAAIshqeuf"
+    },
+    "029C21010020123010190002": {
+      "pid": "vowpjhiaj5tyv2rd",
+      "uid": "uuid5c221a4957ad2f69",
+      "ak": "ysx7mZoKndu12lNAqABH8AP31yW3Iv8v"
     }
   }
 }

BusinessCommon/src/main/res/values/themes.xml

@@ -47,4 +47,12 @@
         <item name="windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
     </style>
+
+    <style name="Splash029CTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- 这里的trans自己写一个#00000000即可-->
+        <item name="android:windowBackground">@drawable/splash_logo_029</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
 </resources>

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

@@ -34,19 +34,22 @@ class PowerAnimationActivity : BaseBindingActivity<ActivityPowerAnimationBinding
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding.fullVideoView.apply {
-            var videoName =   com.develop.common.R.raw.video_cofar
+            var videoName = com.develop.common.R.raw.video_cofar
 
-            if(getSN().startsWith("010D")){
+            if (getSN().startsWith("010D")) {
                 videoName = com.develop.common.R.raw.video_cofar_010d
             }
 
-            if(getSN().startsWith("017A")){
+            if (getSN().startsWith("017A")) {
                 videoName = com.develop.common.R.raw.video_017a
             }
 
-            if(getSN().startsWith("036I")){
+            if (getSN().startsWith("036I")) {
                 videoName = com.develop.common.R.raw.video_036i
             }
+            if (getSN().startsWith("029C")) {
+                videoName = com.develop.common.R.raw.video_029c
+            }
             setVideoURI(Uri.parse("android.resource://$packageName/$videoName"))
             start()
             mainHandler.post(runnable)

app/build.gradle

@@ -12,7 +12,7 @@ ext{
 
     versionCode=Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-    brandCode="036I"
+    brandCode="010D"
     model="1039"
 
 }
@@ -102,6 +102,14 @@ android {
 
         }
 
+        brand029CTuya {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/Splash029CTheme")
+
+        }
+
 
         brand036I {
             dimension "platform"
@@ -170,6 +178,7 @@ android {
         release {
             minifyEnabled false
             productFlavors.brand010D.signingConfig signingConfigs.release
+            productFlavors.brand029CTuya.signingConfig signingConfigs.release
             productFlavors.brand000ATuya.signingConfig signingConfigs.release
             productFlavors.brand030A.signingConfig signingConfigs.release
             productFlavors.brand011ATuya.signingConfig signingConfigs.release