011兼容翻译

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

@@ -7,6 +7,7 @@ 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.DataFactory.dataSn
 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
@@ -24,7 +25,7 @@ import kotlin.Comparator
 
 
 object DataFactory {
-
+val dataSn = getSN()
 
     fun createLanguageDataV2(resource: Resources): List<ConfigUtils.Lang> {
         return ConfigUtils.loadLangConfig()?.langs?.filter { it.show == true }
@@ -205,9 +206,9 @@ object DataFactory {
 
         // 2024.3.20 涂鸦新需求，不管有没有涂鸦功能都显示出来
         settingTypeList.add(SettingType.TUYA)
-        if (getSN().startsWith("049")){
+        if (getSN().startsWith("049")) {
             nameList.add(resource.getString(R.string.tuya_049))
-        }else{
+        } else {
             nameList.add(resource.getString(R.string.tuya))
         }
         resIdList.add(R.drawable.ic_setting_tuya)
@@ -264,7 +265,6 @@ object DataFactory {
 //        resIdList.add(R.drawable.ic_setting_tuya)
 
 
-
         for (i in resIdList.indices) {
             result.add(SettingModel(resIdList[i], nameList[i], settingTypeList[i]))
         }
@@ -287,10 +287,10 @@ object DataFactory {
         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.brightness_011),
 //            resource.getString(R.string.user_account),
 //            resource.getString(R.string.storage),
-            resource.getString(R.string.reset), resource.getString(R.string.about)
+            resource.getString(R.string.reset_011), resource.getString(R.string.about)
 
         )
         val settingTypeList = mutableListOf(
@@ -302,10 +302,11 @@ object DataFactory {
             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)
+//        settingTypeList.add(SettingType.TUYA)
+//        nameList.add(resource.getString(R.string.tuya))
+//        resIdList.add(R.drawable.ic_setting_tuya)
 
 
 //        var tuyaConfig =  ConfigUtils.loadTuyaConfig()
@@ -321,14 +322,14 @@ object DataFactory {
         return result
     }
 
-    fun genSetting010DModesList(resource: Resources): MutableList<SettingModel> {
+    fun genSetting030AModesList(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_brightness,
+//            R.drawable.ic_setting_user,
 //            R.drawable.ic_setting_folder,
             R.drawable.ic_setting_reset,
             R.drawable.ic_setting_about,
@@ -337,8 +338,8 @@ object DataFactory {
         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.brightness),
+//            resource.getString(R.string.user_account),
 //            resource.getString(R.string.storage),
             resource.getString(R.string.reset), resource.getString(R.string.about)
 
@@ -346,15 +347,17 @@ object DataFactory {
         val settingTypeList = mutableListOf(
             SettingType.LANGUAGE, SettingType.WIFI,
 //            SettingType.SOUND,
-//            SettingType.BRIGHTNESS,
-            SettingType.USER_ACCOUNT,
+            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)
+
+        // 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){
@@ -369,13 +372,13 @@ object DataFactory {
         return result
     }
 
-    fun genSetting033FModesList(resource: Resources): MutableList<SettingModel> {
+    fun genSetting010DModesList(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_brightness,
             R.drawable.ic_setting_user,
 //            R.drawable.ic_setting_folder,
             R.drawable.ic_setting_reset,
@@ -385,7 +388,7 @@ object DataFactory {
         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.brightness),
             resource.getString(R.string.user_account),
 //            resource.getString(R.string.storage),
             resource.getString(R.string.reset), resource.getString(R.string.about)
@@ -394,7 +397,7 @@ object DataFactory {
         val settingTypeList = mutableListOf(
             SettingType.LANGUAGE, SettingType.WIFI,
 //            SettingType.SOUND,
-            SettingType.BRIGHTNESS,
+//            SettingType.BRIGHTNESS,
             SettingType.USER_ACCOUNT,
 //            SettingType.STORAGE,
             SettingType.RESTORE_FACTORY_SETTINGS, SettingType.ABOUT
@@ -416,6 +419,7 @@ object DataFactory {
         }
         return result
     }
+
     fun genLocalRecipes(
         categoryName: String,
         recipesList: MutableList<DevRecipe>,
@@ -458,13 +462,23 @@ object DataFactory {
     fun genSortNameList(resource: Resources): MutableList<FilterSortModel> {
         val result = mutableListOf<FilterSortModel>()
         val sn = getSN()
-        val sortNameList = mutableListOf(
+        //处理033隐藏最受欢迎分类  R.string.most_popular
+        val sortNameList = if (sn.startsWith("033")) mutableListOf(
+            "A-Z",
+            resource.getString(R.string.newest),
+        )
+        else if (sn.startsWith("011"))mutableListOf(
+            resource.getString(R.string.all_name),
+            resource.getString(R.string.most_popular),
+            resource.getString(R.string.newest),
+        ) else mutableListOf(
             "A-Z",
             resource.getString(R.string.most_popular),
             resource.getString(R.string.newest),
         )
         //033需求，评价等级功能隐藏，标签也要隐藏
-        if (!sn.startsWith("033")){
+        //011需求 rating 隐藏
+        if (!(sn.startsWith("033") ||sn.startsWith("011"))) {
             sortNameList.add(resource.getString(R.string.rating))
         }
 
@@ -481,7 +495,7 @@ object DataFactory {
         val result = mutableListOf<Any>()
         val homeHeader = HomeHeader()
         homeHeader.filterSortModel = FilterSortModel("")
-        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?:"EN"
+        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?: "EN"
         var historyDataList: MutableList<CommonSearchItem> = mutableListOf()
         val hotWordJson = MMkvUtils.getString("CommonWords-$lang") ?: ""
         if (hotWordJson.isNotEmpty()) {
@@ -509,7 +523,7 @@ object DataFactory {
     fun genOnLineHotTags(hotTags: MutableList<String>): MutableList<Any> {
         val result = mutableListOf<Any>()
         val homeHeader = HomeHeader()
-        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?:"EN"
+        var lang = MMkvUtils.getString(CURRENT_LANGUAGE) ?: "EN"
         homeHeader.filterSortModel = FilterSortModel("")
         var historyDataList: MutableList<CommonSearchItem> = mutableListOf()
         val hotWordJson = MMkvUtils.getString("CommonWords-$lang") ?: ""
@@ -887,7 +901,11 @@ object DataFactory {
         for (i in iconResIds1.indices) {
             dataList.add(
                 EntranceData(
-                    bgResIds011[i], iconResIds1[i], titleStrIds011[i], titleStrIds011[i], typeList11[i]
+                    bgResIds011[i],
+                    iconResIds1[i],
+                    titleStrIds011[i],
+                    titleStrIds011[i],
+                    typeList11[i]
                 )
             )
         }
@@ -899,12 +917,17 @@ object DataFactory {
         for (i in iconResIds1.indices) {
             dataList.add(
                 EntranceData(
-                    bgResIds049[i], iconResIds1[i], titleStrIds011[i], titleStrIds011[i], typeList1[i]
+                    bgResIds049[i],
+                    iconResIds1[i],
+                    titleStrIds011[i],
+                    titleStrIds011[i],
+                    typeList1[i]
                 )
             )
         }
         return dataList
     }
+
     fun get032DEntranceData(): MutableList<EntranceData> {
         val dataList = mutableListOf<EntranceData>()
         for (i in iconResIds1.indices) {
@@ -925,11 +948,16 @@ object DataFactory {
 fun getTime(hour: Int, minute: Int): String {
     var hourStr = ""
     var minuteStr = ""
+
+    var baseHour =  if (dataSn.startsWith("011"))BaseApp.application.resources.getString(R.string.hours_011) else BaseApp.application.resources.getString(R.string.food_hour)
+    var baseMin =  if (dataSn.startsWith("011"))BaseApp.application.resources.getString(R.string.min_011) else BaseApp.application.resources.getString(R.string.food_minutes)
+
+
     if (hour != 0) {
-        hourStr = "$hour"+BaseApp.application.resources.getString(R.string.food_hour)
+        hourStr = "$hour" + baseHour
     }
     if (minute != 0) {
-        minuteStr = "$minute"+BaseApp.application.resources.getString(R.string.food_minutes)
+        minuteStr = "$minute" + baseMin
     }
     return "$hourStr$minuteStr"
 }

BusinessCommon/src/main/java/com/develop/common/dialog/PotCoverUnlockedDialog.kt

@@ -4,7 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import com.develop.base.ext.getSN
 import com.develop.base.mvvm.FullScreenTransparentDialog
+import com.develop.common.R
 import com.develop.common.databinding.DialogPotCoverUnlockedBinding
 
 class PotCoverUnlockedDialog: FullScreenTransparentDialog() {
@@ -23,6 +25,9 @@ class PotCoverUnlockedDialog: FullScreenTransparentDialog() {
             removeSelf()
         }
 
+        if (getSN().startsWith("011")){
+            binding.potCoverText.text = resources.getString(R.string.lid_unlock_011)
+        }
         //监听旋钮点击回调
         setOnKeyFun(object : onKeyFun {
             override fun onType() {

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -13,6 +13,7 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.viewbinding.ViewBinding
 import com.develop.base.ext.getModelNum
+import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.navigateTo
 import com.develop.base.mvvm.BaseBindingActivity
@@ -50,6 +51,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
     private var is062 = false
     private var screenReceiver: BroadcastReceiver? = null
 
+    public  var baseSn = getSN()
 
     protected var hasShowScreenSaver = false
     private var isModelNum = ""
@@ -227,7 +229,11 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
 
                 if (millisUntilFinished == 30 * 1000L) {
                     runOnUiThread {
-                        showScreenSaverDialog()
+                        if (baseSn.startsWith("011")){
+//                            navigateTo(Screens.Setting.SCREEN_SAVER)
+                        }else{
+                            showScreenSaverDialog()
+                        }
                     }
                 }
             }
@@ -239,8 +245,12 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                 }
 
                 runOnUiThread {
-                    screenSaverDialog.removeSelf()
-                    navigateTo(Screens.Setting.SCREEN_SAVER)
+                    if (baseSn.startsWith("011")){
+                        navigateTo(Screens.Setting.SCREEN_SAVER)
+                    }else{
+                        screenSaverDialog.removeSelf()
+                        navigateTo(Screens.Setting.SCREEN_SAVER)
+                    }
                 }
             }
         }
@@ -406,8 +416,10 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
                     event.confirmButtonText, "string", this.packageName
                 )
             )
-            cancelConfirmDialog.title =
-                resources.getString(resources.getIdentifier(event.msg, "string", this.packageName))
+            var title = if (baseSn.startsWith("011")&&lastMsg=="mei_fang_guo_yi_chan")
+                resources.getString(resources.getIdentifier("mei_fang_guo_yi_chan_011", "string", this.packageName))
+            else resources.getString(resources.getIdentifier(event.msg, "string", this.packageName))
+            cancelConfirmDialog.title = title
 
             cancelConfirmDialog.showDialog(supportFragmentManager, "confirmCancelDialog")
 

BusinessCommon/src/main/java/com/develop/common/utils/NoteEditLayout.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.RelativeLayout
+import com.develop.base.ext.getSN
 import com.develop.common.R
 import com.develop.common.databinding.PopEggsViewBinding
 import com.develop.common.databinding.PopNoteEditBinding
@@ -25,6 +26,9 @@ class NoteEditLayout :FrameLayout {
     init {
         val root = View.inflate(context, R.layout.pop_note_edit, this)
         binding = PopNoteEditBinding.bind(root)
+        if (getSN().startsWith("011")){
+          binding.tvNoteTitle.text = resources.getString(R.string.note_title_011)
+        }
     }
 
 

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

@@ -6,6 +6,7 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.develop.base.ext.background_color
 import com.develop.base.ext.background_drawable
+import com.develop.base.ext.getSN
 import com.develop.base.ext.resId2Dimension
 import com.develop.base.ext.skinTextColor
 import com.develop.base.ext.text_color
@@ -125,7 +126,7 @@ class CookCardView : ConstraintLayout {
 
             CardType.DIRECTION -> {
                 binding.viewIcon.background_drawable = R.drawable.cook_direction_selector
-                binding.tvTitle.text = context.getString(R.string.direction)
+                binding.tvTitle.text = if (getSN().startsWith("011")) context.getString(R.string.direction_011) else context.getString(R.string.direction)
             }
 
             CardType.WATER_SPARY -> {

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

@@ -7,6 +7,7 @@ import android.util.Log
 import android.view.View
 import android.widget.RelativeLayout
 import com.blankj.utilcode.util.KeyboardUtils
+import com.develop.base.ext.getSN
 import com.develop.base.ext.isFrLanguage
 import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.resId2Dimension
@@ -34,6 +35,13 @@ class HomeFilterSortSearchView : RelativeLayout {
     init {
         val root = View.inflate(context, R.layout.home_sort_filter_search_view, this)
         binding = HomeSortFilterSearchViewBinding.bind(root)
+        if (getSN().startsWith("011")){
+            binding.downloadLayout.visibility = View.INVISIBLE
+            binding.onlineLayout.visibility = View.INVISIBLE
+        }else{
+            binding.downloadLayout.visibility = View.VISIBLE
+            binding.onlineLayout.visibility = View.VISIBLE
+        }
         if (isFrLanguage()) {
             binding.tvOnline.textSize = dp19
             binding.tvDownload.textSize = dp19

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

@@ -70,9 +70,14 @@ class NewsLayout : RelativeLayout {
             })
 
         }.models = dataList
-        binding.tvNotice.updateText("${context.getString(R.string.notice)}")
         if (getSN().startsWith("011")){
             binding.ivNotify.setBackgroundResource(R.drawable.ic_notify_011_gray)
+            binding.tvNotice.updateText("${context.getString(R.string.notice_011)}")
+            binding.tvEmpty.updateText("${context.getString(R.string.empty_notice_011)}")
+
+        }else{
+            binding.tvNotice.updateText("${context.getString(R.string.notice)}")
+
         }
 
     }

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

@@ -11,6 +11,7 @@ import android.view.animation.Animation
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearSnapHelper
+import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.updateText
 import com.develop.common.R
@@ -43,7 +44,7 @@ class TimePickerView : ConstraintLayout {
     private var secondManager: ScrollLinearManager
     private val animation: Animation = AlphaAnimation(1f, 0.2f)
     private var isCanChange = true
-
+    private var sn = getSN()
     constructor(context: Context) : super(context) {}
     constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
         initAttrs(context, attrs)
@@ -161,11 +162,26 @@ class TimePickerView : ConstraintLayout {
         val firstUnit: String
         val secondUnit: String
         if (firstPos >= 60) {
-            firstUnit = resources.getString(R.string.mode_hour)
-            secondUnit = resources.getString(R.string.mode_min)
+            if (sn.startsWith("011")){
+                firstUnit = resources.getString(R.string.hours_011)
+                secondUnit = resources.getString(R.string.min_011)
+            }else{
+                firstUnit = resources.getString(R.string.mode_hour)
+                secondUnit = resources.getString(R.string.mode_min)
+            }
+
         } else {
-            firstUnit = resources.getString(R.string.mode_min)
-            secondUnit = resources.getString(R.string.mode_sec)
+
+            if (sn.startsWith("011")){
+                firstUnit = resources.getString(R.string.min_011)
+                secondUnit = resources.getString(R.string.sec_011)
+            }else{
+                firstUnit = resources.getString(R.string.mode_min)
+                secondUnit = resources.getString(R.string.mode_sec)
+            }
+
+
+
         }
         if (firstUnit != binding.tvFirstBottom.text) {
             binding.tvFirstBottom.text = firstUnit

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

@@ -39,6 +39,7 @@
                 android:layout_marginTop="@dimen/convert_43px"/>
 
             <TextView
+                android:id="@+id/pot_cover_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/lid_unlock"

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

@@ -102,6 +102,7 @@
         </FrameLayout>
 
         <FrameLayout
+            android:visibility="invisible"
             android:id="@+id/online_layout"
             android:layout_width="@dimen/convert_273px"
             android:layout_height="@dimen/convert_60px"
@@ -166,6 +167,7 @@
         </FrameLayout>
 
         <FrameLayout
+            android:visibility="invisible"
             android:id="@+id/download_layout"
             android:layout_width="@dimen/convert_240px"
             android:layout_height="@dimen/convert_60px"

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

@@ -104,7 +104,10 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="downloading">Downloading</string>
     <string name="enter_search">Enter search</string>
     <string name="search">Search</string>
+    <string name="all_name">Alphabetical (A-Z)</string>
+    <string name="most_popular_011">Favourites</string>
     <string name="most_popular">Most popular</string>
+    <string name="newest_011">The latest</string>
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>
@@ -224,6 +227,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="cancel_lower">Cancel</string>
     <string name="female">Female</string>
     <string name="tare">TARE</string>
+    <string name="tare_011">Tare</string>
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">RESET</string>
@@ -236,6 +240,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
     <string name="enter_what_you_want_to_say">Enter what you want to say</string>
     <string name="note_title">NOTE TITLE</string>
+    <string name="note_title_011">My notes</string>
     <string name="type_your_notes_here">Type your notes here</string>
     <string name="make_1_jar">MAKES 1 JAR</string>
     <string name="make_n_jars">MAKES %1s JARS</string>
@@ -247,6 +252,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="food_hour">hour</string>
     <string name="food_minutes">minutes</string>
 
+    <string name="hours_011">h</string>
+    <string name="min_011">min</string>
+    <string name="sec_011">sec</string>
 
     <string name="ready_in">Ready in:</string>
     <string name="jar">JAR</string>
@@ -386,4 +394,16 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="e14_errCode">Unplug air fryer attachment when in robot cooker mode</string>
     <string name="e15_errCode">TFT screen dissipation abnormal</string>
     <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
+
+
+
+    <!-- 011兼容翻译 -->
+    <string name="brightness_011">Screen lock time</string>
+    <string name="reset_011">Resume to default setting</string>
+    <string name="mei_fang_guo_yi_chan_011">Note\n· No mixing bowl detected</string>
+    <string name="lid_unlock_011">Mixing bowl lid not locked properly</string>
+    <string name="notice_011">Notification</string>
+    <string name="empty_notice_011">No notifications</string>
+    <string name="press_the_button_011">Press and hold the button</string>
+    <string name="direction_011">Rotation</string>
 </resources>

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

@@ -131,6 +131,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="start">Démarrage</string>
     <string name="pause">Pause</string>
     <string name="cancel">Annulation</string>
@@ -155,7 +156,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="pmpt_msg">Conseils</string>
     <string name="dev_end_of_run_tips">Terminé!</string>
     <string name="hight_temp_warning_tips">La température actuelle est supérieure à 60 et la vitesse du moteur est supérieure à 3 vitesses.Vous êtes sûr de vouloir continuer?</string>
-    <string name="hight_temp_turbo_tips">La température actuelle est supérieure à 60 et la fonction Turbo ne fonctionne pas</string>
+    <string name="hight_temp_turbo_tips">La température actuelle est supérieure à 60 et la vitesse du moteur est supérieure à 3 vitesses.Vous êtes sûr de vouloir continuer?</string>
     <string name="update_msg">Mise à jour du système, veuillez patienter...</string>
     <string name="update_title">Est - ce la dernière version?</string>
     <string name="finish_download">Téléchargé</string>

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

@@ -62,7 +62,10 @@
     <string name="downloading">Pobieranie</string>
     <string name="enter_search">Wprowadź dane wyszukiwania</string>
     <string name="search">Wyszukiwanie</string>
+    <string name="all_name">Alfabetycznie (A-Z)</string>
+    <string name="most_popular_011">Ulubione</string>
     <string name="most_popular">Najpopularniejsze</string>
+    <string name="newest_011">Najnowsze</string>
     <string name="newest">Najnowsze</string>
     <string name="the_most_commonly_searched">Najczęściej wyszukiwane</string>
     <string name="notice">Uwaga</string>
@@ -96,6 +99,9 @@
     <string name="easy">easy</string>
     <string name="medium">medium</string>
     <string name="hard">hard</string>
+    <string name="srl_footer_finish">Załadowano</string>
+    <string name="srl_footer_loading">Ładowanie…</string>
+
 
     <string name="restore_factory_settings">Przywracanie ustawień fabrycznych</string>
     <string name="network_wifi_status_connected_no_internet">Połączono, ale nie można uzyskać dostępu do Internetu</string>
@@ -173,6 +179,7 @@
     <string name="cancel_lower">Anuluj</string>
     <string name="female">Kobieta</string>
     <string name="tare">TAROWANIE</string>
+    <string name="tare_011">Zeruj</string>
     <string name="keep_cooking_in_the_background">Gotować w tle?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">RESET</string>
@@ -185,6 +192,7 @@
     <string name="scan_qr_code_with_camera">Skanowanie kodu QR za pomocą kamery</string>
     <string name="enter_what_you_want_to_say">Wprowadź treść</string>
     <string name="note_title">TYTUŁ UWAGI</string>
+    <string name="note_title_011">Moje notatki</string>
     <string name="type_your_notes_here">Wprowadź swoje uwagi</string>
     <string name="make_1_jar">1 SŁOIK</string>
     <string name="make_n_jars">Liczba słoików: %1s</string>
@@ -195,6 +203,12 @@
     <string name="mode_sec">sec</string>
     <string name="hours">h</string>
     <string name="min">min.</string>
+
+    <string name="hours_011">godz.</string>
+    <string name="min_011">min.</string>
+    <string name="sec_011">sek.</string>
+
+
     <string name="ready_in">Czas przygotowania:</string>
     <string name="jar">SŁOIK</string>
     <string name="serving_sizes">Wielkość porcji</string>
@@ -343,4 +357,17 @@
     <string name="e14_errCode">Unplug air fryer attachment when in robot cooker mode</string>
     <string name="e15_errCode">TFT screen dissipation abnormal</string>
     <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
+
+
+
+
+    <!-- 011兼容翻译 -->
+    <string name="brightness_011">Czas blokady ekranu</string>
+    <string name="reset_011">Przywróć ustawienia fabryczne</string>
+    <string name="mei_fang_guo_yi_chan_011">Uwaga\n· Nie wykryto dzbanka</string>
+    <string name="lid_unlock_011">Pokrywa robota nie została prawidłowo zamknięta</string>
+    <string name="notice_011">Powiadomienia</string>
+    <string name="empty_notice_011">Brak powiadomień</string>
+    <string name="press_the_button_011">Naciśnij i przytrzymaj przycisk</string>
+    <string name="direction_011">Obroty</string>
 </resources>

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

@@ -61,7 +61,10 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="downloading">Downloading</string>
     <string name="enter_search">Enter search</string>
     <string name="search">Search</string>
+    <string name="all_name">За алфавітом (A-Z)</string>
+    <string name="most_popular_011">Вибране</string>
     <string name="most_popular">Most popular</string>
+    <string name="newest_011">Oстанній</string>
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>
@@ -96,6 +99,9 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="medium">medium</string>
     <string name="hard">hard</string>
 
+    <string name="srl_footer_finish">Завантажено</string>
+    <string name="srl_footer_loading">Завантаження…</string>
+
     <string name="restore_factory_settings">Restore factory settings</string>
 
     <string name="network_wifi_status_connected_no_internet">Connected， but unable to access the Internet</string>
@@ -175,6 +181,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="cancel_lower">Cancel</string>
     <string name="female">Female</string>
     <string name="tare">TARE</string>
+    <string name="tare_011">Таруванья</string>
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
     <string name="delete_old_recipes">Ви дійсно бажаєте видалити старі рецепти?</string>
     <string name="reset_button">RESET</string>
@@ -187,6 +194,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
     <string name="enter_what_you_want_to_say">Enter what you want to say</string>
     <string name="note_title">NOTE TITLE</string>
+    <string name="note_title_011">Мої нотатки</string>
     <string name="type_your_notes_here">Type your notes here</string>
     <string name="make_1_jar">MAKES 1 JAR</string>
     <string name="make_n_jars">MAKES %1s JARS</string>
@@ -194,6 +202,11 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="preparation">Preparation:</string>
     <string name="hours">h</string>
     <string name="min">min</string>
+
+    <string name="hours_011">год.</string>
+    <string name="min_011">хв.</string>
+    <string name="sec_011">с.</string>
+
     <string name="ready_in">Ready in:</string>
     <string name="jar">JAR</string>
     <string name="serving_sizes">Serving sizes</string>
@@ -226,7 +239,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="reset_to_default_settings">Reset to default settings</string>
     <string name="home_auth"><![CDATA[HOME >>]]></string>
     <string name="rating">rating</string>
-    <string name="loading">Loading</string>
+    <string name="loading">Завантаження</string>
     <string name="Min20">20Min</string>
     <string name="enjoy_your_meal">ENJOY YOUR MEAL</string>
 
@@ -343,4 +356,16 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="e14_errCode">Unplug air fryer attachment when in robot cooker mode</string>
     <string name="e15_errCode">TFT screen dissipation abnormal</string>
     <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
+
+
+
+    <!-- 011兼容翻译 -->
+    <string name="brightness_011">Час блокування екрана</string>
+    <string name="reset_011">Відновити заводські налаштування</string>
+    <string name="mei_fang_guo_yi_chan_011">Примітка\n· контейнер не виявлено</string>
+    <string name="lid_unlock_011">Кришка робота не була закрита належним чином</string>
+    <string name="notice_011">Сповіщення</string>
+    <string name="empty_notice_011">Без сповіщень</string>
+    <string name="press_the_button_011">Натисніть і утримуйте кнопку</string>
+    <string name="direction_011">Оборот</string>
 </resources>

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

@@ -59,6 +59,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="potato_peeler">POTARO PEELER</string>
 
 
+
+
     <string name="language">LANGUAGE</string>
     <string name="sound">SOUND</string>
     <string name="brightness">BRIGHTNESS</string>
@@ -78,7 +80,10 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="downloading">Downloading</string>
     <string name="enter_search">Enter search</string>
     <string name="search">Search</string>
+    <string name="all_name">Alphabetical (A-Z)</string>
+    <string name="most_popular_011">Favourites</string>
     <string name="most_popular">Most popular</string>
+    <string name="newest_011">The latest</string>
     <string name="newest">Newest</string>
     <string name="the_most_commonly_searched">The most commonly searched</string>
     <string name="notice">Notice</string>
@@ -141,6 +146,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="time">TIME</string>
     <string name="speed">SPEED</string>
     <string name="direction">DIRECTION</string>
+
     <string name="bad">Bad</string>
     <string name="imperfect">Imperfect</string>
     <string name="ordinary">Ordinary</string>
@@ -196,6 +202,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="cancel_lower">Cancel</string>
     <string name="female">Female</string>
     <string name="tare">TARE</string>
+    <string name="tare_011">Tare</string>
     <string name="keep_cooking_in_the_background">Keep cooking in the background?</string>
     <string name="delete_old_recipes">Do you want to delete the old recipes?</string>
     <string name="reset_button">RESET</string>
@@ -208,6 +215,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="scan_qr_code_with_camera">Scan QR code with camera</string>
     <string name="enter_what_you_want_to_say">Enter what you want to say</string>
     <string name="note_title">NOTE TITLE</string>
+    <string name="note_title_011">My notes</string>
     <string name="type_your_notes_here">Type your notes here</string>
     <string name="make_1_jar">MAKES 1 JAR</string>
     <string name="make_n_jars">MAKES %1s JARS</string>
@@ -220,6 +228,10 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="hours">h</string>
     <string name="min">min</string>
 
+    <string name="hours_011">h</string>
+    <string name="min_011">min</string>
+    <string name="sec_011">sec</string>
+
     <string name="food_hour">hour</string>
     <string name="food_minutes">minutes</string>
 
@@ -431,4 +443,17 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="e14_errCode">Unplug air fryer attachment when in robot cooker mode</string>
     <string name="e15_errCode">TFT screen dissipation abnormal</string>
     <string name="e16_errCode">Please put in the correct pot, or end the current program</string>
+
+
+
+
+    <!-- 011兼容翻译 -->
+    <string name="brightness_011">Screen lock time</string>
+    <string name="reset_011">Resume to default setting</string>
+    <string name="mei_fang_guo_yi_chan_011">Note\n· No mixing bowl detected</string>
+    <string name="lid_unlock_011">Mixing bowl lid not locked properly</string>
+    <string name="notice_011">Notification</string>
+    <string name="empty_notice_011">No notifications</string>
+    <string name="press_the_button_011">Press and hold the button</string>
+    <string name="direction_011">Rotation</string>
 </resources>

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

@@ -13,6 +13,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.recyclerview.widget.RecyclerView
 import androidx.room.Update
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.blankj.utilcode.util.NetworkUtils
 import com.develop.base.ext.getGoneLogin
 import com.develop.base.ext.getModelNum
 import com.develop.base.ext.getSN
@@ -24,6 +25,7 @@ import com.develop.base.ext.isNightTheme
 import com.develop.base.ext.navigateTo
 import com.develop.base.ext.src
 import com.develop.base.ext.updateText
+import com.develop.base.util.GlobalToast
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.base.util.MMkvUtils
 import com.develop.base.util.SerialportUtils
@@ -107,10 +109,10 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
         }
 
         //049 用另外的布局处理
-        if (sn.startsWith("049")){
+        if (sn.startsWith("049")) {
             binding.modeEntranceLayout.visibility = View.VISIBLE
             binding.entranceRecycle.visibility = View.GONE
-        }else{
+        } else {
             binding.modeEntranceLayout.visibility = View.GONE
             binding.entranceRecycle.visibility = View.VISIBLE
         }
@@ -119,7 +121,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
             binding.ivTab.setImageResource(com.develop.common.R.drawable.ic_more_002d)
             binding.homeLayout.setBackgroundResource(com.develop.common.R.drawable.home_entrance_bg_002d)
         }
-        if (sn.startsWith("011")){
+        if (sn.startsWith("011")) {
             binding.ivTab.setImageResource(com.develop.common.R.drawable.ic_tab_011)
         }
 
@@ -168,7 +170,12 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                 if (FoodDataProvider.checkDataExit()) {
 
 
-                                    var modeName = if (sn.startsWith("011"))resources.getString(com.develop.common.R.string.manual_cooking_011).replace("\n"," ")  else resources.getString(com.develop.common.R.string.adapted_cooking)
+                                    var modeName =
+                                        if (sn.startsWith("011")) resources.getString(com.develop.common.R.string.manual_cooking_011)
+                                            .replace(
+                                                "\n",
+                                                " "
+                                            ) else resources.getString(com.develop.common.R.string.adapted_cooking)
                                     navigateTo(Screens.Cook.COOK_MODES) {
 
                                         if (DevModes.SOUP == CofarSDK.devInfo().devMode) {
@@ -193,23 +200,36 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             }
 
                             EntranceType.download_new_recipes -> {
-                                if (FoodDataProvider.checkDataExit()) {
-                                    val bundle = Bundle()
-                                    bundle.putInt(MODE_ENTRANCE, Recipes)
-                                    bundle.putInt(RECIPES_TYPE, NetFood)
-                                    bundle.putString(HOME_TITLE, title)
-                                    navigateTo(Screens.Main.HOME) {
-                                        with(bundle)
+                                if (sn.startsWith("011")) {
+                                    if (NetworkUtils.isWifiConnected()) {
+                                        if (!AppVersionUtil.dialogRecipeUpdate.isShow) {
+                                            AppVersionUtil.checkAboutRecipeUpdate(true)
+                                        }
+                                    } else {
+                                        GlobalToast.showToast(getString(com.develop.common.R.string.network_error))
+
                                     }
                                 } else {
-                                    showLoading()
+                                    if (FoodDataProvider.checkDataExit()) {
+                                        val bundle = Bundle()
+                                        bundle.putInt(MODE_ENTRANCE, Recipes)
+                                        bundle.putInt(RECIPES_TYPE, NetFood)
+                                        bundle.putString(HOME_TITLE, title)
+                                        navigateTo(Screens.Main.HOME) {
+                                            with(bundle)
+                                        }
+                                    } else {
+                                        showLoading()
+                                    }
                                 }
+
                             }
                         }
                     }
                 }
-            }.models = if (getSN().startsWith("011")) DataFactory.get011NightEntranceData() else DataFactory.getNightEntranceData()
-        } else if (getSN().startsWith("002D")) {
+            }.models =
+                if (sn.startsWith("011")) DataFactory.get011NightEntranceData() else DataFactory.getNightEntranceData()
+        } else if (sn.startsWith("002D")) {
             binding.entranceRecycle.apply {
                 grid(2)
                 setup {
@@ -379,7 +399,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                     }
                 }
             }.models = DataFactory.get032DEntranceData()
-        } else if (sn.startsWith("049")){
+        } else if (sn.startsWith("049")) {
             binding.entranceRecycle049.apply {
 //                linear(RecyclerView.HORIZONTAL)
                 grid(4)
@@ -424,7 +444,12 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                                 if (FoodDataProvider.checkDataExit()) {
 
 
-                                    var modeName = if (sn.startsWith("011"))resources.getString(com.develop.common.R.string.manual_cooking_011).replace("\n"," ")  else resources.getString(com.develop.common.R.string.adapted_cooking)
+                                    var modeName =
+                                        if (sn.startsWith("011")) resources.getString(com.develop.common.R.string.manual_cooking_011)
+                                            .replace(
+                                                "\n",
+                                                " "
+                                            ) else resources.getString(com.develop.common.R.string.adapted_cooking)
                                     navigateTo(Screens.Cook.COOK_MODES) {
 
                                         if (DevModes.SOUP == CofarSDK.devInfo().devMode) {
@@ -464,8 +489,8 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                         }
                     }
                 }
-            }.models =  DataFactory.get049EntranceData()
-        }else {
+            }.models = DataFactory.get049EntranceData()
+        } else {
             binding.entranceRecycle.apply {
                 grid(2)
                 setup {
@@ -642,7 +667,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
         isResetZero = CofarSDK.devInfo().resetZero.toInt()
         super.onResume()
 
-        if (!AppVersionUtil.dialogRecipeUpdate.isShow){
+        if (!AppVersionUtil.dialogRecipeUpdate.isShow) {
             AppVersionUtil.checkRecipeUpdate(false)
         }
 //        UpdateUtil.checkApkVersion(false)
@@ -731,9 +756,9 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
         /**
          * 当扭橙的值不等于初始化的时候，就需要重新跳转ModesDetails
          * */
-        if (event.devInfo.resetZero.toInt() == 1&&event.devInfo.resetZero.toInt()!=isResetZero) {
+        if (event.devInfo.resetZero.toInt() == 1 && event.devInfo.resetZero.toInt() != isResetZero) {
 
-            var modeName = if (sn.startsWith("011"))  {
+            var modeName = if (sn.startsWith("011")) {
                 resources.getString(com.develop.common.R.string.citrus_juicer_011)
             } else {
                 resources.getString(com.develop.common.R.string.citrus_juicer)
@@ -754,7 +779,7 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
         }
 
         //处理扭橙逻辑 一进来是扭橙盖，重新打开，重新闭合 没办法跳转到扭橙页面
-            isResetZero = event.devInfo.resetZero.toInt()
+        isResetZero = event.devInfo.resetZero.toInt()
 
     }
 

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

@@ -25,6 +25,7 @@ import kotlinx.coroutines.Dispatchers
 import java.lang.reflect.Type
 
 class HomeViewModel : BaseViewModel() {
+    val snModel = getSN()
     var positionRecycle = MutableLiveData<String>()
     val netFoodLiveData = MutableLiveData<Boolean>()
     val refreshRecipesLiveData = MutableLiveData<Boolean>()
@@ -99,11 +100,12 @@ class HomeViewModel : BaseViewModel() {
     fun queryRecipesCategory() {
         var allSize = 0
         scope(Dispatchers.IO) {
-            val result = FoodDataProvider.getDatabase().recipeDao().queryCategory().toMutableList()
+            val result =
+                FoodDataProvider.getDatabase().recipeDao().queryCategory().toMutableList()
+
             categorySizeList.clear()
             result.forEach {
-                val size = FoodDataProvider.getDatabase().recipeDao()
-                    .queryRecipesByCategory(it.number ?: "").size
+                val size = FoodDataProvider.getDatabase().recipeDao().queryRecipesByCategory(it.number ?: "").size
                 categorySizeList[it.number ?: ""] = if (size.toString() == "null") {
                     "0"
                 } else {

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

@@ -8,9 +8,11 @@ import android.provider.Settings
 import android.provider.Settings.System.SCREEN_OFF_TIMEOUT
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.SeekBar
 import androidx.annotation.RequiresApi
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.develop.base.ext.getSN
 import com.develop.base.ext.isBrand062
 import com.develop.base.ext.setVisible
 import com.develop.base.ext.updateText
@@ -26,6 +28,7 @@ import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 
 @Route(path = Screens.Setting.BRIGHTNESS)
 class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
+    private  var sn = getSN()
     override fun createViewBinding(inflater: LayoutInflater): ActivityBirghtnessBinding {
         return ActivityBirghtnessBinding.inflate(layoutInflater)
     }
@@ -36,10 +39,16 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
         Log.i("screen", Settings.System.getInt(contentResolver, SCREEN_OFF_TIMEOUT).toString())
 
         super.onCreate(savedInstanceState)
-        binding.tvTitle.updateText(getString(com.develop.common.R.string.Brightness))
+
         binding.ivClose.setOnClickListener {
             finish()
         }
+        if (sn.startsWith("011")){
+            binding.tvScreenLockTime.visibility = View.INVISIBLE
+            binding.tvTitle.updateText(getString(com.develop.common.R.string.brightness_011))
+        }else{
+            binding.tvTitle.updateText(getString(com.develop.common.R.string.Brightness))
+        }
 
         binding.rb3Min.text =  "   " + resources.getString(com.develop.common.R.string.time_5min)
         binding.rb10Min.text =  "   " + resources.getString(com.develop.common.R.string.time_10min)

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

@@ -66,7 +66,18 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
         }else if (sn.startsWith("011")){
             binding.ivBanner.setBackgroundResource(com.develop.common.R.drawable.account_background_011a)
         }
-        countForPolicyTime()
+
+        if (sn.startsWith("011")){
+            isFinish = true
+            runOnMainThread {
+                binding.tvAgree.background_drawable =
+                    com.develop.common.R.drawable.language_conner
+                binding.tvAgree.text = getString(com.develop.common.R.string.i_agree)
+            }
+        }else{
+            countForPolicyTime()
+
+        }
         binding.ivBack.setOnClickListener {
             finish()
         }

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

@@ -77,21 +77,21 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 //        }
 
         /**
-         * 需要隐藏登录 032D 011A 030A 010F
-         * 需要隐藏涂鸦 010D 010F 032D 033F
+         * 需要隐藏登录 032D 011A 030A 010F 033F
+         * 需要隐藏涂鸦 010D 010F 032D 033F 011A
          * 需要隐藏亮度 010D
          * */
 
 
         dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (sn.startsWith("032D") || sn.startsWith("010F")) {
+        } else if (sn.startsWith("032D") || sn.startsWith("010F")||sn.startsWith("033F")) {
             DataFactory.genSetting032DModesList(resources)
-        } else if (sn.startsWith("011A") || sn.startsWith("030A")) {
+        } else if (sn.startsWith("011A") ) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("033F")) {
-            DataFactory.genSetting033FModesList(resources)
-        } else {
+        } else if (sn.startsWith("030A")) {
+            DataFactory.genSetting030AModesList(resources)
+        }else {
             DataFactory.genSettingModesList(resources)
         }
 
@@ -313,17 +313,22 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
 
     @SuppressLint("NotifyDataSetChanged")
     fun tuyaEvent() {
-        //判断是否有涂鸦功能
-        dataList.clear()
+        /**
+         * 需要隐藏登录 032D 011A 030A 010F 033F
+         * 需要隐藏涂鸦 010D 010F 032D 033F 011A
+         * 需要隐藏亮度 010D
+         * */
+
+
         dataList = if (sn.startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (sn.startsWith("032D") || sn.startsWith("010F")) {
+        } else if (sn.startsWith("032D") || sn.startsWith("010F")||sn.startsWith("033F")) {
             DataFactory.genSetting032DModesList(resources)
-        } else if (sn.startsWith("011A") || sn.startsWith("030A")) {
+        } else if (sn.startsWith("011A") ) {
             DataFactory.genSetting011AModesList(resources)
-        } else if (sn.startsWith("033F")) {
-            DataFactory.genSetting033FModesList(resources)
-        } else {
+        } else if (sn.startsWith("030A")) {
+            DataFactory.genSetting030AModesList(resources)
+        }else {
             DataFactory.genSettingModesList(resources)
         }
 

BusinessSetting/src/main/java/com/develop/setting/ui/viewmodel/AboutViewModel.kt

@@ -19,7 +19,6 @@ class AboutViewModel : BaseViewModel() {
         val result = Post<DevInfoResult>(Api.DEV_INFO) {
             body = DeviceInfoBody.genDeviceInfoBody()
         }.await()
-
         devInfoLiveData.postValue(result)
     }.catch {
         errorCallBack.postValue(it.message?:"")

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

@@ -59,6 +59,7 @@ import com.develop.common.widget.EggsSelectorLayout
 import com.develop.common.widget.RingControlView
 import com.develop.common.widget.TimePickerView
 import com.develop.step.CookSettingType
+import com.develop.step.R
 import com.develop.step.databinding.ActivityModeDetailBinding
 import com.develop.step.viewmodel.ModesViewMode
 import com.drake.net.time.Interval
@@ -312,6 +313,18 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             }
         }
 
+        if (sn.startsWith("011")){
+            binding.turboText.text = resources.getString(com.develop.common.R.string.press_the_button_011)
+            binding.tvWeightTare.text = resources.getString(com.develop.common.R.string.tare_011)
+
+            if (viewModel.modeType=="DICING"||viewModel.modeType=="CITRUS_JUICER" ||viewModel.modeType=="POTATO_PEELER"){
+                binding.ivTurbo.visibility = View.INVISIBLE
+                binding.ivWeight.visibility = View.INVISIBLE
+            }
+
+        }
+
+
         //初始化模式数据
         initModeData(lastModeType)
         initData()
@@ -2088,7 +2101,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 return
             }
             if (CofarSDK.devInfo().potStatus.toInt() == 1) {
-                showErrMsgDialog("mei_fang_guo_yi_chan")
+                if (baseSn.startsWith("011")){
+                    showErrMsgDialog("mei_fang_guo_yi_chan_011")
+
+                }else{
+                    showErrMsgDialog("mei_fang_guo_yi_chan")
+
+                }
             } else if (CofarSDK.devInfo().potStatus.toInt() == 0 && CofarSDK.devInfo().potCloverStatus.toInt() == 1) {
                 showPotCloverDialog()
             } else if (mRunningInstId != mSettingInstId) {

BusinessStep/src/main/java/com/develop/step/ui/cook_step/CookStepActivity.kt

@@ -144,6 +144,10 @@ class CookStepActivity : CookStepBaseActivity() {
         isModelNum = getModelNum()
 
 
+        if (baseSn.startsWith("011")){
+            binding.tvWeightTare.text = resources.getString(com.develop.common.R.string.tare_011)
+        }
+
         if (!isNightTheme()) {
             if (is062) {
                 binding.viewChangeCrush.setBgColor(R.color.view_change_062)
@@ -639,7 +643,7 @@ class CookStepActivity : CookStepBaseActivity() {
             pendingCookStep = true
         }
         viewModel.nextStep()
-
+        binding.tvStepName.scrollTo(0,0)
         initStepData() //初始化步骤参数
         whereIndex = -1
         binding.controller.clSetTime.stopAlphaAnim()
@@ -657,6 +661,7 @@ class CookStepActivity : CookStepBaseActivity() {
             // 当前为手动步骤, 上一个步骤切换会设置为当前烹饪步骤
             pendingCookStep = true
         }
+        binding.tvStepName.scrollTo(0,0)
         whereIndex = -1
         binding.controller.clSetTime.stopAlphaAnim()
         viewModel.prevStep()

BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -157,13 +157,18 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         }
 
 
-        if (is062) {
+        if (is062||baseSn.startsWith("011")) {
             binding.tvEasy.visibility = View.VISIBLE
         }
 
         if (sn.startsWith("033F") || sn.startsWith("033G")) {
             binding.startLayout.visibility = View.INVISIBLE
             binding.tvMoreScore.visibility = View.GONE
+            binding.viewMore.visibility = View.INVISIBLE
+        }
+        if (sn.startsWith("011")){
+            binding.viewMore.visibility = View.INVISIBLE
+            binding.viewHide.visibility = View.INVISIBLE
         }
         if (sn.startsWith("017A") || sn.startsWith("062A")) {
             binding.tvJarCount.visibility = View.VISIBLE
@@ -501,37 +506,38 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         timeDescBuilder.append(" ")
         if (detail.recipe.prepareHours.isPositive()) {
             timeDescBuilder.append(detail.recipe.prepareHours)
-            timeDescBuilder.append(getString(com.develop.common.R.string.hours))
+            timeDescBuilder.append(if (sn.startsWith("011"))getString(com.develop.common.R.string.hours_011) else getString(com.develop.common.R.string.hours))
             timeDescBuilder.append(" ")
         }
         if (detail.recipe.prepareMinutes.isPositive()) {
             timeDescBuilder.append(detail.recipe.prepareMinutes)
-            timeDescBuilder.append(getString(com.develop.common.R.string.min))
+            timeDescBuilder.append(if (sn.startsWith("011")) getString(com.develop.common.R.string.min_011) else getString(com.develop.common.R.string.min))
+
         }
         timeDescBuilder.append("\n")
         timeDescBuilder.append(getString(com.develop.common.R.string.ready_in))
         timeDescBuilder.append(" ")
         if (detail.recipe.makeHours.isPositive()) {
             timeDescBuilder.append(detail.recipe.makeHours)
-            timeDescBuilder.append(getString(com.develop.common.R.string.hours))
+            timeDescBuilder.append(if (sn.startsWith("011"))getString(com.develop.common.R.string.hours_011) else getString(com.develop.common.R.string.hours))
             timeDescBuilder.append(" ")
         }
         if (detail.recipe.makeMinutes.isPositive()) {
             timeDescBuilder.append(detail.recipe.makeMinutes)
-            timeDescBuilder.append(getString(com.develop.common.R.string.min))
+            timeDescBuilder.append(if (sn.startsWith("011")) getString(com.develop.common.R.string.min_011) else getString(com.develop.common.R.string.min))
         }
-        if (sn.startsWith("033")&&(detail.recipe.restHours.isPositive()||detail.recipe.restMinutes.isPositive())){
+        if (sn.startsWith("033")){
             timeDescBuilder.append("\n")
             timeDescBuilder.append(getString(com.develop.common.R.string.rest_time))
             timeDescBuilder.append(" ")
             if (detail.recipe.restHours.isPositive()) {
                 timeDescBuilder.append(detail.recipe.restHours)
-                timeDescBuilder.append(getString(com.develop.common.R.string.hours))
+                timeDescBuilder.append(if (sn.startsWith("011"))getString(com.develop.common.R.string.hours_011) else getString(com.develop.common.R.string.hours))
                 timeDescBuilder.append(" ")
             }
             if (detail.recipe.restMinutes.isPositive()) {
                 timeDescBuilder.append(detail.recipe.restMinutes)
-                timeDescBuilder.append(getString(com.develop.common.R.string.min))
+                timeDescBuilder.append(if (sn.startsWith("011")) getString(com.develop.common.R.string.min_011) else getString(com.develop.common.R.string.min))
             }
 
 

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

@@ -456,6 +456,7 @@
             android:background="@drawable/ic_turbo_unselected" />
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/turbo_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/iv_turbo_view"

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

@@ -216,7 +216,7 @@ fun getSN(): String {
 //        return "011A10390020123010190001"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
-//        return "011A50370020123010190004"
+        return "011A50370020123010190006"
 //    return "007D20020020123010190001"
 //        return "036I21060020123010190007"
 //        return "030A10390020123010190004"
@@ -228,7 +228,7 @@ fun getSN(): String {
 //        return "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //         return  "030A10390020123010190002"
-        return  "033F20020020123010190001"
+//        return  "033F20020020123010190001"
 //        return "033G20020020123010190001"
 //        return  "014A19050020123010190002"
 //        return "029C21010020123010190001"