[6.7.0][HDMap][Overlay] 优化地图marker的处理逻辑；当地图控件从窗口中移除时，断开Java层与Marker之间的引用，规避内存泄露

OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java

@@ -234,12 +234,6 @@ public class BusPassengerRouteFragment extends
 
     @Override
     public void onDestroyView() {
-        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-        if(overlayManager!=null) {
-            overlayManager.removeAllLines();
-            overlayManager.removeAllPoints();
-        }
-
         super.onDestroyView();
     }
 

OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt

@@ -65,10 +65,6 @@ class PM2HPMapFragment :
 
     override fun onDestroyView() {
         mapBizView.onDestroy()
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         super.onDestroyView()
     }
 

OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt

@@ -112,10 +112,6 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
         if (mPresenter != null) {
             mPresenter?.onDestroy(this)
         }
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         super.onDestroyView()
     }
 

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt

@@ -266,10 +266,6 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), IMogo
     override fun onDestroyView() {
         mapBizView.onDestroy()
         omvOverMap.onDestroy()
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         MogoMapListenerHandler.mogoMapListenerHandler.unregisterHostMapListener(TAG)
         EventBus.getDefault().unregister(this)
         if (mPresenter != null) {

OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/ShuttleFragment.java

@@ -89,11 +89,6 @@ public class ShuttleFragment extends BaseShuttleTabFragment<ShuttleFragment, Bus
         if (mPresenter != null) {
             mPresenter.onDestroy(this);
         }
-        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-        if(overlayManager!=null) {
-            overlayManager.removeAllLines();
-            overlayManager.removeAllPoints();
-        }
         super.onDestroyView();
     }
 

OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java

@@ -145,11 +145,6 @@ public class BusPassengerRouteFragment extends
         if (mPresenter != null) {
             mPresenter.onDestroy(this);
         }
-        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-        if(overlayManager!=null) {
-            overlayManager.removeAllLines();
-            overlayManager.removeAllPoints();
-        }
         super.onDestroyView();
     }
 

OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt

@@ -64,10 +64,6 @@ class PM2HPMapFragment :
 
     override fun onDestroyView() {
         mapBizView.onDestroy()
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         super.onDestroyView()
     }
 

OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java

@@ -145,11 +145,6 @@ public class BusPassengerRouteFragment extends
         if (mPresenter != null) {
             mPresenter.onDestroy(this);
         }
-        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-        if(overlayManager!=null) {
-            overlayManager.removeAllLines();
-            overlayManager.removeAllPoints();
-        }
         super.onDestroyView();
     }
 

OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt

@@ -64,10 +64,6 @@ class PM2HPMapFragment :
 
     override fun onDestroyView() {
         mapBizView.onDestroy()
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         super.onDestroyView()
     }
 

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java

@@ -155,11 +155,6 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         if (mPresenter != null) {
             mPresenter.onDestroy(this);
         }
-        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
-        if(overlayManager!=null) {
-            overlayManager.removeAllLines();
-            overlayManager.removeAllPoints();
-        }
         super.onDestroyView();
     }
 

OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt

@@ -229,10 +229,6 @@ class TaxiPassengerBaseFragment() :
         if (mPresenter != null) {
             mPresenter?.onDestroy(this)
         }
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         super.onDestroyView()
     }
 

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt

@@ -182,10 +182,6 @@ class TaxiFragment :MvpFragment<TaxiFragment?, TaxiPresenter?>(),
         if (mPresenter != null) {
             mPresenter?.onDestroy(this)
         }
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         CallerEagleBaseFunctionCall4OchManager.removeToolkitByTag(mutableListOf(lineView))
         CallerEagleBaseFunctionCall4OchManager.removeToolKitDefaultItemClickListener(lineView)
         startAutopilotAnimationView.cancelCountdown()

OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/TaxiPassengerBaseFragment.kt

@@ -245,10 +245,6 @@ class TaxiPassengerBaseFragment() :
     override fun onDestroyView() {
         mapBizView!!.onDestroy()
         overMapView?.onDestroy()
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         super.onDestroyView()
     }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt

@@ -138,10 +138,6 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context,
         // 先取消注册数据，再onDestroy
         CallerChassisLocationWGS84ListenerManager.removeListener(TAG)
         CallerChassisStatesListenerManager.removeListener(TAG)
-        CallerMapUIServiceManager.getOverlayManager()?.let {
-            it.removeAllLines()
-            it.removeAllPoints()
-        }
         super.onDestroy()
     }
 

libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/IMoGoOverlayManager.kt

@@ -77,4 +77,6 @@ interface IMoGoOverlayManager {
     fun hideAllPointsExceptOwners(vararg owners: String)
 
     fun updateAnimPoint(options: Point.Options, mapTag:String = DEFAULT)
+
+    fun clear()
 }

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
 import com.mogo.eagle.core.data.enums.Carmodel.T2
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.zhidaoauto.map.sdk.inner.abs.IMapController
 import com.zhidaoauto.map.sdk.inner.abs.IMarkerController
@@ -37,4 +38,16 @@ class MoGoAutoView: MapAutoView {
             return controller.addSelfCar(markerOptions)
         }
     }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        Logger.d(TAG, "-- onAttachedToWindow --")
+        CallerMapUIServiceManager.getOverlayManager()?.clear()
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        Logger.d(TAG, "-- onDetachedFromWindow --")
+        CallerMapUIServiceManager.getOverlayManager()?.clear()
+    }
 }

libraries/mogo-map/src/main/java/com/mogo/map/overlay/MoGoOverlayManagerImpl.kt

@@ -458,4 +458,13 @@ internal class MoGoOverlayManagerImpl: IMoGoOverlayManager {
     override fun updateAnimPoint(options: Options, mapTag:String) {
         mapInstance.getMogoMap(mapTag)?.addAnimPoint(options)
     }
+
+    override fun clear() {
+        synchronized(points) {
+            points.clear()
+        }
+        synchronized(lines) {
+            lines.clear()
+        }
+    }
 }