[3.3.0]merge

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

@@ -18,7 +18,6 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
 import com.mogo.eagle.core.function.api.devatools.apm.*
 import com.mogo.eagle.core.function.api.devatools.strict.*
-import com.mogo.eagle.core.function.call.map.*
 import com.mogo.eagle.core.function.api.devatools.download.*
 import com.mogo.eagle.core.function.api.lookaround.*
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -59,7 +58,6 @@ import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeManager.Companion.up
 import com.zhjt.mogo_core_function_devatools.weaknetwork.DetectResultImpl
 import com.zhjt.mogo_core_function_devatools.weaknetwork.WeakNetworkStrategy
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
 
 @Route(path = MogoServicePaths.PATH_DEVA_TOOLS)
 class DevaToolsProvider : IDevaToolsProvider {
@@ -91,14 +89,12 @@ class DevaToolsProvider : IDevaToolsProvider {
             KoomInitTask.init(AbsMogoApplication.getApp())
             initMatrix()
         }
-        ttsManager.initTts(mContext!!) //todo
+        ttsManager.initTts(mContext!!) //todo 扶风 优化
         bizConfigCenter.init(mContext!!)
+        upgradeManager.updateUpgradeProgress()
         FuncConfigImpl.init()
         MogoLogCatchManager.init(mContext!!)
 
-        // 视角切换功能初始化，监听路口及停止线回调
-        CallerVisualAngleManager.init()
-
         //升级(鹰眼/工控)与监控服务
         iPCReportManager.initServer()
         moFangManager.init(mContext!!)
@@ -195,10 +191,8 @@ class DevaToolsProvider : IDevaToolsProvider {
     @ChainLog(
         linkChainLog = ChainConstant.CHAIN_LINK_LOG_ANR,
         linkCode = ChainConstant.CHAIN_LINK_ANR,
-        endpoint = PAD,
         nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_RECORD_ANR,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
     )
     private fun printEvilMsg(evilMethod: String) {
         w("TraceCanary", evilMethod)
@@ -281,7 +275,7 @@ class DevaToolsProvider : IDevaToolsProvider {
     }
 
     override fun updateUpgradeProgress() {
-        upgradeManager.updateUpgradeProgress()
+
     }
 
     override fun showStatusBar(ctx: Context, container: ViewGroup) {

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

@@ -11,7 +11,6 @@ import com.mogo.eagle.core.function.api.devatools.apm.*
 import com.mogo.eagle.core.utilcode.util.*
 import com.zhjt.mogo_core_function_devatools.apm.config.*
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
 import kotlinx.coroutines.*
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
@@ -113,10 +112,8 @@ class ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope {
     @ChainLog(
         linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
         linkCode = CHAIN_LINK_INIT,
-        endpoint = PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ENV_RESTART,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
     )
     private fun restartApp(envStr:String) {
         launch(Dispatchers.Main) {

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

@@ -18,7 +18,6 @@ import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst.Companio
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst.Companion.defaultFuncConfig
 import com.zhjt.mogo_core_function_devatools.funcconfig.network.FuncConfigNetWorkModel
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants
 import com.zhjt.service_biz.BizManager
 import com.zhjt.service_biz.FuncConfig
 import mogo.telematics.pad.MessagePad
@@ -74,10 +73,8 @@ class FuncConfigCenter : IMogoOnMessageListener<FuncConfig>, IMoGoAutopilotCarCo
     @ChainLog(
         linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
         linkCode = CHAIN_LINK_CLOUD,
-        endpoint = TracingConstants.Endpoint.PAD,
         nodeAliasCode = CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
     )
     private fun refreshConfig(funcConfig: FuncConfig) {
         BizManager.updateBizConfigData(funcConfig)

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

@@ -16,7 +16,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.zhjt.mogo_core_function_devatools.trace.network.StartUpTraceNetWorkModel
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants
 
 object SyncConfig {
 
@@ -24,12 +23,6 @@ object SyncConfig {
     private var traceId: String? = null
 
     fun update(context: Context) {
-
-        //        if (AppConfigInfo.widevineIDMd5.isNullOrEmpty()) {
-//            AppConfigInfo.widevineIDMd5 =
-//                DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp())
-//        }
-
         if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
             AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
             AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
@@ -60,10 +53,8 @@ object SyncConfig {
     @ChainLog(
         linkChainLog = ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS,
         linkCode = ChainConstant.CHAIN_LINK_INIT,
-        endpoint = TracingConstants.Endpoint.PAD,
         nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
     )
     fun logOutConfig(appConfig: AppConfigInfo) {
         startUpTraceModel.report(traceId, {

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

@@ -15,7 +15,6 @@ import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.zhidao.loglib.fw.FileWriteManager
 import com.zhidao.loglib.fw.FwBuild
-import com.zhjt.service.chain.core.ChainTraceStarter
 import mogo.telematics.pad.MessagePad
 
 class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
@@ -42,7 +41,6 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
         mContext = context
         // 初始化Trace抓取服务
         val pkgName = Utils.getApp().packageName
-        ChainTraceStarter.start(pkgName, DeviceUtils.getMacAddress(), false)
         CallerCloudListenerManager.addListener(TAG, this)
         CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
 

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt

@@ -16,7 +16,6 @@ import com.zhjt.mogo_core_function_devatools.upgrade.provider.db.vo.UpgradeRecor
 import com.zhjt.mogo_core_function_devatools.upgrade.provider.db.vo.UpgradeRecord.Type.FULL
 import com.zhjt.mogo_core_function_devatools.upgrade.provider.db.vo.UpgradeRecord.Type.PATCH
 import com.zhjt.service.chain.*
-import com.zhjt.service.chain.TracingConstants.Endpoint
 import java.util.TreeMap
 import java.util.concurrent.TimeUnit
 
@@ -299,10 +298,8 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider {
     @ChainLog(
         linkChainLog = ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS,
         linkCode = ChainConstant.CHAIN_LINK_CLOUD,
-        endpoint = Endpoint.PAD,
         nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
     )
     private fun onUpgradeRecordLinkLog(extra: Map<String, String>) {}
 }