010H/I修改

BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -326,6 +326,57 @@ val dataSn = getSN()
         }
         return result
     }
+    fun genSetting010IModesList(resource: Resources): MutableList<SettingModel> {
+        val result = mutableListOf<SettingModel>()
+        val resIdList = mutableListOf(
+            R.drawable.ic_setting_language,
+            R.drawable.ic_setting_wifi,
+//            R.drawable.ic_setting_voice,
+//            R.drawable.ic_setting_brightness,
+//            R.drawable.ic_setting_user,
+//            R.drawable.ic_setting_folder,
+            R.drawable.ic_setting_reset,
+            R.drawable.ic_setting_about,
+        )
+
+        val nameList = mutableListOf(
+            resource.getString(R.string.language_011), resource.getString(R.string.wifi),
+//            resource.getString(R.string.sound),
+//            resource.getString(R.string.brightness_011),
+//            resource.getString(R.string.user_account),
+//            resource.getString(R.string.storage),
+            resource.getString(R.string.reset_011), resource.getString(R.string.about)
+
+        )
+        val settingTypeList = mutableListOf(
+            SettingType.LANGUAGE, SettingType.WIFI,
+//            SettingType.SOUND,
+//            SettingType.BRIGHTNESS,
+//            SettingType.USER_ACCOUNT,
+//            SettingType.STORAGE,
+            SettingType.RESTORE_FACTORY_SETTINGS, SettingType.ABOUT
+        )
+
+        //2024.06.04    1039 011 不显示涂鸦功能
+        // 2024.3.20 涂鸦新需求，不管有没有涂鸦功能都显示出来
+//        settingTypeList.add(SettingType.TUYA)
+//        nameList.add(resource.getString(R.string.tuya))
+//        resIdList.add(R.drawable.ic_setting_tuya)
+
+
+//        var tuyaConfig =  ConfigUtils.loadTuyaConfig()
+//        if(tuyaConfig != null){
+//            settingTypeList.add(SettingType.TUYA)
+//            nameList.add(resource.getString(R.string.tuya))
+//            resIdList.add(R.drawable.ic_setting_tuya)
+//        }
+
+        for (i in resIdList.indices) {
+            result.add(SettingModel(resIdList[i], nameList[i], settingTypeList[i]))
+        }
+        return result
+    }
+
 
     fun genSetting030AModesList(resource: Resources): MutableList<SettingModel> {
         val result = mutableListOf<SettingModel>()

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

@@ -343,6 +343,7 @@ 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>

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

@@ -332,6 +332,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>

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

@@ -322,6 +322,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>

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

@@ -5,11 +5,13 @@ import android.os.Bundle
 import android.os.PowerManager
 import android.view.LayoutInflater
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.blankj.utilcode.util.LanguageUtils
 import com.develop.base.ext.updateText
 import com.develop.base.manager.WifiHelp
 import com.develop.base.scop.safeGlobalScope
 import com.develop.base.util.MMkvUtils
 import com.develop.common.data_repo.FoodDataProvider
+import com.develop.common.data_repo.db.DataFactory
 import com.develop.common.router.Screens
 import com.develop.common.ui.CommonBindingActivity
 import com.develop.common.dialog.CancelConfirmDialog
@@ -19,6 +21,7 @@ import com.develop.common.tag.CURRENT_USER_ID_TAG
 import com.develop.common.tag.FIRST_IN
 import com.develop.common.tag.ISTUYA
 import com.develop.common.tag.LOGIN_TAG
+import com.develop.common.utils.ConfigUtils
 import com.develop.common.utils.TuyaUtils
 import com.develop.setting.R
 import com.develop.setting.databinding.ActivityRestoreBinding
@@ -28,6 +31,7 @@ import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.File
+import java.util.Locale
 
 @Route(path = Screens.Setting.RESTORE)
 class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
@@ -110,11 +114,24 @@ class RestoreActivity : CommonBindingActivity<ActivityRestoreBinding>() {
             }
     }
 
