083需求

BusinessAuth/src/main/java/com/develop/auth/ui/MemberAuthActivity.kt

@@ -75,7 +75,9 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
             }else{
                 binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
             }
-        } else if (sn.startsWith("054")) {
+        } else if (sn.startsWith("083")){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_083)
+        }else if (sn.startsWith("054")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_054a)
         } else if (sn.startsWith("010H")||sn.startsWith("010I")) {
             if (sn.startsWith("010H")){

BusinessCommon/src/main/java/com/develop/common/widget/FoodContentView.kt

@@ -257,6 +257,9 @@ class FoodContentView : ConstraintLayout {
 
             }
             if (foodSn.startsWith("011")){
+                if (foodSn.startsWith("011F")){
+                    binding.tvEasy.setTextColor(resources.getColor(R.color.color_A3A3A2))
+                }
                 binding.easyLayout.visibility = View.VISIBLE
                 content.level.let {
                     var  difficultyLevel = if (it.isEmpty()){

BusinessMain/src/main/java/com/develop/main/ui/ModeEntranceActivity.kt

@@ -131,8 +131,12 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
             binding.homeLayout.setBackgroundResource(R.drawable.home_entrance_bg_002d)
         }
         if (sn.startsWith("011")) {
-         var id  =  if (sn.startsWith("011F"))com.develop.common.R.drawable.ic_tab_011f
-                    else com.develop.common. R.drawable.ic_tab_011
+            var id = 0
+            id = if (sn.startsWith("011F")) {
+                com.develop.common.R.drawable.ic_tab_011f
+            } else {
+                com.develop.common.R.drawable.ic_tab_011
+            }
 
             binding.ivTab.setImageResource(id)
         }
@@ -440,7 +444,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                             GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
 
                                         }
-                                    } else if (sn.startsWith("010H") || sn.startsWith("010I")) {
+                                    } else if (sn.startsWith("010H") || sn.startsWith("010I")||sn.startsWith("083A") || sn.startsWith("083B")) {
                                         getFwActivity()
                                     } else {
                                         if (FoodDataProvider.checkDataExit()) {

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

@@ -287,7 +287,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 }
 //                ivLogoParam.width = dimenRes(com.develop.common.R.dimen.convert_180px)
 //                ivLogoParam.height = dimenRes(com.develop.common.R.dimen.convert_180px)
-            }else if (sn.startsWith("010H")||sn.startsWith("010I")){
+            }else if (sn.startsWith("010H")||sn.startsWith("010I")
+                ||sn.startsWith("083A")||sn.startsWith("083B")){
 
                 ivLogoParam.apply {
                     width = dimenRes(com.develop.common.R.dimen.convert_320px)
@@ -298,9 +299,10 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
                 if (sn.startsWith("010H")){
                     binding.ivLogo.setImageResource(com.develop.common.R.drawable.ic_logo_010_h)
 
-                }else{
+                }else if (sn.startsWith("010I")){
                     binding.ivLogo.setImageResource(com.develop.common.R.drawable.ic_logo_010_i)
-
+                }else{
+                    binding.ivLogo.setImageResource(com.develop.common.R.drawable.ic_logo_083)
                 }
 //                ivLogoParam.width = dimenRes(com.develop.common.R.dimen.convert_180px)
 //                ivLogoParam.height = dimenRes(com.develop.common.R.dimen.convert_180px)

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

@@ -77,6 +77,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
         } else if (sn.startsWith("053")) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_053a)
+        }else if (sn.startsWith("083")){
+            binding.ivLogo.setGone()
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_083)
         }else if (sn.startsWith("010H")||sn.startsWith("010I")) {
             binding.ivLogo.setGone()
             if (sn.startsWith("010H")){

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

@@ -60,6 +60,8 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
         }else if (sn.startsWith("053")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_053a)
+        }else if (sn.startsWith("083")){
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_083)
         }else if (sn.startsWith("010H")||sn.startsWith("010I")) {
             if (sn.startsWith("010H")){
                 binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_010h)

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

@@ -67,6 +67,9 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         val dataList010I = mutableListOf(
             com.develop.common.R.drawable.ic_screensaver_010i
         )
+        val dataList083 = mutableListOf(
+            com.develop.common.R.drawable.ic_screensaver_083
+        )
 
 
         val bannerAdapter = ScreenBannerAdapter(
@@ -78,7 +81,11 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
             else if (sn.startsWith("045")) dataList045
             else if (sn.startsWith("010H")) dataList010H
             else if (sn.startsWith("010I")) dataList010I
-            else if (sn.startsWith("077") || sn.startsWith("025") || sn.startsWith("053")|| sn.startsWith("000B")) dataList000
+            else if (sn.startsWith("083")) dataList083
+            else if (sn.startsWith("077") || sn.startsWith("025") || sn.startsWith("053") || sn.startsWith(
+                    "000B"
+                )
+            ) dataList000
             else dataList
         )
         binding.bannerView.adapter = bannerAdapter

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

@@ -105,7 +105,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
          * 需要隐藏登录 032D 032E 011A 030A 010F 033  010I 010H  083A 083B
          * 需要隐藏涂鸦 010D 010F 032D 033 011A 036I 058A 058B   083A 083B
          * 需要隐藏亮度 010D
-         * 需要隐藏息屏 010I 010H
+         * 需要隐藏息屏 010I 010H 083A 083B
          *
          * ps:修改了的话，记得同步下面tuya代码
          * 也要修改GlobaExt 中的 getGoneTuYa
@@ -115,12 +115,11 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
         } else if (sn.startsWith("032D") || sn.startsWith("010F") || sn.startsWith("033")
-            || sn.startsWith("083A") || sn.startsWith("083B")
         ) {
             DataFactory.genSetting032DModesList(resources)
         } else if (sn.startsWith("011")) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("010I") || sn.startsWith("010H")) {
+        } else if (sn.startsWith("010I") || sn.startsWith("010H")||sn.startsWith("083A") || sn.startsWith("083B")) {
             DataFactory.genSetting010IModesList(resources)
         } else if (sn.startsWith("030A") || sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
@@ -507,12 +506,11 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
         } else if (sn.startsWith("032D") || sn.startsWith("010F") || sn.startsWith("033")
-            || sn.startsWith("083A") || sn.startsWith("083B")
         ) {
             DataFactory.genSetting032DModesList(resources)
         } else if (sn.startsWith("011")) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("010I") || sn.startsWith("010H")) {
+        } else if (sn.startsWith("010I") || sn.startsWith("010H")||sn.startsWith("083A") || sn.startsWith("083B")) {
             DataFactory.genSetting010IModesList(resources)
         } else if (sn.startsWith("030A") || sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)

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

