diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt index 548280ca96..545947b0ef 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/comment/TaxiPassengerArrivedView.kt @@ -259,7 +259,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { .setDuration(120) alpha.addUpdateListener(object : ValueAnimator.AnimatorUpdateListener{ var isStart = false - override fun onAnimationUpdate(animation: ValueAnimator?) { + override fun onAnimationUpdate(animation: ValueAnimator) { val animatedValue = animation?.getAnimatedValue("alpha") animatedValue as Float if(animatedValue>0.45&&!isStart){ @@ -293,7 +293,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { if(currentAnimarion==maxIndex) { // 最后一个动画结束后提交积分 set.addListener(object : AnimatorListenerAdapter() { - override fun onAnimationEnd(animation: Animator?) { + override fun onAnimationEnd(animation: Animator) { super.onAnimationEnd(animation) // 启动变高动画 startChangeHeightAnimarion() diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt index f16747eef7..d833aab94a 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/leftmenu/OverlayLeftViewUtils.kt @@ -226,8 +226,8 @@ object OverlayLeftViewUtils { windowManager?.updateViewLayout(overlayView, params) } valueAnimator.addListener(object : Animator.AnimatorListener { - override fun onAnimationStart(animation: Animator?) {} - override fun onAnimationEnd(animation: Animator?) { + override fun onAnimationStart(animation: Animator) {} + override fun onAnimationEnd(animation: Animator) { acivOpenClose?.apply { pivotX = (width /2).toFloat() pivotY = (height /2).toFloat() @@ -239,8 +239,8 @@ object OverlayLeftViewUtils { WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL windowManager?.updateViewLayout(overlayView, params) } - override fun onAnimationCancel(animation: Animator?) {} - override fun onAnimationRepeat(animation: Animator?) {} + override fun onAnimationCancel(animation: Animator) {} + override fun onAnimationRepeat(animation: Animator) {} }) valueAnimator.start() } @@ -324,8 +324,8 @@ object OverlayLeftViewUtils { } } valueAnimator.addListener(object : Animator.AnimatorListener { - override fun onAnimationStart(animation: Animator?) {} - override fun onAnimationEnd(animation: Animator?) { + override fun onAnimationStart(animation: Animator) {} + override fun onAnimationEnd(animation: Animator) { acivOpenClose?.apply { pivotX = (width /2).toFloat() pivotY = (height /2).toFloat() @@ -340,8 +340,8 @@ object OverlayLeftViewUtils { } } - override fun onAnimationCancel(animation: Animator?) {} - override fun onAnimationRepeat(animation: Animator?) {} + override fun onAnimationCancel(animation: Animator) {} + override fun onAnimationRepeat(animation: Animator) {} }) valueAnimator.start() }