wbspool 1 rok pred
rodič
commit
32d71d42fb

+ 2 - 2
BusinessAirFryer/src/main/assets/config_000.json

@@ -76,8 +76,8 @@
     {
       "type": "AF_DIY",
       "name": "af_diy",
-      "bg": "af_diy",
-      "icon": "af_diy_bg",
+      "bg": "af_diy_bg",
+      "icon": "af_diy",
       "devMode": "AIR_FRYER",
       "listShow": false
     },

+ 1 - 1
BusinessCommon/src/main/res/values/strings.xml

@@ -264,7 +264,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="af_pizza">PIZZA</string>
     <string name="af_dehydrate">DEHYDRATE</string>
     <string name="af_reheat">REHEAT</string>
-    <string name="af_chicken_wing">AF_CHICKEN_WING</string>
+    <string name="af_chicken_wing">CHICKEN WING</string>
     <string name="af_steak">STEAK</string>
     <string name="af_sea_food">SEAFOOD</string>
     <string name="af_vegetable">VEGETABLE</string>

+ 24 - 6
BusinessMain/src/main/java/com/develop/main/ui/ModeEntranceActivity.kt

@@ -34,7 +34,10 @@ import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
+import com.kuyuntech.cofarcooking.device.sdk.constant.core.DevModes
+import com.kuyuntech.cofarcooking.device.sdk.constant.core.WorkModes
 import com.kuyuntech.cofarcooking.device.sdk.eventbus.event.DevPromptEvent
+import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
 import com.smarx.notchlib.utils.ScreenUtil
 import org.alee.component.skin.service.ThemeSkinService
 import org.greenrobot.eventbus.EventBus
@@ -116,9 +119,18 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             EntranceType.manual_cooking -> {
                                 if (FoodDataProvider.checkDataExit()) {
                                     navigateTo(Screens.Cook.COOK_MODES) {
-                                        val bundle = Bundle()
-                                        bundle.putString(MODE_TYPE, "ADAPTED_COOKING")
-                                        with(bundle)
+
+                                        if(DevModes.SOUP == CofarSDK.devInfo().devMode){
+                                            val bundle = Bundle()
+                                            bundle.putString(MODE_TYPE, WorkModes.ADAPTED_COOKING)
+                                            with(bundle)
+                                        }else{
+                                            val bundle = Bundle()
+                                            bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
+                                            with(bundle)
+                                        }
+
+
                                     }
                                 } else {
                                     showLoading()
@@ -190,9 +202,15 @@ class ModeEntranceActivity : CommonBindingActivity<ActivityModeEntranceBinding>(
                             EntranceType.manual_cooking -> {
                                 if (FoodDataProvider.checkDataExit()) {
                                     navigateTo(Screens.Cook.COOK_MODES) {
-                                        val bundle = Bundle()
-                                        bundle.putString(MODE_TYPE, "ADAPTED_COOKING")
-                                        with(bundle)
+                                        if(DevModes.SOUP == CofarSDK.devInfo().devMode){
+                                            val bundle = Bundle()
+                                            bundle.putString(MODE_TYPE, WorkModes.ADAPTED_COOKING)
+                                            with(bundle)
+                                        }else{
+                                            val bundle = Bundle()
+                                            bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
+                                            with(bundle)
+                                        }
                                     }
                                 } else {
                                     showLoading()