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

switch float play view

See merge request app_android_lib/YDL-Component!61

app/src/main/java/com/ydl/component/music/PlayFragment.java

@@ -66,6 +66,10 @@ public class PlayFragment extends Fragment implements View.OnClickListener,
         super.onActivityCreated(savedInstanceState);
         EventBus.getDefault().register(this);
         initPlayMode();
+
+        MeditationFloatEvent event = new MeditationFloatEvent(false,true,null,null);
+        EventBus.getDefault().post(event);
+
         onChangeImpl(AudioPlayer.Companion.get().getPlayMusic());
         AudioPlayer.Companion.get().addOnPlayEventListener(this);
     }

config.gradle

@@ -9,12 +9,12 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.17",
-            "m-home"          : "0.0.23.64",
+            "m-home"          : "0.0.23.65",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.10",
 
-            "m-muse"          : "0.0.28.42",
+            "m-muse"          : "0.0.28.45",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
 
@@ -94,12 +94,12 @@ ext {
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
             "m-user"          : "0.0.62.17",
-            "m-home"          : "0.0.23.64",
+            "m-home"          : "0.0.23.65",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.8",
 
-            "m-muse"          : "0.0.28.42",
+            "m-muse"          : "0.0.28.45",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
             //-------------- 业务模块 API 层 --------------

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

@@ -10,6 +10,8 @@ import android.widget.SeekBar
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.ydl.media.audio.AudioPlayer
+import com.ydl.media.view.PlayerFloatHelper
 import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.base.BaseActivity
@@ -100,6 +102,10 @@ class PlayMeditationActivity : BaseActivity() {
         statusBarLightMode(this)
         super.onCreate(savedInstanceState)
 
+        PlayerFloatHelper.removeView(mContext)
+        PlayerFloatHelper.playTempData.clear()
+        AudioPlayer.get().stopPlayer()
+
         mMediaPlayer = MediaPlayerManager.getInstance(this)?.getMediaPlayer()
 
         EventBus.getDefault().register(this)

m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt

@@ -131,6 +131,7 @@ class MeditationWindowService : LifecycleService() {
                     }catch (e:Exception){
 
                     }
+                    hideFloatWindow()
                 }
                 hideFloatWindow()
             }