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()){