修改sdk ，厨师机上传， 时间控件修改

BusinessAirFryer/src/main/assets/config.json

@@ -147,6 +147,14 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "SPECIAL_DIY_MODE",
+      "name": "special_diy_mode",
+      "bg": "ic_mode_diy",
+      "icon": "ic_grid_adapted_cooking",
+      "devMode": "SOUP",
+      "listShow": true
+    },
 
     {
       "type": "AIR_FRYER",
@@ -336,6 +344,14 @@
       "icon": "af_mutton_chop",
       "devMode": "AIR_FRYER",
       "listShow": false
+    }, {
+      "type": "WIGHT",
+      "name": "wight",
+      "bg": "ic_mode_weight",
+      "icon": "ic_grid_weight",
+      "devMode": "AIR_FRYER",
+      "listShow": true
     }
+
   ]
 }

BusinessAirFryer/src/main/assets/config_000.json

@@ -9,6 +9,23 @@
       "devMode": "SOUP",
       "listShow": true
     },
+    {
+      "type": "BROWN",
+      "name": "brown",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+    {
+      "type": "ROAST",
+      "name": "roast",
+      "bg": "cm_icon_roast",
+      "icon": "cm_icon_roast",
+      "devMode": "SOUP",
+      "listShow": false
+    },
+
     {
       "type": "COOK_EGGS",
       "name": "cook_eggs",
@@ -95,7 +112,7 @@
       "bg": "ic_mode_citrus_juicer",
       "icon": "ic_grid_citrus_juicer",
       "devMode": "SOUP",
-      "listShow": true
+      "listShow": false
     },
 
     {
@@ -209,6 +226,90 @@
       "icon": "af_mutton_chop",
       "devMode": "AIR_FRYER",
       "listShow": true
+    },
+
+
+    {
+      "type": "SM_DIY",
+      "name": "sm_diy",
+      "bg": "ic_special_diy_mode_bg",
+      "icon": "ic_special_diy_mode",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_KNEAD",
+      "name": "sm_knead",
+      "bg": "ic_sm_knead_bg",
+      "icon": "ic_sm_knead",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_WHISK",
+      "name": "sm_whisk",
+      "bg": "ic_sm_whisk_bg",
+      "icon": "ic_sm_whisk",
+      "devMode": "STAND_MIXER",
+      "listShow": false
+    },
+    {
+      "type": "SM_BEATER",
+      "name": "sm_beater",
+      "bg": "ic_sm_beater_bg",
+      "icon": "ic_sm_beater",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_SHREDDER",
+      "name": "sm_shredder",
+      "bg": "ic_sm_shredder_bg",
+      "icon": "ic_sm_shredder",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_MEAT_GRUBDER",
+      "name": "sm_meat_grubder",
+      "bg": "ic_sm_meat_grubder_bg",
+      "icon": "ic_sm_meat_grubder",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_BLENDER",
+      "name": "sm_blender",
+      "bg": "ic_sm_blender_bg",
+      "icon": "ic_sm_blender",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_PASTA_MAKER",
+      "name": "sm_pasta_maker",
+      "bg": "ic_sm_pasta_maker_bg",
+      "icon": "ic_sm_pasta_maker",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_TURBO",
+      "name": "turbo",
+      "bg": "ic_sm_turbo_bg",
+      "icon": "ic_sm_turbo",
+      "devMode": "STAND_MIXER",
+      "listShow": true
+    },
+    {
+      "type": "SM_WIGHT",
+      "name": "wight",
+      "bg": "ic_sm_wight_bg",
+      "icon": "ic_sm_wight",
+      "devMode": "STAND_MIXER",
+      "listShow": true
     }
+
+
   ]
 }

BusinessAirFryer/src/main/assets/config_000_5067.json

