011更新代码

BusinessAirFryer/src/main/assets/config_000.json

@@ -114,6 +114,25 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "DICING",
+      "name": "dicing_011",
+      "bg": "ic_mode_dicing",
+      "icon": "ic_grid_dicing",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+    {
+      "type": "POTATO_PEELER",
+      "name": "potato_peeler_011",
+      "bg": "ic_mode_potato_peeler",
+      "icon": "ic_grid_potato_peeler",
+      "devMode": "SOUP",
+      "listShow": true
+    },
+
+
 
     {
       "type": "AF_DIY",

BusinessAirFryer/src/main/assets/tuya_config.json

@@ -454,11 +454,13 @@
       "pid": "zqu9xyol98eirdqg",
       "uid": "uuidfb9425b618c727ea",
       "ak": "xlAFfJzBcZxb04wV8RwZGw2QA1rDTewv"
-    },"014A19050020123010190002": {
+    },
+    "014A19050020123010190002": {
       "pid": "bvuorstpnkfsh6fm",
       "uid": "uuid758e6c5bea1239b3",
       "ak": "ArxSJZf7ZeQ0nkl7x39hzSD7dSfTGhSs"
-    },"033G20020020123010190001": {
+    },
+    "033G20020020123010190001": {
       "pid": "je90y7he5zc62rdl",
       "uid": "uuid481324819eb29b69",
       "ak": "lEkmeMDBw0f5usArqbm110UMfxTzxOOf"
@@ -467,6 +469,16 @@
       "pid": "wy8ogbhchnzkmrup",
       "uid": "uuid3a0b274f5edbc38b",
       "ak": "2wGAsGNRzAsTlL8x3qgxmP46DC6p2K8Y"
+    },
+    "029C10390020123010190001": {
+      "pid": "vowpjhiaj5tyv2rd",
+      "uid": "uuid64cad3f1bece5ef4",
+      "ak": "EVxke5XMySMDmjWAOxLdfmvwdG1u32iE"
+    },
+    "029C10390020123010190002": {
+      "pid": "vowpjhiaj5tyv2rd",
+      "uid": "uuidc77b95e70f41df5c",
+      "ak": "dqFC3ytJ3XUtVjFh5rIM3J6iJAJstutA"
     }
   }
 }

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

@@ -40,7 +40,7 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
     private val memberProfileFragment = MemberProfileFragment()
     private val memberRegisterFragment = MemberRegisterFragment()
     private val fragmentMap = HashMap<FragmentTag, Fragment>()
-
+    private var sn = getSN()
     override fun createViewModel(): MemberViewModel {
         return getViewModel(MemberViewModel::class.java)
     }
@@ -60,15 +60,15 @@ class MemberAuthActivity : CommonBVMActivity<ActivityMemberAuthBinding, MemberVi
         if (isBrand036I()) {
             //binding.ivLogo.setVisible()
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.guide_bg_036i)
-        } else if (getSN().startsWith("002D")) {
+        } else if (sn.startsWith("002D")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_002d)
-        } else if (isBrand011A()) {
+        } else if (sn.startsWith("011")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_011a)
         } else if (isBrand054A()) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_054a)
         } else if (isBrand062()) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_062a)
-        }else if (getSN().startsWith("045")) {
+        }else if (sn.startsWith("045")) {
             binding.ivBanner.setImageResource(com.develop.common.R.drawable.account_background_045a)
         }
         initFragmentList()

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

@@ -2,12 +2,14 @@ package com.develop.common.data_repo.db
 
 import android.content.res.Resources
 import com.develop.base.app.BaseApp
+import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand036I
 import com.develop.base.ext.isNightTheme
 import com.develop.base.util.MMkvUtils
 import com.develop.common.R
 import com.develop.common.data_repo.db.entity.DevRecipe
 import com.develop.common.data_repo.db.entity.UserFavoriteRecipes
+import com.develop.common.tag.CURRENT_LANGUAGE
 import com.develop.common.tag.ISTUYA
 import com.develop.common.utils.ConfigUtils
 import com.develop.common.utils.TuyaUtils
@@ -363,6 +365,53 @@ object DataFactory {
         return result
     }
 
