Merge branch 'feat/lancet/meditation_optimize' into 'd/v4.4.05'

remove  MeditationService

See merge request app_android_lib/YDL-Component!268

m-muse/src/main/AndroidManifest.xml

@@ -26,7 +26,5 @@
                 android:screenOrientation="portrait"
                 android:theme="@style/un_full_screen_activity"/>
 
-        <service android:name=".service.MeditationWindowService"/>
-
     </application>
 </manifest>

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

@@ -453,7 +453,7 @@ class PlayMeditationActivity : BaseActivity() {
                 meditation = currentMeditation?.copy(
                     meditationType = mMeditationType, meditationId =
                     mMeditationId ?: 0
-                )
+                ),meditations = meditations
             )
             EventBus.getDefault().post(event)
 
@@ -1070,7 +1070,7 @@ class PlayMeditationActivity : BaseActivity() {
     }
 
     override fun onBackPressed() {
-        val event = MeditationFloatEvent(true, meditation = currentMeditation)
+        val event = MeditationFloatEvent(true, meditation = currentMeditation,meditations = meditations)
         EventBus.getDefault().post(event)
         super.onBackPressed()
     }

m-muse/src/main/java/com/yidianling/muse/event/MeditationFloatEvent.kt

@@ -7,6 +7,6 @@ class MeditationFloatEvent(
     val stop: Boolean? = null,
     val time: Long? = null,
     val meditation: MeditationPlayModuleBean.MeditationDetail? = null,
-    val meditations: ArrayList<MeditationPlayModuleBean.MeditationDetail>? = null
+    val meditations: MutableList<MeditationPlayModuleBean.MeditationDetail>? = null
 )