merge dev2_aiSdk_datalink

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

@@ -35,7 +35,9 @@ public abstract class MogoBaseMapView extends FrameLayout implements ILifeCycle
 
     private void init( Context context ) {
         addMapView( context );
-        MogoMap.getInstance().init( getContext(), mMapView.getMap() );
+        if (mMapView != null){
+            MogoMap.getInstance().init( getContext(), mMapView.getMap() );
+        }
     }
 
     protected abstract void addMapView( Context context );

libraries/mogo-map-api/src/main/java/com/mogo/map/listener/MogoMapListenerHandler.java

@@ -1,5 +1,6 @@
 package com.mogo.map.listener;
 
+import android.util.Log;
 import android.view.MotionEvent;
 
 import com.mogo.map.MogoLatLng;

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

@@ -42,7 +42,7 @@ public interface IMogoMarkerManager {
     void removeMarkers( String tag );
 
     /**
-     * 移除地图上所有markers
+     * 移除地图上添加的所有markers
      */
     void removeMarkers();
 
@@ -63,6 +63,7 @@ public interface IMogoMarkerManager {
      * @return
      */
     List< IMogoMarker > getMarkers( String tag );
+
     /**
      * 获取所有类型的marker。
      *

libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java

@@ -11,7 +11,6 @@ import androidx.annotation.Nullable;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.anim.OnMarkerAnimationListener;
-import com.mogo.realtime.entity.ADASRecognizedResult;
 
 import org.json.JSONObject;
 
@@ -54,7 +53,7 @@ public interface IMogoMapUIController {
      *
      * @param angelMode {@link VisualAngleMode}
      */
-    void changeMapVisualAngle(VisualAngleMode angelMode);
+    void changeMapVisualAngle(VisualAngleMode angelMode, MogoLatLng mogoLatLng);
 
     /**
      * 获得当前地图视距模式