Merge branch 'feat/lp/lp_muse_4' into 'd/4.3.93_muse'

feat: 合并和升级组件

See merge request app_android_lib/YDL-Component!58

config.gradle

@@ -14,7 +14,7 @@ ext {
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.10",
 
-            "m-muse"          : "0.0.28.41",
+            "m-muse"          : "0.0.28.42",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
 
@@ -38,7 +38,7 @@ ext {
             "ydl-platform"    : "0.0.41.15",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.79",
+            "ydl-webview"     : "0.0.38.82",
             "ydl-media"       : "0.0.21.44",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.90",
@@ -99,7 +99,7 @@ ext {
             "m-dynamic"       : "0.0.7.73",
             "m-article"       : "0.0.0.8",
 
-            "m-muse"          : "0.0.28.41",
+            "m-muse"          : "0.0.28.42",
             "m-tests"         : "0.0.24.18",
             "m-course"        : "0.0.43.37",
             //-------------- 业务模块 API 层 --------------
@@ -121,7 +121,7 @@ ext {
             "ydl-platform"    : "0.0.41.15",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.79",
+            "ydl-webview"     : "0.0.38.82",
             "ydl-media"       : "0.0.21.44",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.90",

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

@@ -30,6 +30,7 @@ import com.yidianling.muse.constants.MuseBIConstants
 import com.yidianling.muse.event.MeditationFloatEvent
 import com.yidianling.muse.helper.MediaPlayerManager
 import com.yidianling.muse.utils.MediaPlayerTimeUtil
+import com.yidianling.muse.utils.MeditationFloatPermissionUtil
 import com.yidianling.muse.widget.QuitMeditationDialog
 import com.yidianling.muse.widget.ShareMeditationDialog
 import com.yidianling.user.api.service.IUserService

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -1068,7 +1068,7 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
     public void onEvent(ReloadUrlEvent event) {
         //刷新页面
         loadUrl(event.getUrl());
-        shouldClearHistory = true;
+//        shouldClearHistory = true;
     }
 
     public void onEvent(UserBindPhoneEvent event) {