Browse Source

提交人:jtm
提交内容:bug fixed

江天明 1 year ago
parent
commit
9aeb5daa18

+ 1 - 1
BusinessCommon/src/main/java/com/develop/common/data_repo/db/entity/DevRecipeCookingStep.kt

@@ -111,7 +111,7 @@ data class DevRecipeCookingStep(
      * 描述
      */
     @ColumnInfo
-    val description: String?,
+    var description: String?,
 
     /**
      * 语言

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

@@ -231,4 +231,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="login_expire_tips">Failed to login, please try again</string>
     <string name="no_net_error">Please connect to Wifi</string>
     <string name="no_login">Please enter the fields above to login</string>
+    <string name="enjoy_your_meal_desc">enjoy your meal</string>
 </resources>

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

@@ -283,5 +283,6 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="success">Opération réussie.</string>
     <string name="no_net_error">Veuillez vous connecter au Wifi</string>
     <string name="no_login">Please enter the fields above to log in</string>
+    <string name="enjoy_your_meal_desc">Votre recette est prête !</string>
 
 </resources>

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

@@ -277,6 +277,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="loading">Loading</string>
     <string name="Min20">20Min</string>
     <string name="enjoy_your_meal">ENJOY YOUR MEAL</string>
+    <string name="enjoy_your_meal_desc">enjoy your meal</string>
     <string name="save_success">Save success</string>
     <string name="reset_password_success">Reset password success!</string>
     <string name="email_send">Email send</string>

+ 5 - 1
BusinessStep/src/main/java/com/develop/step/viewmodel/CookStepViewModel.kt

@@ -6,11 +6,13 @@ import android.text.Spanned
 import android.text.style.ForegroundColorSpan
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
+import com.develop.base.ext.globalRes
 import com.develop.base.mvvm.BaseViewModel
 import com.develop.common.data_repo.FoodDataProvider
 import com.develop.common.data_repo.db.entity.DevRecipe
 import com.develop.common.utils.CofarUtils
 import com.develop.step.CookSettingType
+import com.develop.step.R
 import com.develop.step.ui.cook_step.model.CookStepStatus
 import com.develop.step.ui.cook_step.model.CookStepUiData
 import com.develop.step.ui.recipes_detail.model.CookStatus
@@ -56,7 +58,9 @@ class CookStepViewModel : BaseViewModel() {
             }
 
             //默认添加最后一步享用美食
-            val finalStep = CookStepStatus("Final Step",cookSteps[0])
+            val lastStep = cookSteps[0]
+            lastStep.description = globalRes().getString(com.develop.common.R.string.enjoy_your_meal_desc)
+            val finalStep = CookStepStatus("Final Step",lastStep)
             allSteps.add(finalStep)
             dataCopy.add(finalStep.uiData.newCopy())