Merge branch 'qa_merge_shunyi_vr_map' into dev2

# Conflicts:
#	config.gradle
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/CloudLocationInfo.java
#	services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

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

@@ -129,7 +129,16 @@ public interface IMogoADASController extends IProvider {
      */
     void removeAdasRecognizedDataCallback( IMogoAdasRecognizedDataCallback callback );
 
+    /**
+     * 自车定位数据
+     *
+     * @param carDataCallback
+     */
+    void setAdasCarDataCallback( IMogoAdasCarDataCallback carDataCallback );
+
     void addAdasOCHCallback( IMogoAdasOCHCallback callback );
 
     void removeAdasOCHCallback();
+
+    void onAutopilotArriveLike( int type );
 }

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

@@ -0,0 +1,17 @@
+package com.mogo.service.adas;
+
+import com.mogo.service.adas.entity.ADASCarStateInfo;
+
+/**
+ * adas 自车位置数据回调
+ *
+ * @author tongchenfei
+ */
+public interface IMogoAdasCarDataCallback {
+    /**
+     * adas 数据回调
+     *
+     * @param msg 具体数据
+     */
+    void onAdasCarDataCallback( ADASCarStateInfo msg );
+}

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

@@ -0,0 +1,142 @@
+package com.mogo.service.adas.entity;
+
+import java.io.Serializable;
+
+/**
+ * @author nie yunlong
+ * @des 车辆状态
+ * @date 2020/3/12
+ */
+public class ADASCarStateInfo implements Serializable {
+
+
+    /**
+     * action : “state”
+     * values : {"lon":116.8,"lat":39.4,"alt":22.3,"heading":87.5,"acceleration":0.5,"yaw_rate":0.3}
+     */
+
+    private String action;
+    private ValuesBean values;
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public ValuesBean getValues() {
+        return values;
+    }
+
+    public void setValues(ValuesBean values) {
+        this.values = values;
+    }
+
+    public static class ValuesBean {
+        /**
+         * lon : 116.8
+         * lat : 39.4
+         * alt : 22.3
+         * heading : 87.5
+         * acceleration : 0.5
+         * yaw_rate : 0.3
+         */
+
+        private double lon;
+        private double lat;
+        private double alt;
+        private double heading;
+        private double acceleration;
+        private double yaw_rate;
+        //惯导车速 m/s
+        private float gnss_speed;
+        //gps 时间
+        private String satelliteTime;
+
+        public float getGnss_speed() {
+            return gnss_speed;
+        }
+
+        public void setGnss_speed( float gnss_speed ) {
+            this.gnss_speed = gnss_speed;
+        }
+
+        public String getSatelliteTime() {
+            return satelliteTime;
+        }
+
+        public void setSatelliteTime( String satelliteTime ) {
+            this.satelliteTime = satelliteTime;
+        }
+
+        public double getLon() {
+            return lon;
+        }
+
+        public void setLon(double lon) {
+            this.lon = lon;
+        }
+
+        public double getLat() {
+            return lat;
+        }
+
+        public void setLat(double lat) {
+            this.lat = lat;
+        }
+
+        public double getAlt() {
+            return alt;
+        }
+
+        public void setAlt(double alt) {
+            this.alt = alt;
+        }
+
+        public double getHeading() {
+            return heading;
+        }
+
+        public void setHeading(double heading) {
+            this.heading = heading;
+        }
+
+        public double getAcceleration() {
+            return acceleration;
+        }
+
+        public void setAcceleration(double acceleration) {
+            this.acceleration = acceleration;
+        }
+
+        public double getYaw_rate() {
+            return yaw_rate;
+        }
+
+        public void setYaw_rate(double yaw_rate) {
+            this.yaw_rate = yaw_rate;
+        }
+
+        @Override
+        public String toString() {
+            return "ValuesBean{" +
+                    "lon=" + lon +
+                    ", lat=" + lat +
+                    ", alt=" + alt +
+                    ", heading=" + heading +
+                    ", acceleration=" + acceleration +
+                    ", yaw_rate=" + yaw_rate +
+                    '}';
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "CarStateInfo{" +
+                "action='" + action + '\'' +
+                ", values=" + values +
+                '}';
+    }
+}

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

@@ -39,18 +39,10 @@ class ADASRecognizedListResult {
     public double distanceY;
 
     /**
-     * 同一个uuid 1s内所对应的连续坐标
+     * 同一个uuid 1帧内所对应的坐标
      */
-    public List< LatLon > latLonList;
+    public double lon;
+    public double lat;
 
-    public static class LatLon {
-
-        public LatLon( double lat, double lon ) {
-            this.lat = lat;
-            this.lon = lon;
-        }
-
-        public double lat;
-        public double lon;
-    }
+    public long systemTime;
 }