提交人：jtm

提交内容称重页面才异常弹窗

BusinessCommon/src/main/java/com/develop/common/ui/CommonBindingActivity.kt

@@ -59,6 +59,8 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         CancelConfirmDialog()
     }
 
+    protected var isWidget = false
+
     private var timeDownUtil: TimeDownUtil? = null
     private var screenSaverTime = 3 //minute
 
@@ -273,6 +275,9 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
             return
         }
         lastMsg = event.msg
+        if (lastMsg == "dian_zi_cheng_tong_xin_yi_chan" && !isWidget) {
+            return
+        }
         cancelConfirmDialog.showCancel = event.isShowCancelBtn
         cancelConfirmDialog.showConfirm = event.isShowConfirmBtn
 
@@ -330,7 +335,7 @@ abstract class CommonBindingActivity<T : ViewBinding> : BaseBindingActivity<T>()
         navigateTo(Screens.Auth.MEMBER) {
             val bundle = Bundle()
             bundle.putBoolean("isTokenOut", true)
-           with(bundle)
+            with(bundle)
         }
         finish()
     }

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

@@ -162,6 +162,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
 
     override fun onDestroy() {
         super.onDestroy()
+        isWidget = false
         viewModel.stopTurbo()
         viewModel.cancelAnimator()
         hasShowScreenSaver = false
@@ -899,6 +900,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
                 binding.llTurboView.visibility = View.VISIBLE
             }
         } else {
+            isWidget = true
             binding.ivWeight.visibility = View.VISIBLE
             binding.ivTurbo.visibility = View.VISIBLE
         }
