From 7a252d96037e1769513a49c74fe42f312f340860 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 25 Mar 2024 17:28:10 +0800 Subject: [PATCH] =?UTF-8?q?[v630]=20refactor:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E9=AA=8C=E8=AF=81=E9=A1=B5=E9=9D=A2=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChekAndStartAutopilotView.kt | 30 +++++++++++++----- .../ChekAndStartAutopilotView.kt | 31 ++++++++++++++----- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 561e65cd00..0a79a7c4cd 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.common.module.utils.RxUtils @@ -192,14 +193,27 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, aniStartAutopilotSuccessAni.setOnAnimStopListener(object : BigFrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { - checkPhoneNumber.visibility = View.VISIBLE - startAutopilotView.visibility = View.GONE - startAutopilotClose.visibility = View.GONE - this@ChekAndStartAutopilotView.animate().alpha(0f).withEndAction { - this@ChekAndStartAutopilotView.visibility = View.GONE - aciv_start_autopilt_success_bg.alpha = 0f - aciv_start_autopilt_success_ani.alpha = 0f - }.duration=1000 + ThreadUtils.runOnUiThread { + checkPhoneNumber.visibility = View.VISIBLE + startAutopilotView.visibility = View.GONE + startAutopilotClose.visibility = View.GONE + + this@ChekAndStartAutopilotView.animate().alpha(0f).setListener(object: AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + super.onAnimationEnd(animation) + this@ChekAndStartAutopilotView.visibility = View.GONE + aciv_start_autopilt_success_bg.alpha = 0f + aciv_start_autopilt_success_ani.alpha = 0f + } + + override fun onAnimationCancel(animation: Animator) { + super.onAnimationCancel(animation) + this@ChekAndStartAutopilotView.visibility = View.GONE + aciv_start_autopilt_success_bg.alpha = 0f + aciv_start_autopilt_success_ani.alpha = 0f + } + }).duration=1000L + } } }) aniStartAutopilotSuccessAni.start() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt index 8caad0b16c..97bf5652bf 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/checkstartautopilot/ChekAndStartAutopilotView.kt @@ -14,6 +14,7 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager import com.mogo.och.common.module.utils.BigFrameAnimatorContainer import com.mogo.och.common.module.utils.RxUtils @@ -190,14 +191,28 @@ class ChekAndStartAutopilotView : WindowRelativeLayout, aniStartAutopilotSuccessAni.setOnAnimStopListener(object : BigFrameAnimatorContainer.OnAnimationStoppedListener{ override fun AnimationStopped() { - checkPhoneNumber.visibility = View.VISIBLE - startAutopilotView.visibility = View.GONE - startAutopilotClose.visibility = View.GONE - this@ChekAndStartAutopilotView.animate().alpha(0f).withEndAction { - this@ChekAndStartAutopilotView.visibility = View.GONE - aciv_start_autopilt_success_bg.alpha = 0f - aciv_start_autopilt_success_ani.alpha = 0f - }.duration=1000 + ThreadUtils.runOnUiThread { + checkPhoneNumber.visibility = View.VISIBLE + startAutopilotView.visibility = View.GONE + startAutopilotClose.visibility = View.GONE + + this@ChekAndStartAutopilotView.animate().alpha(0f).setListener(object : + AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + super.onAnimationEnd(animation) + this@ChekAndStartAutopilotView.visibility = View.GONE + aciv_start_autopilt_success_bg.alpha = 0f + aciv_start_autopilt_success_ani.alpha = 0f + } + + override fun onAnimationCancel(animation: Animator) { + super.onAnimationCancel(animation) + this@ChekAndStartAutopilotView.visibility = View.GONE + aciv_start_autopilt_success_bg.alpha = 0f + aciv_start_autopilt_success_ani.alpha = 0f + } + }).duration = 1000L + } } }) aniStartAutopilotSuccessAni.start()