[6.4.0]

[高精地图部分持有清理]
2024-05-06 09:51:05 +08:00
parent 2372ecb31d
commit 205061b361
15 changed files with 103 additions and 19 deletions
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -87,6 +87,11 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
        if (mPresenter != null) {
            mPresenter.onDestroy(this);
        }
+        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+        if(overlayManager!=null) {
+            overlayManager.removeAllLines();
+            overlayManager.removeAllPoints();
+        }
        super.onDestroyView();
    }

--- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
+++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
@@ -18,8 +18,10 @@ import com.amap.api.maps.model.LatLng;
 import com.elegant.utils.UiThreadHandler;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.function.hmi.ui.widget.DriverMonitorView;
 import com.mogo.commons.storage.SharedPrefsMgr;
+import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.ui.adapter.BusPassengerLineStationsAdapter;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
@@ -220,6 +222,17 @@ public class BusPassengerRouteFragment extends
        }
    }

+    @Override
+    public void onDestroyView() {
+        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+        if(overlayManager!=null) {
+            overlayManager.removeAllLines();
+            overlayManager.removeAllPoints();
+        }
+
+        super.onDestroyView();
+    }
+
    @Override
    public void onDestroy() {
        super.onDestroy();
--- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
+++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2HPMapFragment.kt
@@ -2,6 +2,7 @@ package com.mogo.och.bus.passenger.passenger.ui

 import android.os.Bundle
 import com.mogo.commons.mvp.MvpFragment
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getOverlayManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.map.overlay.core.Level
@@ -64,6 +65,10 @@ class PM2HPMapFragment :

    override fun onDestroyView() {
        mapBizView.onDestroy()
+        CallerMapUIServiceManager.getOverlayManager()?.let {
+            it.removeAllLines()
+            it.removeAllPoints()
+        }
        super.onDestroyView()
    }

--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt
@@ -15,6 +15,7 @@ import com.magic.mogo.och.charter.view.SlidePanelView
 import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.temp.EventLogout
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.common.module.utils.DateTimeUtil
@@ -111,6 +112,10 @@ class DriverM1Fragment : CharterBaseFragment<DriverM1Fragment?, DriverM1Presente
        if (mPresenter != null) {
            mPresenter?.onDestroy(this)
        }
+        CallerMapUIServiceManager.getOverlayManager()?.let {
+            it.removeAllLines()
+            it.removeAllPoints()
+        }
        super.onDestroyView()
    }

--- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
+++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/MainFragment.kt
@@ -10,17 +10,14 @@ import com.amap.api.maps.model.LatLng
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.data.config.HdMapBuildConfig
-import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
-import com.mogo.eagle.core.function.hmi.ui.msgbox.MMsgBoxButtonView
 import com.mogo.eagle.core.function.view.SiteMarkerBean
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS_P
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.listener.MogoMapListenerHandler
-import com.mogo.map.uicontroller.VisualAngleMode
 import com.mogo.och.charter.passenger.R
 import com.mogo.och.charter.passenger.bean.event.EventLineSites
 import com.mogo.och.charter.passenger.callback.IClearViewCallback
@@ -45,9 +42,6 @@ import kotlinx.android.synthetic.main.charter_p_main_fragment.biz_video
 import kotlinx.android.synthetic.main.charter_p_main_fragment.mapBizView
 import kotlinx.android.synthetic.main.charter_p_main_fragment.mcv_play_music
 import kotlinx.android.synthetic.main.charter_p_main_fragment.omvOverMap
-//import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxBubble
-//import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxButton
-//import kotlinx.android.synthetic.main.charter_p_main_fragment.viewBusPM1MsgBoxList
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -272,6 +266,10 @@ 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) {
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/ShuttleFragment.java
@@ -88,6 +88,11 @@ 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();
    }