@@ -123,6 +123,9 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         } else if (sn.startsWith("053")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_053a)
             binding.ivLogo.setGone()
+        }else if (sn.startsWith("083")){
+            binding.ivLogo.setGone()
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_083)
         }else if (sn.startsWith("010H")||sn.startsWith("010I")) {
             binding.ivLogo.setGone()
             if (sn.startsWith("010H")){

app/build.gradle

@@ -20,7 +20,7 @@ ext {
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
 //    brandCode="000B"
-    brandCode = "010H"
+    brandCode = "083A"
 //    model = "5037"
     model = "1039"
 
@@ -871,13 +871,13 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-            manifestPlaceholders = [channelName: "brand011FTuya"]
-            buildConfigField("String", "UpdatePlatform", "\"011F\"")
-            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: "brand011FTuya"]
+//            buildConfigField("String", "UpdatePlatform", "\"011F\"")
+//            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"]
@@ -1092,14 +1092,14 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 //            buildConfigField("String", "time","\"${getCurrentTime()}\"" )
 
-//            manifestPlaceholders = [channelName: "brand083ATuya"]
-//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
-//            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-//            buildConfigField("String", "model", "\"1039\"")
-//            buildConfigField("String", "brandCode", "\"083A\"")
-//            //appCode 1.01 指向bug修复，2.01指向功能变更
-//            buildConfigField("String", "appCode", "\"1.01\"")
-//            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
+            manifestPlaceholders = [channelName: "brand083ATuya"]
+            buildConfigField("String", "UpdatePlatform", "\"night\"")
+            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"083A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+            buildConfigField("String", "time", "\"${getCurrentTime()}\"")
 
 
         }

app/src/brand083ATuya/res/values-de/strings.xml

@@ -41,6 +41,14 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="list_view">Listenansicht</string>
     <string name="adapted_cooking">ANPASSTE KOCHUNG</string>
     <string name="scales">SCHALEN</string>
+    <string name="cook_eggs">Eier kochen</string>
+    <string name="cook_rice">COOK RICE</string>
+    <string name="mulsify">MULSIFY</string>
+    <string name="puree">PURE</string>
+    <string name="roast">Braten</string>
+    <string name="smoothie">SMOOTHIE</string>
+    <string name="sovs_vide">SOVS VIDE</string>
+    <string name="auto_clean">AUTOREINIGUNG</string>
     <string name="boil_water">BOILWASSER</string>
     <string name="chop">SCHNEIDEN</string>
     <string name="ferment">Gärung</string>
@@ -48,11 +56,9 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="knead_dough">Knetteig</string>
     <string name="steam">Dampf</string>
     <string name="food_processor">LEBENSMITTELVERARBEITER</string>
+    <string name="wight">GEWICHT</string>
     <string name="turbo">TURBO</string>
