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;
+    }
+}

services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

@@ -21,12 +21,14 @@ import com.mogo.module.common.utils.CarSeries;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.adas.IMogoAdasDataCallback;
+import com.mogo.service.adas.IMogoAdasOCHCallback;
 import com.mogo.service.adas.IMogoAdasRecognizedDataCallback;
 import com.mogo.service.adas.IMogoAdasWarnMessageCallback;
 import com.mogo.service.adas.RemoteControlAutoPilotParameters;
 import com.mogo.service.adas.entity.ADASRecognizedListResult;
 import com.mogo.service.adas.entity.ADASRecognizedResult;
 import com.mogo.service.adas.entity.ADASWarnMessage;
+import com.mogo.service.adas.entity.AdasOCHData;
 import com.mogo.service.impl.singleton.SingletonsHolder;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.utils.TipToast;
@@ -42,6 +44,7 @@ import com.zhidao.adasconfig.common.config.EnumSkinStyle;
 import com.zhidao.autopilot.support.api.AutopilotServiceManage;
 import com.zhidao.autopilot.support.api.IAutopilotServiceStatusListener;
 import com.zhidao.autopilot.support.api.IAutopolitDataCallBack;
+import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel;
 import com.zhidao.support.adas.high.OnAdasListener;
 import com.zhidao.support.adas.high.bean.RectInfo;
 import com.zhidao.support.adas.high.bean.WarnMessageInfo;
@@ -156,6 +159,7 @@ public class MogoADASController implements IMogoADASController {
      * 缓存容器
      */
     List< RectInfo > mCacheRecognizedDataSet = new ArrayList<>();
+    private IMogoAdasOCHCallback mAdasOCHCallback;
 
     /**
      * 处理数据，将识别到的物体分组，然后每1s进行一次回调
@@ -306,6 +310,20 @@ public class MogoADASController implements IMogoADASController {
                 public void showToast( String msg ) {
                     UiThreadHandler.post( () -> TipToast.tip( msg ) );
                 }
+
+                @Override
+                public void autopilotArrive( AdasAIDLAutopilotArriveModel autopilotArriveModel ) {
+                    if ( autopilotArriveModel == null ) {
+                        return;
+                    }
+                    if ( mAdasOCHCallback != null ) {
+                        mAdasOCHCallback.onArriveAt( new AdasOCHData(
+                                autopilotArriveModel.getCarType(),
+                                autopilotArriveModel.getLon(),
+                                autopilotArriveModel.getLat() )
+                        );
+                    }
+                }
             };
             AutopilotServiceManage.getInstance().registerAutopilotDataListener( mAutopolitDataCallBack );
         }
@@ -585,4 +603,15 @@ public class MogoADASController implements IMogoADASController {
         }
         mMogoAdasRecognizedDataCallbacks.remove( callback );
     }
+
+
+    @Override
+    public void addAdasOCHCallback( IMogoAdasOCHCallback callback ) {
+        mAdasOCHCallback = callback;
+    }
+
+    @Override
+    public void removeAdasOCHCallback() {
+        mAdasOCHCallback = null;
+    }
 }