@@ -1,205 +0,0 @@
-{
-  "baseQrUrl": "https://icook.cofarcn.com/h5/index.html",
-  "workModes": [
-    {
-      "type": "ADAPTED_COOKING",
-      "name": "adapted_cooking",
-      "bg": "ic_mode_diy",
-      "icon": "ic_grid_adapted_cooking",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "COOK_EGGS",
-      "name": "cook_eggs",
-      "bg": "cm_icon_cook_eggs_bg",
-      "icon": "cm_icon_cook_eggs",
-      "devMode": "SOUP",
-      "listShow": false
-    },
-    {
-      "type": "WIGHT",
-      "name": "wight",
-      "bg": "ic_mode_weight",
-      "icon": "ic_grid_weight",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "BOIL_WATER",
-      "name": "boil_water",
-      "bg": "ic_mode_boil_water",
-      "icon": "ic_grid_boil_water",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "CHOP",
-      "name": "chop",
-      "bg": "ic_mode_chop",
-      "icon": "ic_grid_chop",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "SLOW_COOK",
-      "name": "slow_cook",
-      "bg": "ic_mode_slow_cook",
-      "icon": "ic_grid_slow_cook",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "ROAST",
-      "name": "roast",
-      "bg": "cm_icon_roast",
-      "icon": "cm_icon_roast",
-      "devMode": "SOUP",
-      "listShow": false
-    },
-    {
-      "type": "KNEAD_TOUGH",
-      "name": "knead_dough",
-      "bg": "ic_mode_knead_dough",
-      "icon": "ic_grid_knead_dough",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "STEAM",
-      "name": "steam",
-      "bg": "ic_mode_steam",
-      "icon": "ic_grid_steam",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "FOOD_PROCESSOR",
-      "name": "food_processor",
-      "bg": "ic_mode_food_processor",
-      "icon": "ic_grid_food_processor",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "TURBO",
-      "name": "turbo",
-      "bg": "ic_mode_turbo",
-      "icon": "ic_grid_turbo",
-      "devMode": "SOUP",
-      "listShow": true
-    },
-    {
-      "type": "AF_DIY",
-      "name": "af_diy",
-      "bg": "af_diy_bg",
-      "icon": "af_diy",
-      "devMode": "AIR_FRYER",
-      "listShow": false
-    },
-    {
-      "type": "AF_AIR_FRYER",
-      "name": "af_air_fryer",
-       "bg": "af_air_fryer_bg",
-      "icon": "af_air_fryer",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "WIGHT",
-      "name": "wight",
-      "bg": "ic_mode_weight",
-      "icon": "ic_grid_weight",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_BAKE",
-      "name": "af_bake",
-      "bg": "af_bake_bg",
-      "icon": "af_bake",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_DRUMSTICKS",
-      "name": "af_drumsticks",
-      "bg": "af_drumsticks_bg",
-      "icon": "af_drumsticks",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_EGG_TART",
-      "name": "af_egg_tart",
-      "bg": "af_egg_tart_bg",
-      "icon": "af_egg_tart",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_PIZZA",
-      "name": "af_pizza",
-      "bg": "af_pizza_bg",
-      "icon": "af_pizza",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_DEHYDRATE",
-      "name": "af_dehydrate",
-      "bg": "af_dehydrate_bg",
-      "icon": "af_dehydrate",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_REHEAT",
-      "name": "af_reheat",
-      "bg": "af_reheat_bg",
-      "icon": "af_reheat",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_CHICKEN_WING",
-      "name": "af_chicken_wing",
-      "bg": "af_chicken_wing_bg",
-      "icon": "af_chicken_wing",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_STEAK",
-      "name": "af_steak",
-      "bg": "af_steak_bg",
-      "icon": "af_steak",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_SEA_FOOD",
-      "name": "af_sea_food",
-      "bg": "af_sea_food_bg",
-      "icon": "af_sea_food",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_VEGETABLE",
-      "name": "af_vegetable",
-      "bg": "af_vegetable_bg",
-      "icon": "af_vegetable",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    },
-    {
-      "type": "AF_MUTTON_CHOP",
-      "name": "af_mutton_chop",
-      "bg": "af_mutton_chop_bg",
-      "icon": "af_mutton_chop",
-      "devMode": "AIR_FRYER",
-      "listShow": true
-    }
-  ]
-}

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

