Merge branch 'master' of https://git.kuyuntech.com/developer/FoodCooking_LandScape

BusinessAuth/src/main/java/com/develop/auth/viewmodel/MemberViewModel.kt

@@ -132,7 +132,7 @@ class MemberViewModel : BaseViewModel() {
             userInfoLiveData.postValue(userInfo)
         }
     }.catch {
-        perfectInfoLiveData.postValue(AuthModel(false, it.message))
+//        perfectInfoLiveData.postValue(AuthModel(false, it.message))
     }
 
     fun queryUserInfo() {

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?,
 
     /**
      * 语言

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>

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>

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>

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

@@ -16,6 +16,8 @@ import androidx.core.graphics.drawable.DrawableCompat
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setGone
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.src
 import com.develop.base.util.ThreadUtils
 import com.develop.common.data_repo.db.ModesType
@@ -924,6 +926,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     /**切换到温度*/
     private fun changeTempSettingStep() {
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.steamFire.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
@@ -953,7 +957,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到时间*/
     private fun changeTimeSettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -972,7 +977,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到转速*/
     private fun changeSpeedSettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -991,7 +997,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到方向*/
     private fun changeDirectionSettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setGone()
+        binding.jiahao.setGone()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE
@@ -1010,7 +1017,8 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     /**切换到*/
     private fun changeWaterSprySettingStep() {
         binding.steamFire.visibility = View.GONE
-
+        binding.jianhao.setVisible()
+        binding.jiahao.setVisible()
         binding.llWeightView.visibility = View.GONE
         binding.functionLayout.visibility = View.VISIBLE
         binding.tempRingView.visibility = View.INVISIBLE

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

@@ -18,6 +18,8 @@ import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.alibaba.android.arouter.launcher.ARouter
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.isNightTheme
+import com.develop.base.ext.setGone
+import com.develop.base.ext.setVisible
 import com.develop.base.ext.src
 import com.develop.base.ext.text_color
 import com.develop.base.ext.updateText
@@ -348,6 +350,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTempSettingPanel() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
@@ -381,6 +385,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeTimeSettingPanel() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
@@ -400,6 +406,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeSpeedSettingStep() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE
@@ -420,6 +428,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeWaterGearSettingStep() {
+        binding.controller.jianhao.setVisible()
+        binding.controller.jiahao.setVisible()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.llWeightView.visibility = View.GONE
@@ -441,6 +451,8 @@ abstract class CookStepBaseActivity :
     }
 
     fun changeDirectionSettingStep() {
+        binding.controller.jianhao.setGone()
+        binding.controller.jiahao.setGone()
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.controller.waterRingView.visibility = View.GONE

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].copy()
+            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())