merge

services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoAdasRecognizedDataCallback.java

@@ -1,6 +1,5 @@
 package com.mogo.service.adas;
 
-import com.mogo.service.adas.entity.ADASRecognizedListResult;
 import com.mogo.service.adas.entity.ADASRecognizedResult;
 
 import java.util.List;
@@ -16,5 +15,5 @@ public interface IMogoAdasRecognizedDataCallback {
      *
      * @param resultList 具体识别的物体数据
      */
-    void onAdasDataCallback( List< ADASRecognizedListResult > resultList );
+    void onAdasDataCallback( List< ADASRecognizedResult > resultList );
 }

services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASCarStateInfo.java

@@ -55,6 +55,10 @@ public class ADASCarStateInfo implements Serializable {
         //gps 时间
         private String satelliteTime;
 
+        private String systemTime;
+        //接收到数据的时间
+        private String receiverDataTime;
+
         public float getGnss_speed() {
             return gnss_speed;
         }
@@ -119,6 +123,22 @@ public class ADASCarStateInfo implements Serializable {
             this.yaw_rate = yaw_rate;
         }
 
+        public String getSystemTime() {
+            return systemTime;
+        }
+
+        public void setSystemTime( String systemTime ) {
+            this.systemTime = systemTime;
+        }
+
+        public String getReceiverDataTime() {
+            return receiverDataTime;
+        }
+
+        public void setReceiverDataTime( String receiverDataTime ) {
+            this.receiverDataTime = receiverDataTime;
+        }
+
         @Override
         public String toString() {
             return "ValuesBean{" +

services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASRecognizedListResult.java

@@ -1,48 +0,0 @@
-package com.mogo.service.adas.entity;
-
-import java.util.List;
-
-public
-/**
- * @author congtaowang
- * @since 2020/10/25
- *
- * adas 识别物体参数
- */
-class ADASRecognizedListResult {
-
-    /**
-     * 识别物体类型
-     */
-    public int type;
-
-    /**
-     * 识别物体唯一标识
-     */
-    public String uuid;
-    /**
-     * 方向
-     */
-    public double heading;
-    /**
-     * 速度
-     */
-    public double speed;
-    /**
-     * x 轴距离
-     */
-    public double distanceX;
-
-    /**
-     * y 轴距离
-     */
-    public double distanceY;
-
-    /**
-     * 同一个uuid 1帧内所对应的坐标
-     */
-    public double lon;
-    public double lat;
-
-    public long systemTime;
-}

services/mogo-service-api/src/main/java/com/mogo/service/adas/entity/ADASRecognizedResult.java

@@ -69,4 +69,23 @@ class ADASRecognizedResult {
      */
     public long mortonCode;
 
+    /**
+     * x 轴距离
+     */
+    public double distanceX;
+
+    /**
+     * y 轴距离
+     */
+    public double distanceY;
+
+    /**
+     * 实际直线距离
+     */
+    public double distance;
+
+    /**
+     * 数据来源精度 0 - 普通定位、1 - 高精定位
+     */
+    public int dataAccuracy;
 }