From 93a805bc83f8df6f77a5dafd5e2f1ab79f0a8b8a Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 15 May 2025 14:39:00 +0800
Subject: [PATCH] =?UTF-8?q?[8.0.0]=20[fea]=20[=E9=9F=B3=E4=B9=90=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E7=AC=AC=E4=B8=80=E4=B8=AA=E4=B8=8D?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/unmanned/passenger/ui/music/MusicModel.kt     |  6 ++++--
 .../unmanned/passenger/ui/music/list/MusicListView.kt | 11 +++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt
index 8570ef96ec..2433a5624b 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/MusicModel.kt
@@ -119,7 +119,7 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
      * 1、更新选中状态
      * 2、如果正在播放 需要开始播放选中音乐
      */
-    fun checkMusic(musicData: MusicData){
+    fun checkMusic(musicData: MusicData,startPlay:Boolean = true){
         AuditionManager.musicList.forEach {
             // 上一个选中歌曲
             if (it.select==true) {
@@ -136,7 +136,9 @@ object MusicModel : CallerBase<MusicModel.MusicDataListener>(), OrderListener, I
             }
         }
         notifySelectChange(musicData)
-        AuditionManager.play(musicData)
+        if(startPlay) {
+            AuditionManager.play(musicData)
+        }
     }
 
     private fun notifySelectChange(musicData: MusicData) {
diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt
index 9ed3821924..9db7ad9b86 100644
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/music/list/MusicListView.kt
@@ -29,6 +29,8 @@ class MusicListView : ConstraintLayout, MusicListViewModel.IMusicListViewCaLillb
     private val dataList = mutableListOf<MusicData>()
     private lateinit var lineAdapter:MusicListItemAdapter
 
+    private var isFirstVisable = false
+
     private fun initView() {
         LayoutInflater.from(context).inflate(R.layout.taxi_p_music_list, this, true)
         rv_music_list.layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
@@ -39,6 +41,8 @@ class MusicListView : ConstraintLayout, MusicListViewModel.IMusicListViewCaLillb
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
 
+        isFirstVisable = true
+
         val viewModel = findViewTreeViewModelStoreOwner()?.let {
             ViewModelProvider(it).get(MusicListViewModel::class.java)
         }
@@ -48,8 +52,11 @@ class MusicListView : ConstraintLayout, MusicListViewModel.IMusicListViewCaLillb
 
     override fun onVisibilityAggregated(isVisible: Boolean) {
         super.onVisibilityAggregated(isVisible)
-        if(isVisible){
-
+        if(isVisible&&isFirstVisable){
+            isFirstVisable = false
+            if (dataList.isNotEmpty()) {
+                MusicModel.checkMusic(dataList.first(),false)
+            }
         }
     }