From 86ee3d8f4bee33b501d200b9a8059c9f9d68e4cf Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Fri, 25 Apr 2025 14:00:38 +0800
Subject: [PATCH] =?UTF-8?q?[8.0.0]=20[fea]=20[=E9=9F=B3=E4=B9=90=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=8A=A8=E7=94=BB]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/music/playing/MusicPlayingView.kt      | 29 ++++++++++++++++---
 .../main/res/layout/taxi_p_music_playing.xml  |  1 +
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt
index 7b1d741b34..cdbc3cae52 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/playing/MusicPlayingView.kt
@@ -11,8 +11,6 @@ import android.widget.SeekBar
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.TimeTransformUtils
 import com.mogo.och.common.module.manager.audition.MusicData
@@ -20,7 +18,7 @@ import com.mogo.och.common.module.manager.audition.PlayState
 import com.mogo.och.common.module.utils.DateTimeUtil
 import com.mogo.och.unmanned.taxi.passenger.R
 import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_music_cover
-import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_music_cover_bg
+import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_music_point
 import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_show_next
 import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_show_pre
 import kotlinx.android.synthetic.main.taxi_p_music_playing.view.iv_toggle
@@ -47,10 +45,12 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi
     private var viewModel:MusicPlayingViewModel?=null
 
     private var animator:ObjectAnimator?=null
+    private var animatorPoint:ObjectAnimator?=null
 
     private var isSeekBarTouch = false
 
-//    private val centerWidth = AutoSizeUtils.dp2px(context,146f)
+    private val centerWidth = AutoSizeUtils.dp2px(context,294f)
+    private val centerHeight = AutoSizeUtils.dp2px(context,130f)
 
     private fun initView() {
         LayoutInflater.from(context).inflate(R.layout.taxi_p_music_playing, this, true)
@@ -153,12 +153,33 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi
         animator?.repeatMode = ValueAnimator.RESTART
         animator?.interpolator = LinearInterpolator()
         animator?.start()
+        if(animatorPoint!=null){
+            animatorPoint?.cancel()
+            animatorPoint = null
+        }
+        animatorPoint = ObjectAnimator.ofFloat(iv_music_point, "rotation", iv_music_point.rotation, 25f)
+        iv_music_point.pivotX = (centerWidth).toFloat()
+        iv_music_point.pivotY = (centerHeight).toFloat()
+        animatorPoint?.duration = 2000
+        animatorPoint?.interpolator = LinearInterpolator()
+        animatorPoint?.start()
     }
     private fun endAnimal(){
         if(animator!=null){
             animator?.cancel()
             animator = null
         }
+
+        if(animatorPoint!=null){
+            animatorPoint?.cancel()
+            animatorPoint = null
+        }
+        animatorPoint = ObjectAnimator.ofFloat(iv_music_point, "rotation", iv_music_point.rotation,0f)
+        iv_music_point.pivotX = (centerWidth).toFloat()
+        iv_music_point.pivotY = (centerHeight).toFloat()
+        animatorPoint?.duration = 2000
+        animatorPoint?.interpolator = LinearInterpolator()
+        animatorPoint?.start()
     }
 
     override fun setPlayOrpause(it: MusicData) {
diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml
index c0f5e80777..cec42c5c13 100644
--- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml
+++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_music_playing.xml
@@ -42,6 +42,7 @@
         android:layout_height="@dimen/dp_59"/>
 
     <ImageView
+        android:id="@+id/iv_music_point"
         android:src="@drawable/taxi_p_music_playing_pointer"
         app:layout_constraintStart_toEndOf="@+id/iv_music_cover"
         android:layout_width="@dimen/dp_501"