Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

# Conflicts:
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapWrapper.java
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
#	modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/IdentifyDataDrawer.java

libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java

@@ -1,5 +1,6 @@
 package com.mogo.map;
 
+import com.mogo.eagle.core.data.traffic.TrafficData;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
 import com.mogo.map.overlay.IMogoPolyline;
@@ -39,6 +40,29 @@ public interface IMogoMap {
      */
     IMogoMarker addMarker( String tag, MogoMarkerOptions options );
 
+
+    /**
+     * 批量更新锚点位置
+     *
+     * @param optionsArrayList 锚点集合
+     */
+    void updateBatchMarkerPositon(ArrayList<TrafficData> optionsArrayList);
+
+    /**
+     * 添加感知使用到的3d模型
+     *
+     * @param type
+     * @param modelRes
+     */
+    String addPreVehicleModel(int type, int modelRes);
+
+    /**
+     * 要移除的感知数据uuid
+     *
+     * @param uuidString
+     */
+    void removeMarker(String uuidString);
+
     /**
      * 在地图上添一组图片标记（marker）对象，并设置是否改变地图状态以至于所有的marker对象都在当前地图可视区域范围内显示。
      *

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerManager.java

@@ -3,6 +3,7 @@ package com.mogo.map.marker;
 import android.content.Context;
 
 import com.mogo.eagle.core.data.map.MogoLatLng;
+import com.mogo.eagle.core.data.traffic.TrafficData;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,6 +35,26 @@ public interface IMogoMarkerManager {
      */
     List< IMogoMarker > addMarkers( String tag, ArrayList< MogoMarkerOptions > options, boolean moveToCenter );
 
+    /**
+     * 批量更新锚点位置
+     * @param optionsArrayList 锚点集合
+     */
+    void updateBatchMarkerPosition(ArrayList<TrafficData> optionsArrayList);
+
+    /**
+     * 添加感知使用到的3d模型
+     * @param type
+     * @param modelRes
+     */
+    String addPreVehicleModel(int type,int modelRes);
+
+    /**
+     * 要移除的感知数据uuid
+     *
+     * @param uuidString
+     */
+    void removeMarker(String uuidString);
+
     /**
      * 移除某一个类型、某个模块的 markers
      *

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/MogoMarkerOptions.java

@@ -20,6 +20,9 @@ import java.util.Observable;
  */
 public class MogoMarkerOptions extends Observable {
 
+    // marker 唯一标记
+    private String uuid;
+    private int markerType;
     private double latitude;
     private double longitude;
     // 设置 Marker覆盖物 的标题
@@ -94,7 +97,23 @@ public class MogoMarkerOptions extends Observable {
      */
     private boolean mMatchOnRoadSide = true;
 
-    public MogoMarkerOptions matchOnRoadSide( boolean matchOnRoadSide ) {
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public int getMarkerType() {
+        return markerType;
+    }
+
+    public void setMarkerType(int markerType) {
+        this.markerType = markerType;
+    }
+
+    public MogoMarkerOptions matchOnRoadSide(boolean matchOnRoadSide ) {
         this.mMatchOnRoadSide = matchOnRoadSide;
         return this;
     }
@@ -404,7 +423,9 @@ public class MogoMarkerOptions extends Observable {
     @Override
     public String toString() {
         return "MogoMarkerOptions{" +
-                "latitude=" + latitude +
+                "uuid='" + uuid + '\'' +
+                ", markerType=" + markerType +
+                ", latitude=" + latitude +
                 ", longitude=" + longitude +
                 ", title='" + title + '\'' +
                 ", snippet='" + snippet + '\'' +
@@ -416,7 +437,7 @@ public class MogoMarkerOptions extends Observable {
                 ", visible=" + visible +
                 ", inifoWindowEnable=" + inifoWindowEnable +
                 ", alpha=" + alpha +
-                " ,scale=" + scale+
+                ", scale=" + scale +
                 ", isGps=" + isGps +
                 ", u=" + u +
                 ", v=" + v +
@@ -424,6 +445,16 @@ public class MogoMarkerOptions extends Observable {
                 ", offsetX=" + offsetX +
                 ", offsetY=" + offsetY +
                 ", zIndex=" + zIndex +
+                ", mIconView=" + mIconView +
+                ", mOwner='" + mOwner + '\'' +
+                ", mObject=" + mObject +
+                ", mAutoManager=" + mAutoManager +
+                ", mIcon3DRes=" + mIcon3DRes +
+                ", mAnchorColor='" + mAnchorColor + '\'' +
+                ", mIs3DMode=" + mIs3DMode +
+                ", mIsControlAngle=" + mIsControlAngle +
+                ", mResName='" + mResName + '\'' +
+                ", mMatchOnRoadSide=" + mMatchOnRoadSide +
                 '}';
     }
 }