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

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

@@ -12,6 +12,7 @@ import com.facebook.stetho.Stetho;
 import com.meituan.android.walle.WalleChannelReader;
 import com.netease.nimlib.sdk.util.NIMUtil;
 import com.tencent.bugly.crashreport.CrashReport;
+import com.tencent.smtt.sdk.QbSdk;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.socialize.PlatformConfig;
@@ -83,7 +84,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
                 Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
 
                 //子线程中初始化X5内核，防止ANR问题
-                initX5();
+                initX5(application);
 
                 if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)){
 //                    YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830");
@@ -152,24 +153,25 @@ public class DemoAppLifecycles implements IAppLifecycles {
 
     /**
      * 初始化X5内核
+     * @param application
      */
-    private void initX5() {
-//        if (!QbSdk.isTbsCoreInited()) {//// preinit只需要调用一次，如果已经完成了初始化，那么就直接构造view
-//            QbSdk.preInit(application, null);// 设置X5初始化完成的回调接口
-//        }
-//
-//        QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
-//
-//            @Override
-//            public void onViewInitFinished(boolean arg0) {
-//                //初始化完成回调
-//            }
-//
-//            @Override
-//            public void onCoreInitFinished() {
-//            }
-//        };
-//        QbSdk.initX5Environment(application, cb);
+    private void initX5(Application application) {
+        if (!QbSdk.isTbsCoreInited()) {//// preinit只需要调用一次，如果已经完成了初始化，那么就直接构造view
+            QbSdk.preInit(application, null);// 设置X5初始化完成的回调接口
+        }
+
+        QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
+
+            @Override
+            public void onViewInitFinished(boolean arg0) {
+                //初始化完成回调
+            }
+
+            @Override
+            public void onCoreInitFinished() {
+            }
+        };
+        QbSdk.initX5Environment(application, cb);
     }
 
 

config.gradle

 ext {
     kotlin_version = "1.3.21"
-    dev_mode = true
+    dev_mode = false
 
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -42,17 +42,17 @@ ext {
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
-            "m-confide"       : "0.0.42",
-            "m-consultant"    : "0.0.52",
-            "m-fm"            : "0.0.24",
-            "m-user"          : "0.0.42",
-            "m-home"          : "0.0.8.3",
-            "m-im"            : "0.0.4.4",
-            "m-dynamic"       : "0.0.2.1",
+            "m-confide"       : "0.0.42.1",
+            "m-consultant"    : "0.0.52.1",
+            "m-fm"            : "0.0.24.1",
+            "m-user"          : "0.0.42.1",
+            "m-home"          : "0.0.8.4",
+            "m-im"            : "0.0.4.6",
+            "m-dynamic"       : "0.0.2.2",
 
-            "m-muse"          : "0.0.21.1",
-            "m-tests"         : "0.0.16.1",
-            "m-course"        : "0.0.35.2",
+            "m-muse"          : "0.0.21.2",
+            "m-tests"         : "0.0.16.2",
+            "m-course"        : "0.0.35.3",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.5",
@@ -69,19 +69,19 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.30.3",
-            //第二步 若干
+            "ydl-platform"    : "0.0.30.4",
 
-            "ydl-webview"     : "0.0.29",
-            "ydl-media"       : "0.0.15",
-            "ydl-pay"         : "0.0.12",
-            "m-audioim"       : "0.0.41",
+            //第二步 若干
+            "ydl-webview"     : "0.0.29.1",
+            "ydl-media"       : "0.0.15.1",
+            "ydl-pay"         : "0.0.12.1",
+            "m-audioim"       : "0.0.41.1",
+            "ydl-flutter-base": "0.0.5.23",
 
             //以下 几乎不会动
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.1",
-            "ydl-utils"       : "0.0.3",
-            "ydl-flutter-base": "0.0.5.22",
+            "ydl-utils"       : "0.0.3.1",
     ]
     
 
@@ -115,20 +115,19 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.30.3",
+            "ydl-platform"    : "0.0.30.4",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.29",
-            "ydl-media"       : "0.0.15",
-            "ydl-pay"         : "0.0.12",
-            "m-audioim"       : "0.0.41",
+            "ydl-webview"     : "0.0.29.1",
+            "ydl-media"       : "0.0.15.1",
+            "ydl-pay"         : "0.0.12.1",
+            "m-audioim"       : "0.0.41.1",
+            "ydl-flutter-base": "0.0.5.23",
 
             //以下 几乎不会动
-
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.1",
-            "ydl-utils"       : "0.0.3",
-            "ydl-flutter-base": "0.0.5.22",
+            "ydl-utils"       : "0.0.3.1",
     ]
 
     dependencies = [

ydl-platform/build.gradle

@@ -87,8 +87,8 @@ dependencies {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
     }
 
-//    api rootProject.ext.dependencies["ydl-utils"]
-    api project(':ydl-utils')
+    api rootProject.ext.dependencies["ydl-utils"]
+//    api project(':ydl-utils')
     api rootProject.ext.dependencies["ydl-js"]
     api rootProject.ext.dependencies["ydl-net"]
     api rootProject.ext.dependencies["ydl-js"]