@@ -910,6 +912,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private fun changeWeightStep() {
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
+        isWidget = false
         binding.ivWeight.visibility = View.GONE
         binding.ivTurbo.visibility = View.GONE
         binding.functionLayout.visibility = View.GONE
@@ -924,6 +927,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
     private fun changeTurboStep() {
         whereIndex = -1
         binding.clSetTime.stopAlphaAnim()
+        isWidget = false
         binding.ivWeight.visibility = View.GONE
         binding.ivTurbo.visibility = View.GONE
         binding.functionLayout.visibility = View.GONE
@@ -1105,14 +1109,14 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
             } else {
                 step = rotateStep()
             }
-            if (increase){
+            if (increase) {
                 targetTime += step
             } else {
                 targetTime -= step
             }
 
 
-            Log.d("kkkkkkk","$whereIndex===$step===$targetTime")
+            Log.d("kkkkkkk", "$whereIndex===$step===$targetTime")
             if (targetTime < 0) {
                 targetTime = 0;
             }
@@ -1561,6 +1565,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         initModeData(viewModel.modeType)
         viewModel.changeStep(CookSettingType.WEIGHT)
         binding.ivTurbo.visibility = View.GONE
+        isWidget = false
         binding.ivWeight.visibility = View.GONE
         binding.tvModeName.text = viewModel.getModeTitle(resources)
 
@@ -1582,6 +1587,7 @@ class ModesDetailActivity : CommonBVMActivity<ActivityModeDetailBinding, ModesVi
         viewModel.changeStep(CookSettingType.TURBO)
         binding.tvModeName.text = viewModel.getModeTitle(resources)
         binding.ivTurbo.visibility = View.GONE
+        isWidget = false
         binding.ivWeight.visibility = View.GONE
         Log.d("dddddd", "llTurboView===VISIBLE")
         binding.llTurboView.visibility = View.VISIBLE

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

@@ -47,7 +47,7 @@ import java.util.*
 import kotlin.math.abs
 
 abstract class CookStepBaseActivity :
-    CommonBVMActivity<ActivityCookStepBaseBinding, CookStepViewModel>(){
+    CommonBVMActivity<ActivityCookStepBaseBinding, CookStepViewModel>() {
     @JvmField
     @Autowired(name = "number")
     var recipeNumber: String? = null
@@ -109,6 +109,7 @@ abstract class CookStepBaseActivity :
     override fun createViewBinding(inflater: LayoutInflater): ActivityCookStepBaseBinding {
         return ActivityCookStepBaseBinding.inflate(inflater)
     }
+
     private val FLING_MIN_DISTANCE = 50
     private val FLING_MIN_VELOCITY = 0
 
@@ -277,14 +278,15 @@ abstract class CookStepBaseActivity :
                     turboDownEvent()
                 }
 
-                MotionEvent.ACTION_UP,MotionEvent.ACTION_CANCEL -> {
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
                     turboUpEvent()
                 }
             }
             true
         }
         configureDirection()
-        binding.scrollLayout.setOnGestureChangeListener(object :BCustomerLinearLayout.OnGestureChangeListener{
+        binding.scrollLayout.setOnGestureChangeListener(object :
+            BCustomerLinearLayout.OnGestureChangeListener {
             override fun scrollLeft() {
                 //向左手势
                 clickPrevStep()
@@ -342,10 +344,12 @@ abstract class CookStepBaseActivity :
     fun changeWeightPanel() {
         binding.controller.root.visibility = View.GONE
         binding.llWeightView.visibility = View.VISIBLE
+        isWidget = true
         binding.ivTurboView.visibility = View.GONE
     }
 
     fun changeDescription() {
+        isWidget = false
         binding.controller.root.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
         binding.ivTurboView.visibility = View.GONE
@@ -364,6 +368,7 @@ abstract class CookStepBaseActivity :
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
+        isWidget = false
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.VISIBLE
         binding.controller.tvRingTempText.visibility = View.VISIBLE
@@ -376,12 +381,12 @@ abstract class CookStepBaseActivity :
         }
 
         //蒸汽模式特殊处理
-        if(viewModel.displayStep()?.workMode == ModesType.STEAM.name){
+        if (viewModel.displayStep()?.workMode == ModesType.STEAM.name) {
             binding.controller.steamFire.visibility = View.VISIBLE;
             binding.controller.tvRingTempText.visibility = View.GONE;
             binding.controller.steamFireSmall.visibility = View.VISIBLE;
             binding.controller.tvCookingTempTarget.visibility = View.GONE;
-        }else{
+        } else {
             binding.controller.steamFire.visibility = View.GONE;
             binding.controller.tvRingTempText.visibility = View.VISIBLE;
             binding.controller.steamFireSmall.visibility = View.GONE;
@@ -401,6 +406,7 @@ abstract class CookStepBaseActivity :
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
+        isWidget = false
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.INVISIBLE
         binding.controller.tvRingTempText.visibility = View.GONE
@@ -422,6 +428,7 @@ abstract class CookStepBaseActivity :
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
+        isWidget = false
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.INVISIBLE
         binding.controller.tvRingTempText.visibility = View.GONE
@@ -442,6 +449,7 @@ abstract class CookStepBaseActivity :
         binding.controller.steamFire.visibility = View.GONE;
         binding.controller.steamFireSmall.visibility = View.GONE;
         binding.llWeightView.visibility = View.GONE
+        isWidget = false
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.INVISIBLE
         binding.controller.tvRingTempText.visibility = View.GONE
@@ -467,6 +475,7 @@ abstract class CookStepBaseActivity :
         binding.controller.waterRingView.visibility = View.GONE
         binding.controller.waterSprayShow.visibility = View.GONE
         binding.llWeightView.visibility = View.GONE
+        isWidget = false
         binding.controller.root.visibility = View.VISIBLE
         binding.controller.tempRingView.visibility = View.INVISIBLE
         binding.controller.tvRingTempText.visibility = View.GONE
@@ -646,7 +655,7 @@ abstract class CookStepBaseActivity :
 
     override fun onDestroy() {
         super.onDestroy()
-
+        isWidget = false
         turboTimer?.cancel()
         CofarSDK.stoptWeight()
         rotateAnimator?.cancel()