Merge branch 'd/lancet/4.3.93_muse' into 'd/4.3.93_muse'

fix  meditationId  set value err

See merge request app_android_lib/YDL-Component!69

m-muse/src/main/java/com/yidianling/muse/activity/PlayMeditationActivity.kt

@@ -399,7 +399,8 @@ class PlayMeditationActivity : BaseActivity() {
                 ""
             )
             val event = MeditationFloatEvent(true,
-                meditation = currentMeditation?.copy(meditationType = mMeditationType))
+                meditation = currentMeditation?.copy(meditationType = mMeditationType,meditationId =
+                mMeditationId?:0))
             EventBus.getDefault().post(event)
 
             Handler().postDelayed({
@@ -742,8 +743,8 @@ class PlayMeditationActivity : BaseActivity() {
 
     private fun initMediaPlayer(path: String, current: Int) {
 
-        val event = MeditationFloatEvent(show = false,stop = false,meditation = currentMeditation)
-        EventBus.getDefault().post(event)
+//        val event = MeditationFloatEvent(show = false,stop = false,meditation = currentMeditation)
+//        EventBus.getDefault().post(event)
 
         if (MediaPlayerManager.getInstance(this)?.getAudioPath() != null
             && MediaPlayerManager.getInstance(this)?.getAudioPath() == path