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 113df59a72..6403838858 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 @@ -35,8 +35,8 @@ class DevaToolsProvider : IDevaToolsProvider { MogoLogCatchManager.startCatchLog() } - override fun startLogCatch(duration: Int) { - MogoLogCatchManager.startCatchLog(duration) + override fun startLogCatch(duration: Int, logPrefixName: String?) { + MogoLogCatchManager.startCatchLog(duration, logPrefixName) } override fun stopLogCatch() { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index 2cb25a49a9..f0c5c94477 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -10,12 +10,12 @@ import com.mogo.commons.AbsMogoApplication import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.constants.MoGoConfig -import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.ThreadUtils @@ -103,14 +103,14 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl return false } - fun startCatchLog(duration: Int = 10) { + fun startCatchLog(duration: Int = 10, logPrefixName: String? = null) { if (catchingList.contains(MANUAL_CATCH_PKG_NAME)) { TipToast.shortTip("已经在抓取日志了,请稍后再试") } else { CallerLogger.d("$M_DEVA$TAG", "开始抓取日志==== duration : $duration") manualContent.type = START_CATCH_LOG manualContent.duration = duration - startCatchLog(manualContent) + startCatchLog(manualContent, logPrefixName) } } @@ -120,7 +120,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl stopCatchLog(manualContent) } - private fun startCatchLog(content: RemoteLogPushContent) { + private fun startCatchLog(content: RemoteLogPushContent, logPrefixName: String? = null) { catchingList.add(content.pkgName) var delay = (content.duration).toLong() handler.removeMessages(MSG_TRY_CLOSE_LOG) @@ -136,6 +136,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl mContext, MoGoAiCloudClientConfig.getInstance().sn, AppConfigInfo.toString(), + logPrefixName?.replace("_", "-"), content, this ) diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index a1cb922dac..1b81017f93 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -22,7 +22,7 @@ interface IDevaToolsProvider : IMoGoFunctionServerProvider { * 开始抓取日志 * duration : 抓取时间(分钟) */ - fun startLogCatch(duration: Int) + fun startLogCatch(duration: Int, logPrefixName: String? = null) /** * 停止i抓取日志 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index a30a36d037..f216303736 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -1,7 +1,6 @@ package com.mogo.eagle.core.function.call.devatools import android.content.Context -import android.view.ContextMenu import android.view.View import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.chain.ChainLogParam @@ -30,8 +29,8 @@ object CallerDevaToolsManager { * 开始抓取全量日志 * duration 分钟数 */ - fun startCatchLog(duration: Int) { - devaToolsProviderApi?.startLogCatch(duration) + fun startCatchLog(duration: Int, logPrefixName: String? = null) { + devaToolsProviderApi?.startLogCatch(duration, logPrefixName) } /** diff --git a/gradle.properties b/gradle.properties index 4541faa64b..cbbcd5f14a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,7 +60,7 @@ HOOK_LOG_VERSION=1.5.17 SERVICE_CHAIN_VERSION=1.0.53 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.2.15 +LOGLIB_VERSION=1.2.19 ######## MogoAiCloudSDK Version ######## # 网络请求 MOGO_NETWORK_VERSION=1.3.31