-
-
-
-
+    <!-- 由于之前没有另外做兼容包，在公版翻译添加了010，现在做了兼容，010的翻译建议上面的自动程序翻译同一样-->
     <string name="steam_010">Dampf</string>
     <string name="knead_dough_010">Knetteig</string>
     <string name="slow_cook_010">Langsam kühl</string>
@@ -136,6 +142,7 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="network_wifi_status_failed">Fehlgeschlagen</string>
     <string name="network_wifi_status_blocked">Blockiert</string>
     <string name="network_wifi_status_verifying_poor_link">Temporär heruntergefahren (schlechter Netzzustand)</string>
+    <string name="wifi_loading_text"> </string>
     <string name="start">Beginn</string>
     <string name="pause">PAUSE</string>
     <string name="cancel">STORNIEREN</string>
@@ -234,7 +241,6 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="pot_clover_not_clost_tips">Der Deckel ist entriegelt. Bitte zuerst den Deckel verschließen und starten.</string>
     <string name="screen_saver_title">Willst du den Atembildschirm betreten?</string>
     <string name="sex">Geschlecht</string>
-    <string name="wight">GEWICHT</string>
     <string name="running_block_tips">Bitte beenden Sie das laufende Programm und starten Sie neue Programme.</string>
     <string name="unset_target_time">Die Zeit ist noch nicht festgelegt.</string>
     <string name="recipe_complete">ERFÜLLTE REZEPTE</string>
@@ -304,14 +310,7 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="af_dehydrate">DEHYDRAT</string>
 
 
-    <string name="cook_eggs">Eier kochen</string>
-    <string name="cook_rice">COOK RICE</string>
-    <string name="mulsify">MULSIFY</string>
-    <string name="puree">PURE</string>
-    <string name="roast">Braten</string>
-    <string name="smoothie">SMOOTHIE</string>
-    <string name="sovs_vide">SOVS VIDE</string>
-    <string name="auto_clean">AUTOREINIGUNG</string>
+
     <string name="network_error">Netzwerkfehler</string>
     <string name="apk_version_latest">Die App-Version ist bereits auf dem neuesten Stand.</string>
     <string name="installing">Installation...</string>
@@ -343,6 +342,8 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="no_net_error">Bitte verbinden Sie sich mit Wifi</string>
     <string name="no_login">Bitte geben Sie die obigen Felder ein, um sich anzumelden</string>
     <string name="wrong_captcha">Falsches Captcha</string>
+    <string name="frement_010d_stage_first_finish">Lege ein Blatt Plastikfolie auf den Boden des Dampfkorbs und ordne dann deine Joghurtbecher an. Verschließen Sie den Deckel Anocover mit einem Tuch oder einem Handtuch.</string>
+
 
     <string name="e7_errCode">Motor heat dissipation abnormal</string>
     <string name="e8_errCode">Plug in air fryer attachment</string>
@@ -361,6 +362,5 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="Automatic_programmes_29">Automatische Programme</string>
     <string name="Download_new_recipes_29">Herunterladen neuer Rezepte</string>
 
-    <string name="step_running_pause">Läuft, bitte drücken Sie zuerst Pause</string>
 
 </resources>

app/src/brand083ATuya/res/values-fr/strings.xml

@@ -42,16 +42,19 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="adapted_cooking">Mode manuel</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">Bouillir</string>
+
     <string name="steam">Vapeur</string>
     <string name="knead_dough">Pétrir</string>
     <string name="slow_cook">Mijoter</string>
-    <string name="ferment">Fermentation</string>
-    <string name="mulsify">Emulsification</string>
-    <string name="food_processor">Râper/Trancher</string>
+    <string name="ferment">Yaourt</string>
+    <string name="mulsify">Emulsionner</string>
+    <string name="food_processor">Râper/trancher</string>
     <string name="chop">Hacher</string>
     <string name="wight">Balance</string>
-    <string name="auto_clean">Nettoyage automatique</string>
+    <string name="auto_clean">Nettoyage</string>
     <string name="turbo">Pulse</string>
+
+    <!-- 由于之前没有另外做兼容包，在公版翻译添加了010，现在做了兼容，建议上面的自动程序翻译同一样-->
     <string name="steam_010">Vapeur</string>
     <string name="knead_dough_010">Pétrir</string>
     <string name="slow_cook_010">Mijoter</string>
@@ -131,7 +134,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="network_wifi_status_failed">L’échec</string>
     <string name="network_wifi_status_blocked">Bloqué</string>
     <string name="network_wifi_status_verifying_poor_link">Temporairement fermé (mauvais état du réseau)</string>
