tbs 内核调整

.gitignore

@@ -58,3 +58,5 @@ output.json
 
 /libcore/.cxx
 /libygo/.cxx
+/mobile/assets/data/single
+/mobile/assets/data/pack

mobile/proguard-rules.pro

@@ -42,3 +42,14 @@
 -dontwarn com.tencent.bugly.**
 -keep public class com.tencent.bugly.**{*;}
 -keep class android.support.**{*;}
+
+-dontwarn dalvik.**
+-dontwarn com.tencent.smtt.**
+
+-keep class com.tencent.smtt.** {
+    *;
+}
+
+-keep class com.tencent.tbs.** {
+    *;
+}
\ No newline at end of file

mobile/src/main/AndroidManifest.xml

@@ -194,7 +194,7 @@
         <!-- 如果已经安装过原版YGOMobile，请注释掉或修改成其他，否则会导致无法安装 -->
         <provider
             android:name="cn.garymb.ygomobile.ui.preference.YGOPreferencesProvider"
-            android:authorities="cn.garymb.ygomobile.ui.preference.YGOPreferencesProvider"
+            android:authorities="${applicationId}.ui.preference.YGOPreferencesProvider"
             android:exported="false"
             android:grantUriPermissions="true" />
         <provider
@@ -206,6 +206,11 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
         </provider>
+
+        <service
+            android:name="com.tencent.smtt.export.external.DexClassLoaderProviderService"
+            android:label="dexopt"
+            android:process=":dexopt" />
     </application>
 
     <uses-permission android:name="android.permission.INTERNET" />

mobile/src/main/java/cn/garymb/ygomobile/App.java

@@ -15,13 +15,18 @@ import com.bumptech.glide.Glide;
 import com.ourygo.assistant.util.DuelAssistantManagement;
 import com.tencent.bugly.Bugly;
 import com.tencent.bugly.beta.Beta;
+import com.tencent.smtt.export.external.TbsCoreSettings;
+import com.tencent.smtt.sdk.QbSdk;
 import com.yuyh.library.imgsel.ISNav;
 import com.yuyh.library.imgsel.common.ImageLoader;
 
+import java.util.HashMap;
+
 import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.utils.CrashHandler;
+import cn.garymb.ygomobile.utils.ProcessUtils;
 
 public class App extends GameApplication {
 
@@ -33,10 +38,17 @@ public class App extends GameApplication {
         //初始化异常工具类
         CrashHandler crashHandler = CrashHandler.getInstance();
         crashHandler.init(getApplicationContext());
-        //初始化图片选择器
-        initImgsel();
         //初始化bugly
         initBugly();
+        if(!ProcessUtils.getCurrentProcessName(this).endsWith(":game")){
+            //初始化图片选择器
+            initImgsel();
+            //x5
+            HashMap map = new HashMap();
+            map.put(TbsCoreSettings.TBS_SETTINGS_USE_SPEEDY_CLASSLOADER, true);
+            map.put(TbsCoreSettings.TBS_SETTINGS_USE_DEXLOADER_SERVICE, true);
+            QbSdk.initTbsSettings(map);
+        }
     }
 
     @Override

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -47,6 +47,7 @@ import com.ourygo.assistant.base.listener.OnDuelAssistantListener;
 import com.ourygo.assistant.util.DuelAssistantManagement;
 import com.ourygo.assistant.util.Util;
 import com.tencent.bugly.beta.Beta;
+import com.tencent.smtt.export.external.TbsCoreSettings;
 import com.tencent.smtt.sdk.QbSdk;
 import com.tubb.smrv.SwipeMenuRecyclerView;
 
@@ -57,6 +58,7 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 
 import cn.garymb.ygodata.YGOGameOptions;