+    fun genSetting033FModesList(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), resource.getString(R.string.wifi),
+//            resource.getString(R.string.sound),
+            resource.getString(R.string.brightness),
+            resource.getString(R.string.user_account),
+//            resource.getString(R.string.storage),
+            resource.getString(R.string.reset), 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.3.20 鸦图标隐藏（只针对010Dak、010Fapk、032Dapk）
+//        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 genLocalRecipes(
         categoryName: String,
         recipesList: MutableList<DevRecipe>,
@@ -404,12 +453,16 @@ object DataFactory {
 
     fun genSortNameList(resource: Resources): MutableList<FilterSortModel> {
         val result = mutableListOf<FilterSortModel>()
+        val sn = getSN()
         val sortNameList = mutableListOf(
             "A-Z",
             resource.getString(R.string.most_popular),
             resource.getString(R.string.newest),
-            resource.getString(R.string.rating)
         )
+        //033需求，评价等级功能隐藏，标签也要隐藏
+        if (!sn.startsWith("033")){
+            sortNameList.add(resource.getString(R.string.rating))
+        }
 
         for (name in sortNameList) {
             result.add(FilterSortModel(name))
@@ -417,12 +470,16 @@ object DataFactory {
         return result
     }
 
+    /**
+     * 本地搜索
+     * */
     fun genTestSearchDataList(): MutableList<Any> {
         val result = mutableListOf<Any>()
         val homeHeader = HomeHeader()
         homeHeader.filterSortModel = FilterSortModel("")
+        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?:"EN"
         var historyDataList: MutableList<CommonSearchItem> = mutableListOf()
-        val hotWordJson = MMkvUtils.getString("CommonWords") ?: ""
+        val hotWordJson = MMkvUtils.getString("CommonWords-$lang") ?: ""
         if (hotWordJson.isNotEmpty()) {
             val type: Type = object : TypeToken<List<CommonSearchItem>>() {}.type
             historyDataList = Gson().fromJson(hotWordJson, type)
@@ -448,9 +505,10 @@ object DataFactory {
     fun genOnLineHotTags(hotTags: MutableList<String>): MutableList<Any> {
         val result = mutableListOf<Any>()
         val homeHeader = HomeHeader()
+        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?:"EN"
         homeHeader.filterSortModel = FilterSortModel("")
         var historyDataList: MutableList<CommonSearchItem> = mutableListOf()
-        val hotWordJson = MMkvUtils.getString("CommonWords") ?: ""
+        val hotWordJson = MMkvUtils.getString("CommonWords-$lang") ?: ""
         if (hotWordJson.isNotEmpty()) {
             val type: Type = object : TypeToken<List<CommonSearchItem>>() {}.type
             historyDataList = Gson().fromJson(hotWordJson, type)
@@ -685,8 +743,8 @@ object DataFactory {
 
     private var titleStrIds011 = mutableListOf<Int>(
         R.string.automatic_recipes_011,
-        R.string.manual_cooking_011,
         R.string.automatic_programmes_011,
+        R.string.manual_cooking_011,
         R.string.download_new_recipes_011
     )
     private var title2StrIds1 = mutableListOf<Int>(

BusinessCommon/src/main/res/layout/home_sort_filter_search_view.xml

@@ -203,9 +203,9 @@
         android:id="@+id/searchLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/convert_88px"
-        android:layout_marginStart="@dimen/convert_290px"
+        android:layout_marginStart="@dimen/convert_270px"
         android:layout_marginTop="@dimen/convert_40px"
-        android:layout_marginEnd="@dimen/convert_290px"
+        android:layout_marginEnd="@dimen/convert_270px"
         android:layout_marginBottom="@dimen/convert_60px"
         android:visibility="gone"
         >
@@ -223,7 +223,9 @@
             android:paddingRight="@dimen/convert_120px"
             android:textColor="@color/color_1A1A1A"
             android:textColorHint="@color/color_1A1A1A"
-            android:textSize="@dimen/convert_45px" />
+            android:textSize="@dimen/convert_40px"
+
+            />
 
         <ImageView
             android:id="@+id/iv_search"

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

@@ -50,6 +50,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="food_processor">FOOD PROCESSOR</string>
     <string name="turbo">TURBO</string>
     <string name="citrus_juicer">CITRUS_JUICER</string>
+    <string name="dicing">DICING</string>
+    <string name="potato_peeler">POTARO PEELER</string>
 
     <string name="steam_010">STEAM</string>
     <string name="knead_dough_010">KNEAD DOUGH</string>

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

@@ -34,27 +34,24 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="skin_for_now">La peau actuellement</string>
     <string name="login">Se connecter</string>
     <string name="online_recipes">Recettes en ligne</string>
-    <string name="cook_history">Histoire culinaire</string>
-    <string name="favourite_recipes">Recettes préférées</string>
+    <string name="cook_history">Historique</string>
+    <string name="favourite_recipes">Favoris</string>
     <string name="settings">Paramètres</string>
     <string name="grid_view">Vue grille</string>
     <string name="list_view">Vue de liste</string>
-    <string name="adapted_cooking">Cuisine adaptable</string>
+    <string name="adapted_cooking">Mode manuel</string>
     <string name="scales">SCALES</string>
-    <string name="boil_water">Brûler l’eau</string>
-
-
-
+    <string name="boil_water">Bouillir</string>
     <string name="steam">Vapeur</string>
-    <string name="knead_dough">Pétrir la pâte</string>
-    <string name="slow_cook">Cuire lentement</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">Machines de traitement des aliments</string>
-    <string name="chop">Fendu</string>
-    <string name="wight">Poids</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="turbo">Turbine</string>
+    <string name="turbo">Pulse</string>
     <string name="steam_010">Vapeur</string>
     <string name="knead_dough_010">Pétrir</string>
     <string name="slow_cook_010">Mijoter</string>
@@ -142,9 +139,9 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="turn_right">Tourner à droite</string>
     <string name="turn_left">Tourner à gauche</string>
     <string name="temperature">Température</string>
-    <string name="time">Le temps</string>
+    <string name="time">Temps</string>
     <string name="speed">Vitesse</string>
-    <string name="direction">Direction</string>
+    <string name="direction">Rotation</string>
     <string name="bad">Désagréable</string>
     <string name="imperfect">Pas parfait</string>
     <string name="ordinary">Ordinaire</string>
@@ -189,7 +186,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="please_select_age">Veuillez sélectionner un âge</string>
     <string name="cancel_lower">Annulation</string>
     <string name="female">De la femme</string>
-    <string name="tare">Poids du cuir</string>
+    <string name="tare">Poids</string>
     <string name="keep_cooking_in_the_background">Continuer à cuisiner en arrière - plan?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">Réinitialisation</string>
@@ -229,7 +226,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="weight_align_success">Calibration réussie!</string>
     <string name="change_lang_tips2">Après avoir changé de langue, la langue de la recette change et redémarre en même temps. Êtes - vous sûr de vouloir changer de langue? </string>
     <string name="pot_clover_not_clost_tips">Le couvercle est déverrouillé. S’il vous plaît verrouiller le couvercle d’abord et commencer.</string>
-    <string name="screen_saver_title">Vous souhaitez accéder à l’écran respiratoire?</string>
+    <string name="screen_saver_title">Mise en veille ?</string>
     <string name="sex">Sexe</string>
     <string name="running_block_tips">Arrêtez le programme en cours d’exécution et lancez - en un nouveau.</string>
     <string name="unset_target_time">L’heure n’est pas encore définie.</string>
@@ -248,11 +245,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">Formule automatique</string>
-    <string name="automatic_programmes">Programme automatique</string>
-    <string name="manual_cooking">Cuisiner à la main</string>
-    <string name="download_new_recipes">Télécharger la nouvelle recette</string>
-    <string name="home">Maison</string>
+    <string name="automatic_recipes">Recettes intégrées</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">Menu</string>
     <string name="back">Arrière</string>
     <string name="historical_search">Recherche historique</string>
 

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

@@ -54,6 +54,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="food_processor">FOOD PROCESSOR</string>
     <string name="turbo">TURBO</string>
     <string name="citrus_juicer">CITRUS_JUICER</string>
+
+    <string name="dicing">DICING</string>
+    <string name="potato_peeler">POTARO PEELER</string>
+
+
     <string name="language">LANGUAGE</string>
     <string name="sound">SOUND</string>
     <string name="brightness">BRIGHTNESS</string>

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

@@ -157,6 +157,8 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             EntranceType.manual_cooking -> {
                                 if (FoodDataProvider.checkDataExit()) {
 
+
+                                    var modeName = if (sn.startsWith("011"))resources.getString(com.develop.common.R.string.automatic_programmes_011).replace("\n"," ")  else resources.getString(com.develop.common.R.string.adapted_cooking)
                                     navigateTo(Screens.Cook.COOK_MODES) {
 
                                         if (DevModes.SOUP == CofarSDK.devInfo().devMode) {
@@ -164,7 +166,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                             bundle.putString(MODE_TYPE, WorkModes.ADAPTED_COOKING)
                                             bundle.putString(
                                                 "mode_name",
-                                                resources.getString(com.develop.common.R.string.adapted_cooking)
+                                                modeName
                                             )
                                             with(bundle)
                                         } else {

BusinessMain/src/main/java/com/develop/main/viewmodel/HomeViewModel.kt

@@ -490,11 +490,11 @@ class HomeViewModel : BaseViewModel() {
     fun saveHistoryWords(hotWord: String) {
         var hotWordList: MutableList<String> = mutableListOf()
         val type: Type = object : TypeToken<List<String>>() {}.type
+        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?:"EN"
         val hotWordJson = MMkvUtils.getString("HistoryWords") ?: ""
 
         var commonDataList: MutableList<CommonSearchItem> = mutableListOf()
-
-        val commonWordJson = MMkvUtils.getString("CommonWords") ?: ""
+        val commonWordJson = MMkvUtils.getString("CommonWords-$lang") ?: ""
         if (commonWordJson.isNotEmpty()) {
             val type1: Type = object : TypeToken<List<CommonSearchItem>>() {}.type
             commonDataList = Gson().fromJson(commonWordJson, type1)
@@ -511,7 +511,7 @@ class HomeViewModel : BaseViewModel() {
             commonDataList.add(CommonSearchItem(hotWord, 1))
         }
 
-        MMkvUtils.save("CommonWords", Gson().toJson(commonDataList))
+        MMkvUtils.save("CommonWords-$lang", Gson().toJson(commonDataList))
 
         if (hotWordJson.isNotEmpty()) {
             hotWordList = Gson().fromJson(hotWordJson, type)

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

@@ -77,6 +77,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
     private var tpCount = 0
 
+    private var sn = getSN()
     private val cancelConfirmDialog by lazy {
         CancelConfirmDialog()
     }
@@ -238,6 +239,8 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
             }
             if (isBrand036I()) {
                 binding.ivLogo.setBackgroundResource(com.develop.common.R.drawable.ic_logo_036i)
+            }else if (sn.startsWith("011")){
+                binding.ivLogo.setBackgroundResource(com.develop.common.R.drawable.ic_logo_011)
             }
             ivUpdateParam.apply {
                 width = dimenRes(com.develop.common.R.dimen.convert_66px)
@@ -258,7 +261,7 @@ class AboutActivity : CommonBVMActivity<ActivityAboutBinding, AboutViewModel>()
 
             if (isBrand054A()) {
                 binding.ivLogo.setBackgroundResource(com.develop.common.R.drawable.ic_logo_054a)
-            } else if (getSN().startsWith("045")) {
+            } else if (sn.startsWith("045")) {
                 binding.ivLogo.setBackgroundResource(com.develop.common.R.drawable.ic_logo_045a)
             }
         }

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

@@ -56,9 +56,9 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
     private var selectedPosition = -1
     private var isLanguageTip = false
     private var isFromSetting = false
-    private var language :String? = ""
-    private  var is062 = false
-    private  var is011 = false
+    private var language: String? = ""
+    private var is062 = false
+    private var is011 = false
     override fun createViewBinding(inflater: LayoutInflater): ActivityLanguageBinding {
         return ActivityLanguageBinding.inflate(inflater)
     }
@@ -67,23 +67,26 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
         super.onCreate(savedInstanceState)
         language = MMkvUtils.getString(CURRENT_LANGUAGE)
         is062 = isBrand062()
-        is011 = isBrand011A()
+        is011 = getSN().startsWith("011")
 
         if (isBrand036I()) {
             binding.ivLogo.setVisible()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.guide_bg_036i)
-        }else if (isBrand054A()) {
+        } else if (isBrand054A()) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
-        }else if (is062) {
+        } else if (is062) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
-        }else if (getSN().startsWith("045")){
+        } else if (is011) {
+            binding.ivLogo.setGone()
+            binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
+        } else if (getSN().startsWith("045")) {
             binding.ivLogo.setGone()
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)
         }
         binding.ivLanguageClose.setVisible()
-        binding.ivLanguageClose.setImageResource( com.develop.common.R.drawable.ic_close)
+        binding.ivLanguageClose.setImageResource(com.develop.common.R.drawable.ic_close)
         isFromSetting = intent.extras?.getBoolean(LANGUAGE_FROM_SETTING) ?: false
         if (isFromSetting) {
             binding.apply {
@@ -109,7 +112,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 tvNext.updateText(getString(com.develop.common.R.string.confirm))
             }
         }
-      var list =   DataFactory.createLanguageDataV2(resources)
+        var list = DataFactory.createLanguageDataV2(resources)
 
         binding.languageRecycle.apply {
             linear()
@@ -120,13 +123,13 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                     val tvTitle = findView<AppCompatTextView>(R.id.tv_title)
                     val cardView = findView<RelativeLayout>(R.id.content_layout)
                     if (selectedPosition == absoluteAdapterPosition) {
-                        if (is062){
+                        if (is062) {
                             tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_5887DA))
                             cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44px5887da_stoke)
-                        }else if (is011){
+                        } else if (is011) {
                             tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_C10A27))
                             cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxc10a27_stoke)
-                        }else{
+                        } else {
                             tvTitle.setTextColor(context.resources.getColor(com.develop.common.R.color.color_EE8F08))
                             cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxfff6e9_stoke)
                         }
@@ -136,14 +139,20 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                         cardView.setBackgroundResource(com.develop.common.R.drawable.shape_44pxffffff_stoke)
                     }
                     val model = getModel<ConfigUtils.Lang>()
-                    ivIcon.load(context.resources.getIdentifier(model.icon,"drawable","com.develop.foodcooking"))
+                    ivIcon.load(
+                        context.resources.getIdentifier(
+                            model.icon,
+                            "drawable",
+                            "com.develop.foodcooking"
+                        )
+                    )
                     model.showName?.let { it1 -> tvTitle.updateText(it1) }
                 }
                 R.id.content_layout.onClick {
                     updateSelectionPos(absoluteAdapterPosition)
                 }
             }
-        }.models =list
+        }.models = list
 
         selectedPosition = getSelectedPos()
 
@@ -185,7 +194,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
             }
             if (isFromSetting) {
                 //相同语言的时候不可点击
-                if (language ==list[selectedPosition].value){
+                if (language == list[selectedPosition].value) {
                     finish()
                     return@setOnClickListener
                 }
@@ -229,11 +238,11 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
     private fun updateLanguage() {
         var index = 0
         index = selectedPosition
-        if(selectedPosition == -1){
+        if (selectedPosition == -1) {
             index = 0
         }
         //添加状态，避免设置语言反复设置
-        MMkvUtils.save(LANGUAGE_SETTING,true)
+        MMkvUtils.save(LANGUAGE_SETTING, true)
         binding.languageRecycle.models?.get(index)?.apply {
             var l = this as ConfigUtils.Lang;
             MMkvUtils.save(CURRENT_LANGUAGE, l.value)
@@ -241,7 +250,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
 //                //系统变化语言
 //                  updateLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
 //            }
-            LanguageUtils.applyLanguage(Locale(l.value.lowercase(),l.value.uppercase()))
+            LanguageUtils.applyLanguage(Locale(l.value.lowercase(), l.value.uppercase()))
         }
     }
 
@@ -252,7 +261,7 @@ class LanguageActivity : BaseBindingActivity<ActivityLanguageBinding>() {
                 selectedPosition = i
             }
         }
-        if(selectedPosition == -1){
+        if (selectedPosition == -1) {
             selectedPosition = 0
         }
         return selectedPosition

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

@@ -61,9 +61,9 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_054a)
         }else if (isBrand062()){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
-        }else if (getSN().startsWith("045")){
+        }else if (sn.startsWith("045")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)
-        }else if (isBrand011A()){
+        }else if (sn.startsWith("011")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
         }
         countForPolicyTime()

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

@@ -29,8 +29,9 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         return ActivityScreensaverBinding.inflate(layoutInflater)
     }
 
-    private var selectedPosition = -1
 
+    private var selectedPosition = -1
+    private var sn = getSN()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         hasShowScreenSaver = true
@@ -46,7 +47,7 @@ class ScreensaverActivity : CommonBindingActivity<ActivityScreensaverBinding>()
         val dataList045 = mutableListOf(
             com.develop.common.R.drawable.ic_screensaver_045a
         )
-        val bannerAdapter = ScreenBannerAdapter(if (isBrand011A()) dataList011 else if (isBrand054A()) dataList054 else if (getSN().startsWith("045")) dataList045 else dataList)
+        val bannerAdapter = ScreenBannerAdapter(if (sn.startsWith("011")) dataList011 else if (isBrand054A()) dataList054 else if (sn.startsWith("045")) dataList045 else dataList)
         binding.bannerView.adapter = bannerAdapter
 
         binding.circleRecycler.apply {

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

@@ -57,7 +57,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     var exitTime: Long = 0 // 退出时间
     private var onIsResume = true
     private var isNetwork = false
-
+    private var sn = getSN()
 
     override fun createViewBinding(inflater: LayoutInflater): ActivitySettingMainBinding {
         return ActivitySettingMainBinding.inflate(layoutInflater)
@@ -78,15 +78,19 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
         /**
          * 需要隐藏登录 032D 011A 030A 010F
-         * 需要隐藏涂鸦 010D 010F 032D
+         * 需要隐藏涂鸦 010D 010F 032D 033F
          * 需要隐藏亮度 010D
          * */
-        dataList = if (getSN().startsWith("010D")) {
+
+
+        dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (getSN().startsWith("032D")||getSN().startsWith("010F")) {
+        } else if (sn.startsWith("032D") || sn.startsWith("010F")) {
             DataFactory.genSetting032DModesList(resources)
-        } else if (getSN().startsWith("011A") || getSN().startsWith("030A")) {
+        } else if (sn.startsWith("011A") || sn.startsWith("030A")) {
             DataFactory.genSetting011AModesList(resources)
+        } else if (sn.startsWith("033F")) {
+            DataFactory.genSetting033FModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)
         }
@@ -311,12 +315,14 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     fun tuyaEvent() {
         //判断是否有涂鸦功能
         dataList.clear()
-        dataList = if (getSN().startsWith("010D")) {
+        dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (getSN().startsWith("032D")||getSN().startsWith("010F")) {
+        } else if (sn.startsWith("032D") || sn.startsWith("010F")) {
             DataFactory.genSetting032DModesList(resources)
-        } else if (getSN().startsWith("011A") || getSN().startsWith("030A")) {
+        } else if (sn.startsWith("011A") || sn.startsWith("030A")) {
             DataFactory.genSetting011AModesList(resources)
+        } else if (sn.startsWith("033F")) {
+            DataFactory.genSetting033FModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)
         }
@@ -339,7 +345,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
     override fun onResume() {
         super.onResume()
         //避免涂鸦功能不出现估做这个判断
-        if (onIsResume&&!isTuya) {
+        if (onIsResume && !isTuya) {
             getDevTuya()
         }
     }

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

@@ -66,7 +66,7 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
 
     private var timer: CountDownTimer? = null
     private var isSuccess = false
-
+    private var sn = getSN()
     override fun createViewBinding(inflater: LayoutInflater): ActivityWifiListBinding {
         return ActivityWifiListBinding.inflate(inflater)
     }
@@ -107,10 +107,10 @@ class WifiListActivity : CommonBindingActivity<ActivityWifiListBinding>(),
         } else if (isBrand062()) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_062a)
             binding.ivLogo.setGone()
-        } else if (isBrand011A()) {
+        } else if (sn.startsWith("011")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
             binding.ivLogo.setGone()
-        } else if (getSN().startsWith("045")) {
+        } else if (sn.startsWith("045")) {
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_045a)
             binding.ivLogo.setGone()
         }

BusinessStep/src/main/java/com/develop/step/ui/ModesDetailActivity.kt

@@ -267,7 +267,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
          * CofarSDK.devInfo().resetZero.toInt()==1 代表已经是扭橙汁配件
          * */
         if (modeType == WorkModes.CITRUS_JUICER && CofarSDK.devInfo().resetZero.toInt() != 1) {
-            showMsgDialog(resources.getString(com.develop.common.R.string.dev_not_orange_parts))
+            showMsgDialog(resources.getString(com.develop.common.R.string.dev_dice_and_peel_tips))
         }
         /**
          * 需求：非扭橙模式打开点击运行，且是扭橙的配件时需要提示用户
@@ -974,7 +974,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         viewModel.modeType.apply {
             val baseMode = CofarSDK.devMode(this)
             //处理5/7/10寸屏，默认转速不同
-            if (baseMode is Knead){
+            if (baseMode is Knead && !sn.startsWith("011")){
                 var  defMotorGear = when(StringUtils.getScreenSize(this@ModesDetailActivity)){
                     5->{
                         1
@@ -991,10 +991,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 }
                 baseMode.defaultMotorGear = defMotorGear
             }
-            if (sn.startsWith("011")){
-                //处理011程序兼容
-                init011Mode(baseMode)
-            }
 
 
 
@@ -2375,21 +2371,6 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     }
 
     private fun init011Mode(obj :Any){
-        /**
-         * 由于 011客户给了自动程序参数改动，所以才有些在 程序上改，有些在SDK上改
-         * */
-        //揉面
-        if (obj is Knead){
-            //处理揉面 011 都是默认挡速 3
-            obj.defaultMotorGear = 3
-        }
-
-        //煮水
-        if (obj is Kettle){
-            //60-100度
-            obj.minTemp = 60
-            obj.isTempChange = true
-        }
 
 
     }

BusinessStep/src/main/res/layout/activity_mode_detail.xml

@@ -505,7 +505,7 @@
             android:includeFontPadding="false"
             android:text="@string/tare"
             android:textColor="#ffffff"
-            android:textSize="@dimen/convert_36px"
+            android:textSize="@dimen/convert_32px"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />

app/src/main/assets/help/FR/help-white-a.html

@@ -99,8 +99,7 @@
 
   <div class="item">
     <h3>Accessoires : J’ai égaré le panier à vapeur, j’ai perdu le poussoir, j’ai cassé mon fouet.</h3>
-    <p>Le client peut acheter la pièce directement sur le site www.expercare.fr, ou le PDV peut passer la commande
-      directement à l'adresse électronique p.blanc@schneiderconsumer.com</p>
+    <p>Veuillez prendre contact avec le Service Après-Vente de Mathon.fr  Soit au 04 58 08 03 00 (numéro non surtaxé) du lundi au vendredi de 9h à 17h hors jours fériés Soit par mail : commercial@mathon.fr </p>
   </div>
 
   <div class="item">

app/src/main/assets/help/FR/help-white.html

@@ -91,8 +91,7 @@
 
   <div class="item">
     <h3>Accessoires : J’ai égaré le panier à vapeur, j’ai perdu le poussoir, j’ai cassé mon fouet.</h3>
-    <p>Le client peut acheter la pièce directement sur le site www.expercare.fr, ou le PDV peut passer la commande
-      directement à l'adresse électronique p.blanc@schneiderconsumer.com</p>
+    <p>Veuillez prendre contact avec le Service Après-Vente de Mathon.fr  Soit au 04 58 08 03 00 (numéro non surtaxé) du lundi au vendredi de 9h à 17h hors jours fériés Soit par mail : commercial@mathon.fr </p>
   </div>
 
   <div class="item">

app/src/main/assets/help/FR/help.html

@@ -91,8 +91,7 @@
 
   <div class="item">
     <h3>Accessoires : J’ai égaré le panier à vapeur, j’ai perdu le poussoir, j’ai cassé mon fouet.</h3>
-    <p>Le client peut acheter la pièce directement sur le site www.expercare.fr, ou le PDV peut passer la commande
-      directement à l'adresse électronique p.blanc@schneiderconsumer.com</p>
+    <p>Veuillez prendre contact avec le Service Après-Vente de Mathon.fr  Soit au 04 58 08 03 00 (numéro non surtaxé) du lundi au vendredi de 9h à 17h hors jours fériés Soit par mail : commercial@mathon.fr </p>
   </div>
 
   <div class="item">