-    <string name="wifi_loading_text">Connexion...</string>
+    <string name="wifi_loading_text"> </string>
     <string name="start">Démarrage</string>
     <string name="pause">Pause</string>
     <string name="cancel">Annulation</string>
@@ -166,7 +169,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="forgot_password">Mot de passe oublié</string>
     <string name="enter_email_id">Entrez votre identifiant email</string>
     <string name="enter_password">Entrez le mot de passe</string>
-    <string name="register">Enregistrement</string>
+    <string name="register">Vous n’êtes pas encore membre de la communauté POWERCHEF?</string>
     <string name="launch_detail">Rejoignez - nous aujourd’hui pour une expérience culinaire ultime</string>
     <string name="login_sign_up">Connexion / Enregistrement</string>
     <string name="skip_for_now">Sauter temporairement</string>
@@ -174,7 +177,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="enter_captcha">Entrez  Captcha</string>
     <string name="send_email">Envoyer un courriel</string>
     <string name="enter_password_again">Entrez à nouveau votre mot de passe</string>
-    <string name="enter_the_captcha_obtained_from_the_mail">Entrez CAPTCHA obtenu à partir du message</string>
+    <string name="enter_the_captcha_obtained_from_the_mail">Entrer le code reçu par email</string>
     <string name="nickname">Surnom</string>
     <string name="enter_nickname">Entrez un pseudonyme</string>
     <string name="Gender">Sexe</string>
@@ -249,11 +252,11 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="Password_is_not_the_same">Les mots de passe ne sont pas identiques</string>
     <string name="enter">Entrée</string>
     <string name="repeat">Répéter</string>
-    <string name="automatic_recipes">Recettes intégrées</string>
+    <string name="automatic_recipes">Recettes automatigues</string>
     <string name="automatic_programmes">Programmes automatiques</string>
-    <string name="manual_cooking">Mode manuel</string>
-    <string name="download_new_recipes">Télécharger les nouvelles recettes</string>
-    <string name="home">Maison</string>
+    <string name="manual_cooking">Mode Manuel</string>
+    <string name="download_new_recipes">Nouvelles recettes</string>
+    <string name="home">Menu</string>
     <string name="back">Retour</string>
     <string name="historical_search">Recherche historique</string>
 
@@ -306,7 +309,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="help">Aide</string>
     <string name="evaluate_successfully">Évaluer le succès</string>
     <string name="reset_to_default_settings">Réinitialiser les paramètres par défaut</string>
-    <string name="home_auth"><![CDATA[MAISON >>]]></string>
+    <string name="home_auth"><![CDATA[MENU >>]]></string>
     <string name="rating">Évaluation</string>
     <string name="loading">Chargement en cours</string>
     <string name="Min20">20 minutes</string>
@@ -332,6 +335,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="no_net_error">Veuillez vous connecter au WiFi</string>
     <string name="no_login">Veuillez saisir les champs ci-dessus pour vous connecter</string>
     <string name="wrong_captcha">Le mauvais CAPTCHA</string>
+    <string name="frement_010d_stage_first_finish">Ajoutez un film étirable dans le fond du panier vapeur puis disposez vos pots de yaourt. Fermez le couvercle et couvrez avec un linge ou un torchon.</string>
 
     <string name="e7_errCode">Motor heat dissipation abnormal</string>
     <string name="e8_errCode">Plug in air fryer attachment</string>
@@ -351,5 +355,5 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="Automatic_programmes_29">Programmes automatiques</string>
     <string name="Download_new_recipes_29">Téléchargement de nouvelles recettes</string>
 
-    <string name="step_running_pause">En cours d’exécution, veuillez d’abord appuyer sur pause</string>
+
 </resources>

app/src/brand083ATuya/res/values-it/strings.xml

@@ -42,13 +42,24 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="adapted_cooking">CUCINA ADATTATA</string>
     <string name="scales">BILANCE</string>
     <string name="boil_water">ACQUA DI BOIL</string>
+    <string name="cook_eggs">CUOCI UOVA</string>
+    <string name="cook_rice">RISO COTTO</string>
+    <string name="mulsify">MULSIFICA</string>
+    <string name="puree">PUREA</string>
+    <string name="roast">ARROSTO</string>
+    <string name="smoothie">LEVIGANTE</string>
+    <string name="sovs_vide">SOVS VIDE</string>
+    <string name="auto_clean">PULIZIA AUTOMATICA</string>
     <string name="chop">TAGLIA</string>
     <string name="ferment">FERMENTO</string>
-    <string name="slow_cook">CUOCO LENTO</string>
+    <string name="slow_cook">Cuoco lento</string>
     <string name="knead_dough">IMPASTATURA</string>
     <string name="steam">VAPORE</string>
     <string name="food_processor">PROCESSORE ALIMENTARE</string>
+    <string name="wight">PESO</string>
     <string name="turbo">TURBO</string>
