Merge remote-tracking branch 'origin/feature/v1.0.4' into feature/v1.0.4

# Conflicts:
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoCarLocationChangedListener2.java

@@ -0,0 +1,14 @@
+package com.mogo.map.navi;
+
+import android.location.Location;
+
+/**
+ * @author congtaowang
+ * @since 2020-03-14
+ * <p>
+ * 车辆位置变化
+ */
+public interface IMogoCarLocationChangedListener2 extends IMogoCarLocationChangedListener {
+
+    void onCarLocationChanged2( Location latLng );
+}

libraries/mogo-map-api/src/main/java/com/mogo/map/navi/IMogoNavi.java

@@ -144,12 +144,19 @@ public interface IMogoNavi {
      */
     MogoLatLng getCarLocation();
 
+    /**
+     * 获取车标经纬度
+     *
+     * @return
+     */
+    Location getCarLocation2();
+
     /**
      * 注册车辆位置变化监听，非业务使用
      *
      * @param listener
      */
-    void registerCarLocationChangedListener( IMogoCarLocationChangedListener listener );
+    void registerCarLocationChangedListener( IMogoCarLocationChangedListener2 listener );
 
     /**
      * 打开巡航模式
@@ -161,10 +168,17 @@ public interface IMogoNavi {
      */
     void stopAimlessMode();
 
+    /**
+     * 设置巡航模式状态
+     *
+     * @param open
+     */
+    void setAimlessModeStatus( boolean open );
+
     /**
      * 查看全程
      */
-    void displayOverview();
+    void displayOverview( Rect bounds );
 
     /**
      * 设置使用外部定位源

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

@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.animation.Interpolator;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
 
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
@@ -88,8 +89,10 @@ public interface IMogoMapUIController {
 
     /**
      * 预览全程
+     *
+     * @param bounds 显示范围
      */
-    void displayOverview();
+    void displayOverview( Rect bounds );
 
     /**
      * 获取比例尺数据
@@ -192,7 +195,7 @@ public interface IMogoMapUIController {
     /**
      * 配置自车图标样式
      *
-     * @param option
+     * @param option 为空时使用默认配置
      */
-    void setCarCursorOption( CarCursorOption option );
+    void setCarCursorOption( @Nullable CarCursorOption option );
 }