提交人：jtm

提交内容：bug fix

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

@@ -267,10 +267,8 @@ class CookStepActivity : CookStepBaseActivity() {
                     val description =
                         "${temperature}°C/${minute}m${second}s/V${rotateSpeed}/${if (rotateDirection == MotorDirections.FORWARD.toString()) "R" else "L"}";
                     binding.tvStepName.text = description
-                    binding.tvTitleStep.text = description
                 } else {
                     binding.tvStepName.text = it.source.description
-                    binding.tvTitleStep.text = it.source.description
                 }
                 if (stepCount == 1) {
                     binding.ivPrevStep.setGone()
@@ -351,7 +349,9 @@ class CookStepActivity : CookStepBaseActivity() {
                 }
             }
         }
-
+        viewModel.recipeLiveData.observe(this) {
+            binding.tvTitleStep.text = it.name
+        }
     }
 
     private fun playStepAudio(audioPath: String?) {
@@ -1097,15 +1097,17 @@ class CookStepActivity : CookStepBaseActivity() {
                 viewModel.cookingStep?.let { updateUiSetting(it, true) }
             }
         }, 500)
-
-
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
+    override fun finish() {
+        super.finish()
         audioUtil.releaseMedia()
     }
 
+    override fun onBackPressed() {
+        finish()
+    }
+
     private fun recordRecipes() {
         if (!isHistory) {
             isHistory = true

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

@@ -14,6 +14,7 @@ import com.develop.step.viewmodel.CookDetailViewModel
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
+import java.math.BigDecimal
 
 class CookDetailServeFragment :
     CommonBVMFragment<FragmentDetailCookServingBinding, CookDetailViewModel>() {
@@ -47,7 +48,7 @@ class CookDetailServeFragment :
                 sourceItems.add(
                     CookSourceItem(
                         nutrition.nutritionName ?: "",
-                        "${nutrition.amount} ${nutrition.unit}"
+                        "${BigDecimal.valueOf(nutrition.amount ?: 0f.toDouble()).stripTrailingZeros().toPlainString()} ${nutrition.unit}"
                     )
                 )
             }

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

@@ -14,6 +14,7 @@ import com.develop.step.viewmodel.CookDetailViewModel
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
+import java.math.BigDecimal
 
 class CookDetailSourceFragment :
     CommonBVMFragment<FragmentDetailCookSourceBinding, CookDetailViewModel>() {
@@ -48,7 +49,7 @@ class CookDetailSourceFragment :
                 for (recipeFood in it.material) {
                     val sourceItem = CookSourceItem(
                         recipeFood.foodName ?: "",
-                        "${recipeFood.amount} ${recipeFood.unit}"
+                        "${BigDecimal.valueOf(recipeFood.amount ?: 0f.toDouble()).stripTrailingZeros().toPlainString()} ${recipeFood.unit}"
                     )
                     if (recipeFood.recipePortionSizeNumber == size.portionSize) {
                         sourceItems.add(sourceItem)

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

@@ -18,11 +18,6 @@ import java.util.concurrent.CopyOnWriteArrayList
 
 class CookStepViewModel : BaseViewModel() {
 
-    @Deprecated("后面会移除下面这些CookStatus")
-    val tempStatus = CookStatus.Temp(80)
-    val timeStatus = CookStatus.Time(5, 0, 0)
-    val speedStatus = CookStatus.Speed(2, 0)
-    val directionStatus = CookStatus.Direction(1, 1)
     val currentSetting = MutableLiveData(CookSettingType.WEIGHT)
     val stepUiData = CookStepUiData()
 
@@ -32,6 +27,7 @@ class CookStepViewModel : BaseViewModel() {
     val dataCopy = mutableListOf<CookStepUiData>()
     val allSteps = CopyOnWriteArrayList<CookStepStatus>()
     val stepDisplay = MutableLiveData<CookStepStatus>()
+    val recipeLiveData = MutableLiveData<DevRecipe>()
     var cookingStep: CookStepStatus? = null
     var recipe: DevRecipe?= null;
 
@@ -39,6 +35,7 @@ class CookStepViewModel : BaseViewModel() {
         FoodDataProvider.getDatabase().runInTransaction {
             allSteps.clear()
             recipe =  FoodDataProvider.getDatabase().recipeDao().queryRecipe(number)
+            recipeLiveData.postValue(recipe)
             val cookSteps = FoodDataProvider
                 .getDatabase()
                 .recipeDao()