From 56ec39ccc969d699e33b7977f2f5d4247c38abbb Mon Sep 17 00:00:00 2001 From: aibingbing Date: Mon, 25 Mar 2024 13:02:42 +0800 Subject: [PATCH] =?UTF-8?q?[v630]=20fix:=20=E9=9F=B3=E4=B9=90=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E5=88=97=E8=A1=A8=E9=A1=B5=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=B8=8D=E9=80=89=E6=8B=A9=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt | 2 +- .../och/taxi/passenger/ui/music/playing/MusicPlayingView.kt | 2 +- .../taxi/passenger/ui/music/playing/MusicPlayingViewModel.kt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt index b89f3fc916..006557f9a8 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/music/list/MusicListView.kt @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.taxi_p_music_list.view.rv_music_list class MusicListView : ConstraintLayout, MusicListViewModel.IMusicListViewCaLillback, MusicListItemAdapter.ClickListener { - private val TAG = "ItineraryView" + private val TAG = "MusicListView" constructor(context: Context) : super(context) 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 a23d0dec21..339f26edd5 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 @@ -33,7 +33,7 @@ import kotlinx.android.synthetic.main.taxi_p_music_playing.view.tv_tag class MusicPlayingView : ConstraintLayout, MusicPlayingViewModel.IMusicPlayingViewCallback { - private val TAG = "ItineraryView" + private val TAG = "MusicPlayingView" constructor(context: Context) : super(context) 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 ecab8648db..9ad878e2e2 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 @@ -55,7 +55,8 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen this.checkMusicData = AuditionManager.musicDataPlaying!! } }else { - this.checkMusicData = AuditionManager.musicList.first() + //暂停播放的时候，如果在选择页面什么也不选，应该也需要默认是当前暂停播放的音乐 + return } }else { this.checkMusicData = musicData