[dev_opt_2.15.0] 合并dev_arch_opt_3.0分支并解决冲突

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -1,9 +1,13 @@
 package com.mogo.launcher;
 
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.eagle.core.function.api.devatools.strict.IStrictModeProvider;
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
 import com.mogo.eagle.core.function.call.startup.CallerStartUpManager;
 import com.mogo.eagle.core.function.main.MainMoGoApplication;
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.util.SharedPrefs;
 import com.mogo.launcher.crash.CrashSystem;
 import com.mogo.launcher.startup.ARouterStartUp;
 import com.mogo.launcher.startup.ConfigStartUp;
@@ -21,9 +25,21 @@ public class MogoApplication extends MainMoGoApplication {
         ARouterStartUp.init(this);
         ConfigStartUp.init(this);
         CallerStartUpManager.initStageOne();
+        tryEnableStrictMode();
         super.onCreate();
     }
 
+    private void tryEnableStrictMode() {
+        IStrictModeProvider strict = CallerDevaToolsManager.INSTANCE.strict();
+        if (DebugConfig.isDebug() && strict != null) {
+            boolean enabled = SharedPrefs.getInstance(this).getBoolean("MOGO_STRICT_MODE_ENABLED", false);
+            Logger.e("StrictMode", "isEnabled:" + enabled);
+            if (enabled) {
+                strict.enable();
+            }
+        }
+    }
+
     @Override
     protected void initCrashConfig() {
         CrashSystem crashSystem = CrashSystem.getInstance(this);

app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt

@@ -14,23 +14,29 @@ import com.knightboost.lancet.api.annotations.*
 @Group("crash_fix")
 class CrashFix {
 
-    /**
-     * 修正Android8.0及之后，后台启动Service引起的崩溃
-     * java.lang.IllegalStateException: Not allowed to start service Intent {
-     *  act=com.zhidao.cosupload.service.UPLOAD_ACTION cmp=com.mogo.launcher.f/com.zhidao.cosupload.service.UploadService }: app is in background uid UidRecord{6443b7b u0a404 LAST bg:+1m15s362ms idle change:idle procs:1 seq(0,0,0)}
-     */
-    @Insert(mayCreateSuper = true)
-    @TargetClass("android.content.Context", scope = LEAF)
-    @TargetMethod(methodName = "startService")
-    fun fixStartServiceCrash(intent: Intent): ComponentName? {
-        return try {
-            Origin.call() as ComponentName?
-        } catch (t: Throwable) {
-            t.printStackTrace()
-            null
+
+    companion object {
+
+        /**
+         * 修正Android8.0及之后，后台启动Service引起的崩溃
+         * java.lang.IllegalStateException: Not allowed to start service Intent {
+         *  act=com.zhidao.cosupload.service.UPLOAD_ACTION cmp=com.mogo.launcher.f/com.zhidao.cosupload.service.UploadService }: app is in background uid UidRecord{6443b7b u0a404 LAST bg:+1m15s362ms idle change:idle procs:1 seq(0,0,0)}
+         */
+        @JvmStatic
+        @TargetClass("android.content.Context", scope = ALL)
+        @TargetMethod(methodName = "startService")
+        @ReplaceInvoke
+        fun fixStartServiceCrash(context: Context, intent: Intent): ComponentName? {
+            return try {
+                context.startService(intent)
+            } catch (t: Throwable) {
+                t.printStackTrace()
+                null
+            }
         }
     }
 
+
     /**
      * https://console.volcengine.com/apmplus/app/crash/detail/java/bb387ccd9c1a3c6ad2ede4e6f501a5e7?aid=302368&date=%7B%22granularity%22%3A%221h%22%2C%22duration%22%3A%22recently%22%2C%22range%22%3A%221w%22%7D&filters=%7B%22type%22%3A%22and%22%2C%22sub_conditions%22%3A%5B%7B%22dimension%22%3A%22os%22%2C%22op%22%3A%22in%22%2C%22type%22%3A%22expression%22%2C%22values%22%3A%5B%22Android%22%5D%7D%5D%7D&org_id=2100068151&os=Android&page_number=6&status=%5B%22pending%22%2C%22processing%22%2C%22solved%22%2C%22reopen%22%5D
      * java.lang.IllegalArgumentException: Invalid audio buffer size.

app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt

@@ -12,10 +12,12 @@ import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.mogo.launcher.BuildConfig
 import com.mogo.launcher.R
 import com.mogo.test.crashreport.CrashReportConstants
+import com.shuyu.gsyvideoplayer.player.IjkPlayerManager
 import com.zhidaoauto.map.sdk.open.HDTypes
 import com.zhidaoauto.map.sdk.open.MapAutoApi
 import com.zhidaoauto.map.sdk.open.MapParams
 import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
+import tv.danmaku.ijk.media.player.IjkMediaPlayer
 
 object ConfigStartUp {
 
@@ -27,6 +29,9 @@ object ConfigStartUp {
     }
 
     private fun initBuildConfig() {
+        //ijk关闭log
+        IjkPlayerManager.setLogLevel(IjkMediaPlayer.IJK_LOG_SILENT);
+
         // 初始化构建APP的时候的分支及提交HASH，用于辅助定位问题
         AppConfigInfo.workingBranchName = BuildConfig.WORKING_BRANCH_NAME
         AppConfigInfo.workingBranchHash = BuildConfig.WORKING_BRANCH_HASH