+
+    <!-- 由于之前没有另外做兼容包，在公版翻译添加了010，现在做了兼容，010的翻译建议上面的自动程序翻译同一样-->
     <string name="steam_010">VAPORE</string>
     <string name="knead_dough_010">IMPASTATURA</string>
     <string name="slow_cook_010">Cuoco lento</string>
@@ -127,6 +138,7 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="network_wifi_status_failed">Impossibile</string>
     <string name="network_wifi_status_blocked">Bloccato</string>
     <string name="network_wifi_status_verifying_poor_link">Arresto temporaneo (cattive condizioni della rete)</string>
+    <string name="wifi_loading_text"> </string>
     <string name="start">AVVIA</string>
     <string name="pause">PAUSA</string>
     <string name="cancel">CANCELLA</string>
@@ -225,7 +237,6 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="pot_clover_not_clost_tips">Il coperchio è aperto. Prima chiudi il coperchio e inizia.</string>
     <string name="screen_saver_title">Vuoi entrare nel respiratore?</string>
     <string name="sex">Sesso</string>
-    <string name="wight">PESO</string>
     <string name="running_block_tips">Si prega di fermare il programma in esecuzione e avviare nuovi programmi.</string>
     <string name="unset_target_time">Il tempo non è stato fissato.</string>
     <string name="recipe_complete">RICETTA COMPLETA</string>
@@ -283,14 +294,7 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
 
 
 
-    <string name="cook_eggs">CUOCI UOVA</string>
-    <string name="cook_rice">RISO COTTO</string>
-    <string name="mulsify">MULSIFICA</string>
-    <string name="puree">PUREA</string>
-    <string name="roast">ARROSTO</string>
-    <string name="smoothie">LEVIGANTE</string>
-    <string name="sovs_vide">SOVS VIDE</string>
-    <string name="auto_clean">PULIZIA AUTOMATICA</string>
+
     <string name="network_error">errore di rete</string>
     <string name="apk_version_latest">La versione dell\'app è già aggiornata.</string>
     <string name="installing">Installazione...</string>
@@ -322,6 +326,8 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="no_net_error">Si prega di connettersi a Wifi</string>
     <string name="no_login">Inserisci i campi di cui sopra per accedere</string>
     <string name="wrong_captcha">CAPTCHA errato</string>
+    <string name="frement_010d_stage_first_finish">Metti un foglio di pellicola trasparente sul fondo del cestello per la cottura a vapore, quindi disponi i tuoi vasetti di yogurt. Chiudere il coperchio a vento con un panno o un asciugamano.</string>
+
 
     <string name="e7_errCode">Motor heat dissipation abnormal</string>
     <string name="e8_errCode">Plug in air fryer attachment</string>
@@ -340,5 +346,5 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="Automatic_programmes_29">Programmi automatici</string>
     <string name="Download_new_recipes_29">Scarica nuove ricette</string>
 
-    <string name="step_running_pause">In esecuzione, premere prima la pausa</string>
+
 </resources>

app/src/brand083BTuya/res/values-de/strings.xml

@@ -41,6 +41,14 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="list_view">Listenansicht</string>
     <string name="adapted_cooking">ANPASSTE KOCHUNG</string>
     <string name="scales">SCHALEN</string>
+    <string name="cook_eggs">Eier kochen</string>
+    <string name="cook_rice">COOK RICE</string>
+    <string name="mulsify">MULSIFY</string>
+    <string name="puree">PURE</string>
+    <string name="roast">Braten</string>
+    <string name="smoothie">SMOOTHIE</string>
+    <string name="sovs_vide">SOVS VIDE</string>
+    <string name="auto_clean">AUTOREINIGUNG</string>
     <string name="boil_water">BOILWASSER</string>
     <string name="chop">SCHNEIDEN</string>
     <string name="ferment">Gärung</string>
@@ -48,11 +56,9 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="knead_dough">Knetteig</string>
     <string name="steam">Dampf</string>
     <string name="food_processor">LEBENSMITTELVERARBEITER</string>
+    <string name="wight">GEWICHT</string>
     <string name="turbo">TURBO</string>
-
-
-
-
+    <!-- 由于之前没有另外做兼容包，在公版翻译添加了010，现在做了兼容，010的翻译建议上面的自动程序翻译同一样-->
     <string name="steam_010">Dampf</string>
     <string name="knead_dough_010">Knetteig</string>
     <string name="slow_cook_010">Langsam kühl</string>
@@ -136,6 +142,7 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="network_wifi_status_failed">Fehlgeschlagen</string>
     <string name="network_wifi_status_blocked">Blockiert</string>
     <string name="network_wifi_status_verifying_poor_link">Temporär heruntergefahren (schlechter Netzzustand)</string>
