From 43f99b3043b90fb56c3b27d89eb4f1c034acaf16 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Wed, 30 Aug 2023 14:36:13 +0800
Subject: [PATCH] [3.4.0-map-sdk] extends interface of mapbiz

---
 .../com/mogo/eagle/core/function/view/MapBizView.kt  | 12 ++++++++++++
 .../src/main/java/com/mogo/map/IMogoMap.kt           |  8 ++++----
 .../src/main/java/com/mogo/map/overlay/core/Level.kt |  1 -
 .../src/main/java/com/mogo/map/AMapWrapper.java      |  6 +++---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
index efddad6e4c..a86c77fb68 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
@@ -13,6 +13,10 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListene
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager
 import com.mogo.map.MogoMapView
+import com.mogo.map.overlay.line.Polyline
+import com.mogo.map.overlay.point.Point
+import com.mogo.map.overlay.proxy.line.IMapPolylineOverlay
+import com.mogo.map.overlay.proxy.point.IMapPointOverlay
 import com.mogo.map.uicontroller.IMogoMapUIController
 
 
@@ -64,6 +68,14 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context,
         return uiController
     }
 
+    fun addLine(options:Polyline.Options): IMapPolylineOverlay? {
+        return map.addLine(options)
+    }
+
+    fun addPoint(options: Point.Options): IMapPointOverlay?{
+        return map.addPoint(options)
+    }
+
     override fun onSaveInstanceState(outState: Bundle?) {
         super.onSaveInstanceState(outState)
     }
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.kt
index 77ba60c4a6..4c0e2e2bcf 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.kt
@@ -31,23 +31,23 @@ interface IMogoMap {
      */
     val uiController: IMogoMapUIController?
 
-    fun addPoint(options: Point.Options?): IMapPointOverlay?
+    fun addPoint(options: Point.Options): IMapPointOverlay?
 
-    fun addLine(options: Polyline.Options?): IMapPolylineOverlay?
+    fun addLine(options: Polyline.Options): IMapPolylineOverlay?
 
     /**
      * 批量更新锚点位置
      *
      * @param optionsArrayList 锚点集合
      */
-    fun updateBatchMarkerPosition(optionsArrayList: HashMap<String?, TrackedObject?>?)
+    fun updateBatchMarkerPosition(optionsArrayList: HashMap<String, TrackedObject>?)
 
     /**
      * 批量更新锚点位置
      *
      * @param optionsArrayList 锚点集合
      */
-    fun updateBatchAiMarkerPosition(optionsArrayList: HashMap<String?, SocketDownData.CloudRoadDataProto?>?)
+    fun updateBatchAiMarkerPosition(optionsArrayList: HashMap<String, SocketDownData.CloudRoadDataProto>?)
 
     /**
      * 添加感知使用到的3d模型
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/core/Level.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/core/Level.kt
index 449fa8de46..620cd25678 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/core/Level.kt
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/core/Level.kt
@@ -20,7 +20,6 @@ enum class Level(val zIndex: Int) {
      */
     GUIDE_ROUTE_LINE(75000),
 
-
     /**
      * 道路围栏区域绘制
      */
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
index 16d4919d0f..ae79e21ca4 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
@@ -2,7 +2,7 @@ package com.mogo.map;
 
 import android.annotation.SuppressLint;
 
-import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.overlay.proxy.line.IMapPolylineOverlay;
@@ -64,7 +64,7 @@ public class AMapWrapper implements IMogoMap {
     }
 
     @Override
-    public IMapPointOverlay addPoint(com.mogo.map.overlay.point.Point.Options options) {
+    public IMapPointOverlay addPoint(@NonNull com.mogo.map.overlay.point.Point.Options options) {
         if (!checkAMap()) {
             return null;
         }
@@ -81,7 +81,7 @@ public class AMapWrapper implements IMogoMap {
     }
 
     @Override
-    public IMapPolylineOverlay addLine(com.mogo.map.overlay.line.Polyline.Options options) {
+    public IMapPolylineOverlay addLine(@NonNull com.mogo.map.overlay.line.Polyline.Options options) {
         if (!checkAMap()) {
             return null;
         }