Merge remote-tracking branch 'origin/dev2' into dev2

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

@@ -128,4 +128,8 @@ public interface IMogoADASController extends IProvider {
      * @param callback
      */
     void removeAdasRecognizedDataCallback( IMogoAdasRecognizedDataCallback callback );
+
+    void addAdasOCHCallback( IMogoAdasOCHCallback callback );
+
+    void removeAdasOCHCallback();
 }

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

@@ -0,0 +1,15 @@
+package com.mogo.service.adas;
+
+import com.mogo.service.adas.entity.AdasOCHData;
+
+public
+/**
+ * @author congtaowang
+ * @since 2021/1/18
+ *
+ * 自动驾驶到站回调
+ */
+interface IMogoAdasOCHCallback {
+
+    void onArriveAt( AdasOCHData data );
+}

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

@@ -15,9 +15,18 @@ class RemoteControlAutoPilotParameters {
     public List< AutoPilotLonLat > wayLatLons;
     public AutoPilotLonLat endLatLon;
     public float speedLimit;
+    public int vehicleType;// 运营类型
 
     public static class AutoPilotLonLat {
         public double lat;
         public double lon;
+
+        public AutoPilotLonLat() {
+        }
+
+        public AutoPilotLonLat( double lat, double lon ) {
+            this.lat = lat;
+            this.lon = lon;
+        }
     }
 }

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

@@ -0,0 +1,21 @@
+package com.mogo.service.adas.entity;
+
+public
+/**
+ * @author congtaowang
+ * @since 2021/1/18
+ *
+ * 自动驾驶网约车回调数据
+ */
+class AdasOCHData {
+
+    public int type;
+    public double lon;
+    public double lat;
+
+    public AdasOCHData( int type, double lon, double lat ) {
+        this.type = type;
+        this.lon = lon;
+        this.lat = lat;
+    }
+}