fix bug and add new func

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt

@@ -9,9 +9,11 @@ import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_ADA
 import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS
 import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA
 import com.mogo.eagle.core.data.chain.ChainLogParam
+import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.zhidao.loglib.fw.FileWriteManager
@@ -30,13 +32,37 @@ class DevaToolsProvider : IDevaToolsProvider {
 
     override fun init(context: Context) {
         MogoLogCatchManager.init(context)
+        logCheck(context)
         initTrace(context)
     }
 
+    private fun logCheck(context: Context) {
+        val logger = SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
+        val loggerTime = SharedPrefsMgr.getInstance(context).getLong(MoGoConfig.CATCH_LOG_TIME, 0)
+        val logCatchDuration = (System.currentTimeMillis() - loggerTime) / 1000 / 60
+        if (logger && loggerTime > 0) {
+            val logTime: Int = if (10 - logCatchDuration < 1) {
+                1
+            } else {
+                10 - logCatchDuration.toInt()
+            }
+            MogoLogCatchManager.startCatchLog(logTime)
+        } else {
+            Logger.d(
+                functionName,
+                "logCheck logger : $logger , logCatchDuration : $logCatchDuration"
+            )
+        }
+    }
+
     override fun startLogCatch() {
         MogoLogCatchManager.startCatchLog()
     }
 
+    override fun startLogCatch(duration: Int) {
+        MogoLogCatchManager.startCatchLog(duration)
+    }
+
     override fun stopLogCatch() {
         MogoLogCatchManager.stopCatchLog()
     }
@@ -52,8 +78,8 @@ class DevaToolsProvider : IDevaToolsProvider {
         fwBuildMap[CHAIN_LINK_LOG_WEB_SOCKET_DATA] =
             FwBuild(false, pkgName + CHAIN_LINK_LOG_ADAS_MSG, 500)
 
-        traceInfoCache[CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true,"ADAS连接状态")
-        traceInfoCache[CHAIN_LINK_LOG_WEB_SOCKET_DATA] = ChainLogParam(false,"ADAS长链数据")
+        traceInfoCache[CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true, "ADAS连接状态")
+        traceInfoCache[CHAIN_LINK_LOG_WEB_SOCKET_DATA] = ChainLogParam(false, "ADAS长链数据")
         FileWriteManager.getInstance()
             .init(context, MoGoAiCloudClientConfig.getInstance().sn, pkgName, fwBuildMap)
     }
@@ -67,7 +93,7 @@ class DevaToolsProvider : IDevaToolsProvider {
         map.forEach { (type, param) ->
             val fwBuild = this.fwBuildMap[type]
             fwBuild?.let {
-                Logger.d(functionName,"param : ${param.des} , record : ${param.record}")
+                Logger.d(functionName, "param : ${param.des} , record : ${param.record}")
                 it.isRecord = param.record
             }
         }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt

@@ -7,10 +7,12 @@ import android.os.Message
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.network.NetConfig
 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.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.module.common.MogoApisHandler
@@ -45,7 +47,6 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
         MogoApisHandler.getInstance().apis
             .getSocketManagerApi(AbsMogoApplication.getApp().applicationContext)
             .registerOnMessageListener(LOG_PUSH_TYPE, this)
-        manualContent.duration = 10
         manualContent.pkgName = context.packageName
     }
 
@@ -78,12 +79,13 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
         return false
     }
 
-    fun startCatchLog() {
+    fun startCatchLog(duration:Int = 10) {
         if (catchingList.contains(MANUAL_CATCH_PKG_NAME)) {
             TipToast.shortTip("已经在抓取日志了,请稍后再试")
         } else {
-            Logger.d(TAG, "开始抓取日志====")
+            Logger.d(TAG, "开始抓取日志==== duration : $duration")
             manualContent.type = START_CATCH_LOG
+            manualContent.duration = duration
             startCatchLog(manualContent)
         }
     }
@@ -99,21 +101,28 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
         var delay = (content.duration).toLong()
         handler.removeMessages(MSG_TRY_CLOSE_LOG)
         if (delay <= 0) {
-            // 如果push 下来的delay小于等于0，那就给个默认最大值一小时
+            // 如果push 下来的delay小于等于0，那就给个默认值
             delay = 10
         }
         handler.sendEmptyMessageDelayed(MSG_TRY_CLOSE_LOG, delay * 1000L * 60)
+
         openLoggerLevel()
+
         logInfoManager = LogInfoManagerFactory.createPushLogInfoManager(
             mContext,
             MoGoAiCloudClientConfig.getInstance().sn,
             content,
             this
         )
+
         logInfoManager?.start()
         logInfoManager?.registerLogOutListener { lineLog ->
             CallerDevaToolsListenerManager.invokeDevaToolsLogCatchLines(lineLog)
         }
+
+        SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, true)
+        SharedPrefsMgr.getInstance(mContext!!)
+            .putLong(MoGoConfig.CATCH_LOG_TIME, System.currentTimeMillis())
     }
 
     private fun stopCatchLog(content: RemoteLogPushContent) {
@@ -124,6 +133,9 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
         logInfoManager?.stop()
         logInfoManager = null
         closeLoggerLevel()
+
+        SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
+        SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
     }
 
     /**
@@ -151,6 +163,10 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
 
     override fun onClose(pkgName: String?) {
         ThreadUtils.runOnUiThread {
+
+            SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
+            SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
+
             CallerDevaToolsListenerManager.invokeDevaToolsLogCatchClose()
             TipToast.shortTip("日志抓取默认计时结束")
         }