From d1f139b84d1b134ad55cdef2d1c13effeb98a62a Mon Sep 17 00:00:00 2001 From: yangyakun Date: Sat, 23 Mar 2024 01:01:35 +0800 Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[=E7=BC=A9=E5=B0=8F=E5=8A=A8=E7=94=BB?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/passenger/ui/bar/RightBarView.kt | 17 +++++++++++++++-- .../src/main/res/layout/taxi_p_rightbar.xml | 4 ++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt index 59333aeb5e..8fca708bb8 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt @@ -14,6 +14,7 @@ import com.bumptech.glide.request.RequestOptions import com.bumptech.glide.request.target.SimpleTarget import com.bumptech.glide.request.transition.Transition import com.elegant.utils.UiThreadHandler +import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.manager.auditionmanager.AuditionManager import com.mogo.och.common.module.manager.auditionmanager.MusicData @@ -25,6 +26,7 @@ import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting import kotlinx.android.synthetic.main.taxi_p_rightbar.view.ck_setting_only import kotlinx.android.synthetic.main.taxi_p_rightbar.view.con_only_one_group import kotlinx.android.synthetic.main.taxi_p_rightbar.view.con_third_group +import me.jessyan.autosize.utils.AutoSizeUtils class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener { @@ -42,6 +44,9 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener { private var rightBarCallback:RightBarCallback?=null private var animator:ObjectAnimator?=null + private var samllSize = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),55f) + private var normalSize = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),76f) + init { AuditionManager.addDataChangeListener(TAG,this) } @@ -106,9 +111,13 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener { animator?.cancel() animator = null } + val layoutParams = ck_music.layoutParams + layoutParams.width = samllSize + layoutParams.height = samllSize + ck_music.layoutParams = layoutParams animator = ObjectAnimator.ofFloat(ck_music, "rotation", 0f, 360f) - ck_music.pivotX = (ck_music.width / 2).toFloat() - ck_music.pivotY = (ck_music.height / 2).toFloat() + ck_music.pivotX = (samllSize / 2).toFloat() + ck_music.pivotY = (samllSize / 2).toFloat() animator?.duration = 3000 animator?.repeatCount = -1 animator?.repeatMode = ValueAnimator.RESTART @@ -124,6 +133,10 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener { animator = null } aciv_playing_bg.visibility = View.GONE + val layoutParams = ck_music.layoutParams + layoutParams.width = normalSize + layoutParams.height = normalSize + ck_music.layoutParams = layoutParams } override fun onVisibilityAggregated(isVisible: Boolean) { diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml index 79db01c6e5..36e55e319b 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_rightbar.xml @@ -35,8 +35,8 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/ck_music" app:layout_constraintBottom_toBottomOf="@+id/ck_music" - android:layout_width="@dimen/dp_103" - android:layout_height="@dimen/dp_103"/> + android:layout_width="@dimen/dp_76" + android:layout_height="@dimen/dp_76"/>