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