|
@@ -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()
|