From 4e387a95a14d81eb17e811972c92f7b9620aa386 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 29 Aug 2023 18:31:00 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0][Fix]=E8=A7=A3=E5=86=B3Koom=E5=BA=93?= =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function-impl/mogo-core-function-devatools/build.gradle | 2 -- .../zhjt/mogo_core_function_devatools/DevaToolsProvider.kt | 2 -- foudations/mogo-commons/build.gradle | 3 ++- .../src/main/java/com/mogo/commons/AbsMogoApplication.java | 6 ++++++ .../src/main/java/com/mogo/commons}/koom/KoomInitTask.kt | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) rename {core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools => foudations/mogo-commons/src/main/java/com/mogo/commons}/koom/KoomInitTask.kt (94%) diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index ea909edcaa..dd29601f0e 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -87,8 +87,6 @@ dependencies { implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.flexbox implementation rootProject.ext.dependencies.androidautoSize - implementation rootProject.ext.dependencies.koomnative - implementation rootProject.ext.dependencies.koomxhook implementation rootProject.ext.dependencies.mofang_runtime implementation rootProject.ext.dependencies.log_runtime implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: MATRIX_VERSION, changing: true diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index ef0a9fb0c8..821101bcb9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -45,7 +45,6 @@ import com.zhjt.mogo_core_function_devatools.block.* import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl -import com.zhjt.mogo_core_function_devatools.koom.KoomInitTask import com.zhjt.mogo_core_function_devatools.logcat.* import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager import com.zhjt.mogo_core_function_devatools.lookaround.* @@ -98,7 +97,6 @@ class DevaToolsProvider : IDevaToolsProvider { //链路相关 traceManager.init(mContext!!) if (DebugConfig.isDebug()) { - KoomInitTask.init(AbsMogoApplication.getApp()) initMatrix() } ttsManager.initTts(mContext!!) //todo 扶风 优化 diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index c3353c9883..f39dbedbe7 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -57,7 +57,8 @@ dependencies { api 'org.greenrobot:eventbus:3.1.1' api rootProject.ext.dependencies.androidautoSize - + implementation rootProject.ext.dependencies.koomnative + implementation rootProject.ext.dependencies.koomxhook if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogoaicloudservicesdk api rootProject.ext.dependencies.ttsbase diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index 9d4d5fdb61..b66d7a3b87 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -10,6 +10,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.mogo.commons.crash.FinalizeCrashFixer; +import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.koom.KoomInitTask; import com.mogo.commons.screen.ScreenHelper; import com.mogo.commons.module.MogoServices; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; @@ -43,6 +45,10 @@ public abstract class AbsMogoApplication extends Application { super.onCreate(); AutoSize.checkAndInit(this); ScreenHelper.setScreenConfig(this); + // 非主进程也需要初始化 + if (DebugConfig.isDebug()) { + KoomInitTask.INSTANCE.init(AbsMogoApplication.getApp()); + } if (!shouldInit()) { return; } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/koom/KoomInitTask.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/koom/KoomInitTask.kt similarity index 94% rename from core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/koom/KoomInitTask.kt rename to foudations/mogo-commons/src/main/java/com/mogo/commons/koom/KoomInitTask.kt index 6fca530bea..f442e7e573 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/koom/KoomInitTask.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/koom/KoomInitTask.kt @@ -1,4 +1,4 @@ -package com.zhjt.mogo_core_function_devatools.koom +package com.mogo.commons.koom import android.app.Application import android.os.Build @@ -7,6 +7,7 @@ import com.kwai.koom.base.InitTask import com.kwai.koom.base.MonitorManager object KoomInitTask : InitTask { + override fun init(application: Application) { val config = CommonConfig.Builder() .setApplication(application) // Set application