--- a/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java
+++ b/OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/ui/BusPassengerRouteFragment.java
@@ -18,6 +18,8 @@ import com.elegant.utils.UiThreadHandler;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.commons.storage.SharedPrefsMgr;
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
+import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.och.shuttle.passenger.R;
 import com.mogo.och.shuttle.passenger.ui.adapter.BusPassengerLineStationsAdapter;
 import com.mogo.och.shuttle.passenger.constant.BusPassengerConst;
@@ -136,6 +138,11 @@ public class BusPassengerRouteFragment extends
        if (mPresenter != null) {
            mPresenter.onDestroy(this);
        }
+        IMoGoOverlayManager overlayManager = CallerMapUIServiceManager.INSTANCE.getOverlayManager();
+        if(overlayManager!=null) {
+            overlayManager.removeAllLines();
+            overlayManager.removeAllPoints();
+        }
        super.onDestroyView();
    }

--- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt
+++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2HPMapFragment.kt
@@ -2,7 +2,7 @@ package com.mogo.och.shuttle.passenger.ui

 import android.os.Bundle
 import com.mogo.commons.mvp.MvpFragment
-import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getOverlayManager
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.map.overlay.core.Level
 import com.mogo.map.overlay.point.Point
@@ -64,6 +64,10 @@ class PM2HPMapFragment :

    override fun onDestroyView() {
        mapBizView.onDestroy()
+        CallerMapUIServiceManager.getOverlayManager()?.let {
+            it.removeAllLines()
+            it.removeAllPoints()
+        }
        super.onDestroyView()
    }

@@ -106,7 +110,7 @@ class PM2HPMapFragment :
                    builder.rotate(it.angle.toFloat())
                }
            }
-            val overlayManager = getOverlayManager()
+            val overlayManager = CallerMapUIServiceManager.getOverlayManager()
            overlayManager?.showOrUpdatePoint(builder.build())
        }
        OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable)
@@ -118,7 +122,7 @@ class PM2HPMapFragment :
        //开启线程移除起终点marker设置
        val removeMapMarkerRunnable = Runnable {
            d("RemoveMapMaker=" + Thread.currentThread().name, uuid)
-            val overlayManager = getOverlayManager()
+            val overlayManager = CallerMapUIServiceManager.getOverlayManager()
            overlayManager?.removeAllPointsInOwner(TYPE_MARKER_M2_LINE)
        }
        OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable)
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
@@ -17,7 +17,9 @@ import androidx.fragment.app.FragmentTransaction;

 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.temp.EventLogout;
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.map.overlay.IMoGoOverlayManager;
 import com.mogo.och.common.module.biz.login.LoginStatusManager;
 import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum;
 import com.mogo.och.taxi.R;
@@ -159,6 +161,11 @@ 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();
    }

--- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -12,6 +12,7 @@ import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
@@ -223,6 +224,10 @@ class TaxiPassengerBaseFragment() :
        if (mPresenter != null) {
            mPresenter?.onDestroy(this)
        }
+        CallerMapUIServiceManager.getOverlayManager()?.let {
+            it.removeAllLines()
+            it.removeAllPoints()
+        }
        super.onDestroyView()
    }

--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/TaxiUnmannedDriverProvider.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/TaxiUnmannedDriverProvider.kt
@@ -6,7 +6,6 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.och.common.module.constant.OchCommonConst
-import com.mogo.och.common.module.biz.provider.CommonService
 import com.mogo.och.common.module.biz.provider.CommonServiceImpl
 import com.mogo.och.taxi.ui.base.TaxiFragment

--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/BaseTaxiTabFragment.kt
@@ -235,9 +235,6 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
            }
        })

-        val width = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), 420f)
-        val height = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), 220f)
-
    }

    abstract fun stopAutoStartAutopilot()
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt
@@ -11,6 +11,7 @@ import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.data.temp.EventLogout
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
@@ -49,7 +50,7 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
    private var personalDialogFragment: WeakReference<TaxiOperationalDialogFragment>? = null
    private var routingVerifyFragment: WeakReference<TaxiRoutingFragment>? = null