+    <string name="wifi_loading_text"> </string>
     <string name="start">Beginn</string>
     <string name="pause">PAUSE</string>
     <string name="cancel">STORNIEREN</string>
@@ -234,7 +241,6 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="pot_clover_not_clost_tips">Der Deckel ist entriegelt. Bitte zuerst den Deckel verschließen und starten.</string>
     <string name="screen_saver_title">Willst du den Atembildschirm betreten?</string>
     <string name="sex">Geschlecht</string>
-    <string name="wight">GEWICHT</string>
     <string name="running_block_tips">Bitte beenden Sie das laufende Programm und starten Sie neue Programme.</string>
     <string name="unset_target_time">Die Zeit ist noch nicht festgelegt.</string>
     <string name="recipe_complete">ERFÜLLTE REZEPTE</string>
@@ -304,14 +310,7 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="af_dehydrate">DEHYDRAT</string>
 
 
-    <string name="cook_eggs">Eier kochen</string>
-    <string name="cook_rice">COOK RICE</string>
-    <string name="mulsify">MULSIFY</string>
-    <string name="puree">PURE</string>
-    <string name="roast">Braten</string>
-    <string name="smoothie">SMOOTHIE</string>
-    <string name="sovs_vide">SOVS VIDE</string>
-    <string name="auto_clean">AUTOREINIGUNG</string>
+
     <string name="network_error">Netzwerkfehler</string>
     <string name="apk_version_latest">Die App-Version ist bereits auf dem neuesten Stand.</string>
     <string name="installing">Installation...</string>
@@ -343,6 +342,8 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="no_net_error">Bitte verbinden Sie sich mit Wifi</string>
     <string name="no_login">Bitte geben Sie die obigen Felder ein, um sich anzumelden</string>
     <string name="wrong_captcha">Falsches Captcha</string>
+    <string name="frement_010d_stage_first_finish">Lege ein Blatt Plastikfolie auf den Boden des Dampfkorbs und ordne dann deine Joghurtbecher an. Verschließen Sie den Deckel Anocover mit einem Tuch oder einem Handtuch.</string>
+
 
     <string name="e7_errCode">Motor heat dissipation abnormal</string>
     <string name="e8_errCode">Plug in air fryer attachment</string>
@@ -361,6 +362,5 @@ Nanfang plus client ist eine Online-Informationsplattform, die von Guangdong Nan
     <string name="Automatic_programmes_29">Automatische Programme</string>
     <string name="Download_new_recipes_29">Herunterladen neuer Rezepte</string>
 
-    <string name="step_running_pause">Läuft, bitte drücken Sie zuerst Pause</string>
 
 </resources>

app/src/brand083BTuya/res/values-fr/strings.xml

@@ -42,16 +42,19 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="adapted_cooking">Mode manuel</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">Bouillir</string>
+
     <string name="steam">Vapeur</string>
     <string name="knead_dough">Pétrir</string>
     <string name="slow_cook">Mijoter</string>
-    <string name="ferment">Fermentation</string>
-    <string name="mulsify">Emulsification</string>
-    <string name="food_processor">Râper/Trancher</string>
+    <string name="ferment">Yaourt</string>
+    <string name="mulsify">Emulsionner</string>
+    <string name="food_processor">Râper/trancher</string>
     <string name="chop">Hacher</string>
     <string name="wight">Balance</string>
-    <string name="auto_clean">Nettoyage automatique</string>
+    <string name="auto_clean">Nettoyage</string>
     <string name="turbo">Pulse</string>
+
+    <!-- 由于之前没有另外做兼容包，在公版翻译添加了010，现在做了兼容，建议上面的自动程序翻译同一样-->
     <string name="steam_010">Vapeur</string>
     <string name="knead_dough_010">Pétrir</string>
     <string name="slow_cook_010">Mijoter</string>
@@ -131,7 +134,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="network_wifi_status_failed">L’échec</string>
     <string name="network_wifi_status_blocked">Bloqué</string>
     <string name="network_wifi_status_verifying_poor_link">Temporairement fermé (mauvais état du réseau)</string>
-    <string name="wifi_loading_text">Connexion...</string>
+    <string name="wifi_loading_text"> </string>
     <string name="start">Démarrage</string>
     <string name="pause">Pause</string>
     <string name="cancel">Annulation</string>
@@ -166,7 +169,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="forgot_password">Mot de passe oublié</string>
     <string name="enter_email_id">Entrez votre identifiant email</string>
     <string name="enter_password">Entrez le mot de passe</string>
-    <string name="register">Enregistrement</string>
+    <string name="register">Vous n’êtes pas encore membre de la communauté POWERCHEF?</string>
     <string name="launch_detail">Rejoignez - nous aujourd’hui pour une expérience culinaire ultime</string>
     <string name="login_sign_up">Connexion / Enregistrement</string>
     <string name="skip_for_now">Sauter temporairement</string>
