From 3fc540bab797e36caa3902d0b0c84e6d578997a8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 5 Jan 2024 17:05:02 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6]=20[taxi=5Fp]=20[=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=8A=A8=E7=94=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/passenger/ui/arrived/ArrivedView.kt | 26 +++++++++++++++++++ .../taxi/passenger/ui/arrived/ArrivedView.kt | 26 +++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 7ff4973293..58b6506126 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -2,6 +2,7 @@ package com.mogo.och.taxi.passenger.ui.arrived import android.animation.Animator import android.animation.AnimatorListenerAdapter +import android.animation.AnimatorSet import android.animation.ObjectAnimator import android.content.Context import android.util.AttributeSet @@ -20,6 +21,7 @@ import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.aciv_bg import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.aciv_close import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.actv_endstation import kotlinx.android.synthetic.main.taxi_p_arrived_end_panel.view.v_video_right_rear_view +import me.jessyan.autosize.utils.AutoSizeUtils /** @@ -65,6 +67,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { } taxiPxiaozhiLove?.start() v_video_right_rear_view.resetView() + aniSpeedSettingRow() viewModel.setEndInfo() } else { v_video_right_rear_view.resetView() @@ -140,6 +143,29 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { } } + private fun aniSpeedSettingRow(){ + val translationYStart = - AutoSizeUtils.dp2px(context,180f).toFloat() + val translationYEnd: Float = 0f + val alphaStart: Float = 0f + val alphaEnd: Float = 1f + + val translationX = ObjectAnimator.ofFloat( + v_video_right_rear_view, + "translationX", + translationYStart, + translationYEnd + ).apply { + duration = 1000 + } + val alpha = + ObjectAnimator.ofFloat(v_video_right_rear_view, "alpha", alphaStart, alphaEnd).apply { + duration = 1000 + } + val animatorSet = AnimatorSet() + animatorSet.playTogether(mutableListOf(translationX,alpha)) + animatorSet.start() + } + interface ArrivedVisilityChangeListenr{ fun isShow(show: Boolean) } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 9da7e1b484..0b47161aae 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -2,6 +2,7 @@ package com.mogo.och.taxi.passenger.ui.arrived import android.animation.Animator import android.animation.AnimatorListenerAdapter +import android.animation.AnimatorSet import android.animation.ObjectAnimator import android.content.Context import android.util.AttributeSet @@ -22,6 +23,7 @@ import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_bg import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.aciv_close import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.actv_endstation import kotlinx.android.synthetic.main.taxt_u_p_arrived_end_panel.view.v_video_right_rear_view +import me.jessyan.autosize.utils.AutoSizeUtils /** * @@ -66,6 +68,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { } taxiPxiaozhiLove?.start() v_video_right_rear_view.resetView() + aniSpeedSettingRow() viewModel.setEndInfo() } else { v_video_right_rear_view.resetView() @@ -143,6 +146,29 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { } } + private fun aniSpeedSettingRow(){ + val translationYStart = - AutoSizeUtils.dp2px(context,180f).toFloat() + val translationYEnd: Float = 0f + val alphaStart: Float = 0f + val alphaEnd: Float = 1f + + val translationX = ObjectAnimator.ofFloat( + v_video_right_rear_view, + "translationX", + translationYStart, + translationYEnd + ).apply { + duration = 1000 + } + val alpha = + ObjectAnimator.ofFloat(v_video_right_rear_view, "alpha", alphaStart, alphaEnd).apply { + duration = 1000 + } + val animatorSet = AnimatorSet() + animatorSet.playTogether(mutableListOf(translationX,alpha)) + animatorSet.start() + } + interface ArrivedVisilityChangeListenr{ fun isShow(show: Boolean) }