Merge branch 'dev_robotaxi-d_230912_6.1.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_robotaxi-d_230912_6.1.0

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java

@@ -1,41 +0,0 @@
-package com.mogo.eagle.core.function.api.map;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.map.location.IMogoGDLocationClient;
-import com.mogo.map.overlay.IMoGoOverlayManager;
-import com.mogo.map.uicontroller.IMogoMapUIController;
-
-/**
- * @author congtaowang
- * @since 2019-12-18
- * <p>
- * 地图对外接口
- */
-public interface IMogoMapService extends IProvider {
-
-
-
-    /**
-     * 地图UI控制
-     *
-     * @return
-     */
-    IMogoMapUIController getMapUIController();
-
-
-    /**
-     * 覆盖物操作
-     * @return
-     */
-    IMoGoOverlayManager getOverlayManager();
-
-    /**
-     * 获取高德定位服务
-     *
-     * @return
-     */
-    IMogoGDLocationClient getGDLocationServer(Context context);
-
-}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.kt

@@ -0,0 +1,29 @@
+package com.mogo.eagle.core.function.api.map
+
+import com.alibaba.android.arouter.facade.template.IProvider
+import com.mogo.map.location.IMogoGDLocationClient
+import com.mogo.map.overlay.IMoGoOverlayManager
+import com.mogo.map.uicontroller.IMogoMapUIController
+
+interface IMogoMapService :IProvider {
+
+    /**
+     * 地图UI控制
+     *
+     * @return
+     */
+    fun getMapUIController(mapTag:String): IMogoMapUIController?
+
+    /**
+     * 覆盖物操作
+     * @return
+     */
+    fun getOverlayManager(): IMoGoOverlayManager
+
+    /**
+     * 获取高德定位服务
+     *
+     * @return
+     */
+    fun getGDLocationServer(): IMogoGDLocationClient
+}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/listener/IMoGoMapStyleChangeListener.kt

@@ -1,15 +0,0 @@
-package com.mogo.eagle.core.function.api.map.listener
-
-/**
- *@author        xiaoyuzhou
- *@date          2021/10/15 12:18 下午
- * 地图样式改变回调监听
- */
-interface IMoGoMapStyleChangeListener {
-
-    /**
-     * 地图样式改变回调监听
-     */
-    fun onMapStyleModeChange(styleMode: Int)
-
-}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/smp/IMogoSmallMapProvider.java

@@ -1,42 +0,0 @@
-package com.mogo.eagle.core.function.api.map.smp;
-
-import com.mogo.eagle.core.data.map.MogoLatLng;
-
-import java.util.List;
-
-/**
- * @author donghongyu
- * @date 12/10/20 1:36 PM
- */
-public interface IMogoSmallMapProvider {
-
-    /**
-     * 显示面板
-     */
-    void showPanel();
-
-    /**
-     * 隐藏面板
-     */
-    void hidePanel();
-
-    /**
-     * 绘制路径线
-     */
-    void drawablePolyline(List<MogoLatLng> coordinates);
-
-    /**
-     * 清除路径线
-     */
-    void clearPolyline();
-
-    /**
-     * 查询全揽模式下V2X事件
-     */
-    default void startQueryV2XEvents() {}
-
-    /**
-     * 清除V2X事件
-     */
-    default void clearV2XMarkers() {}
-}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/setting/ISopSettingListener.kt

@@ -20,4 +20,9 @@ interface ISopSettingListener {
      */
     fun onPointCloudClickEvent(status: Boolean){}
 
+    /**
+     * 自车光圈
+     */
+    fun onCarApertureClickEvent(status: Boolean){}
+
 }