切换地图的逻辑修改

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -16,6 +16,7 @@ import com.mogo.service.imageloader.IMogoImageloader;
 import com.mogo.service.intent.IMogoIntentManager;
 import com.mogo.service.launcher.IMogoLauncher;
 import com.mogo.service.locationinfo.IMogoLocationInfoService;
+import com.mogo.service.map.IMogoMapFrameController;
 import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.module.IMogoActionManager;
 import com.mogo.service.module.IMogoAddressManager;
@@ -239,42 +240,57 @@ public interface IMogoServiceApis extends IProvider {
 
     /**
      * 获取授权服务
+     *
      * @return
      */
     IMogoAuthManager getAuthManagerApi();
 
     /**
      * 获取探路服务
+     *
      * @return
      */
     IMogoTanluProvider getTanluApi();
 
     /**
      * 获取Monitor相关api
+     *
      * @return
      */
     IMogoMonitorProvider getMogoMonitorApi();
+
     /**
      * 获取探路ui服务
+     *
      * @return
      */
     IMogoTanluUiProvider getTanluUiApi();
 
     /**
      * 皮肤管理接口
+     *
      * @return
      */
     IMogoSkinSupportInstaller getSkinSupportInstallerApi();
 
     /**
      * 获取crashWarnProvider
+     *
      * @return
      */
     IMogoCrashWarnProvider getCrashWarnProvider();
 
     /**
      * 在线车辆面板
+     *
      * @return
      */
     IMogoOnlineCarListPanelProvider getOnlineCarPanelApi();
+
+    /**
+     * 地图图层控制接口
+     *
+     * @return
+     */
+    IMogoMapFrameController getMapFrameControllerApi();
 }

services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java

@@ -225,7 +225,7 @@ public class MogoServicePaths {
      * 授权服务
      */
     @Deprecated
-    public static final String  PATH_AGREEMENT = "/agreement/showFragment";
+    public static final String PATH_AGREEMENT = "/agreement/showFragment";
 
     /**
      * 日志上传
@@ -266,4 +266,9 @@ public class MogoServicePaths {
      * 在线好友面板
      */
     public static final String PATH_ONLINE_CAR_PANEL = "/onlinecar/panel";
+
+    /**
+     * 自研地图和高德地图切换
+     */
+    public static final String PATH_MAP_FRAME_CONTROLLER = "/mapframe/controller";
 }

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

@@ -72,7 +72,20 @@ public interface IMogoADASController extends IProvider {
     /**
      * 给adas传递数据
      *
-     * @param json
+     * @param result
      */
-    void aiCloudToAdasData( String json );
+    void aiCloudToAdasData( RemoteControlAutoPilotParameters result );
+
+
+    /**
+     * 添加adas数据回调接口
+     * @param callback 回调接口
+     */
+    void addAdasDataCallback(IMogoAdasDataCallback callback);
+
+    /**
+     * 移除adas数据回调接口
+     * @param callback 待移除的callback
+     */
+    void removeAdasDataCallback(IMogoAdasDataCallback callback);
 }

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

@@ -0,0 +1,14 @@
+package com.mogo.service.adas;
+
+/**
+ * adas 数据回调接口
+ *
+ * @author tongchenfei
+ */
+public interface IMogoAdasDataCallback {
+    /**
+     * adas 数据回调
+     * @param msg 具体数据
+     */
+    void onAdasDataCallback(String msg);
+}

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

@@ -0,0 +1,14 @@
+package com.mogo.service.adas;
+
+/**
+ * adas 物体识别数据回调接口
+ *
+ * @author tongchenfei
+ */
+public interface IMogoAdasRecognizedDataCallback {
+    /**
+     * adas 数据回调
+     * @param msg 具体数据
+     */
+    void onAdasDataCallback( String msg );
+}

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

@@ -0,0 +1,23 @@
+package com.mogo.service.adas;
+
+import java.util.List;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/10/16
+ *
+ * 自动驾驶参数
+ */
+class RemoteControlAutoPilotParameters {
+
+    public AutoPilotLonLat startLatLon;
+    public List< AutoPilotLonLat > wayLatLons;
+    public AutoPilotLonLat endLatLon;
+    public float speedLimit;
+
+    public static class AutoPilotLonLat {
+        public double lat;
+        public double lon;
+    }
+}

services/mogo-service-api/src/main/java/com/mogo/service/map/IMogoMapFrameController.java

@@ -0,0 +1,26 @@
+package com.mogo.service.map;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+import com.mogo.map.IDestroyable;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/10/23
+ *
+ * 地图图层切换：高德地图 <-> 自研地图，过渡期使用
+ */
+interface IMogoMapFrameController extends IProvider, IDestroyable {
+
+    void initDelegate( IMogoMapFrameController controller );
+
+    /**
+     * 切换到高德2D
+     */
+    void changeTo2dMode();
+
+    /**
+     * 切换到自研vr
+     */
+    void changeToVRMode();
+}