From 3bef6cd9ea970345b4b6a979e582b64a2fbfcecf Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 14 Nov 2023 16:28:43 +0800 Subject: [PATCH] [6.2.0] merge map biz to init --- .../mogo_core_function_devatools/trace/TraceManager.kt | 10 +++------- .../com/mogo/eagle/core/function/utils/MapRomaTrace.kt | 4 ++-- .../mogo/eagle/core/data/deva/chain/ChainConstant.kt | 2 -- .../function/call/map/CallerMapRoadListenerManager.kt | 2 +- .../src/main/java/com/mogo/map/AMapViewWrapper.kt | 4 ++-- .../src/main/java/com/mogo/map/utils/MapTraceUtil.kt | 4 ++-- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index 0f53e12065..4844fa4232 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -75,8 +75,6 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_RECORD_ANR) fwBuildMap[ChainConstant.CHAIN_TYPE_V2X] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_V2X) - fwBuildMap[ChainConstant.CHAIN_TYPE_HD_MAP] = - FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_HD_MAP_BIZ) fwBuildMap[ChainConstant.CHAIN_TYPE_WEAK_NETWORK] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_RECORD_WEAK_NETWORK) fwBuildMap[ChainConstant.CHAIN_TYPE_OCH] = @@ -84,13 +82,13 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { traceInfoCache[ChainConstant.CHAIN_TYPE_STATUS] = - ChainLogParam(true, "INIT状态") + ChainLogParam(true, "BIZ") traceInfoCache[ChainConstant.CHAIN_TYPE_GNSS] = ChainLogParam(true, "ADAS自车定位") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT] = - ChainLogParam(true, "ADAS自动驾驶链路(包含: 自动驾驶状态交互,全局路径,到站提醒,节点状态,异常上报,PNC)") + ChainLogParam(true, "ADAS自动驾驶链路(包含: 自动驾驶状态交互,全局路径,到站提醒,节点状态,异常上报,PNC,FM)") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED] = - ChainLogParam(true, "云感知物体") + ChainLogParam(true, "感知物体") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_TRAJECTORY] = ChainLogParam(false, "ADAS车前引导线") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_VEHICLE] = @@ -101,8 +99,6 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { ChainLogParam(true, "ANR Record") traceInfoCache[ChainConstant.CHAIN_TYPE_V2X] = ChainLogParam(true, "V2X(V2N/V2I)") - traceInfoCache[ChainConstant.CHAIN_TYPE_HD_MAP] = - ChainLogParam(true, "HD Map Caller") traceInfoCache[ChainConstant.CHAIN_TYPE_WEAK_NETWORK] = ChainLogParam(true, "WeakNetWork Record") diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapRomaTrace.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapRomaTrace.kt index d1530b14f6..765b02e604 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapRomaTrace.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapRomaTrace.kt @@ -26,7 +26,7 @@ class MapRomaTrace { } @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, linkCode = ChainConstant.CHAIN_SOURCE_MAP, paramIndexes = [2, 3], endPoint = false @@ -43,7 +43,7 @@ class MapRomaTrace { } @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, linkCode = ChainConstant.CHAIN_SOURCE_MAP, paramIndexes = [2, 3] ) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index b1c4251188..56555c05f0 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -30,7 +30,6 @@ class ChainConstant { const val CHAIN_TYPE_SOCKET_VEHICLE = 5 // 底盘数据 const val CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT = 6 // 多元红绿灯聚合数据 const val CHAIN_TYPE_V2X = 100 // V2X(V2I、V2N) - const val CHAIN_TYPE_HD_MAP = 200 const val CHAIN_TYPE_ANR_LEAK = 300 const val CHAIN_TYPE_WEAK_NETWORK = 400 const val CHAIN_TYPE_OCH = 500 @@ -44,7 +43,6 @@ class ChainConstant { const val CHAIN_LINK_LOG_ADAS_VEHICLE = "-adasVehicle" const val CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT = "-UnionTrafficLight" const val CHAIN_LINK_LOG_V2X = "-eagleCloudWSV2X" - const val CHAIN_LINK_LOG_HD_MAP_BIZ = "-eagleHDMapBiz" const val CHAIN_LINK_LOG_RECORD_ANR = "-eagleRecordANR" const val CHAIN_LINK_LOG_RECORD_WEAK_NETWORK = "-eagleRecordWeakNetwork" const val CHAIN_LINK_LOG_OCH = "-eagleOch" diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt index 7c59e9d809..7687ff90b5 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt @@ -64,7 +64,7 @@ object CallerMapRoadListenerManager { } @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, linkCode = ChainConstant.CHAIN_SOURCE_MAP, nodeAliasCode = ChainConstant.CHAIN_CODE_HD_MAP_ROAD_CROSS, paramIndexes = [0, 1] diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt index c3b5977c2a..908888d2eb 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt @@ -307,7 +307,7 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle } @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, linkCode = ChainConstant.CHAIN_SOURCE_MAP, nodeAliasCode = ChainConstant.CHAIN_CODE_HD_MAP_CALL, paramIndexes = [0] @@ -319,7 +319,7 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle } @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, linkCode = ChainConstant.CHAIN_SOURCE_MAP, parentNodeAliasCode = ChainConstant.CHAIN_CODE_ROMA_REQUEST_OK, nodeAliasCode = ChainConstant.CHAIN_CODE_ROMA_MODE_INVOKE, diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/MapTraceUtil.kt b/libraries/mogo-map/src/main/java/com/mogo/map/utils/MapTraceUtil.kt index 3ccb1769cc..8c39e21d64 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/MapTraceUtil.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/MapTraceUtil.kt @@ -21,7 +21,7 @@ class MapTraceUtil { } @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, linkCode = ChainConstant.CHAIN_SOURCE_MAP, paramIndexes = [2, 3], endPoint = false @@ -38,7 +38,7 @@ class MapTraceUtil { } @ChainLog( - linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkChainLog = ChainConstant.CHAIN_TYPE_STATUS, linkCode = ChainConstant.CHAIN_SOURCE_MAP, paramIndexes = [2, 3] )