From 01d45275d3775c2428e82d1548c70bbf44a95c74 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 26 Jun 2023 13:19:43 +0800 Subject: [PATCH] [3.3.0] union the log --- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 40 ++++++------- .../server/AsyncDataToAutopilotServer.kt | 2 +- .../datacenter/v2x/TrafficLightDispatcher.kt | 4 +- .../trace/TraceManager.kt | 10 +--- .../hmi/ui/setting/DebugSettingView.kt | 16 ----- .../main/res/layout/view_debug_setting.xml | 9 --- .../core/data/deva/chain/ChainConstant.kt | 60 +++++++++---------- .../socket/MogoAiCloudSocketManager.java | 2 +- 8 files changed, 52 insertions(+), 91 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index e5c4f9b874..ca07517c0c 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -7,15 +7,15 @@ import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HdMapBuildConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_AUTOPILOT_ARRIVE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_AUTOPILOT_GUARDIAN -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_AUTOPILOT_RECORD -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_AUTOPILOT_ROUTE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_AUTOPILOT_STATUS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_AUTOPILOT_TRAJECTORY -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_AUTOPILOT_VEHICLE +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ARRIVE +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_GUARDIAN +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_RECORD +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_ROUTE +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_STATUS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_TRAJECTORY +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_VEHICLE import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_CAR_CONFIG -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_CAR_STATE +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_CAR_LOC import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_P_ACTIONS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_P_OBJECTS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ADAS_STATUS_QUERY_RESP @@ -23,8 +23,6 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_GNSS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_INIT_STATUS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_SOCKET_AUTOPILOT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_SOCKET_P_ACTIONS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_SOCKET_P_OBJECTS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_SOCKET_TRAJECTORY import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_SOCKET_VEHICLE import com.mogo.eagle.core.function.call.autopilot.* @@ -91,7 +89,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_TRAJECTORY, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_TRAJECTORY, + nodeAliasCode = CHAIN_CODE_ADAS_TRAJECTORY, paramIndexes = [0, 1] ) override fun onTrajectory(header: MessagePad.Header, trajectory: MessagePad.Trajectory?) { @@ -122,7 +120,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_GNSS, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_CAR_STATE, + nodeAliasCode = CHAIN_CODE_ADAS_CAR_LOC, paramIndexes = [0, 1] ) override fun onGnssInfo(header: MessagePad.Header, gnssInfo: MessagePad.GnssInfo) { @@ -150,7 +148,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_VEHICLE, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_VEHICLE, + nodeAliasCode = CHAIN_CODE_ADAS_VEHICLE, paramIndexes = [0, 1] ) override fun onVehicleState( @@ -210,7 +208,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_VEHICLE, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_VEHICLE, + nodeAliasCode = CHAIN_CODE_ADAS_VEHICLE, paramIndexes = [0, 1] ) override fun onChassisStates( @@ -269,7 +267,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_STATUS, + nodeAliasCode = CHAIN_CODE_ADAS_STATUS, paramIndexes = [0, 1] ) override fun onAutopilotState( @@ -289,7 +287,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_GUARDIAN, + nodeAliasCode = CHAIN_CODE_ADAS_GUARDIAN, paramIndexes = [0, 1] ) override fun onReportMessage( @@ -332,7 +330,7 @@ class MoGoAdasListenerImpl : OnAdasListener { //planning障碍物 @ChainLog( - linkChainLog = CHAIN_TYPE_SOCKET_P_OBJECTS, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = CHAIN_SOURCE_ADAS, nodeAliasCode = CHAIN_CODE_ADAS_P_OBJECTS, paramIndexes = [0, 1] @@ -380,7 +378,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_ROUTE, + nodeAliasCode = CHAIN_CODE_ADAS_ROUTE, paramIndexes = [0, 1] ) override fun onGlobalPathResp( @@ -394,7 +392,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_RECORD, + nodeAliasCode = CHAIN_CODE_ADAS_RECORD, paramIndexes = [0, 1] ) override fun onRecordResult( @@ -413,7 +411,7 @@ class MoGoAdasListenerImpl : OnAdasListener { @ChainLog( linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = CHAIN_SOURCE_ADAS, - nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_ARRIVE, + nodeAliasCode = CHAIN_CODE_ADAS_ARRIVE, paramIndexes = [0, 1] ) override fun onArrivalNotification( @@ -453,7 +451,7 @@ class MoGoAdasListenerImpl : OnAdasListener { * planning决策状态, 透传 */ @ChainLog( - linkChainLog = CHAIN_TYPE_SOCKET_P_ACTIONS, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = CHAIN_SOURCE_ADAS, nodeAliasCode = CHAIN_CODE_ADAS_P_ACTIONS, paramIndexes = [0, 1] diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt index 1742f5631b..95484f5cfd 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt @@ -72,7 +72,7 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen @ChainLog( linkChainLog = ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT, linkCode = ChainConstant.CHAIN_SOURCE_ADAS, - nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_AUTOPILOT_ROUTE_REQ, + nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_ROUTE_REQ, paramIndexes = [0, 1] ) private fun bizLog(tag: String, msg: String) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index fd41ef263b..bca8361b3e 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -223,7 +223,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight @ChainLog( linkChainLog = ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT, linkCode = ChainConstant.CHAIN_SOURCE_ADAS, - nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_AUTOPILOT_TRAFFIC_LIGHT_HIDE, + nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_TRAFFIC_LIGHT_HIDE, paramIndexes = [0, 1] ) private fun hide(msg: String, sourceType: DataSourceType) { @@ -237,7 +237,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight @ChainLog( linkChainLog = ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT, linkCode = ChainConstant.CHAIN_SOURCE_ADAS, - nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_AUTOPILOT_TRAFFIC_LIGHT, + nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_TRAFFIC_LIGHT, paramIndexes = [0, 1, 2] ) override fun onTrafficLightPlusSource( 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 69d14d6078..a971b18bbf 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 @@ -58,10 +58,6 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_VEHICLE) fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT) - fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] = - FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_PLANNING_OBJECTS) - fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_P_ACTIONS] = - FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_PLANNING_ACTIONS) fwBuildMap[ChainConstant.CHAIN_TYPE_HMI] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_HMI_ACTIONS) fwBuildMap[ChainConstant.CHAIN_TYPE_NATIVE_LEAK] = @@ -83,7 +79,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { traceInfoCache[ChainConstant.CHAIN_TYPE_GNSS] = ChainLogParam(true, "ADAS自车定位") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT] = - ChainLogParam(true, "ADAS自动驾驶链路(包含: 自动驾驶状态交互,全局路径,到站提醒,节点状态,异常上报)") + ChainLogParam(true, "ADAS自动驾驶链路(包含: 自动驾驶状态交互,全局路径,到站提醒,节点状态,异常上报,PNC)") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED] = ChainLogParam(true, "ADAS感知物体") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_TRAJECTORY] = @@ -92,10 +88,6 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { ChainLogParam(false, "ADAS车辆底盘数据") traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT] = ChainLogParam(true, "ADAS红绿灯数据") - traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] = - ChainLogParam(false, "ADAS PLANNING 感知障碍物") - traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_P_ACTIONS] = - ChainLogParam(true, "ADAS PLANNING 决策行为") traceInfoCache[ChainConstant.CHAIN_TYPE_HMI] = ChainLogParam(true, "人机交互行为") traceInfoCache[ChainConstant.CHAIN_TYPE_NATIVE_LEAK] = diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 6d1dd0dcaa..62e8fb2254 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -52,7 +52,6 @@ import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.obu.CallerObuApiManager import com.mogo.eagle.core.function.call.obu.CallerObuConnectListenerManager @@ -62,7 +61,6 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView -import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView import com.mogo.eagle.core.utilcode.kotlin.* import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel @@ -1455,20 +1453,6 @@ internal class DebugSettingView @JvmOverloads constructor( CallerDevaToolsManager.refreshTraceInfo(map) } } - - /** - * ADAS PLANNING OBJ 感知障碍物 - */ - cbAdasPlanningObj.setOnCheckedChangeListener { _, isChecked -> - val map = CallerDevaToolsManager.getTraceInfo() - val param = map[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] - param?.let { - it.record = isChecked - map[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] = param - CallerDevaToolsManager.refreshTraceInfo(map) - } - } - } private fun refreshTraceInfo() { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index e873f653fb..4d1d24f308 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -2280,15 +2280,6 @@ android:textColor="#000" android:textSize="@dimen/dp_24" /> - 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 9ce47c696d..2caf6765d9 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 @@ -23,18 +23,16 @@ class ChainConstant { // OCH业务 const val CHAIN_SOURCE_OCH = 13 - const val CHAIN_TYPE_INIT_STATUS = 0 - const val CHAIN_TYPE_GNSS = 1 - const val CHAIN_TYPE_SOCKET_AUTOPILOT = 2 - const val CHAIN_TYPE_SOCKET_DATA_TRACKED = 3 - const val CHAIN_TYPE_SOCKET_TRAJECTORY = 4 - const val CHAIN_TYPE_SOCKET_VEHICLE = 5 - const val CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT = 6 - const val CHAIN_TYPE_SOCKET_P_OBJECTS = 7 - const val CHAIN_TYPE_SOCKET_P_ACTIONS = 8 - const val CHAIN_TYPE_HMI = 9 + const val CHAIN_TYPE_INIT_STATUS = 0 // 各个业务初始化信息,配置信息.链接状态 + const val CHAIN_TYPE_GNSS = 1 // 工控定位数据 + const val CHAIN_TYPE_SOCKET_AUTOPILOT = 2 // 包括自动驾驶状态,reportMsg,planning数据,全局路径数据 + const val CHAIN_TYPE_SOCKET_DATA_TRACKED = 3 // 感知数据,现阶段记录云端漫游 + const val CHAIN_TYPE_SOCKET_TRAJECTORY = 4 // 前车引导线,用于调试 + const val CHAIN_TYPE_SOCKET_VEHICLE = 5 // 底盘数据 + const val CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT = 6 // 多元红绿灯聚合数据 + const val CHAIN_TYPE_HMI = 7 // 包括魔方和应用按钮点击 const val CHAIN_TYPE_NATIVE_LEAK = 100 - const val CHAIN_TYPE_V2X = 200 + const val CHAIN_TYPE_V2X = 200 // V2X(V2I、V2N) const val CHAIN_TYPE_HD_MAP = 300 const val CHAIN_TYPE_ANR = 400 const val CHAIN_TYPE_WEAK_NETWORK = 500 @@ -47,8 +45,6 @@ class ChainConstant { const val CHAIN_LINK_LOG_ADAS_TRAJECTORY = "-adasTrajectory" const val CHAIN_LINK_LOG_ADAS_VEHICLE = "-adasVehicle" const val CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT = "-UnionTrafficLight" - const val CHAIN_LINK_LOG_ADAS_PLANNING_OBJECTS = "-adasPlanningObj" - const val CHAIN_LINK_LOG_ADAS_PLANNING_ACTIONS = "-adasPlanningActions" const val CHAIN_LINK_LOG_HMI_ACTIONS = "-eagleHMIActions" const val CHAIN_LINK_LOG_RECORD_NATIVE_LEAK = "-eagleRecordNativeLeak" const val CHAIN_LINK_LOG_V2X = "-eagleCloudWSV2X" @@ -57,20 +53,21 @@ class ChainConstant { const val CHAIN_LINK_LOG_RECORD_WEAK_NETWORK = "-eagleRecordWeakNetwork" const val CHAIN_LINK_LOG_OCH = "-eagleOch" + /* ------------ Tag ---------- */ const val CHAIN_CODE_MULTI_CONNECT = "CHAIN_CODE_MULTI_CONNECT" const val CHAIN_CODE_ADAS_CAR_CONFIG = "CHAIN_CODE_ADAS_CAR_CONFIG" const val CHAIN_CODE_ADAS_RECT_DATA = "CHAIN_CODE_ADAS_RECT_DATA" - const val CHAIN_CODE_ADAS_CAR_STATE = "CHAIN_CODE_ADAS_CAR_STATE" - const val CHAIN_CODE_ADAS_AUTOPILOT_STATUS = "CHAIN_CODE_ADAS_AUTOPILOT_STATUS" - const val CHAIN_CODE_ADAS_AUTOPILOT_ARRIVE = "CHAIN_CODE_ADAS_AUTOPILOT_ARRIVE" - const val CHAIN_CODE_ADAS_AUTOPILOT_ROUTE = "CHAIN_CODE_ADAS_AUTOPILOT_ROUTE" - const val CHAIN_CODE_ADAS_AUTOPILOT_ROUTE_REQ = "CHAIN_CODE_ADAS_AUTOPILOT_ROUTE_REQ" - const val CHAIN_CODE_ADAS_AUTOPILOT_TRAJECTORY = "CHAIN_CODE_ADAS_AUTOPILOT_TRAJECTORY" - const val CHAIN_CODE_ADAS_AUTOPILOT_GUARDIAN = "CHAIN_CODE_ADAS_AUTOPILOT_GUARDIAN" - const val CHAIN_CODE_ADAS_AUTOPILOT_RECORD = "CHAIN_CODE_ADAS_AUTOPILOT_RECORD" - const val CHAIN_CODE_ADAS_AUTOPILOT_VEHICLE = "CHAIN_CODE_ADAS_AUTOPILOT_VEHICLE" - const val CHAIN_CODE_ADAS_AUTOPILOT_TRAFFIC_LIGHT = "CHAIN_CODE_ADAS_AUTOPILOT_TRAFFIC_LIGHT" - const val CHAIN_CODE_ADAS_AUTOPILOT_TRAFFIC_LIGHT_HIDE = "CHAIN_CODE_ADAS_AUTOPILOT_TRAFFIC_LIGHT_HIDE" + const val CHAIN_CODE_ADAS_CAR_LOC = "CHAIN_CODE_ADAS_CAR_LOC" + const val CHAIN_CODE_ADAS_STATUS = "CHAIN_CODE_ADAS_STATUS" + const val CHAIN_CODE_ADAS_ARRIVE = "CHAIN_CODE_ADAS_ARRIVE" + const val CHAIN_CODE_ADAS_ROUTE = "CHAIN_CODE_ADAS_ROUTE" + const val CHAIN_CODE_ADAS_ROUTE_REQ = "CHAIN_CODE_ADAS_ROUTE_REQ" + const val CHAIN_CODE_ADAS_TRAJECTORY = "CHAIN_CODE_ADAS_ROUTE_REQ" + const val CHAIN_CODE_ADAS_GUARDIAN = "CHAIN_CODE_ADAS_GUARDIAN" + const val CHAIN_CODE_ADAS_RECORD = "CHAIN_CODE_ADAS_RECORD" + const val CHAIN_CODE_ADAS_VEHICLE = "CHAIN_CODE_ADAS_VEHICLE" + const val CHAIN_CODE_ADAS_TRAFFIC_LIGHT = "CHAIN_CODE_ADAS_TRAFFIC_LIGHT" + const val CHAIN_CODE_ADAS_TRAFFIC_LIGHT_HIDE = "CHAIN_CODE_ADAS_TRAFFIC_LIGHT_HIDE" const val CHAIN_CODE_ADAS_P_OBJECTS = "CHAIN_CODE_ADAS_P_OBJECTS" const val CHAIN_CODE_ADAS_P_ACTIONS = "CHAIN_CODE_ADAS_P_ACTIONS" const val CHAIN_CODE_ADAS_STATUS_QUERY_RESP = "CHAIN_CODE_ADAS_STATUS_QUERY_RESP" @@ -79,9 +76,12 @@ class ChainConstant { const val CHAIN_CODE_RECORD_ANR = "CHAIN_CODE_RECORD_ANR" const val CHAIN_CODE_RECORD_WEAK_NETWORK = "CHAIN_ALIAS_CODE_RECORD_WEAK_NETWORK" - const val CHAIN_CODE_INIT_ENV_RESTART = "CHAIN_CODE_INIT_ENV_RESTART" const val CHAIN_CODE_APP_INFO_CONFIG_UPDATE = "CHAIN_CODE_APP_INFO_CONFIG_UPDATE" const val CHAIN_CODE_FUNC_CONFIG_CHANGED = "CHAIN_CODE_FUNC_CONFIG_CHANGED" + const val CHAIN_CODE_START_UP = "CHAIN_CODE_START_UP" + const val CHAIN_CODE_INIT_ENV_RESTART = "CHAIN_CODE_INIT_ENV_RESTART" + const val CHAIN_CODE_INIT_ON_MAP_LOADED = "CHAIN_CODE_INIT_ON_MAP_LOADED" + const val CHAIN_CODE_INIT_ON_MAP_INIT = "CHAIN_CODE_INIT_ON_MAP_INIT" const val CHAIN_CODE_UPGRADE_APP = "CHAIN_CODE_UPGRADE_APP" const val CHAIN_CODE_MO_FANG_CONNECT = "CHAIN_CODE_MO_FANG_CONNECT" @@ -98,10 +98,8 @@ class ChainConstant { const val CHAIN_CODE_V2X_MSG = "CHAIN_CODE_V2X_MSG" const val CHAIN_CODE_MSG_BOX = "CHAIN_CODE_MSG_BOX" - - const val CHAIN_CODE_INIT_ON_MAP_LOADED = "CHAIN_CODE_INIT_ON_MAP_LOADED" - const val CHAIN_CODE_INIT_ON_MAP_INIT = "CHAIN_CODE_INIT_ON_MAP_INIT" - const val CHAIN_CODE_START_UP = "CHAIN_CODE_START_UP" + const val CHAIN_CODE_HD_MAP_CALL = "CHAIN_CODE_HD_MAP_CALL" + const val CHAIN_CODE_HMI_ACTIONS = "CHAIN_CODE_HMI_ACTIONS" //operation by user const val CHAIN_CODE_OCH_TAXI_START_AUTOPILOT = "CHAIN_CODE_OCH_TAXI_START_AUTOPILOT" @@ -109,9 +107,7 @@ class ChainConstant { const val CHAIN_CODE_EAGLE_START_AUTOPILOT = "CHAIN_CODE_EAGLE_START_AUTOPILOT" const val CHAIN_CODE_EAGLE_START_AUTOPILOT_RESULT = "CHAIN_CODE_EAGLE_START_AUTOPILOT_RESULT" - const val CHAIN_CODE_HD_MAP_CALL = "CHAIN_CODE_HD_MAP_CALL" - const val CHAIN_CODE_HMI_ACTIONS = "CHAIN_CODE_HMI_ACTIONS" - + // 漫游业务code const val CHAIN_CODE_ROMA_CLICK = "CHAIN_CODE_ROMA_CLICK" const val CHAIN_CODE_ROMA_CLOSE_CLICK = "CHAIN_CODE_ROMA_CLOSE_CLICK" const val CHAIN_CODE_ROMA_REQUEST = "CHAIN_CODE_ROMA_REQUEST" diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java index a53c72463b..50ef32ca9f 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java @@ -202,7 +202,7 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem if (listeners != null && !listeners.isEmpty()) { for (IMogoOnMessageListener listener : listeners) { if (listener != null) { - CallerLogger.INSTANCE.d(TAG, "received msgId = " + mAckListeners.get(msgType) + " content = " + obj.toString()); +// CallerLogger.INSTANCE.d(TAG, "received msgId = " + mAckListeners.get(msgType) + " content = " + obj.toString()); listener.onMsgReceived(obj); } }