@@ -174,7 +177,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="enter_captcha">Entrez  Captcha</string>
     <string name="send_email">Envoyer un courriel</string>
     <string name="enter_password_again">Entrez à nouveau votre mot de passe</string>
-    <string name="enter_the_captcha_obtained_from_the_mail">Entrez CAPTCHA obtenu à partir du message</string>
+    <string name="enter_the_captcha_obtained_from_the_mail">Entrer le code reçu par email</string>
     <string name="nickname">Surnom</string>
     <string name="enter_nickname">Entrez un pseudonyme</string>
     <string name="Gender">Sexe</string>
@@ -249,11 +252,11 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="Password_is_not_the_same">Les mots de passe ne sont pas identiques</string>
     <string name="enter">Entrée</string>
     <string name="repeat">Répéter</string>
-    <string name="automatic_recipes">Recettes intégrées</string>
+    <string name="automatic_recipes">Recettes automatigues</string>
     <string name="automatic_programmes">Programmes automatiques</string>
-    <string name="manual_cooking">Mode manuel</string>
-    <string name="download_new_recipes">Télécharger les nouvelles recettes</string>
-    <string name="home">Maison</string>
+    <string name="manual_cooking">Mode Manuel</string>
+    <string name="download_new_recipes">Nouvelles recettes</string>
+    <string name="home">Menu</string>
     <string name="back">Retour</string>
     <string name="historical_search">Recherche historique</string>
 
@@ -306,7 +309,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="help">Aide</string>
     <string name="evaluate_successfully">Évaluer le succès</string>
     <string name="reset_to_default_settings">Réinitialiser les paramètres par défaut</string>
-    <string name="home_auth"><![CDATA[MAISON >>]]></string>
+    <string name="home_auth"><![CDATA[MENU >>]]></string>
     <string name="rating">Évaluation</string>
     <string name="loading">Chargement en cours</string>
     <string name="Min20">20 minutes</string>
@@ -332,6 +335,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="no_net_error">Veuillez vous connecter au WiFi</string>
     <string name="no_login">Veuillez saisir les champs ci-dessus pour vous connecter</string>
     <string name="wrong_captcha">Le mauvais CAPTCHA</string>
+    <string name="frement_010d_stage_first_finish">Ajoutez un film étirable dans le fond du panier vapeur puis disposez vos pots de yaourt. Fermez le couvercle et couvrez avec un linge ou un torchon.</string>
 
     <string name="e7_errCode">Motor heat dissipation abnormal</string>
     <string name="e8_errCode">Plug in air fryer attachment</string>
@@ -351,5 +355,5 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="Automatic_programmes_29">Programmes automatiques</string>
     <string name="Download_new_recipes_29">Téléchargement de nouvelles recettes</string>
 
-    <string name="step_running_pause">En cours d’exécution, veuillez d’abord appuyer sur pause</string>
+
 </resources>

app/src/brand083BTuya/res/values-it/strings.xml

@@ -42,13 +42,24 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="adapted_cooking">CUCINA ADATTATA</string>
     <string name="scales">BILANCE</string>
     <string name="boil_water">ACQUA DI BOIL</string>
+    <string name="cook_eggs">CUOCI UOVA</string>
+    <string name="cook_rice">RISO COTTO</string>
+    <string name="mulsify">MULSIFICA</string>
+    <string name="puree">PUREA</string>
+    <string name="roast">ARROSTO</string>
+    <string name="smoothie">LEVIGANTE</string>
+    <string name="sovs_vide">SOVS VIDE</string>
+    <string name="auto_clean">PULIZIA AUTOMATICA</string>
     <string name="chop">TAGLIA</string>
     <string name="ferment">FERMENTO</string>
-    <string name="slow_cook">CUOCO LENTO</string>
+    <string name="slow_cook">Cuoco lento</string>
     <string name="knead_dough">IMPASTATURA</string>
     <string name="steam">VAPORE</string>
     <string name="food_processor">PROCESSORE ALIMENTARE</string>
+    <string name="wight">PESO</string>
     <string name="turbo">TURBO</string>
+
+    <!-- 由于之前没有另外做兼容包，在公版翻译添加了010，现在做了兼容，010的翻译建议上面的自动程序翻译同一样-->
     <string name="steam_010">VAPORE</string>
     <string name="knead_dough_010">IMPASTATURA</string>
     <string name="slow_cook_010">Cuoco lento</string>
@@ -127,6 +138,7 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="network_wifi_status_failed">Impossibile</string>
     <string name="network_wifi_status_blocked">Bloccato</string>
     <string name="network_wifi_status_verifying_poor_link">Arresto temporaneo (cattive condizioni della rete)</string>
