diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt index 58ba72db1f..a86cc6261f 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/bar/RightBarView.kt @@ -148,10 +148,12 @@ class RightBarView : ConstraintLayout, AuditionManager.MusicDataChangeListener { override fun onAttachedToWindow() { super.onAttachedToWindow() + CallerLogger.d(TAG, "onAttachedToWindow") // RightBarView启动的时候必须把MusicPlayingViewModel初始化了,否则和AuditionManager的回掉及逻辑会有问题 try { val musicPlayingViewModel = findViewTreeViewModelStoreOwner()?.let { ViewModelProvider(it).get(MusicPlayingViewModel::class.java) + CallerLogger.d(TAG, "ViewModelProvider(it).get(MusicPlayingViewModel::class.java)") } } catch (e: Exception) { e.printStackTrace() 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 5e7e0814dc..edc3b4650b 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 @@ -2,6 +2,8 @@ package com.mogo.och.taxi.passenger.ui.music.playing import androidx.lifecycle.ViewModel import com.elegant.utils.UiThreadHandler +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.common.module.manager.auditionmanager.AuditionManager import com.mogo.och.common.module.manager.auditionmanager.MusicData @@ -16,6 +18,7 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen init { AuditionManager.addDataChangeListener(TAG,this) + CallerLogger.d(TAG, "init") } fun setDistanceCallback(viewCallback: IMusicPlayingViewCallback) { @@ -128,6 +131,7 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen override fun onMusicCompletion(musicData: MusicData) { super.onMusicCompletion(musicData) + CallerLogger.d(TAG, "onMusicCompletion:${GsonUtils.toJson(musicData)}") checkMusicData?.let { if(it.id==musicData.id){ it.state = musicData.state @@ -137,6 +141,7 @@ class MusicPlayingViewModel : ViewModel(), AuditionManager.MusicDataChangeListen } } val nextMusicData = AuditionManager.getNextMusicData(musicData) + CallerLogger.d(TAG, "onMusicCompletion-nextMusic:${GsonUtils.toJson(nextMusicData)}") setMusicData(nextMusicData) play() }