提交人：jtm

提交内容:bug fixed

BusinessAuth/src/main/java/com/develop/auth/ui/MemberForgotFragment.kt

@@ -75,8 +75,9 @@ class MemberForgotFragment : CommonBVMFragment<FragmentMemberForgotBinding, Memb
                 }else{
                     showToast(this)
                 }
-
-
+                if (it.success) {
+                    viewModel.fragmentChangeLiveData.postValue(FragmentTag.MEMBER_LOGIN)
+                }
             }
         }
         viewModel.sendEmailLiveData.observe(viewLifecycleOwner){

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

@@ -6,6 +6,7 @@ import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import android.widget.Toast
+import androidx.core.view.isInvisible
 import com.alibaba.android.arouter.facade.annotation.Autowired
 import com.develop.base.ext.load
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -73,6 +74,7 @@ class CookStepActivity : CookStepBaseActivity() {
     var portionSizelJson: String? = null
 
     private var titleName = ""
+    private var currModes = ""
 
     private fun turnDevModeUI(){
 
@@ -110,6 +112,7 @@ class CookStepActivity : CookStepBaseActivity() {
         } else {
             binding.viewChangeCrush.setBgColor(R.color.white)
             binding.viewChangeWeight.setBgColor(R.color.white)
+            binding.viewWeightClose.setBgColor(R.color.white)
             binding.viewChangeWeight.src = R.drawable.ic_detail_tab1
             binding.viewChangeCrush.src = R.drawable.ic_cooking_weight
             binding.viewNote.setVisible()
@@ -189,8 +192,21 @@ class CookStepActivity : CookStepBaseActivity() {
                 }
             }
         }
+
+
+        binding.viewWeightClose.setOnClickListener {
+            CofarSDK.stoptWeight()
+            viewModel.setDisplayStep(viewModel.stepIndex, force = true)
+            binding.viewWeightClose.setGone()
+            binding.viewChangeCrush.setVisible()
+        }
+
         binding.viewChangeCrush.setOnClickListener {
             if (isNightTheme()){
+                if (currModes != "WIGHT" && currModes != "WEIGH" && currModes != "WEIGHT") {
+                    binding.viewWeightClose.setVisible()
+                    binding.viewChangeCrush.visibility = View.INVISIBLE
+                }
                 //此主题下，点餐是称重
                 if (CofarSDK.devInfo().status == DevStatus.RUNNING.toInt()) {
                     Toast.makeText(this, "Step is running!", Toast.LENGTH_SHORT).show()
@@ -248,6 +264,7 @@ class CookStepActivity : CookStepBaseActivity() {
         viewModel.queryRecipeCookStep(recipeNumber ?: "", currentStepIndex)
         viewModel.stepDisplay.observe(this) { it ->
             coverPath = FoodDataProvider.getImagePath(it.source.photoVideoFilePath)
+            currModes = it.workMode
             if (it.workMode == "Final Step") {
                 val stepCount = viewModel.getStepCount()
                 val stepIndex = viewModel.allSteps.indexOf(it)

BusinessStep/src/main/res/layout/activity_cook_step_base.xml

@@ -214,6 +214,19 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <com.develop.common.widget.CircleBgImageView
+                android:id="@+id/view_weight_close"
+                android:layout_width="@dimen/convert_60px"
+                android:layout_height="@dimen/convert_60px"
+                android:layout_marginTop="@dimen/convert_140px"
+                android:layout_marginEnd="@dimen/convert_40px"
+                android:visibility="gone"
+                android:padding="@dimen/convert_14px"
+                android:src="@drawable/ic_close"
+                app:bgColor="@color/view_change"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
             <com.develop.common.widget.CircleBgImageView
                 android:id="@+id/view_change_weight"
                 android:layout_width="@dimen/convert_60px"
@@ -226,6 +239,9 @@
                 app:layout_constraintEnd_toStartOf="@+id/view_change_crush"
                 app:layout_constraintTop_toTopOf="parent" />
 
+
+
+
             <com.develop.common.widget.CircleBgImageView
                 android:id="@+id/view_remark"
                 android:layout_width="@dimen/convert_60px"

libBase/src/main/java/com/develop/base/util/GlobalToast.kt

@@ -11,10 +11,11 @@ object GlobalToast {
 
     fun showToast(msg: String, duration: Int = Toast.LENGTH_SHORT) {
         ThreadUtils.runOnMainThread {
-            if (!msg.contains("错误")) {
-                if (msg == "当前网络不可用"){
-                    if (isFrLanguage()){
-                        Toast.makeText(globalApp(), "Veuillez vous connecter au Wifi", duration).show()
+            if (!msg.contains("错误") || msg != "你未登录") {
+                if (msg == "当前网络不可用") {
+                    if (isFrLanguage()) {
+                        Toast.makeText(globalApp(), "Veuillez vous connecter au Wifi", duration)
+                            .show()
                     } else {
                         Toast.makeText(globalApp(), "Please connect to Wifi", duration).show()
                     }