@@ -251,10 +251,10 @@ object DataFactory {
 //            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)
+        // 2024.3.20 鸦图标隐藏（只针对010Dak、010Fapk、032Dapk）
+//        settingTypeList.add(SettingType.TUYA)
+//        nameList.add(resource.getString(R.string.tuya))
+//        resIdList.add(R.drawable.ic_setting_tuya)
 
 
 
@@ -344,10 +344,10 @@ object DataFactory {
 //            SettingType.STORAGE,
             SettingType.RESTORE_FACTORY_SETTINGS, SettingType.ABOUT
         )
-        // 2024.3.20 涂鸦新需求，不管有没有涂鸦功能都显示出来
-        settingTypeList.add(SettingType.TUYA)
-        nameList.add(resource.getString(R.string.tuya))
-        resIdList.add(R.drawable.ic_setting_tuya)
+        // 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){

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

@@ -59,7 +59,9 @@ enum class ModesType {
     KNEAD_TOUGH,
     STEAM,
     FOOD_PROCESSOR,
-    TURBO
+    TURBO,
+    SM_TURBO,
+    SM_WIGHT
 }
 
 enum class SettingType {

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

@@ -3,9 +3,11 @@ package com.develop.common.utils
 import android.os.Bundle
 import com.blankj.utilcode.util.ToastUtils
 import com.develop.base.ext.navigateTo
+import com.develop.base.util.MMkvUtils
 import com.develop.base.util.TopResumedAtyHolder
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.router.Screens
+import com.develop.common.tag.CURRENT_LANGUAGE
 import com.develop.common.tag.MODE_TYPE
 import com.develop.common.tag.NUMBER_TAG
 import com.develop.common.tag.SOURCE_TAG
@@ -20,8 +22,14 @@ object  CommonUtils {
 
 
         FoodDataProvider.getDatabase().recipeDao().apply {
+            var recipeNumber = number
+            if (recipeNumber.contains("@")) {
+                var (numbers, language) = recipeNumber.split("@")
+                recipeNumber = numbers
+            }
+
 
-            val recipeBean = queryRecipe(number)
+            val recipeBean = queryRecipe(recipeNumber)
             if (recipeBean != null) {
 
                 TopResumedAtyHolder.getCurrentActivity()?.navigateTo(Screens.Cook.COOK_DETAIL) {

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

@@ -153,6 +153,7 @@ class TimePickerView : ConstraintLayout {
     }
 
     private fun checkChangeTimeScale(firstPos: Int) {
+        Log.e("TAG PickerView", "firstPos : $firstPos")
         val firstUnit: String
         val secondUnit: String
         if (firstPos >= 60) {
@@ -176,9 +177,21 @@ class TimePickerView : ConstraintLayout {
     private fun updateDisplayTime() {
         checkLimitTime(true)
         if (firstTimePos >= 60) {
+            //处理时间 的 小时超出自动换最大值
+            var maxhoursTime = maxTime / 3600
+            var hoursTime = 0
+            var secondTime = (maxTime - (maxhoursTime * 3600)) / 60
+            if ((firstTimePos - 60 + 1) > maxhoursTime) {
+                hoursTime = maxhoursTime
+            } else {
+                hoursTime = firstTimePos - 60 + 1
+                if (secondTimePos < secondTime) {
+                    secondTime = secondTimePos
+                }
+            }
             setTimeInternal(
-                firstTimePos - 60 + 1,
-                secondTimePos,
+                hoursTime,
+                secondTime,
                 0,
                 true,
                 setByUser = true
@@ -202,6 +215,7 @@ class TimePickerView : ConstraintLayout {
         changeSetting: Boolean,
         setByUser: Boolean = false
     ) {
+        Log.d("TAG PickerView1111", "h:${hours}, m:${minute}, s:${second}, setByUser:${setByUser}")
         val firstTime: Int
         val secondTime: Int
         if (hours > 0 || minute >= 60) {
@@ -242,7 +256,7 @@ class TimePickerView : ConstraintLayout {
                 setByUser
             )
         }
-        Log.d("PickerView", "h:${hours}, m:${minute}, s:${second}, setByUser:${setByUser}")
+        Log.d("TAG PickerView", "h:${hours}, m:${minute}, s:${second}, setByUser:${setByUser}")
     }
 
     /**

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

@@ -144,6 +144,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="pmpt_msg">Tips</string>
     <string name="dev_end_of_run_tips">Finish!</string>
     <string name="dev_not_orange_parts">Please install the Twisted Orange accessory to start the Twisted Orange program。</string>
+    <string name="dev_remove_orange_parts">The machine is in twisted orange mode, please remove the current accessory.</string>
     <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure to continue?</string>
     <string name="hight_temp_turbo_tips">The current temperature exceeds 60, turbo function cannot be operated</string>
     <string name="update_msg">System updating, please wait～</string>

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

@@ -42,13 +42,13 @@ Southern plus client est une plate - forme d’information en ligne développée
     <string name="adapted_cooking">Cuisine adaptable</string>
     <string name="scales">SCALES</string>
     <string name="boil_water">Brûler l’eau</string>
-    <string name="chop">Fendu</string>
-    <string name="ferment">Fermentation</string>
-    <string name="slow_cook">Cuire lentement</string>
-    <string name="knead_dough">Pétrir la pâte</string>
+    <string name="chop">Hacher</string>
+    <string name="ferment">Yaourt</string>
+    <string name="slow_cook">Mijoter</string>
+    <string name="knead_dough">Pétrir</string>
     <string name="steam">Vapeur</string>
-    <string name="food_processor">Machines de traitement des aliments</string>
-    <string name="turbo">Turbine</string>
+    <string name="food_processor">Râper/trancher</string>
+    <string name="turbo">Pulse</string>
     <string name="language">Langue</string>
     <string name="sound">La voix</string>
     <string name="brightness">Luminosité</string>
@@ -210,7 +210,7 @@ Southern plus client est une plate - forme d’information en ligne développée
     <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="sex">Sexe</string>
-    <string name="wight">Poids</string>
+    <string name="wight">Balance</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>
     <string name="recipe_complete">La formule est terminée</string>
@@ -275,12 +275,12 @@ Southern plus client est une plate - forme d’information en ligne développée
 
     <string name="cook_eggs">Œufs à cuire</string>
     <string name="cook_rice">Faire cuire le repas</string>
-    <string name="mulsify">Emulsification</string>
+    <string name="mulsify">Emulsionner</string>
     <string name="puree">Purée de fruits</string>
     <string name="roast">Cuisson</string>
     <string name="smoothie">Milkshake</string>
     <string name="sovs_vide">SOVS VIDE</string>
-    <string name="auto_clean">Nettoyage automatique</string>
+    <string name="auto_clean">Nettoyage</string>
     <string name="network_error">Erreur réseau</string>
     <string name="apk_version_latest">La version de l‘application est déjà à jour.</string>
     <string name="installing">Installation en cours...</string>

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

@@ -146,7 +146,8 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="pmpt_cancel">Cancel</string>
     <string name="pmpt_msg">Tips</string>
     <string name="dev_end_of_run_tips">Finish!</string>
-    <string name="dev_not_orange_parts">Please install the Twisted Orange accessory to start the Twisted Orange program。</string>
+    <string name="dev_not_orange_parts">Please install the Twisted Orange accessory to start the Twisted Orange program.</string>
+    <string name="dev_remove_orange_parts">The machine is in twisted orange mode, please remove the current accessory.</string>
     <string name="hight_temp_warning_tips">The current temperature exceeds 60, and the motor speed exceeds the third gear. Are you sure to continue?</string>
     <string name="hight_temp_turbo_tips">The current temperature exceeds 60, turbo function cannot be operated</string>
     <string name="update_msg">System updating, please wait～</string>
@@ -295,6 +296,16 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="af_vegetable">VEGGIES</string>
     <string name="af_mutton_chop">MUTTON CHOP</string>
 
+    <string name="special_diy_mode"> SPECIAL DIY MODE </string>
+    <string name="sm_diy">STAND MIXER DIY</string>
+    <string name="sm_knead">KNEAD</string>
+    <string name="sm_whisk">WHISK</string>
+    <string name="sm_beater">BEATER</string>
+    <string name="sm_shredder">SHREDDER</string>
+    <string name="sm_meat_grubder">MEAT GRINDER</string>
+    <string name="sm_blender">BLENDER</string>
+    <string name="sm_pasta_maker">PASTA MAKER</string>
+
 
 
     <string name="cook_eggs">COOK EGGS</string>

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

@@ -108,7 +108,13 @@ class  ModesFragment : CommonBVMFragment<FragmentModesBinding, HomeViewModel>()
 
 
     private fun initView() {
-        devMode = CofarSDK.devInfo().devMode
+        //先用汤机模式给5067显示厨师机
+        if (isModelNum == "5067"&& getSN().startsWith("000A")){
+            devMode = "STAND_MIXER"
+        }else{
+            devMode = CofarSDK.devInfo().devMode
+
+        }
         val configJson = ConfigUtils.loadConfig()
 
 

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

@@ -68,14 +68,30 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         super.onCreate(savedInstanceState)
         var ctx = this
         isTuya = MMkvUtils.getBool(ISTUYA, false)
+//        dataList = if (getSN().startsWith("010D")) {
+//            DataFactory.genSetting010DModesList(resources)
+//        } else if (getGoneLogin()) {
+//            DataFactory.genSetting032DModesList(resources)
+//        } else {
+//            DataFactory.genSettingModesList(resources)
+//        }
+
+        /**
+         * 需要隐藏登录 032D 011A 030A 010F
+         * 需要隐藏涂鸦 010D 010F 032D
+         * 需要隐藏亮度 010D
+         * */
         dataList = if (getSN().startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (getGoneLogin()) {
+        } else if (getSN().startsWith("032D")||getSN().startsWith("010F")) {
             DataFactory.genSetting032DModesList(resources)
+        } else if (getSN().startsWith("011A") || getSN().startsWith("030A")) {
+            DataFactory.genSetting011AModesList(resources)
         } else {
             DataFactory.genSettingModesList(resources)
         }
 
+
         if (!getNetwork()) {
             dataList.forEach { settingModel ->
                 if (settingModel.type == SettingType.TUYA) {
@@ -297,7 +313,7 @@ class SettingMainActivity : CommonBindingActivity<ActivitySettingMainBinding>()
         dataList.clear()
         dataList = if (getSN().startsWith("010D")) {
             DataFactory.genSetting010DModesList(resources)
-        } else if (getSN().startsWith("032D")) {
+        } else if (getSN().startsWith("032D")||getSN().startsWith("010F")) {
             DataFactory.genSetting032DModesList(resources)
         } else if (getSN().startsWith("011A") || getSN().startsWith("030A")) {
             DataFactory.genSetting011AModesList(resources)

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

@@ -123,7 +123,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private var devMode = ""
     private var is062 = false
     private var is011 = false
-
+    private var isResetZero = -1  //初始扭橙的值
     private val deviceStateDialog by lazy {
         CancelConfirmDialog()
     }
@@ -217,9 +217,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         hasShowScreenSaver = true
         configLock = true
 
-
         is062 = isBrand062()
         is011 = isBrand011A()
+        isResetZero = CofarSDK.devInfo().resetZero.toInt()
         devMode = CofarSDK.devInfo().devMode
         isModelNum = getModelNum()
         if (!isNightTheme()) {
@@ -721,7 +721,10 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
 
         //处理扭橙问题 扭橙 resetZero ==1 //普通 resetZero ==0
-        if (event.devInfo.resetZero.toInt() == 1) {
+        /**
+         * 当扭橙的值不等于初始化的时候，就需要重新跳转ModesDetails
+         * */
+        if (event.devInfo.resetZero.toInt() == 1&&event.devInfo.resetZero.toInt()!=isResetZero) {
             navigateTo(Screens.Cook.COOK_MODES) {
                 val bundle = Bundle()
                 bundle.putString(MODE_TYPE, WorkModes.CITRUS_JUICER)
@@ -940,13 +943,13 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         viewModel.modeType.apply {
             val baseMode = CofarSDK.devMode(this)
             //显示对应模式UI
-            if (this == ModesType.WIGHT.name) {
+            if (this == ModesType.WIGHT.name||this == ModesType.SM_WIGHT.name) {
                 CofarSDK.recordConfig()
 
                 //称重模式
                 viewModel.changeStep(CookSettingType.WEIGHT)
                 //CofarSDK.changeMode(baseMode)
-            } else if (this == ModesType.TURBO.name) {
+            } else if (this == ModesType.TURBO.name||this == ModesType.SM_TURBO.name) {
                 CofarSDK.recordConfig()
 
                 viewModel.changeStep(CookSettingType.TURBO)
@@ -1956,6 +1959,15 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 showMsgDialog(resources.getString(com.develop.common.R.string.dev_not_orange_parts))
                 return
             }
+            /**
+             * 需求：非扭橙模式打开点击运行，且是扭橙的配件时需要提示用户
+             * CofarSDK.devInfo().resetZero.toInt()==1 代表已经是扭橙汁配件
+             * */
+            if (modeType!=WorkModes.CITRUS_JUICER&&CofarSDK.devInfo().resetZero.toInt()==1){
+                showMsgDialog(resources.getString(com.develop.common.R.string.dev_remove_orange_parts))
+                return
+            }
+
 
             if (CofarSDK.devInfo().potStatus.toInt() == 1) {
                 showErrMsgDialog("mei_fang_guo_yi_chan")
@@ -2426,6 +2438,9 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     fun onDevModeChange(event: DevCommonEvent) {
         //在当前页面，换了模式以后 重新启动
         if (CommonEventTypes.DEV_MODE_CHANGE == event.type) {
+
+
+
             //针对DIY处理
             if (workMode?.devMode != CofarSDK.devInfo().devMode && (lastModeType == WorkModes.ADAPTED_COOKING || lastModeType == WorkModes.AF_DIY)) {
 //                isWidget = false

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

@@ -98,13 +98,13 @@ class CookStepActivity : CookStepBaseActivity() {
     private var photoPath: String? = ""
     private var currentBgId = R.drawable.pot_clover_ele_unlock //0是开锁图，1上锁图
     private var isModelNum = ""
+    private var modeType = ""
     private val deviceStateDialog by lazy {
         CancelConfirmDialog()
     }
 
     private fun turnDevModeUI(devMode: String?) {
         isSelectMode = devMode
-
         if (isSelectMode == DevModes.AIR_FRYER) {
             //隐藏点击
             binding.controller.clCookDirection.visibility = View.GONE;
@@ -236,7 +236,10 @@ class CookStepActivity : CookStepBaseActivity() {
             } else if (viewModel.displayStep()?.isDescription() == true) {
                 CofarSDK.stoptWeight()
                 changeDescription()
-            } else {
+            }  else if (viewModel.displayStep()?.isWarning() == true) {
+                CofarSDK.stoptWeight()
+                changeWarning()
+            }else {
                 CofarSDK.stoptWeight()
                 changeTempSettingPanel()
             }
@@ -258,6 +261,9 @@ class CookStepActivity : CookStepBaseActivity() {
             } else if (viewModel.displayStep()?.isDescription() == true) {
                 CofarSDK.stoptWeight()
                 changeDescription()
+            } else if (viewModel.displayStep()?.isWarning() == true) {
+                CofarSDK.stoptWeight()
+                changeWarning()
             } else {
                 CofarSDK.stoptWeight()
                 changeTempSettingPanel()
@@ -367,7 +373,10 @@ class CookStepActivity : CookStepBaseActivity() {
                 } else if (it.isDescription()) {
                     CofarSDK.stoptWeight()
                     changeDescription()
-                } else {
+                }  else if (it.isWarning()) {
+                    CofarSDK.stoptWeight()
+                    changeWarning()
+                }else {
                     CofarSDK.stoptWeight()
                     changeTempSettingPanel()
                 }
@@ -552,7 +561,7 @@ class CookStepActivity : CookStepBaseActivity() {
                     currentMotorGer = it.uiData.currentSpeed
                     currentWaterGear = it.uiData.currentWaterGear
                     currTime = it.uiData.targetTime
-                    if (!it.isWeightMode() && !it.isDescription()) {
+                    if (!it.isWeightMode() && !it.isDescription()&&!it.isWarning()) {
                         //设置初始参数
                         CofarSDK.cfgMotorGear(0)
                         CofarSDK.cfgTime(0)
@@ -592,7 +601,7 @@ class CookStepActivity : CookStepBaseActivity() {
                     getString(com.develop.common.R.string.confirm), workDevMode
                 )
             }
-
+            modeType = workModes?.type ?:"ADAPTED_COOKING"
             turnDevModeUI(workDevMode)
 
         }
@@ -671,6 +680,25 @@ class CookStepActivity : CookStepBaseActivity() {
         if (tag == BUTTON_TAG_START) {
 
             isClickType = 1
+
+            /**
+             * 需求：扭橙模式一打开，如果没有扭橙汁配件时需要提示
+             * 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))
+                return
+            }
+            /**
+             * 需求：非扭橙模式打开点击运行，且是扭橙的配件时需要提示用户
+             * CofarSDK.devInfo().resetZero.toInt()==1 代表已经是扭橙汁配件
+             * */
+            if (modeType!=WorkModes.CITRUS_JUICER&&CofarSDK.devInfo().resetZero.toInt()==1){
+                showMsgDialog(resources.getString(com.develop.common.R.string.dev_remove_orange_parts))
+                return
+            }
+
+
             //判断是否是空炸错误，由于汤锅错误SDK 已经做了 ；
             if (ConfigUtils.getBooleanErrCode(CofarSDK.devInfo().errCode.toInt()) && CofarSDK.devInfo().devMode == DevModes.AIR_FRYER) {
                 showErrCodeDialog(CofarSDK.devInfo().errCode.toInt())

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

@@ -363,6 +363,7 @@ abstract class CookStepBaseActivity :
         binding.llWeightView.visibility = View.VISIBLE
         isWidget = true
         binding.ivTurboView.visibility = View.GONE
+        binding.tvStepWarning.visibility = View.GONE
     }
 
     fun changeDescription() {
@@ -370,6 +371,14 @@ abstract class CookStepBaseActivity :
         binding.controller.root.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.ivTurboView.visibility = View.GONE
+        binding.tvStepWarning.visibility = View.GONE
+    }
+    fun changeWarning() {
+        isWidget = false
+        binding.tvStepWarning.visibility = View.VISIBLE
+        binding.controller.root.visibility = View.GONE
+        binding.llWeightView.visibility = View.GONE
+        binding.ivTurboView.visibility = View.GONE
     }
 
     fun changeTurboPanel() {
@@ -377,11 +386,13 @@ abstract class CookStepBaseActivity :
         binding.controller.tempRingView.visibility = View.VISIBLE
         binding.controller.tvRingTempText.visibility = View.VISIBLE
         binding.ivTurboView.visibility = View.GONE
+        binding.tvStepWarning.visibility = View.GONE
     }
 
     fun changeTempSettingPanel() {
         binding.controller.jianhao.setVisible()
         binding.controller.jiahao.setVisible()
+        binding.tvStepWarning.visibility = View.GONE
 
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE

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

@@ -22,6 +22,9 @@ class CookStepStatus(
     fun isDescription():Boolean {
         return  workMode == "DESCRIPTION" || workMode =="AF_DESCRIPTION"
     }
+    fun  isWarning():Boolean{
+        return  workMode == "WARNING"
+    }
 
     fun isManualStep(): Boolean {
         return  isWeightMode()

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

@@ -134,11 +134,11 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
     private fun initView() {
 //        处理涂鸦扫码后 APP事件过来给的recipeNumber 是 030000030@EN 带了@估食谱查询不到
         recipeNumber?.let {
-            if (it.contains("@")){
+            if (it.contains("@")) {
                 var (number, language) = it.split("@")
                 recipeNumber = number
-                var appLanger  = MMkvUtils.getString(CURRENT_LANGUAGE)
-                if (!appLanger.equals(language)){
+                var appLanger = MMkvUtils.getString(CURRENT_LANGUAGE)
+                if (!appLanger.equals(language)) {
                     ToastUtils.showShort(resources.getString(com.develop.common.R.string.recipe_not_language))
                     finish()
                 }
@@ -147,15 +147,15 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
         }
 
 
-        if (is062){
+        if (is062) {
             binding.tvEasy.visibility = View.VISIBLE
         }
 
-        if (getSN().startsWith("033F")){
+        if (getSN().startsWith("033F")) {
             binding.startLayout.visibility = View.INVISIBLE
             binding.tvMoreScore.visibility = View.GONE
         }
-        if (getSN().startsWith("017A")|| getSN().startsWith("062A")) {
+        if (getSN().startsWith("017A") || getSN().startsWith("062A")) {
             binding.tvJarCount.visibility = View.VISIBLE
         } else {
             binding.tvJarCount.visibility = View.INVISIBLE
@@ -204,23 +204,23 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.tvDownload.setText(com.develop.common.R.string.start_cooking)
             if (isNightTheme()) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#E03E52"))
-            } else if (is062){
+            } else if (is062) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
-            } else if (is011){
+            } else if (is011) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#C10A27"))
-            }else {
+            } else {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCEE8F08"))
             }
             binding.viewIcon.setGone()
         } else {
             binding.tvDownload.text =
                 getString(com.develop.common.R.string.download).uppercase(Locale.ROOT)
-            if (is062){
+            if (is062) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CCDAE343"))
 
-            }else if (is011){
+            } else if (is011) {
                 binding.viewProgress.setButtonColor(Color.parseColor("#C10A27"))
-            }else{
+            } else {
                 binding.viewProgress.setButtonColor(Color.parseColor("#CC1296DB"))
 
             }
@@ -230,19 +230,21 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             it.add(binding.viewIcon1)
             it.add(binding.viewIcon2)
             it.add(binding.tvFoodTime)
-            it.add(binding.startLayout)
+            if (!getSN().startsWith("033F")) {
+                it.add(binding.startLayout)
+            }
         }
         allTabViews.add(binding.ivTab1)
         allTabViews.add(binding.ivTab2)
         allTabViews.add(binding.ivTab3)
         binding.ivTab4.setGone()
         selectTab(TAB_SOURCE)
-        if (is062){
+        if (is062) {
             binding.tvMoreDelete.setVisible()
-        }else{
+        } else {
             binding.tvMoreDelete.setGone()
         }
-        if (getSN().startsWith("010F")){
+        if (getSN().startsWith("010F")) {
             binding.tvMoreShare.setGone()
         }
 

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

@@ -116,6 +116,20 @@
                     android:layout_height="@dimen/convert_50px"/>
 
             </LinearLayout>
+
+            <ImageView
+                android:id="@+id/tv_step_warning"
+                android:layout_width="@dimen/convert_240px"
+                android:layout_height="@dimen/convert_240px"
+                android:layout_marginTop="@dimen/convert_140px"
+                android:src="@drawable/tv_step_warning"
+                android:layout_marginStart="@dimen/convert_30px"
+                app:layout_constraintBottom_toTopOf="@id/iv_prev_step"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:visibility="gone"
+                />
+
             <TextView
                 app:layout_constraintTop_toTopOf="parent"
                 android:id="@+id/tv_step_name"
@@ -130,8 +144,10 @@
                 android:text="Step1:Peel 3 onions(180g)and2garlic cloves,halve the onions andput both in the blender jug."
                 android:textColor="#fff"
                 android:textSize="@dimen/convert_32px"
+                app:layout_constraintLeft_toRightOf="@+id/tv_step_warning"
                 app:layout_constraintBottom_toTopOf="@id/iv_prev_step"
-                app:layout_constraintStart_toStartOf="parent" />
+
+                />
 
 
             <ImageView

app/build.gradle

@@ -12,9 +12,9 @@ ext {
 
     versionCode = Integer.parseInt(new SimpleDateFormat("yyMMddHH").format(new Date()) + 1)
 //    versionCode=230617180
-//    brandCode="033F"
-    brandCode = "000A"
-    model = "1039"
+    brandCode="000A"
+//    brandCode = "010D"
+    model = "5067"
 
 }
 
@@ -74,6 +74,17 @@ android {
 //            buildConfigField("String", "appCode", "\"2.01\"")
         }
 
+        brand000A5067Tuya {
+            dimension "platform"
+            applicationId "com.develop.foodcooking"
+            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+            resValue("string", "app_theme", "@style/SplashTheme")
+            buildConfigField("String", "model", "\"5067\"")
+            buildConfigField("String", "brandCode", "\"000A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
+//            buildConfigField("String", "appCode", "\"2.01\"")
+        }
 
         brand045ATuya {
             dimension "platform"
@@ -180,7 +191,7 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
             resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-            buildConfigField("String", "model", "\"2002\"")
+            buildConfigField("String", "model", "\"1039\"")
             buildConfigField("String", "brandCode", "\"033F\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
@@ -195,6 +206,8 @@ android {
             resValue("string", "app_theme", "@style/SplashTheme")
             buildConfigField("String", "model", "\"1039\"")
             buildConfigField("String", "brandCode", "\"000A\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
         }
 
         brand010D {
@@ -202,7 +215,10 @@ android {
             applicationId "com.develop.foodcooking"
             buildConfigField("String", "UpdatePlatform", "\"night\"")
             resValue("string", "app_theme", "@style/Splash010DTheme")
-
+            buildConfigField("String", "model", "\"1039\"")
+            buildConfigField("String", "brandCode", "\"010D\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
         }
         brand010F {
             dimension "platform"
@@ -210,7 +226,9 @@ android {
             buildConfigField("String", "UpdatePlatform", "\"night\"")
             resValue("string", "app_theme", "@style/Splash010DTheme")
             buildConfigField("String", "model", "\"1039\"")
-            buildConfigField("String", "brandCode", "\"000A\"")
+            buildConfigField("String", "brandCode", "\"010F\"")
+            //appCode 1.01 指向bug修复，2.01指向功能变更
+            buildConfigField("String", "appCode", "\"1.01\"")
 
         }
 
@@ -364,13 +382,21 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
-             resValue("string", "app_theme", "@style/SplashTheme")
+//             resValue("string", "app_theme", "@style/SplashTheme")
+//            buildConfigField("String", "UpdatePlatform", "\"normal\"")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"000A\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
             buildConfigField("String", "UpdatePlatform", "\"normal\"")
-            buildConfigField("String", "model", "\"1039\"")
+            resValue("string", "app_theme", "@style/SplashTheme")
+            buildConfigField("String", "model", "\"5067\"")
             buildConfigField("String", "brandCode", "\"000A\"")
             //appCode 1.01 指向bug修复，2.01指向功能变更
             buildConfigField("String", "appCode", "\"1.01\"")
 
+
 //             buildConfigField("String", "UpdatePlatform", "\"011A\"")
 //            resValue("string", "app_theme", "@style/Splash011A5037Theme")
 //            buildConfigField("String", "model", "\"5037\"")
@@ -385,7 +411,7 @@ android {
 //            buildConfigField("String", "brandCode", "\"032D\"")
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
-
+//
 //            buildConfigField("String", "UpdatePlatform", "\"night\"")
 //            resValue("string", "app_theme", "@style/Splash010DTheme")
 //            buildConfigField("String", "model", "\"1039\"")
@@ -394,6 +420,13 @@ android {
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
 
+//            buildConfigField("String", "UpdatePlatform", "\"night\"")
+//            resValue("string", "app_theme", "@style/Splash010DTheme")
+//            buildConfigField("String", "model", "\"1039\"")
+//            buildConfigField("String", "brandCode", "\"010F\"")
+//            //appCode 1.01 指向bug修复，2.01指向功能变更
+//            buildConfigField("String", "appCode", "\"1.01\"")
+
 //            buildConfigField("String", "UpdatePlatform", "\"011A\"")
 //            resValue("string", "app_theme", "@style/Splash011ATheme")
 //            buildConfigField("String", "model", "\"1039\"")
@@ -426,10 +459,10 @@ android {
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")
 
-
+//
 //            buildConfigField("String", "UpdatePlatform", "\"normal\"")
 //            resValue("string", "app_theme", "@style/SplashThemeNotLogo")
-//            buildConfigField("String", "model", "\"2002\"")
+//            buildConfigField("String", "model", "\"1039\"")
 //            buildConfigField("String", "brandCode", "\"033F\"")
 //            //appCode 1.01 指向bug修复，2.01指向功能变更
 //            buildConfigField("String", "appCode", "\"1.01\"")

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

@@ -208,9 +208,11 @@ fun getSN(): String {
 //        return "045A21030020123010190001"
 //    return "000A30150020123010190001"
 //     return "002A30150020123010190001"
-     return "000A10390020123010190001"
-//        return "000A50370020123010190005"/
+//     return "000A10390020123010190001"
+        return "000A50670020123010190005"
 //    return "010D10390020123010190001"
+//        return "010F10390020123010190001"
+
 //        return "011A10390020123010190001"
 //        return "000A50370020123010190004"
 //        return "011A50370020123010190003"
@@ -221,13 +223,13 @@ fun getSN(): String {
 //    return  "017A20060020123010190001"
 //        return  "017A10390020123010190001"
 //    return "010D10390020123010190001"
+//        return "010D10390020123010190001"
 //    return "000A10390020123010190009"
 //        return "032D21060020123010190001"
 //        return "000A50370020123010190011"
 //         return  "030A10390020123010190002"
 //        return  "033F20020020123010190001"
 //        return  "014A19050020123010190002"
-
 //        return "029C21010020123010190001"
 //        return  "062A10390020123010190001"
 //        return "062A20030020123010190001"
@@ -258,11 +260,15 @@ fun getSN(): String {
 
 fun getGoneLogin(): Boolean {
     var sn = getSN()
-    return sn.startsWith("032D") || sn.startsWith("011A") || sn.startsWith("030A")|| sn.startsWith("010F")
+    return sn.startsWith("032D") || sn.startsWith("011A") || sn.startsWith("030A") || sn.startsWith(
+        "010F"
+    )
 }
-fun getSNUrl():String {
-    return "https://icook.cofarcn.com/ext/devInfo?sn="+ getSN()
+
+fun getSNUrl(): String {
+    return "https://icook.cofarcn.com/ext/devInfo?sn=" + getSN()
 }
+
 fun ImageView.load(data: Any?) {
     Glide.with(this.context).load(data)
         .diskCacheStrategy(DiskCacheStrategy.RESOURCE)