+    <string name="wifi_loading_text"> </string>
     <string name="start">AVVIA</string>
     <string name="pause">PAUSA</string>
     <string name="cancel">CANCELLA</string>
@@ -225,7 +237,6 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="pot_clover_not_clost_tips">Il coperchio è aperto. Prima chiudi il coperchio e inizia.</string>
     <string name="screen_saver_title">Vuoi entrare nel respiratore?</string>
     <string name="sex">Sesso</string>
-    <string name="wight">PESO</string>
     <string name="running_block_tips">Si prega di fermare il programma in esecuzione e avviare nuovi programmi.</string>
     <string name="unset_target_time">Il tempo non è stato fissato.</string>
     <string name="recipe_complete">RICETTA COMPLETA</string>
@@ -283,14 +294,7 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
 
 
 
-    <string name="cook_eggs">CUOCI UOVA</string>
-    <string name="cook_rice">RISO COTTO</string>
-    <string name="mulsify">MULSIFICA</string>
-    <string name="puree">PUREA</string>
-    <string name="roast">ARROSTO</string>
-    <string name="smoothie">LEVIGANTE</string>
-    <string name="sovs_vide">SOVS VIDE</string>
-    <string name="auto_clean">PULIZIA AUTOMATICA</string>
+
     <string name="network_error">errore di rete</string>
     <string name="apk_version_latest">La versione dell\'app è già aggiornata.</string>
     <string name="installing">Installazione...</string>
@@ -322,6 +326,8 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="no_net_error">Si prega di connettersi a Wifi</string>
     <string name="no_login">Inserisci i campi di cui sopra per accedere</string>
     <string name="wrong_captcha">CAPTCHA errato</string>
+    <string name="frement_010d_stage_first_finish">Metti un foglio di pellicola trasparente sul fondo del cestello per la cottura a vapore, quindi disponi i tuoi vasetti di yogurt. Chiudere il coperchio a vento con un panno o un asciugamano.</string>
+
 
     <string name="e7_errCode">Motor heat dissipation abnormal</string>
     <string name="e8_errCode">Plug in air fryer attachment</string>
@@ -340,5 +346,5 @@ Nanfang plus client è una piattaforma di informazioni online sviluppata e gesti
     <string name="Automatic_programmes_29">Programmi automatici</string>
     <string name="Download_new_recipes_29">Scarica nuove ricette</string>
 
-    <string name="step_running_pause">In esecuzione, premere prima la pausa</string>
+
 </resources>

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

@@ -239,7 +239,7 @@ fun getSN(): String {
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
 //        return "011A10390020123010190001"
-        return "011F10390020123010190001"
+//        return "011F10390020123010190001"
 //        return "011A10390020123010190009"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
@@ -251,6 +251,8 @@ fun getSN(): String {
 //    return  "017A20060020123010190001"
 //        return  "017A10390020123010190001"
 //    return "010D10390020123010190001"
+        return "083A10390020123010190001"
+
 //        return "010I10390020123010190001"
 //        return "010D10390020123010190001"
 //    return "000A10390020123010190009"
@@ -311,24 +313,24 @@ fun getGoneLogin(): Boolean {
     var sn = getSN()
     return sn.startsWith("032D") || sn.startsWith("032E") || sn.startsWith("011")
             || sn.startsWith("030A") || sn.startsWith("010F")
-            || sn.startsWith("033")||
-            sn.startsWith("010I")|| sn.startsWith("010H")
+            || sn.startsWith("033") ||
+            sn.startsWith("010I") || sn.startsWith("010H")
             || sn.startsWith("083A") || sn.startsWith("083B")
 }
 
 //隐藏在线食谱
-fun  getGoneRecipes():Boolean {
+fun getGoneRecipes(): Boolean {
     var sn = getSN()
-    return sn.startsWith("011") ||  sn.startsWith("010H") || sn.startsWith("010I")
-            ||  sn.startsWith("083A") || sn.startsWith("083B")
+    return sn.startsWith("011") || sn.startsWith("010H") || sn.startsWith("010I")
+            || sn.startsWith("083A") || sn.startsWith("083B")
 }
 
 //隐藏星星评分
-fun  getGoneScore():Boolean{
+fun getGoneScore(): Boolean {
     var sn = getSN()
-    return sn.startsWith("011") ||sn.startsWith("033")
-            ||  sn.startsWith("010H") || sn.startsWith("010I")
-            ||  sn.startsWith("083A") || sn.startsWith("083B")
+    return sn.startsWith("011") || sn.startsWith("033")
+            || sn.startsWith("010H") || sn.startsWith("010I")
+            || sn.startsWith("083A") || sn.startsWith("083B")
 }