010D,厨师机食谱处理

BusinessAirFryer/src/main/assets/config_000.json

@@ -66,14 +66,6 @@
       "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",

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

@@ -203,7 +203,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
         if (CofarSDK.devInfo().devMode == DevModes.SOUP) {
 
-            //隐藏点击
+//            //隐藏点击
             binding.clCookTemp.visibility = View.VISIBLE
             binding.clCookTime.visibility = View.VISIBLE
             binding.clCookDirection.visibility = View.VISIBLE;
@@ -212,6 +212,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             //  binding.ivTurbo.visibility = View.VISIBLE
             binding.clCookWater.visibility = View.GONE
             binding.clTextView.visibility = View.GONE
+
+
         }
 
         if (CofarSDK.devInfo().devMode == DevModes.STAND_MIXER) {
@@ -219,19 +221,12 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             //隐藏点击
             binding.clCookTemp.visibility = View.GONE
             binding.clCookTime.visibility = View.VISIBLE
-
-            //隐藏点击
             binding.clCookDirection.visibility = View.GONE;
             binding.clCookSpeed.visibility = View.VISIBLE;
-            /**
-             * 2023.11.21 空炸部分把喷水功能隐藏
-             * */
             binding.clCookWater.visibility = View.GONE
-//            binding.clCookWater.visibility = View.VISIBLE
-            binding.ivTurbo.visibility = View.GONE
-
-            //中间要有个占位
-            binding.clTextView.visibility = View.INVISIBLE
+            //  binding.ivTurbo.visibility = View.VISIBLE
+            binding.clCookWater.visibility = View.GONE
+            binding.clTextView.visibility = View.GONE
         }
 
 //        if (CofarSDK.devInfo().devMode=="AF_AIR_FRYER"){
@@ -471,7 +466,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                                  * 当后台点进来模式页面，currentTemp为0故在这重新set值
                                  * */
 
-                                if (currentTemp == 0 && keep&&keepIsTemp) {
+                                if (currentTemp == 0 && keep && keepIsTemp) {
                                     // temp 当前温度  目标温度 targetTemp
                                     currentTemp = if (CofarSDK.devInfo().temp > baseMode.minTemp) {
                                         CofarSDK.devInfo().temp.toInt()
@@ -484,7 +479,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
 
                                 //当前调节温度
-                                if (currentTemp>35){
+                                if (currentTemp > 35) {
                                     currentTemp -= CofarSDK.getTempInterval()
                                 }
                                 if (currentTemp < minTemp) {
@@ -822,11 +817,11 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                             resources.getString(com.develop.common.R.string.adapted_cooking)
                         )
                         with(bundle)
-                    } else if (DevModes.STAND_MIXER == CofarSDK.devInfo().devMode){
+                    } else if (DevModes.STAND_MIXER == CofarSDK.devInfo().devMode) {
                         val bundle = Bundle()
                         bundle.putString(MODE_TYPE, WorkModes.SM_DIY)
                         with(bundle)
-                    }else {
+                    } else {
                         val bundle = Bundle()
                         bundle.putString(MODE_TYPE, WorkModes.AF_DIY)
                         with(bundle)
@@ -1181,7 +1176,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 changeCommonStep()
 
                 //运行情况初始化需要设置转速 ，不然以后会导致设置是0速度，设置后台回来以后会是currentMotorGer，在设置时间上面的话，会导致错误
-                if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()){
+                if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
                     currentMotorGer = CofarSDK.devInfo().motorGear.toInt()
                 }
 

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

@@ -121,6 +121,8 @@ class CookStepActivity : CookStepBaseActivity() {
 
     private fun turnDevModeUI(devMode: String?) {
         isSelectMode = devMode
+        binding.controller.clCookTemp.visibility =  View.VISIBLE
+        binding.controller.clCookTime.visibility =  View.VISIBLE
         if (isSelectMode == DevModes.AIR_FRYER) {
             //隐藏点击
             binding.controller.clCookDirection.visibility = View.GONE;
@@ -139,6 +141,15 @@ class CookStepActivity : CookStepBaseActivity() {
             binding.controller.clTextView.visibility = View.GONE
 
         }
+        if (isSelectMode == DevModes.STAND_MIXER) {
+            binding.controller.clCookTemp.visibility =  View.GONE
+            //隐藏点击
+            binding.controller.clCookDirection.visibility = View.GONE;
+            binding.controller.clCookSpeed.visibility = View.VISIBLE;
+            binding.controller.clCookWater.visibility = View.GONE
+            binding.controller.clTextView.visibility = View.GONE
+
+        }
 
     }
 

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

@@ -20,10 +20,10 @@ class CookStepStatus(
     }
 
     fun isDescription():Boolean {
-        return  workMode == "DESCRIPTION" || workMode =="AF_DESCRIPTION"
+        return  workMode == "DESCRIPTION" || workMode =="AF_DESCRIPTION"  || workMode =="SM_DESCRIPTION"
     }
     fun  isWarning():Boolean{
-        return  workMode == "WARNING" || workMode == "AF_WARNING"
+        return  workMode == "WARNING" || workMode == "AF_WARNING" || workMode =="AF_DESCRIPTION"
     }
 
     fun  isFinalStep() :Boolean{

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

@@ -34,7 +34,7 @@ class CookDetailSourceFragment :
 
     override fun onPostCreateView() {
         super.onPostCreateView()
-        if (sn.startsWith("033")) {
+        if (sn.startsWith("033")||sn.startsWith("010D")) {
             binding.sourceScroll.visibility = View.VISIBLE
             viewModel.getRecipeLiveData().observe(viewLifecycleOwner) {
                 var foodDescription = it.recipe.foodDescription

app/build.gradle

@@ -20,8 +20,8 @@ ext {
 //    versionCode=230617180
 //    brandCode="011E"
     brandCode = "000A"
-//    model = "5037"
-    model = "1039"
+    model = "5037"
+//    model = "1039"
 
 }
 

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

@@ -216,7 +216,6 @@ fun getSN(): String {
 //        return "000A30150020123010190001"
 //     return "000A10390020123010170001"
 //     return "000A10390020123010190001"
-//        return "000A50670020123010190005"
 //        return "010D10390020123010190001"
 //        return "010F10390020123010190001"
 //        return "011D10390020123010190001"
@@ -257,6 +256,7 @@ fun getSN(): String {
 //        return  "053A10390020123010190001"
         return  "000A10390020123010190023"
 //        return  "000A21050020123010190023"
+//        return "000A50670020123010190005"
     } else {
         //通过反射获取sn号
         try {