add new func of track process of adas

2022-02-04 18:32:31 +08:00
parent df31309b44
commit 435f511416
15 changed files with 261 additions and 123 deletions
--- a/modules/mogo-module-adas/build.gradle
+++ b/modules/mogo-module-adas/build.gradle
@@ -47,10 +47,11 @@ dependencies {
    implementation rootProject.ext.dependencies.arouter
    kapt rootProject.ext.dependencies.aroutercompiler

+    implementation rootProject.ext.dependencies.mogochainbase
    // 现有的ADAS的通讯SDK，需要将里面的东西融合到我们项目中
    compileOnly rootProject.ext.dependencies.adasapi

-    api rootProject.ext.dependencies.adasHigh
+//    api rootProject.ext.dependencies.adasHigh
    implementation rootProject.ext.dependencies.mogoami

    annotationProcessor rootProject.ext.dependencies.aroutercompiler
@@ -74,6 +75,8 @@ dependencies {
        implementation project(':core:mogo-core-utils')
        implementation project(':core:mogo-core-function-api')
        implementation project(':core:mogo-core-function-call')
+
+        implementation project(':libraries:mogo-adas')
    }
 }
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
+++ b/modules/mogo-module-adas/src/main/java/com/mogo/module/adas/OnAdasListenerAdapter.java
@@ -1,5 +1,16 @@
 package com.mogo.module.adas;

+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA;
+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_ADAS;
+
 import android.util.Log;

 import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
@@ -25,7 +36,6 @@ import com.zhidao.support.adas.high.bean.AutopilotStatus;
 import com.zhidao.support.adas.high.bean.AutopilotWayArrive;
 import com.zhidao.support.adas.high.bean.CarLaneInfo;
 import com.zhidao.support.adas.high.bean.CarStateInfo;
-import com.zhidao.support.adas.high.bean.IPCUpgradeInfo;
 import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo;
 import com.zhidao.support.adas.high.bean.LightStatueInfo;
 import com.zhidao.support.adas.high.bean.ObstaclesInfo;
@@ -36,6 +46,8 @@ import com.zhidao.support.adas.high.bean.WarnMessageInfo;
 import com.zhidao.support.adas.high.bean.guardian.AutopilotGuardianInfo;
 import com.zhidao.support.adas.high.bean.record.AutopilotRecordResult;
 import com.zhidao.support.obu.ami.AmiClientManager;
+import com.zhjt.service.chain.ChainLog;
+import com.zhjt.service.chain.TracingConstants;

 import java.util.ArrayList;
 import java.util.List;
@@ -49,7 +61,11 @@ import java.util.List;
 public class OnAdasListenerAdapter implements OnAdasListener {
    private final String TAG = "OnAdasListenerAdapter";

-
+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void onRectData(RectInfo rectInfo) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -58,7 +74,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {
        }
    }

-
+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void onCarStateData(CarStateInfo carStateInfo) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -87,6 +107,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {
        }
    }

+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void autopilotStatus(AutopilotStatus autopilotStatus) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -113,6 +138,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {
        }
    }

+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void autopilotArrive(AutopilotWayArrive autopilotWayArrive) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -131,6 +161,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {
        }
    }

+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void onAutopilotRoute(AutopilotRoute route) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -140,6 +175,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {
        }
    }

+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void onAutopilotTrajectory(List<TrajectoryInfo> trajectoryList) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -170,6 +210,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {
        CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutopilotSNRequest();
    }

+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void onAutopilotGuardian(AutopilotGuardianInfo guardianInfo) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -178,6 +223,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {
        }
    }

+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void onAutopilotRecord(AutopilotRecordResult result) {
        if (result != null) {
@@ -212,7 +262,11 @@ public class OnAdasListenerAdapter implements OnAdasListener {

    }

-
+    @ChainLog(linkCode = CHAIN_LINK_ADAS,
+            endpoint = TracingConstants.Endpoint.PAD,
+            nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN,
+            paramIndexes = {0},
+            clientPkFileName = "sn")
    @Override
    public void onWarnMessage(WarnMessageInfo warnMessageInfo) {
        final AutopilotWarnMessage warnMessage = AdasObjectUtils.INSTANCE.fromAdasObject(warnMessageInfo);
@@ -226,6 +280,7 @@ public class OnAdasListenerAdapter implements OnAdasListener {

    /**
     * 工控机升级状态
+     *
     * @param info 工控机升级状态
     */
    @Override
@@ -264,7 +319,6 @@ public class OnAdasListenerAdapter implements OnAdasListener {
 //    }


-
    @Override
    public void onSSHResult(SSHResult info) {

--- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
+++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java
@@ -1,5 +1,6 @@
 package com.mogo.module.common.drawer;

+import static com.mogo.eagle.core.data.chain.ChainConstant.CHAIN_LINK_CLOUD_SHOW;
 import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_DATA;

 import android.os.Build;
@@ -140,11 +141,11 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic
     *
     * @param data 自车周边数据
     */
-    @ChainLog(linkCode = 0,
-            endpoint = TracingConstants.Endpoint.PAD,
-            nodeAliasCode = "PAD_YINGYAN_SHOW",
-            paramIndexes = {0},
-            clientPkFileName = "sn")
+//    @ChainLog(linkCode = CHAIN_LINK_CLOUD_SHOW,
+//            endpoint = TracingConstants.Endpoint.PAD,
+//            nodeAliasCode = "PAD_YINGYAN_SHOW",
+//            paramIndexes = {0},
+//            clientPkFileName = "sn")
    public void renderSnapshotData(SocketDownData.LauncherSnapshotProto data) {
        final long start = System.nanoTime();
        if (clear(data)) {