提交人：jtm

提交内容：部分bug fix

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

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
+import android.widget.Toast
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -89,6 +90,47 @@ class CookStepActivity : CookStepBaseActivity() {
                 binding.viewAlarm.setBackgroundResource(R.drawable.ic_alarm)
             }
         }
+        binding.viewChangeWeight.setOnClickListener {
+            val weightSelected = binding.viewChangeWeight.isSelected
+            if (weightSelected) {
+                CofarSDK.stoptWeight()
+                viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+            } else {
+                binding.ivPrevStep.setGone()
+                binding.ivNextStep.setGone()
+                CofarSDK.changeMode(
+                    "$recipeNumber:${viewModel.stepIndex}",
+                    CofarSDK.devMode("WEIGHT")
+                )
+                changeWeightPanel()
+                CofarSDK.stoptWeight()
+                CofarSDK.startWeight()
+            }
+            binding.viewChangeWeight.isSelected = !weightSelected
+            binding.viewChangeCrush.isSelected = false
+        }
+        binding.viewChangeCrush.setOnClickListener {
+            if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
+                Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
+                return@setOnClickListener
+            }
+            val turboSelected = binding.viewChangeCrush.isSelected
+            if (turboSelected) {
+                CofarSDK.stoptWeight()
+                viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+            } else {
+                binding.ivPrevStep.setGone()
+                binding.ivNextStep.setGone()
+                CofarSDK.changeMode(
+                    "$recipeNumber:${viewModel.stepIndex}",
+                    CofarSDK.devMode("TURBO")
+                )
+                CofarSDK.stoptWeight()
+                changeTurboPanel()
+            }
+            binding.viewChangeWeight.isSelected = false
+            binding.viewChangeCrush.isSelected = !turboSelected
+        }
         initData()
     }
 

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

@@ -231,6 +231,8 @@ abstract class CookStepBaseActivity :
 
     fun changeTurboPanel() {
         changeTempSettingPanel()
+        binding.controller.tempRingView.visibility = View.GONE
+        binding.controller.tvRingTempText.visibility = View.GONE
         binding.ivTurboView.visibility = View.VISIBLE
     }
 

BusinessStep/src/main/java/com/develop/step/viewmodel/CookStepViewModel.kt

@@ -82,10 +82,10 @@ class CookStepViewModel:BaseViewModel() {
         }
     }
 
-    fun setDisplayStep(index: Int) {
+    fun setDisplayStep(index: Int, force: Boolean = false) {
         stepIndex = index
         allSteps.getOrNull(stepIndex)?.let {
-            if (stepDisplay.value != it) {
+            if (stepDisplay.value != it || force) {
                 stepDisplay.value = it
             }
         }