[6.5.0] merge

libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.kt

@@ -36,7 +36,6 @@ import com.mogo.map.listener.MogoMapListenerHandler.Companion.mogoMapListenerHan
 import com.mogo.map.uicontroller.*
 import com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT
 import com.mogo.map.utils.MapTraceUtil
-import com.mogo.map.utils.MogoMapUtils
 import com.mogo.map.utils.MogoMapUtils.getLatLngBounds
 import com.mogo.map.utils.ObjectUtils
 import com.zhidaoauto.map.data.point.LonLatPoint
@@ -387,18 +386,22 @@ class AMapViewWrapper(mMapView: MapAutoView) : IMogoMapView, IMogoMapUIControlle
     override fun showMyLocation(visible: Boolean) {
         d(M_MAP + TAG, "showMyLocation1 $visible")
         // 如果是VR模式
-        if (isVrMold) {
-            return
-        }
+//        if (isVrMold) {
+//            return
+//        }
         // 不是VR模式情况强制刷新下
         if (checkAMapView()) {
             val style = mMapView.getMapAutoViewHelper()!!
                 .getMyLocationStyle()
-            if (visible) {
-                // 强制刷新一遍车标
-                style!!.myLocationIcon(mCarCursorOption!!.carCursorRes)
+            style?.let {
+                if (visible) {
+                    // 强制刷新一遍车标
+                    it.myLocationIcon(mCarCursorOption!!.carCursorRes)
+                }else{
+                    it.hideCar()
+                }
+                mMapView.getMapAutoViewHelper()!!.setMyLocationStyle(style)
             }
-            mMapView.getMapAutoViewHelper()!!.setMyLocationStyle(style!!)
         }
     }
 

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.kt

@@ -83,7 +83,7 @@ class AMapWrapper(map: MapAutoViewHelper?, mapView: MapAutoView, controller: IMo
         return AMapPolylineWrapper(options.id, delegate, mMapView)
     }
 
-    var batchMarkerOptions = BatchMarkerOptions()
+    private val batchMarkerOptions = BatchMarkerOptions()
 
     @SuppressLint("NewApi")
     override fun updateBatchMarkerPosition(optionsArrayList: HashMap<String, TrackedObject>?) {

libraries/mogo-map/src/main/java/com/mogo/map/MogoMapView.kt

@@ -52,6 +52,10 @@ open class MogoMapView : MogoBaseMapView, ILifeCycle {
         }
     }
 
+    override fun getInstanceTag(): String {
+        return ""
+    }
+
     /**
      * 子类实现
      * 代码StyleParams和XML初始化设置同时仅支持一种
@@ -61,10 +65,6 @@ open class MogoMapView : MogoBaseMapView, ILifeCycle {
     protected val styleParams: MapStyleParams?
         protected get() = null
 
-    override fun getInstanceTag(): String {
-        return MogoMap.DEFAULT
-    }
-
     override fun onCreate(bundle: Bundle?) {
         super.onCreate(bundle)
         d(TAG, "onCreate")