From c9d2fb61420b42c52a2cb3fcf218a6d8387531e7 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 21 Mar 2024 17:40:17 +0800
Subject: [PATCH] =?UTF-8?q?[6.3.0]=20[taxi=20=E9=80=89=E6=8B=A9=E6=AD=8C?=
 =?UTF-8?q?=E6=9B=B2=E7=9B=B4=E6=8E=A5=E6=92=AD=E6=94=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/passenger/ui/music/MusicView.kt     | 2 +-
 .../taxi/passenger/ui/music/playing/MusicPlayingView.kt   | 4 ++++
 .../passenger/ui/music/playing/MusicPlayingViewModel.kt   | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt
index 0e24c4a4f3..7433862f46 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/MusicView.kt
@@ -88,7 +88,7 @@ class MusicView : ConstraintLayout, MusicViewModel.IMusicViewCallback, MusicList
     }
 
     override fun checkItem(musicData: MusicData) {
-        mpv_playing.setData(musicData)
+        mpv_playing.setDatafromCheck(musicData)
         // 详情页显示歌曲
         showMusicPlaying()
     }
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt
index 984763e4f9..a23d0dec21 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingView.kt
@@ -105,6 +105,10 @@ class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingVi
         viewModel?.setMusicData(musicData)
     }
 
+    fun setDatafromCheck(musicData: MusicData){
+        viewModel?.setMusciDataFromCheck(musicData)
+    }
+
     override fun setViewData(musicData: MusicData){
         tv_music_name.text = musicData.songName
         tv_tag.text = musicData.tag.first()
diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt
index 1e4410dbf5..ecab8648db 100644
--- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt
+++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt
@@ -38,6 +38,14 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen
         }
     }
 
+    fun setMusciDataFromCheck(musicData: MusicData){
+        val playing = AuditionManager.isPlaying()
+        showData(musicData)
+        if(playing){
+            play()
+        }
+    }
+
     private fun showData(musicData: MusicData?){
         if(musicData==null){
             if(AuditionManager.isPlaying()){