Merge branch 'feature/im_update' of…

Merge branch 'feature/im_update' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/im_update

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -20,8 +20,8 @@ import java.util.List;
 public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
     //        public static String appEnv = YDLConstants.ENV_AUTO_TEST;
-    public static String appEnv = YDLConstants.ENV_TEST;
-//    public static String appEnv = YDLConstants.ENV_PROD;
+//    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_PROD;
 
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

app/src/main/java/com/ydl/component/service/web/WVClickAbstractListener.java

@@ -393,7 +393,9 @@ public class WVClickAbstractListener implements WebViewClientClickListener {
 
     @Override
     public void openShareMenu(H5JsBean.H5JsCmd.Params params) {
-
+        if (mContext instanceof NewH5Activity) {
+            ((NewH5Activity) mContext).openShareMenu(params);
+        }
     }
 
     @Override

config.gradle

@@ -52,7 +52,7 @@ ext {
 
             "m-muse"          : "0.0.26",
             "m-tests"         : "0.0.21",
-            "m-course"        : "0.0.40",
+            "m-course"        : "0.0.40.1",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
@@ -72,7 +72,7 @@ ext {
             "ydl-platform"    : "0.0.37",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.37",
+            "ydl-webview"     : "0.0.37.1",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
             "m-audioim"       : "0.0.46",
@@ -118,7 +118,7 @@ ext {
             "ydl-platform"    : "0.0.37",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.36",
+            "ydl-webview"     : "0.0.37.1",
             "ydl-media"       : "0.0.20",
             "ydl-pay"         : "0.0.17",
             "m-audioim"       : "0.0.46",

m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt

@@ -18,6 +18,8 @@ import android.widget.AdapterView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.alibaba.android.arouter.facade.annotation.Route
+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
@@ -730,6 +732,15 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
         getData(false)
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        if (!PlayerFloatHelper.isCanClick) {
+            PlayerFloatHelper.hide()
+            PlayerFloatHelper.removeView(this)
+            AudioPlayer.get().stopPlayer()
+        }
+    }
+
 
     override fun onResume() {
         super.onResume()

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

@@ -40,7 +40,6 @@ import com.ydl.ydlcommon.base.BaseActivity;
 import com.ydl.ydlcommon.base.BaseApp;
 import com.ydl.ydlcommon.base.config.YDLConstants;
 import com.ydl.ydlcommon.bean.StatusBarOptions;
-import com.ydl.ydlcommon.data.PlatformRamImpl;
 import com.ydl.ydlcommon.ui.LogoLoadingView;
 import com.ydl.ydlcommon.utils.BuryPointUtils;
 import com.ydl.ydlcommon.utils.LogUtil;
@@ -49,7 +48,6 @@ import com.ydl.ydlcommon.utils.StatusBarUtils;
 import com.ydl.ydlcommon.utils.TemporaryUtils;
 import com.ydl.ydlcommon.utils.URLUtils;
 import com.ydl.ydlcommon.view.TitleBar;
-import com.ydl.ydlcommon.view.dialog.CommonDialog;
 import com.ydl.ydlcommon.view.dialog.YDLCommonDialog;
 import com.ydl.ydlcommon.view.dialog.YDLShareDialog;
 import com.yidianling.common.tools.RxDeviceTool;
@@ -1389,6 +1387,6 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
     }
 
     private void toTrend(String url) {
-        WebModularServiceUtils.Companion.getDynamicService().publishArticleToTrend(NewH5Activity.this, url, cover, shareTitle);
+        this.startActivity(WebModularServiceUtils.Companion.getDynamicService().publishArticleToTrend(NewH5Activity.this, url, cover, shareTitle));
     }
 }