+    fun language(){
+        var list = DataFactory.createLanguageDataV2(resources)
+        if (list.isNotEmpty()){
+            var l = list[0]
+            LanguageUtils.applyLanguage(Locale(l.value.lowercase(), l.value.uppercase()))
+
+        }
+
+    }
+
     private fun delete(delete: Boolean) {
         safeGlobalScope.launch(Dispatchers.IO) {
             if (delete) {
                 FoodDataProvider.deleteAll()
             }
+            //设置默认语言
+            language()
+
             val cacheDirectory = cacheDir
             WifiHelp.Build(this@RestoreActivity).build().removeAllWifi()
             FoodDataProvider.getUserDatabase().userInfoDao().apply {

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

@@ -79,8 +79,9 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         var ctx = this
-        if (sn.startsWith("011F")){
-            binding.settingLayout.background = resources.getDrawable(com.develop.common.R.drawable.home_bg_011_f)
+        if (sn.startsWith("011F")) {
+            binding.settingLayout.background =
+                resources.getDrawable(com.develop.common.R.drawable.home_bg_011_f)
         }
         isTuya = MMkvUtils.getBool(ISTUYA, false)
         tuyaRequestDialog = TuyaRequestDialog()
@@ -104,6 +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
          *
          * ps:修改了的话，记得同步下面tuya代码
          * 也要修改GlobaExt 中的 getGoneTuYa
@@ -112,15 +114,17 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         dataList.clear()
         dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (sn.startsWith("032D")  || sn.startsWith("010F") || sn.startsWith("033")
+        } 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")||sn.startsWith("010I")||sn.startsWith("010H")) {
+        } else if (sn.startsWith("011")) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
+        } else if (sn.startsWith("010I") || sn.startsWith("010H")) {
+            DataFactory.genSetting010IModesList(resources)
+        } else if (sn.startsWith("030A") || sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
-        } else if (sn.startsWith("036I")|| sn.startsWith("058A") || sn.startsWith("058B")) {
+        } else if (sn.startsWith("036I") || sn.startsWith("058A") || sn.startsWith("058B")) {
             DataFactory.genSetting036IModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)
@@ -320,7 +324,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
     private fun downTimeVoid() {
         if (isTuya) {
-            if (TuyaUtils.qrcodeUrl != ""||TuyaUtils.init){
+            if (TuyaUtils.qrcodeUrl != "" || TuyaUtils.init) {
                 tuyaRequestDialog?.removeSelf()
                 timer?.let { timer ->
                     timer.cancel()
@@ -331,7 +335,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
             }
 
 
-        } else  {
+        } else {
             timer?.let { timer ->
                 timer.cancel()
             }
@@ -493,24 +497,26 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
          * 需要隐藏登录 032D 032E 011A 030A 010F 033  010I 010H
          * 需要隐藏涂鸦 010D 010F 032D 033 011A 036I 058A 058B
          * 需要隐藏亮度 010D
+         * 需要隐藏息屏 010H 010I
          *
          * ps:修改了的话，记得同步下面tuya代码
          * 也要修改GlobaExt 中的 getGoneTuYa
          * */
 
 
-
         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")||sn.startsWith("010I")||sn.startsWith("010H")) {
+        } else if (sn.startsWith("011")) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("030A")||sn.startsWith("032E")) {
+        } else if (sn.startsWith("010I") || sn.startsWith("010H")) {
+            DataFactory.genSetting010IModesList(resources)
+        } else if (sn.startsWith("030A") || sn.startsWith("032E")) {
             DataFactory.genSetting030AModesList(resources)
-        } else if (sn.startsWith("036I")|| sn.startsWith("058A") || sn.startsWith("058B")) {
+        } else if (sn.startsWith("036I") || sn.startsWith("058A") || sn.startsWith("058B")) {
             DataFactory.genSetting036IModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)

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

@@ -342,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>

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

@@ -335,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>

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

@@ -326,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>

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

@@ -342,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>

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

@@ -335,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>

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

@@ -326,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>

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

@@ -342,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>

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

@@ -335,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>

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

@@ -326,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>