From 08f2e210ae13b1ed0827156f3b960bb5281a810e Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Jun 2023 16:33:59 +0800 Subject: [PATCH] [3.3.0]merge --- .../com/mogo/och/taxi/model/TaxiModel.java | 12 +- app/1 | 12 ++ .../eagle/function/biz/v2x/V2XBizTrace.kt | 6 +- .../function/biz/v2x/v2n/V2XEventManager.kt | 22 ++- .../autopilot/MoGoAutopilotControlProvider.kt | 21 ++- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 142 +++++++++--------- .../MoGoAdasMsgConnectStatusListenerImpl.kt | 80 +++++----- .../server/AsyncDataToAutopilotServer.kt | 6 +- .../autopilot/telematic/TeleMsgHandler.kt | 8 +- .../DevaToolsProvider.kt | 6 +- .../apm/ApmEnvProviderImpl.kt | 12 +- .../funcconfig/FuncConfigCenter.kt | 12 +- .../trace/SyncConfig.kt | 6 +- .../trace/TraceManager.kt | 57 ++++--- .../provider/MoGoUpgradeProviderImpl.kt | 6 +- .../hmi/ui/setting/DebugSettingView.kt | 35 +++-- .../eagle/core/function/main/MainActivity.kt | 6 +- .../function/main/MainLauncherActivity.java | 12 +- .../main/PassengerLauncherActivity.java | 12 +- .../business/ai/AiCloudIdentifyDataManager.kt | 6 +- .../business/identify/IdentifyFactory.kt | 6 +- .../eagle/core/function/utils/MapBizTrace.kt | 6 +- .../startup/stageone/HttpDnsStartUp.kt | 42 +++--- .../core/data/deva/chain/ChainConstant.kt | 123 ++++++++------- .../CallerAutoPilotControlManager.kt | 10 +- .../socket/MogoAiCloudSocketManager.java | 57 ++++--- gradle/ext.gradle | 2 +- .../zhidao/support/adas/high/AdasChannel.java | 62 ++++---- .../support/adas/high/chain/AdasChain.java | 26 ++-- .../support/adas/high/socket/FpgaSocket.java | 24 +-- .../java/com/mogo/map/AMapViewWrapper.java | 32 ++-- .../com/mogo/map/location/GDLocationClient.kt | 8 +- 32 files changed, 446 insertions(+), 431 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index e5df0b75bc..fe521b87c3 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -91,9 +91,9 @@ import mogo.telematics.pad.MessagePad; import mogo_msg.MogoReportMsg; import system_master.SystemStatusInfo; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_ADAS; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_OCH_TAXI_START_AUTOPILOT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_ADAS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; /** @@ -890,9 +890,9 @@ public class TaxiModel { * 以当前订单为基础，开启自动驾驶 **/ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_OCH_TAXI_START_AUTOPILOT, paramIndexes = {-1} ) public void startAutoPilot() { diff --git a/app/1 b/app/1 index e69de29bb2..eed016e6a1 100644 --- a/app/1 +++ b/app/1 @@ -0,0 +1,12 @@ +父节点，生成traceID: initAiCloudSDKd4998c42-1fb8-47d3-b0bc-60e9583c6ed9，并更新NodeGraph +父节首次创建 addEdge result:true +update chainNode:ChainNode(linkCode=0, linkChainLog=0, parentNodeAliasCode=, nodeAliasCode=CHAIN_ALIAS_CODE_CLOUD_INIT, methodName=initAiCloudSDK, paramIndexes=[-1], recordDataChange=true, endPoint=false, traceId=initAiCloudSDKd4998c42-1fb8-47d3-b0bc-60e9583c6ed9, spanId=null, thread=main) +子节点:CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN , 寻找对应关系 parent :CHAIN_ALIAS_CODE_CLOUD_INIT +找到traceId:initAiCloudSDKd4998c42-1fb8-47d3-b0bc-60e9583c6ed9 , 与父节点建立连接，生成spanID:onTokenGoteb4cf638-0c8c-44d9-b218-ab3ebabb9bd2，并更新NodeGraph +addEdge new link : initAiCloudSDKd4998c42-1fb8-47d3-b0bc-60e9583c6ed9 , traceName : CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN +与父节点建立连接 addEdge result:true +update chainNode:ChainNode(linkCode=0, linkChainLog=0, parentNodeAliasCode=CHAIN_ALIAS_CODE_CLOUD_INIT, nodeAliasCode=CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN, methodName=onTokenGot, paramIndexes=[0, 1], recordDataChange=true, endPoint=false, traceId=initAiCloudSDKd4998c42-1fb8-47d3-b0bc-60e9583c6ed9, spanId=onTokenGoteb4cf638-0c8c-44d9-b218-ab3ebabb9bd2, thread=main) +父节点，生成traceID: init846f6661-22c2-4986-96aa-31dbc62fd3c2，并更新NodeGraph +addEdge new trace : init846f6661-22c2-4986-96aa-31dbc62fd3c2 , traceName : CHAIN_ALIAS_CODE_CLOUD_SOCKET_INIT +父节首次创建 addEdge result:true +update chainNode:ChainNode(linkCode=0, linkChainLog=0, parentNodeAliasCode=, nodeAliasCode=CHAIN_ALIAS_CODE_CLOUD_SOCKET_INIT, methodName=init, paramIndexes=[1, 2, 3, 4], recordDataChange=true, endPoint=false, traceId=init846f6661-22c2-4986-96aa-31dbc62fd3c2, spanId=null, thread=main) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt index 84fa8f1467..10dd9ceb83 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/V2XBizTrace.kt @@ -11,9 +11,9 @@ class V2XBizTrace { companion object { @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N, - linkCode = ChainConstant.CHAIN_LINK_CLOUD, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_CLOUD_V2N, + linkChainLog = ChainConstant.CHAIN_TYPE_CLOUD_V2N, + linkCode = ChainConstant.CHAIN_SOURCE_CLOUD, + nodeAliasCode = ChainConstant.CHAIN_CODE_CLOUD_V2N, paramIndexes = [0, 1] ) fun onAck(data: Any, data1: Any) { diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index 017e1c0d1b..acaa5a93a0 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -6,9 +6,9 @@ import android.util.* import androidx.annotation.* import androidx.localbroadcastmanager.content.* import com.mogo.eagle.core.data.config.* -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_V2N -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CLOUD_V2N +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_CLOUD_V2N +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_CLOUD +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_CLOUD_V2N import com.mogo.eagle.core.data.enums.* import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.EventTypeEnumNew.Companion.isRoadEvent @@ -16,17 +16,13 @@ import com.mogo.eagle.core.data.enums.WarningDirectionEnum.ALERT_WARNING_TOP import com.mogo.eagle.core.data.map.* import com.mogo.eagle.core.data.map.entity.* import com.mogo.eagle.core.data.msgbox.* -import com.mogo.eagle.core.data.traffic.* import com.mogo.eagle.core.data.v2x.* import com.mogo.eagle.core.function.api.autopilot.* import com.mogo.eagle.core.function.api.cloud.* -import com.mogo.eagle.core.function.api.hmi.warning.* -import com.mogo.eagle.core.function.api.map.angle.* import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02 import com.mogo.eagle.core.function.call.cloud.* import com.mogo.eagle.core.function.call.hmi.* -import com.mogo.eagle.core.function.call.map.* import com.mogo.eagle.core.function.call.msgbox.* import com.mogo.eagle.core.utilcode.mogo.* import com.mogo.eagle.core.utilcode.mogo.logger.* @@ -148,9 +144,9 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, * V2XEvent事件回调 */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CLOUD_V2N, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_V2N, + linkChainLog = CHAIN_TYPE_CLOUD_V2N, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_CLOUD_V2N, paramIndexes = [0] ) override fun onAck(event: V2XEvent) { @@ -183,9 +179,9 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, @RequiresApi(Build.VERSION_CODES.N) @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CLOUD_V2N, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_V2N, + linkChainLog = CHAIN_TYPE_CLOUD_V2N, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_CLOUD_V2N, paramIndexes = [0] ) override fun onAutopilotIdentifyPlanningObj(planningObjects: List?) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt index 1c3822bd87..96416261ca 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt @@ -15,16 +15,15 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_MULTI_CONNECT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_MULTI_CONNECT +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_ADAS +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.biz.trafficlight.TrafficLightResult import com.mogo.eagle.core.data.biz.trafficlight.toTrafficLightDetail import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotControlProvider import com.mogo.eagle.core.function.api.map.collect.IMoGoMapDataCollectProvider -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasListenerImpl import com.mogo.eagle.core.function.datacenter.autopilot.adapter.MoGoAdasMsgConnectStatusListenerImpl import com.mogo.eagle.core.function.datacenter.autopilot.server.AsyncDataToAutopilotServer @@ -341,9 +340,9 @@ class MoGoAutopilotControlProvider : } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT_RESULT, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = ChainConstant.CHAIN_CODE_EAGLE_START_AUTOPILOT_RESULT, paramIndexes = [0] ) private fun invokeAutoPilotResult(status: String) { @@ -869,9 +868,9 @@ class MoGoAutopilotControlProvider : } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_MULTI_CONNECT, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_MULTI_CONNECT, paramIndexes = [0] ) private fun invokeNettyConnResult(status: String) { 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 28b34dece3..d0231c934d 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,30 +7,28 @@ 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_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_CONFIG -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_ACTIONS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE +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_TRAFFIC_LIGHT +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_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_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 +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_ADAS +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_GNSS +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_TRAFFIC_LIGHT +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.* import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.invokeArriveAtStation @@ -99,9 +97,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //车前引导线 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY, + linkChainLog = CHAIN_TYPE_SOCKET_TRAJECTORY, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_TRAJECTORY, paramIndexes = [0, 1] ) override fun onTrajectory(header: MessagePad.Header, trajectory: MessagePad.Trajectory?) { @@ -130,9 +128,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //自车定位信息 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE, + linkChainLog = CHAIN_TYPE_GNSS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_CAR_STATE, paramIndexes = [0, 1] ) override fun onGnssInfo(header: MessagePad.Header, gnssInfo: MessagePad.GnssInfo) { @@ -159,9 +157,9 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param vehicleState 数据 */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE, + linkChainLog = CHAIN_TYPE_SOCKET_VEHICLE, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_VEHICLE, paramIndexes = [0, 1] ) override fun onVehicleState( @@ -219,9 +217,9 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param vehicleState 数据 */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE, + linkChainLog = CHAIN_TYPE_SOCKET_VEHICLE, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_VEHICLE, paramIndexes = [0, 1] ) override fun onChassisStates( @@ -278,9 +276,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //自动驾驶状态 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_STATUS, paramIndexes = [0, 1] ) override fun onAutopilotState( @@ -319,9 +317,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //监控 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_GUARDIAN, paramIndexes = [0, 1] ) override fun onReportMessage( @@ -335,9 +333,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //感知红绿灯 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT, + linkChainLog = CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_TRAFFIC_LIGHT, paramIndexes = [0, 1] ) override fun onPerceptionTrafficLight( @@ -366,9 +364,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //planning障碍物 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS, + linkChainLog = CHAIN_TYPE_SOCKET_P_OBJECTS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_P_OBJECTS, paramIndexes = [0, 1] ) override fun onPlanningObjects( @@ -390,9 +388,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //工控机基础配置信息 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_CONFIG, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_CAR_CONFIG, paramIndexes = [0, 1] ) override fun onCarConfigResp( @@ -411,9 +409,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //全局路径规划 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_ROUTE, paramIndexes = [0, 1] ) override fun onGlobalPathResp( @@ -425,9 +423,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //数据采集，badCase @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_RECORD, paramIndexes = [0, 1] ) override fun onRecordResult( @@ -452,9 +450,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //到站回调 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_AUTOPILOT_ARRIVE, paramIndexes = [0, 1] ) override fun onArrivalNotification( @@ -466,9 +464,9 @@ class MoGoAdasListenerImpl : OnAdasListener { //状态查询应答 @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_STATUS_QUERY_RESP, paramIndexes = [0, 1] ) override fun onStatusQueryResp( @@ -494,9 +492,9 @@ class MoGoAdasListenerImpl : OnAdasListener { * planning决策状态, 透传 */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_ACTIONS, + linkChainLog = CHAIN_TYPE_SOCKET_P_ACTIONS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_P_ACTIONS, paramIndexes = [0, 1] ) override fun onPlanningActionMsg( @@ -718,9 +716,9 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param rsi 数据 */ @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N, - linkCode = ChainConstant.CHAIN_LINK_CLOUD, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_CLOUD_V2N, + linkChainLog = ChainConstant.CHAIN_TYPE_CLOUD_V2N, + linkCode = ChainConstant.CHAIN_SOURCE_CLOUD, + nodeAliasCode = ChainConstant.CHAIN_CODE_CLOUD_V2N, paramIndexes = [0,1] ) override fun onV2nCongestionEvent(header: MessagePad.Header, rsi: MogoV2X.RSI_PB) { @@ -738,9 +736,9 @@ class MoGoAdasListenerImpl : OnAdasListener { * @param parkingViolation 违停 ---包含 静态障碍车 */ @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N, - linkCode = ChainConstant.CHAIN_LINK_CLOUD, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_CLOUD_V2N, + linkChainLog = ChainConstant.CHAIN_TYPE_CLOUD_V2N, + linkCode = ChainConstant.CHAIN_SOURCE_CLOUD, + nodeAliasCode = ChainConstant.CHAIN_CODE_CLOUD_V2N, paramIndexes = [0] ) override fun onV2nGlobalPathEvents(header: MessagePad.Header, roadOverview: RoadOverviewEvents.RoadOverviewData, construct: MogoV2X.RSI_PB?, triangle: MogoV2X.RSI_PB?, congestion: MogoV2X.RSI_PB?, parkingViolation: MogoV2X.RSM_PB?) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index f77595e303..89a2909fb4 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -43,47 +43,53 @@ class MoGoAdasMsgConnectStatusListenerImpl : ipcConnectionStatus, reason ) - if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTED) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接成功") - connectStatus = true - // 初始化自动驾驶状态信息 - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = + when (ipcConnectionStatus) { + Constants.IPC_CONNECTION_STATUS.CONNECTED -> { + CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接成功") + connectStatus = true + // 初始化自动驾驶状态信息 + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = AdasManager.getInstance().ipcConnectedIp - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort = + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort = AdasManager.getInstance().ipcConnectedPort - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = true - // 同步SN给工控机 - syncBasicInfoToAutopilot() - //每次工控机连接成功后，需同步当前设置的美化模式状态 - CallerAutoPilotControlManager.setDemoMode(FunctionBuildConfig.isDemoMode) - //当连接状态是关闭美化模式时，同步给工控机 - if (!FunctionBuildConfig.isDemoMode) { - CallerAutoPilotControlManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode) - } - //每次工控机连接成功后，需同步当前设置的雨天模式状态 - CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode) - } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.DISCONNECTED) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接失败 reason:$reason") - if (connectStatus) { - reason?.let { - ToastUtils.showLong("工控机连接断开，原因:$it , 等待重连") + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = true + // 同步SN给工控机 + syncBasicInfoToAutopilot() + //每次工控机连接成功后，需同步当前设置的美化模式状态 + CallerAutoPilotControlManager.setDemoMode(FunctionBuildConfig.isDemoMode) + //当连接状态是关闭美化模式时，同步给工控机 + if (!FunctionBuildConfig.isDemoMode) { + CallerAutoPilotControlManager.setIPCDemoMode(FunctionBuildConfig.isDemoMode) } - connectStatus = false + //每次工控机连接成功后，需同步当前设置的雨天模式状态 + CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode) } - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = + Constants.IPC_CONNECTION_STATUS.DISCONNECTED -> { + CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接失败 reason:$reason") + if (connectStatus) { + reason?.let { + ToastUtils.showLong("工控机连接断开，原因:$it , 等待重连") + } + connectStatus = false + } + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP = AdasManager.getInstance().ipcConnectedIp - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort = + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectPort = AdasManager.getInstance().ipcConnectedPort - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = false - //与工控机断开连接，需要重置自动驾驶状态(包括上传至云平台缓存信息)，等待连接成功后同步状态信息 - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state = 0 - CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode = 0 - } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTING) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在连接") - } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.SEARCH_ADDRESS) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在搜索工控机IP") - } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.NOT_FOUND_ADDRESS) { - CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用") + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = false + //与工控机断开连接，需要重置自动驾驶状态(包括上传至云平台缓存信息)，等待连接成功后同步状态信息 + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().state = 0 + CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().pilotmode = 0 + } + Constants.IPC_CONNECTION_STATUS.CONNECTING -> { + CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在连接") + } + Constants.IPC_CONNECTION_STATUS.SEARCH_ADDRESS -> { + CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 正在搜索工控机IP") + } + Constants.IPC_CONNECTION_STATUS.NOT_FOUND_ADDRESS -> { + CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 找不到可用IP 传入的IP不可用或固定IP列表中所有IP不可用") + } } CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ipcConnStatus = ipcConnectionStatus @@ -105,7 +111,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : /** * 同步SN信息给工控机 */ - private fun syncBasicInfoToAutopilot(sn: String? = null) { + private fun syncBasicInfoToAutopilot() { CallerLogger.d("$M_ADAS_IMPL$TAG", "同步PAD的SN给工控机……") if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { // 设置PAD-SN给工控,网络环境 @@ -145,7 +151,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : } override fun tokenGot(token: String, sn: String) { - syncBasicInfoToAutopilot(sn) + syncBasicInfoToAutopilot() } } \ No newline at end of file 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 c411410a6b..b6af9329b4 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 @@ -81,9 +81,9 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen } @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = ChainConstant.CHAIN_LINK_ADAS, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_BIZ, + linkChainLog = ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = ChainConstant.CHAIN_SOURCE_ADAS, + nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_AUTOPILOT_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/autopilot/telematic/TeleMsgHandler.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt index e51956b32f..469d2b742a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt @@ -9,7 +9,7 @@ import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_INIT_STATUS import com.mogo.eagle.core.data.multidisplay.TelematicConstant import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.setDemoMode @@ -293,9 +293,9 @@ class TeleMsgHandler : IMsgHandler { override fun handleServerConnStatus(statusCode: Int, content: String?, channel: Channel) {} @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = ChainConstant.CHAIN_LINK_ADAS, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_MULTI_CONNECT, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = ChainConstant.CHAIN_SOURCE_ADAS, + nodeAliasCode = ChainConstant.CHAIN_CODE_MULTI_CONNECT, paramIndexes = [0] ) private fun invokeNettyConnResult(status: String) { 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 efe35e075e..0c008d5a70 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 @@ -189,9 +189,9 @@ class DevaToolsProvider : IDevaToolsProvider { } @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_ANR, - linkCode = ChainConstant.CHAIN_LINK_ANR, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_RECORD_ANR, + linkChainLog = ChainConstant.CHAIN_TYPE_ANR, + linkCode = ChainConstant.CHAIN_SOURCE_ANR, + nodeAliasCode = ChainConstant.CHAIN_CODE_RECORD_ANR, paramIndexes = [0] ) private fun printEvilMsg(evilMethod: String) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt index 7cbe2cf584..65a2c104ac 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/apm/ApmEnvProviderImpl.kt @@ -4,9 +4,9 @@ import android.os.Process import android.text.TextUtils import android.widget.Toast import com.mogo.commons.debug.DebugConfig -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_INIT_ENV_RESTART -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_INIT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_INIT_ENV_RESTART +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_INIT +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_INIT_STATUS 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.* @@ -110,9 +110,9 @@ class ApmEnvProviderImpl: IApmEnvProvider, CoroutineScope { } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_INIT, - nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ENV_RESTART, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_INIT, + nodeAliasCode = CHAIN_CODE_INIT_ENV_RESTART, paramIndexes = [0] ) private fun restartApp(envStr:String) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt index d324016339..efdd65d59b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigCenter.kt @@ -4,9 +4,9 @@ import android.content.Context import com.mogo.aicloud.services.socket.IMogoOnMessageListener import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager import com.mogo.commons.AbsMogoApplication -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_FUNC_CONFIG_CHANGED +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_CLOUD +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_INIT_STATUS import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsFuncConfigListenerManager @@ -71,9 +71,9 @@ class FuncConfigCenter : IMogoOnMessageListener, IMoGoAutopilotCarCo } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_FUNC_CONFIG_CHANGED, paramIndexes = [0] ) private fun refreshConfig(funcConfig: FuncConfig) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt index 8814630d00..e5464fd9d1 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt @@ -51,9 +51,9 @@ object SyncConfig { } @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = ChainConstant.CHAIN_LINK_INIT, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE, + linkChainLog = ChainConstant.CHAIN_TYPE_INIT_STATUS, + linkCode = ChainConstant.CHAIN_SOURCE_INIT, + nodeAliasCode = ChainConstant.CHAIN_CODE_APP_INFO_CONFIG_UPDATE, paramIndexes = [0] ) fun logOutConfig(appConfig: AppConfigInfo) { 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 9e6ed0c739..53de7a845e 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 @@ -11,7 +11,6 @@ import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager 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.scene.SceneConstant.Companion.M_DEVA -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 @@ -45,61 +44,61 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { CallerAutopilotCarConfigListenerManager.addListener(TAG, this) // Trace过程中进行日志抓取，对日志进行配置 - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = - FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_INIT) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO] = + fwBuildMap[ChainConstant.CHAIN_TYPE_INIT_STATUS] = + FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_INIT) + fwBuildMap[ChainConstant.CHAIN_TYPE_GNSS] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_GNSS) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = + fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_AUTO) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = + fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_DATA_TRACK) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = + fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_TRAJECTORY] = FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAJECTORY) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = + fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_VEHICLE] = FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_VEHICLE) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT] = + fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT] = FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS] = + fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] = FwBuild(false, 30, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_PLANNING_OBJECTS) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS] = + fwBuildMap[ChainConstant.CHAIN_TYPE_SOCKET_P_ACTIONS] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_ADAS_PLANNING_ACTIONS) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK] = + fwBuildMap[ChainConstant.CHAIN_TYPE_NATIVE_LEAK] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_RECORD_NATIVE_LEAK) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_ANR] = + fwBuildMap[ChainConstant.CHAIN_TYPE_ANR] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_RECORD_ANR) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N] = + fwBuildMap[ChainConstant.CHAIN_TYPE_CLOUD_V2N] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_CLOUD_WEB_SOCKET_V2N) - fwBuildMap[ChainConstant.CHAIN_LINK_LOG_HD_MAP] = + fwBuildMap[ChainConstant.CHAIN_TYPE_HD_MAP] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_HD_MAP_BIZ) fwBuildMap[ChainConstant.CHAIN_LINK_LOG_WEAK_NETWORK] = FwBuild(true, -1, pkgName + ChainConstant.CHAIN_LINK_LOG_RECORD_WEAK_NETWORK) - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS] = + traceInfoCache[ChainConstant.CHAIN_TYPE_INIT_STATUS] = ChainLogParam(true, "ADAS连接状态") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO] = + traceInfoCache[ChainConstant.CHAIN_TYPE_GNSS] = ChainLogParam(true, "ADAS自车定位") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = + traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT] = ChainLogParam(true, "ADAS自动驾驶链路(包含: 自动驾驶状态交互,全局路径,到站提醒,节点状态,异常上报)") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = + traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED] = ChainLogParam(true, "ADAS感知物体") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = + traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_TRAJECTORY] = ChainLogParam(false, "ADAS车前引导线") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = + traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_VEHICLE] = ChainLogParam(false, "ADAS车辆底盘数据") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT] = + traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT] = ChainLogParam(false, "ADAS红绿灯数据") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS] = + traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] = ChainLogParam(false, "ADAS PLANNING 感知障碍物") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS] = + traceInfoCache[ChainConstant.CHAIN_TYPE_SOCKET_P_ACTIONS] = ChainLogParam(true, "ADAS PLANNING 决策行为") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK] = + traceInfoCache[ChainConstant.CHAIN_TYPE_NATIVE_LEAK] = ChainLogParam(true, "Native Leak Record") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_ANR] = + traceInfoCache[ChainConstant.CHAIN_TYPE_ANR] = ChainLogParam(true, "ANR Record") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N] = + traceInfoCache[ChainConstant.CHAIN_TYPE_CLOUD_V2N] = ChainLogParam(true, "Cloud WebSocket V2N") - traceInfoCache[ChainConstant.CHAIN_LINK_LOG_HD_MAP] = + traceInfoCache[ChainConstant.CHAIN_TYPE_HD_MAP] = ChainLogParam(true, "HD Map Caller") traceInfoCache[ChainConstant.CHAIN_LINK_LOG_WEAK_NETWORK] = ChainLogParam(true, "WeakNetWork Record") @@ -136,7 +135,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { fun refreshTraceInfo(map: HashMap) { map.forEach { (type, param) -> - if (type != ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS) { + if (type != ChainConstant.CHAIN_TYPE_INIT_STATUS) { val fwBuild = this.fwBuildMap[type] fwBuild?.let { CallerLogger.d("$M_DEVA$TAG", "param : ${param.des} , record : ${param.record}") diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt index b34e368b35..483e2a083c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt @@ -296,9 +296,9 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = ChainConstant.CHAIN_LINK_CLOUD, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_UPGRADE_APP, + linkChainLog = ChainConstant.CHAIN_TYPE_INIT_STATUS, + linkCode = ChainConstant.CHAIN_SOURCE_CLOUD, + nodeAliasCode = ChainConstant.CHAIN_CODE_UPGRADE_APP, paramIndexes = [0] ) private fun onUpgradeRecordLinkLog(extra: Map) {} 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 962bbe9474..f9a17726e2 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 @@ -79,7 +79,6 @@ import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.* import kotlinx.android.synthetic.main.view_debug_setting.view.* import kotlinx.android.synthetic.main.view_debug_setting.view.tbRouteDynamicEffect -import kotlinx.android.synthetic.main.view_sop_setting.view.* import kotlinx.coroutines.* import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg @@ -1437,10 +1436,10 @@ internal class DebugSettingView @JvmOverloads constructor( */ cbAdasAutoPilot.setOnCheckedChangeListener { _, isChecked -> val map = CallerDevaToolsManager.getTraceInfo() - val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] + val param = map[ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT] param?.let { it.record = isChecked - map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] = param + map[ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT] = param CallerDevaToolsManager.refreshTraceInfo(map) } } @@ -1450,10 +1449,10 @@ internal class DebugSettingView @JvmOverloads constructor( */ cbAdasDataTrack.setOnCheckedChangeListener { _, isChecked -> val map = CallerDevaToolsManager.getTraceInfo() - val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] + val param = map[ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED] param?.let { it.record = isChecked - map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] = param + map[ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED] = param CallerDevaToolsManager.refreshTraceInfo(map) } } @@ -1463,10 +1462,10 @@ internal class DebugSettingView @JvmOverloads constructor( */ cbAdasTrajectory.setOnCheckedChangeListener { _, isChecked -> val map = CallerDevaToolsManager.getTraceInfo() - val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] + val param = map[ChainConstant.CHAIN_TYPE_SOCKET_TRAJECTORY] param?.let { it.record = isChecked - map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] = param + map[ChainConstant.CHAIN_TYPE_SOCKET_TRAJECTORY] = param CallerDevaToolsManager.refreshTraceInfo(map) } } @@ -1476,10 +1475,10 @@ internal class DebugSettingView @JvmOverloads constructor( */ cbAdasVehicle.setOnCheckedChangeListener { _, isChecked -> val map = CallerDevaToolsManager.getTraceInfo() - val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] + val param = map[ChainConstant.CHAIN_TYPE_SOCKET_VEHICLE] param?.let { it.record = isChecked - map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] = param + map[ChainConstant.CHAIN_TYPE_SOCKET_VEHICLE] = param CallerDevaToolsManager.refreshTraceInfo(map) } } @@ -1489,10 +1488,10 @@ internal class DebugSettingView @JvmOverloads constructor( */ cbAdasTrafficlight.setOnCheckedChangeListener { _, isChecked -> val map = CallerDevaToolsManager.getTraceInfo() - val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT] + val param = map[ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT] param?.let { it.record = isChecked - map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT] = param + map[ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT] = param CallerDevaToolsManager.refreshTraceInfo(map) } } @@ -1502,10 +1501,10 @@ internal class DebugSettingView @JvmOverloads constructor( */ cbAdasPlanningObj.setOnCheckedChangeListener { _, isChecked -> val map = CallerDevaToolsManager.getTraceInfo() - val param = map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS] + val param = map[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] param?.let { it.record = isChecked - map[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS] = param + map[ChainConstant.CHAIN_TYPE_SOCKET_P_OBJECTS] = param CallerDevaToolsManager.refreshTraceInfo(map) } } @@ -1514,23 +1513,23 @@ internal class DebugSettingView @JvmOverloads constructor( private fun refreshTraceInfo() { val traceInfoMap = CallerDevaToolsManager.getTraceInfo() - val autopilot = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT] + val autopilot = traceInfoMap[ChainConstant.CHAIN_TYPE_SOCKET_AUTOPILOT] autopilot?.let { cbAdasAutoPilot.isChecked = it.record } - val dataTrack = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED] + val dataTrack = traceInfoMap[ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED] dataTrack?.let { cbAdasDataTrack.isChecked = it.record } - val trajectory = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY] + val trajectory = traceInfoMap[ChainConstant.CHAIN_TYPE_SOCKET_TRAJECTORY] trajectory?.let { cbAdasTrajectory.isChecked = it.record } - val vehicle = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE] + val vehicle = traceInfoMap[ChainConstant.CHAIN_TYPE_SOCKET_VEHICLE] vehicle?.let { cbAdasVehicle.isChecked = it.record } - val trafficlight = traceInfoMap[ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT] + val trafficlight = traceInfoMap[ChainConstant.CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT] trafficlight?.let { cbAdasTrafficlight.isChecked = it.record } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt index 666d4ed169..0eda4869c8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.kt @@ -260,9 +260,9 @@ open class MainActivity : MvpActivity(), MainView, } @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_NATIVE_LEAK, - linkCode = ChainConstant.CHAIN_LINK_LEAK, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK, + linkChainLog = ChainConstant.CHAIN_TYPE_NATIVE_LEAK, + linkCode = ChainConstant.CHAIN_SOURCE_LEAK, + nodeAliasCode = ChainConstant.CHAIN_CODE_RECORD_NATIVE_LEAK, paramIndexes = [0] ) private fun printLeakMsg(leakRecord: String) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java index 26e7072fa7..e6d841a1a2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java @@ -1,8 +1,8 @@ package com.mogo.eagle.core.function.main; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_START_UP; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_START_UP; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_INIT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_INIT_STATUS; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAIN; @@ -150,9 +150,9 @@ public class MainLauncherActivity extends MainActivity implements IMogoIntentLis } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_INIT, - nodeAliasCode = CHAIN_ALIAS_CODE_START_UP, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_INIT, + nodeAliasCode = CHAIN_CODE_START_UP, paramIndexes = {0} ) private void traceStartUp(String content) { diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java index a7dc018459..25a11413a7 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/PassengerLauncherActivity.java @@ -1,8 +1,8 @@ package com.mogo.eagle.core.function.main; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_START_UP; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_START_UP; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_INIT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_INIT_STATUS; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_HMI; import android.bluetooth.BluetoothAdapter; @@ -145,9 +145,9 @@ public class PassengerLauncherActivity extends MainActivity implements IMogoInte } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_INIT, - nodeAliasCode = CHAIN_ALIAS_CODE_START_UP, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_INIT, + nodeAliasCode = CHAIN_CODE_START_UP, paramIndexes = {0} ) private void traceStartUp(String content) { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 47c9854bda..3de6ac001c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -58,9 +58,9 @@ class AiCloudIdentifyDataManager : IMogoMapListener, } @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED, - linkCode = ChainConstant.CHAIN_LINK_ADAS, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA, + linkChainLog = ChainConstant.CHAIN_TYPE_SOCKET_DATA_TRACKED, + linkCode = ChainConstant.CHAIN_SOURCE_ADAS, + nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_RECT_DATA, paramIndexes = [0] ) override fun onMsgReceived(obj: SocketDownData.SocketDownDataProto?) { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt index dd70ae2865..d9afd55947 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyFactory.kt @@ -66,9 +66,9 @@ object IdentifyFactory : Identify, IMoGoObuStatusListener, IMoGoAutopilotCarConf } @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = ChainConstant.CHAIN_LINK_INIT, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA, + linkChainLog = ChainConstant.CHAIN_TYPE_INIT_STATUS, + linkCode = ChainConstant.CHAIN_SOURCE_INIT, + nodeAliasCode = ChainConstant.CHAIN_CODE_ADAS_RECT_DATA, paramIndexes = [0] ) private fun drawType(type: String) { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt index cb9d1af9ee..12413f57fa 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/utils/MapBizTrace.kt @@ -11,9 +11,9 @@ class MapBizTrace { companion object { @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_HD_MAP, - linkCode = ChainConstant.CHAIN_LINK_MAP, - nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_HD_MAP_BIZ, + linkChainLog = ChainConstant.CHAIN_TYPE_HD_MAP, + linkCode = ChainConstant.CHAIN_SOURCE_MAP, + nodeAliasCode = ChainConstant.CHAIN_CODE_HD_MAP_BIZ, paramIndexes = [0, 1] ) fun log(data: Any, data1: Any) { diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt index f7c479cafc..914e9a273f 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stageone/HttpDnsStartUp.kt @@ -20,15 +20,17 @@ import com.mogo.commons.module.status.MogoStatusManager import com.mogo.commons.network.NetConfigUtils import com.mogo.commons.utils.MogoAnalyticUtils import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_INIT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_RECONNECT -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_HTTP_DNS_ERROR_REASON -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_CLOUD_INIT +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_CLOUD_PASSPORT_TOKEN +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_CLOUD_RECONNECT +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_HTTP_DNS_ERROR_REASON +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_CLOUD +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_INIT_STATUS import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationWGS84Listener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager @@ -189,9 +191,9 @@ class HttpDnsStartUp : AndroidStartup() { } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_INIT, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_CLOUD_INIT, paramIndexes = [-1], endPoint = false ) @@ -201,10 +203,10 @@ class HttpDnsStartUp : AndroidStartup() { object : IMoGoTokenCallback { @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - parentNodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_INIT, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + parentNodeAliasCode = CHAIN_CODE_CLOUD_INIT, + nodeAliasCode = CHAIN_CODE_CLOUD_PASSPORT_TOKEN, paramIndexes = [0, 1], endPoint = false ) @@ -309,15 +311,16 @@ class HttpDnsStartUp : AndroidStartup() { } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_HTTP_DNS_ERROR_REASON, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_HTTP_DNS_ERROR_REASON, paramIndexes = [0] ) private fun logError(pr: String) { CallerLogger.e("$M_MAIN$TAG", "pr:$pr") } + //todo 归一处理 private fun getPrReason(msg: String): String { val map = hashMapOf() map["wifiState"] = @@ -331,13 +334,14 @@ class HttpDnsStartUp : AndroidStartup() { CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02().longitude else CallerMapUIServiceManager.getGDLocationServer(context!!)!!.lastLon map["reason"] = msg + map["time"] = System.currentTimeMillis() return GsonUtils.toJson(map) } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_RECONNECT, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_CLOUD_RECONNECT, paramIndexes = [0, 1] ) private fun reConnectSocket(oldCityCode: String, newCityCode: String) { 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 c3d0e3e797..62d07e90f7 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 @@ -5,36 +5,36 @@ class ChainConstant { companion object{ // 与云平台数据链路交互 - const val CHAIN_LINK_CLOUD = 0 + const val CHAIN_SOURCE_CLOUD = 0 // 与工控机相关交互 - const val CHAIN_LINK_ADAS = 1 + const val CHAIN_SOURCE_ADAS = 1 // 鹰眼初始化流程顺序相关 - const val CHAIN_LINK_INIT = 2 + const val CHAIN_SOURCE_INIT = 2 // Map交互 - const val CHAIN_LINK_MAP = 3 + const val CHAIN_SOURCE_MAP = 3 // Native内存泄漏 - const val CHAIN_LINK_LEAK = 10 + const val CHAIN_SOURCE_LEAK = 10 // ANR - const val CHAIN_LINK_ANR = 11 + const val CHAIN_SOURCE_ANR = 11 // 弱网监测 const val CHAIN_LINK_WEAK_NETWORK = 12 - const val CHAIN_LINK_LOG_CONNECT_STATUS = 0 - const val CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO = 1 - const val CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT = 2 - const val CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED = 3 - const val CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY = 4 - const val CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE = 5 - const val CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT = 6 - const val CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS = 7 - const val CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS = 8 - const val CHAIN_LINK_LOG_NATIVE_LEAK = 100 - const val CHAIN_LINK_LOG_CLOUD_V2N = 200 - const val CHAIN_LINK_LOG_HD_MAP = 300 - const val CHAIN_LINK_LOG_ANR = 400 + 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_NATIVE_LEAK = 100 + const val CHAIN_TYPE_CLOUD_V2N = 200 + const val CHAIN_TYPE_HD_MAP = 300 + const val CHAIN_TYPE_ANR = 400 const val CHAIN_LINK_LOG_WEAK_NETWORK = 500 - const val CHAIN_LINK_LOG_ADAS_INIT = "-eagleInitStatus" + const val CHAIN_LINK_LOG_INIT = "-eagleInitStatus" const val CHAIN_LINK_LOG_ADAS_GNSS = "-adasWsGnssInfo" const val CHAIN_LINK_LOG_ADAS_AUTO = "-adasWsAutoPilot" const val CHAIN_LINK_LOG_ADAS_DATA_TRACK = "-adasWsDataTrack" @@ -49,57 +49,56 @@ class ChainConstant { const val CHAIN_LINK_LOG_RECORD_ANR = "-eagleRecordANR" const val CHAIN_LINK_LOG_RECORD_WEAK_NETWORK = "-eagleRecordWeakNetwork" - const val CHAIN_ALIAS_CODE_MULTI_CONNECT = "CHAIN_ALIAS_CODE_MULTI_CONNECT" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_CONFIG = "CHAIN_ALIAS_CODE_CAR_CONFIG" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA = "PAD_ADAS_MESSAGE_AUTOPILOT_RECT_DATA" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE = "PAD_ADAS_MESSAGE_AUTOPILOT_CAR_STATE" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS = "PAD_ADAS_MESSAGE_AUTOPILOT_STATUS" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE = "PAD_ADAS_MESSAGE_AUTOPILOT_ARRIVE" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE = "PAD_ADAS_MESSAGE_AUTOPILOT_ROUTE" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY = "PAD_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN = "PAD_ADAS_MESSAGE_AUTOPILOT_GUARDIAN" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD = "PAD_ADAS_MESSAGE_AUTOPILOT_RECORD" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE = "PAD_ADAS_MESSAGE_AUTOPILOT_VEHICLE" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT = "PAD_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS = "CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_ACTIONS = "CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_ACTIONS" - const val CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP = "CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP" - const val CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_BIZ = "CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_BIZ" + 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_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" - const val CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK = "CHAIN_ALIAS_CODE_RECORD_NATIVE_LEAK" - const val CHAIN_ALIAS_CODE_RECORD_ANR = "CHAIN_ALIAS_CODE_RECORD_ANR" + const val CHAIN_CODE_RECORD_NATIVE_LEAK = "CHAIN_CODE_RECORD_NATIVE_LEAK" + const val CHAIN_CODE_RECORD_ANR = "CHAIN_CODE_RECORD_ANR" const val CHAIN_ALIAS_CODE_RECORD_WEAK_NETWORK = "CHAIN_ALIAS_CODE_RECORD_WEAK_NETWORK" - const val CHAIN_ALIAS_CODE_HD_MAP_CALL = "CHAIN_ALIAS_CODE_HD_MAP_CALL" - const val CHAIN_ALIAS_CODE_HD_MAP_BIZ = "CHAIN_ALIAS_CODE_HD_MAP_BIZ" + const val CHAIN_CODE_HD_MAP_CALL = "CHAIN_CODE_HD_MAP_CALL" + const val CHAIN_CODE_HD_MAP_BIZ = "CHAIN_CODE_HD_MAP_BIZ" - const val CHAIN_ALIAS_CODE_INIT_ENV_RESTART = "CHAIN_ALIAS_CODE_INIT_ENV_RESTART" - const val CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE = "CHAIN_ALIAS_CODE_APP_INFO_CONFIG_UPDATE" - const val CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED = "CHAIN_ALIAS_CODE_FUNC_CONFIG_CHANGED" - const val CHAIN_ALIAS_CODE_UPGRADE_APP = "CHAIN_ALIAS_CODE_UPGRADE_APP" + 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_UPGRADE_APP = "CHAIN_CODE_UPGRADE_APP" + const val CHAIN_CODE_CLOUD_INIT = "CHAIN_CODE_CLOUD_INIT" + const val CHAIN_CODE_CLOUD_PASSPORT_TOKEN = "CHAIN_CODE_CLOUD_PASSPORT_TOKEN" + const val CHAIN_CODE_CLOUD_SOCKET_INIT = "CHAIN_CODE_CLOUD_SOCKET_INIT" + const val CHAIN_CODE_CLOUD_CONNECT_FAIL = "CHAIN_CODE_CLOUD_CONNECT_FAIL" + const val CHAIN_CODE_CLOUD_CONNECT_SUCCESS = "CHAIN_CODE_CLOUD_CONNECT_SUCCESS" + const val CHAIN_CODE_CLOUD_CONNECT_LOST = "CHAIN_CODE_CLOUD_CONNECT_LOST" + const val CHAIN_CODE_CLOUD_CONNECT_ERROR = "CHAIN_CODE_CLOUD_CONNECT_ERROR" + const val CHAIN_CODE_CLOUD_RECONNECT = "CHAIN_CODE_CLOUD_RECONNECT" + const val CHAIN_CODE_HTTP_DNS_CITY_CODE = "CHAIN_CODE_HTTP_DNS_CITY_CODE" + const val CHAIN_CODE_HTTP_DNS_ERROR_REASON = "CHAIN_CODE_HTTP_DNS_ERROR_REASON" - const val CHAIN_ALIAS_CODE_CLOUD_INIT = "CHAIN_ALIAS_CODE_CLOUD_INIT" - const val CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN = "CHAIN_ALIAS_CODE_CLOUD_PASSPORT_TOKEN" - const val CHAIN_ALIAS_CODE_CLOUD_SOCKET_INIT = "CHAIN_ALIAS_CODE_CLOUD_SOCKET_INIT" - const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL" - const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS" - const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST" - const val CHAIN_ALIAS_CODE_CLOUD_CONNECT_ERROR = "CHAIN_ALIAS_CODE_CLOUD_CONNECT_ERROR" - const val CHAIN_ALIAS_CODE_CLOUD_RECONNECT = "CHAIN_ALIAS_CODE_CLOUD_RECONNECT" - const val CHAIN_ALIAS_CODE_HTTP_DNS_CITY_CODE = "CHAIN_ALIAS_CODE_HTTP_DNS_CITY_CODE" - const val CHAIN_ALIAS_CODE_HTTP_DNS_ERROR_REASON = "CHAIN_ALIAS_CODE_SOCKET_ERROR_REASON" + const val CHAIN_CODE_CLOUD_V2N = "CHAIN_CODE_CLOUD_V2N" - const val CHAIN_ALIAS_CODE_CLOUD_V2N = "CHAIN_ALIAS_CODE_CLOUD_V2N" - - const val CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED = "CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED" - const val CHAIN_ALIAS_CODE_INIT_ON_MAP_INIT = "CHAIN_ALIAS_CODE_INIT_ON_MAP_INIT" - const val CHAIN_ALIAS_CODE_START_UP = "CHAIN_ALIAS_CODE_START_UP" + 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" //operation by user - const val CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT = "CHAIN_ALIAS_CODE_OCH_TAXI_START_AUTOPILOT" - const val CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT = "CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT" - const val CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT_RESULT = "CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT_RESULT" + const val CHAIN_CODE_OCH_TAXI_START_AUTOPILOT = "CHAIN_CODE_OCH_TAXI_START_AUTOPILOT" + 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" } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt index d882cfde60..46d104f87d 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt @@ -11,6 +11,10 @@ import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_ADAS import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_EAGLE_START_AUTOPILOT +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_SOURCE_ADAS +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_TYPE_SOCKET_AUTOPILOT +import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotControlProvider import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils @@ -62,9 +66,9 @@ object CallerAutoPilotControlManager { * @param controlParameters 开启自动驾驶的控制参数 */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_EAGLE_START_AUTOPILOT, paramIndexes = [0] ) fun startAutoPilot(controlParameters: AutopilotControlParameters?) { 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 b72f504383..a53c72463b 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 @@ -1,12 +1,13 @@ package com.mogo.aicloud.services.socket; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_CLOUD_CONNECT_ERROR; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_CLOUD_SOCKET_INIT; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_CLOUD; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_CLOUD_CONNECT_ERROR; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_CLOUD_CONNECT_FAIL; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_CLOUD_CONNECT_LOST; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_CLOUD_CONNECT_SUCCESS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_CLOUD_PASSPORT_TOKEN; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_CLOUD_SOCKET_INIT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_CLOUD; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_INIT_STATUS; import android.content.Context; @@ -77,9 +78,10 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem private final Map mAckListeners = new ConcurrentHashMap<>(); @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_SOCKET_INIT, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + parentNodeAliasCode = CHAIN_CODE_CLOUD_PASSPORT_TOKEN, + nodeAliasCode = CHAIN_CODE_CLOUD_SOCKET_INIT, paramIndexes = {1, 2, 3, 4}, endPoint = false ) @@ -209,11 +211,10 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem }; @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS, - paramIndexes = {-1}, - endPoint = false + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_CLOUD_CONNECT_SUCCESS, + paramIndexes = {-1} ) @Override public void onConnectSuccess() { @@ -227,11 +228,10 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL, - paramIndexes = {-1}, - endPoint = false + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_CLOUD_CONNECT_FAIL, + paramIndexes = {-1} ) @Override public void onConnectFailure() { @@ -245,11 +245,10 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST, - paramIndexes = {-1}, - endPoint = false + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_CLOUD_CONNECT_LOST, + paramIndexes = {-1} ) @Override public void onConnectLost(boolean reconnect) { @@ -263,10 +262,10 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_CLOUD, - parentNodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_SOCKET_INIT, - nodeAliasCode = CHAIN_ALIAS_CODE_CLOUD_CONNECT_ERROR, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_CLOUD, + parentNodeAliasCode = CHAIN_CODE_CLOUD_SOCKET_INIT, + nodeAliasCode = CHAIN_CODE_CLOUD_CONNECT_ERROR, paramIndexes = {0, 1} ) @Override diff --git a/gradle/ext.gradle b/gradle/ext.gradle index b10c2b0ce4..ee5282fdc0 100644 --- a/gradle/ext.gradle +++ b/gradle/ext.gradle @@ -3,6 +3,6 @@ ext { kotlin_version = '1.5.30' plugin_version = '10.0.0_mogo' hook_log_plugin_version = '1.7.2' - service_chain_version = '5.2.2' + service_chain_version = '5.2.3' lancetx_plugin_version = '10.0.3_mogo' } \ No newline at end of file diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 96c2f5b03a..7260e0fac5 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -1,16 +1,16 @@ package com.zhidao.support.adas.high; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_CONNECT_ADDRESS; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_INIT; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_STATUS_CHANGE_REASON; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_ADAS; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_CONNECT_STATUS; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_SEND_GLOBAL_PATH; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_SEND_SYSTEM_CMD; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_START_AUTOPILOT; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_CONNECT_ADDRESS; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_ADAS_INIT; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_STATUS_CHANGE_REASON; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_SOURCE_ADAS; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_INIT_STATUS; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_SOCKET_AUTOPILOT; import android.os.Handler; import android.os.Message; @@ -275,9 +275,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec ipcFixationIPHelper.start(ips); } - @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_INIT, + @ChainLog(linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_INIT, paramIndexes = {-1}) private void initSocket() { mSocket = new FpgaSocket(); @@ -291,9 +291,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec connect(); } - @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_CONNECT_ADDRESS, + @ChainLog(linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_CONNECT_ADDRESS, paramIndexes = {0,1}) private void connectSocket(String address, int port) { if (mSocket != null) { @@ -638,9 +638,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * @param reason 状态描述 * 如果ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.DISCONNECTED && reason==null 表示主动断开连接 */ - @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_STATUS_CHANGE_REASON, + @ChainLog(linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_STATUS_CHANGE_REASON, paramIndexes = {0, 1}) private void updateConnectStatus(@Define.IPCConnectionStatus int status, @Nullable String reason) { ipcConnectionStatus.set(status); @@ -836,9 +836,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * @return boolean */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_START_AUTOPILOT, paramIndexes = {0, 1, 2} ) @Override @@ -1006,9 +1006,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * @return boolean */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_SEND_GLOBAL_PATH, paramIndexes = {-1} ) @Override @@ -1076,9 +1076,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * @return boolean */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_SEND_SYSTEM_CMD, paramIndexes = {0} ) @Override @@ -1096,9 +1096,9 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec * @return boolean */ @ChainLog( - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD, + linkChainLog = CHAIN_TYPE_SOCKET_AUTOPILOT, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD, paramIndexes = {0} ) @Override diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java index 7289402419..5e762dc21e 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/chain/AdasChain.java @@ -2,21 +2,21 @@ package com.zhidao.support.adas.high.chain; public class AdasChain { - public static final int CHAIN_LINK_ADAS = 1; + public static final int CHAIN_SOURCE_ADAS = 1; - public static final int CHAIN_LINK_LOG_CONNECT_STATUS = 0; - public static final int CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT = 2; + public static final int CHAIN_TYPE_INIT_STATUS = 0; + public static final int CHAIN_TYPE_SOCKET_AUTOPILOT = 2; - public static final String CHAIN_ALIAS_CODE_INIT = "PAD_ADAS_INIT"; - public static final String CHAIN_ALIAS_CODE_STATUS_CHANGE_REASON = "CHAIN_ALIAS_CODE_STATUS_CHANGE_REASON"; - public static final String CHAIN_ALIAS_CODE_CONNECT_ADDRESS = "PAD_ADAS_CONNECT_ADDRESS"; - public static final String CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN = "PAD_ADAS_WEB_SOCKET_OPEN"; - public static final String CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON = "PAD_ADAS_WEB_SOCKET_MESSAGE_JSON"; - public static final String CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE = "PAD_ADAS_WEB_SOCKET_MESSAGE_BYTE"; + public static final String CHAIN_CODE_ADAS_INIT = "CHAIN_CODE_ADAS_INIT"; + public static final String CHAIN_CODE_STATUS_CHANGE_REASON = "CHAIN_CODE_STATUS_CHANGE_REASON"; + public static final String CHAIN_CODE_CONNECT_ADDRESS = "CHAIN_CODE_CONNECT_ADDRESS"; + public static final String CHAIN_CODE_WEB_SOCKET_OPEN = "CHAIN_CODE_WEB_SOCKET_OPEN"; + public static final String CHAIN_CODE_WEB_SOCKET_MESSAGE_JSON = "CHAIN_CODE_WEB_SOCKET_MESSAGE_JSON"; + public static final String CHAIN_CODE_WEB_SOCKET_MESSAGE_BYTE = "CHAIN_CODE_WEB_SOCKET_MESSAGE_BYTE"; //operation by user - public static final String CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT = "CHAIN_ALIAS_CODE_ADAS_START_AUTOPILOT"; - public static final String CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH = "CHAIN_ALIAS_CODE_ADAS_SEND_GLOBAL_PATH"; - public static final String CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD = "CHAIN_ALIAS_CODE_ADAS_SEND_SYSTEM_CMD"; - public static final String CHAIN_ALIAS_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD = "CHAIN_ALIAS_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD"; + public static final String CHAIN_CODE_ADAS_START_AUTOPILOT = "CHAIN_CODE_ADAS_START_AUTOPILOT"; + public static final String CHAIN_CODE_ADAS_SEND_GLOBAL_PATH = "CHAIN_CODE_ADAS_SEND_GLOBAL_PATH"; + public static final String CHAIN_CODE_ADAS_SEND_SYSTEM_CMD = "CHAIN_CODE_ADAS_SEND_SYSTEM_CMD"; + public static final String CHAIN_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD = "CHAIN_CODE_ADAS_SEND_TRAJECTORY_DOWNLOAD"; } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java index 19f4400e0a..d0d39ec604 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/socket/FpgaSocket.java @@ -1,10 +1,10 @@ package com.zhidao.support.adas.high.socket; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_ADAS; -import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_LINK_LOG_CONNECT_STATUS; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_WEB_SOCKET_MESSAGE_BYTE; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_WEB_SOCKET_MESSAGE_JSON; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_CODE_WEB_SOCKET_OPEN; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_SOURCE_ADAS; +import static com.zhidao.support.adas.high.chain.AdasChain.CHAIN_TYPE_INIT_STATUS; import static com.zhidao.support.adas.high.common.Constants.RESOURCE_PATH; import static com.zhidao.support.adas.high.common.Constants.WS_IP_HOST_HEAD; @@ -198,9 +198,9 @@ public class FpgaSocket implements IWebSocket { public class EchoWebSocketListener extends WebSocketListener { - @ChainLog(linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_OPEN, + @ChainLog(linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_WEB_SOCKET_OPEN, paramIndexes = {1}) @Override public void onOpen(@NonNull WebSocket webSocket, @NonNull Response response) { @@ -220,8 +220,8 @@ public class FpgaSocket implements IWebSocket { } @ChainLog(linkChainLog = -1, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_JSON, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_WEB_SOCKET_MESSAGE_JSON, paramIndexes = {1}) @Override public void onMessage(@NonNull WebSocket webSocket, @NonNull String text) { @@ -249,8 +249,8 @@ public class FpgaSocket implements IWebSocket { } @ChainLog(linkChainLog = -1, - linkCode = CHAIN_LINK_ADAS, - nodeAliasCode = CHAIN_ALIAS_CODE_WEB_SOCKET_MESSAGE_BYTE, + linkCode = CHAIN_SOURCE_ADAS, + nodeAliasCode = CHAIN_CODE_WEB_SOCKET_MESSAGE_BYTE, paramIndexes = {-1}) @Override public void onMessage(@NonNull WebSocket webSocket, @NonNull ByteString bytes) { diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 9aedff219e..48411a02a0 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -1,12 +1,12 @@ package com.mogo.map; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_HD_MAP_CALL; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_INIT_ON_MAP_INIT; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_INIT; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_HD_MAP; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_MAP; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_HD_MAP_CALL; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_INIT_ON_MAP_INIT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_CODE_INIT_ON_MAP_LOADED; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_INIT; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_INIT_STATUS; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_TYPE_HD_MAP; +import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_SOURCE_MAP; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP; import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300; import static com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS; @@ -379,9 +379,9 @@ public class AMapViewWrapper implements IMogoMapView, } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_HD_MAP, - linkCode = CHAIN_LINK_MAP, - nodeAliasCode = CHAIN_ALIAS_CODE_HD_MAP_CALL, + linkChainLog = CHAIN_TYPE_HD_MAP, + linkCode = CHAIN_SOURCE_MAP, + nodeAliasCode = CHAIN_CODE_HD_MAP_CALL, paramIndexes = {0} ) @Override @@ -723,9 +723,9 @@ public class AMapViewWrapper implements IMogoMapView, @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_INIT, - nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ON_MAP_INIT, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_INIT, + nodeAliasCode = CHAIN_CODE_INIT_ON_MAP_INIT, paramIndexes = {-1} ) @Override @@ -735,9 +735,9 @@ public class AMapViewWrapper implements IMogoMapView, } @ChainLog( - linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = CHAIN_LINK_INIT, - nodeAliasCode = CHAIN_ALIAS_CODE_INIT_ON_MAP_LOADED, + linkChainLog = CHAIN_TYPE_INIT_STATUS, + linkCode = CHAIN_SOURCE_INIT, + nodeAliasCode = CHAIN_CODE_INIT_ON_MAP_LOADED, paramIndexes = {-1} ) @Override diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt index 33bbe054e9..534a351eac 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/location/GDLocationClient.kt @@ -10,7 +10,7 @@ import com.amap.api.location.AMapLocationListener import com.mogo.commons.AbsMogoApplication import com.mogo.commons.constants.SharedPrefsConstants import com.mogo.eagle.core.data.deva.chain.ChainConstant -import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_HTTP_DNS_CITY_CODE +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_HTTP_DNS_CITY_CODE import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.call.map.CallerGaoDeMapLocationListenerManager import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr @@ -147,9 +147,9 @@ class GDLocationClient private constructor(context: Context) : AMapLocationListe } @ChainLog( - linkChainLog = ChainConstant.CHAIN_LINK_LOG_CONNECT_STATUS, - linkCode = ChainConstant.CHAIN_LINK_CLOUD, - nodeAliasCode = CHAIN_ALIAS_CODE_HTTP_DNS_CITY_CODE, + linkChainLog = ChainConstant.CHAIN_TYPE_INIT_STATUS, + linkCode = ChainConstant.CHAIN_SOURCE_CLOUD, + nodeAliasCode = CHAIN_CODE_HTTP_DNS_CITY_CODE, paramIndexes = [0], ) private fun setCityCode(code: String) {