-    private var moFanglistener: IMogoStatusChangedListener = object :IMogoStatusChangedListener{
+    private var moFanglistener: IMogoStatusChangedListener? = object :IMogoStatusChangedListener{
        override fun onStatusChanged(descriptor: StatusDescriptor?, isTrue: Boolean) {
            if (StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE == descriptor) {
                UiThreadHandler.post {
@@ -96,6 +97,7 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
    }

    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        e(SceneConstant.M_TAXI + TAG, "onActivityCreated")
        super.onActivityCreated(savedInstanceState)
    }

@@ -104,6 +106,7 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View? {
+        e(SceneConstant.M_TAXI + TAG, "onCreateView")
        EventBus.getDefault().register(this)
        return super.onCreateView(inflater, container, savedInstanceState)
    }
@@ -224,15 +227,31 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
    }

    override fun onDestroyView() {
+        e(SceneConstant.M_TAXI + TAG, "onDestroyView")
        MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG,
            StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE,moFanglistener)
        if (mPresenter != null) {
            mPresenter?.onDestroy(this)
        }
+        CallerMapUIServiceManager.getOverlayManager()?.let {
+            it.removeAllLines()
+            it.removeAllPoints()
+        }
        super.onDestroyView()
        EventBus.getDefault().unregister(this)
    }

+    override fun onDestroy() {
+        moFanglistener = null
+        super.onDestroy()
+        e(SceneConstant.M_TAXI + TAG, "onDestroy")
+    }
+
+    override fun onDetach() {
+        super.onDetach()
+        e(SceneConstant.M_TAXI + TAG, "onDetach")
+    }
+
    fun setRole(finalRole:String){
        if (!TextUtils.isEmpty(finalRole)) {
            taxi_driver_role_tv.visibility = View.VISIBLE
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/navi/auto/TaxiRoutingNaviFragment.kt
@@ -4,6 +4,8 @@ import android.os.Bundle
 import com.amap.api.maps.model.LatLng
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.data.map.MogoLocation
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.och.taxi.R

@@ -24,26 +26,36 @@ class TaxiRoutingNaviFragment : MvpFragment<TaxiRoutingNaviFragment?, RoutingNav

    override fun initViews() {}
    override fun initViews(savedInstanceState: Bundle?) {
+        CallerLogger.e(SceneConstant.M_TAXI + TAG, "initViews")
        super.initViews(savedInstanceState)
        mMapDirectionView = mRootView.findViewById<TaxiMapDirectionView>(R.id.rotting_navi_view)
        mMapDirectionView!!.onCreateView(savedInstanceState)
    }

    override fun onResume() {
+        CallerLogger.e(SceneConstant.M_TAXI + TAG, "onResume")
        super.onResume()
        mMapDirectionView!!.onResume()
    }

    override fun onPause() {
+        CallerLogger.e(SceneConstant.M_TAXI + TAG, "onPause")
        super.onPause()
        mMapDirectionView!!.onPause()
    }

-    override fun onDestroy() {
-        super.onDestroy()
+    override fun onDestroyView() {
        if (mMapDirectionView != null) {
            mMapDirectionView!!.onDestroy()
        }
+        CallerLogger.e(SceneConstant.M_TAXI + TAG, "onDestroyView")
+        super.onDestroyView()
+
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+
    }

    override fun createPresenter(): RoutingNaviPresenter {
--- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
+++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
@@ -9,9 +9,8 @@ import android.view.View
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.commons.voice.AIAssist
-import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
@@ -236,6 +235,10 @@ class TaxiPassengerBaseFragment() :
    override fun onDestroyView() {
        mapBizView!!.onDestroy()
        overMapView?.onDestroy()
+        CallerMapUIServiceManager.getOverlayManager()?.let {
+            it.removeAllLines()
+            it.removeAllPoints()
+        }
        super.onDestroyView()
    }