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

app/src/main/AndroidManifest.xml

@@ -64,12 +64,6 @@
             android:launchMode="singleTask"
             android:noHistory="true">
         </activity>
-
-        <service
-                android:name="com.tencent.smtt.export.external.DexClassLoaderProviderService"
-                android:label="dexopt"
-                android:process=":dexopt"
-                />
     </application>
 
 </manifest>
\ No newline at end of file

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

@@ -12,7 +12,6 @@ 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.export.external.TbsCoreSettings;
 import com.tencent.smtt.sdk.QbSdk;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
@@ -23,14 +22,13 @@ import com.ydl.component.MainActivity;
 import com.ydl.media.audio.PlayService;
 import com.ydl.ydlcommon.base.config.YDLConstants;
 import com.ydl.ydlcommon.base.delegate.IAppLifecycles;
+import com.ydl.ydlcommon.utils.LogUtil;
 import com.ydl.ydlcommon.utils.YdlBuryPointUtil;
 import com.yidianling.course.lifeCallback.CoursePlayLifecycle;
 import com.yidianling.im.config.NimApplication;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashMap;
-
 import io.flutter.view.FlutterMain;
 
 /**
@@ -160,23 +158,25 @@ public class DemoAppLifecycles implements IAppLifecycles {
      */
     private void initX5(Application application) {
         // 在调用TBS初始化、创建WebView之前进行如下配置，以开启优化方案
-        HashMap map = new HashMap();
-        map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
-        QbSdk.initTbsSettings(map);
+//        HashMap map = new HashMap();
+//        map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
+//        QbSdk.initTbsSettings(map);
 
-        if (!QbSdk.isTbsCoreInited()) {//// preinit只需要调用一次，如果已经完成了初始化，那么就直接构造view
-            QbSdk.preInit(application, null);// 设置X5初始化完成的回调接口
-        }
+//        if (!QbSdk.isTbsCoreInited()) {//// preinit只需要调用一次，如果已经完成了初始化，那么就直接构造view
+//            QbSdk.preInit(application, null);// 设置X5初始化完成的回调接口
+//        }
 
         QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
 
             @Override
             public void onViewInitFinished(boolean arg0) {
                 //初始化完成回调
+                LogUtil.i("QbSdk onViewInitFinished："+arg0);
             }
 
             @Override
             public void onCoreInitFinished() {
+                LogUtil.i("QbSdk onCoreInitFinished");
             }
         };
         QbSdk.initX5Environment(application, cb);

config.gradle

@@ -72,7 +72,7 @@ ext {
             "ydl-platform"    : "0.0.30.5",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.29.1",
+            "ydl-webview"     : "0.0.29.2",
             "ydl-media"       : "0.0.15.1",
             "ydl-pay"         : "0.0.12.1",
             "m-audioim"       : "0.0.41.1",
@@ -118,7 +118,7 @@ ext {
             "ydl-platform"    : "0.0.30.5",
             //第二步 若干
 
-            "ydl-webview"     : "0.0.29.1",
+            "ydl-webview"     : "0.0.29.2",
             "ydl-media"       : "0.0.15.1",
             "ydl-pay"         : "0.0.12.1",
             "m-audioim"       : "0.0.41.1",

ydl-webview/build.gradle

@@ -25,6 +25,10 @@ android {
             }
         }
 
+        ndk {
+            abiFilters "armeabi"
+        }
+
     }
 
     buildTypes {
@@ -48,19 +52,17 @@ android {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     kapt 'com.alibaba:arouter-compiler:1.2.2'
-
     api rootProject.ext.dependencies["ydl-user-router"]
-    api fileTree(dir: 'libs', include: ['*.jar'])
-
-    api 'com.tencent.tbs.tbssdk:sdk:43697'
-    if (rootProject.ext.dev_mode){
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    //    api 'com.tencent.tbs.tbssdk:sdk:43697'
+    api files('libs/tbs_sdk_thirdapp_v4.3.0.1148_43697_sharewithdownloadwithfile_withoutGame_obfs_20190805_175505.jar')
+    if (rootProject.ext.dev_mode) {
         //开发时使用
         api project(':ydl-platform')
         implementation modularPublication('com.ydl:m-user-api')
         implementation modularPublication('com.ydl:m-dynamic-api')
         implementation modularPublication('com.ydl:m-im-api')
-
-    }else {
+    } else {
         //发布时使用
         compileOnly rootProject.ext.dependencies["ydl-m-user-api"]
         compileOnly rootProject.ext.dependencies["ydl-m-dynamic-api"]
@@ -69,6 +71,5 @@ dependencies {
             transitive = true
         }
     }
-
 }