diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 2a352f1cb5..a00acdcf0e 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -307,9 +307,9 @@ public abstract class BaseBusTabFragment if(smallMapView != null){ smallMapView.onDestroy(); } - super.onDestroyView(); CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG); EventBus.getDefault().unregister(this); + super.onDestroyView(); } /** diff --git 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 index ccac17cb28..39f96aefff 100644 --- 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 @@ -84,6 +84,9 @@ public class BusFragment extends BaseBusTabFragment @Override public void onDestroyView() { + if (mPresenter != null) { + mPresenter.onDestroy(this); + } super.onDestroyView(); } diff --git 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 index d4b30d1d6b..fa64db920e 100644 --- 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 @@ -108,6 +108,9 @@ class DriverM1Fragment : CharterBaseFragment(), IMogo mapBizView.onDestroy() omvOverMap.onDestroy() MogoMapListenerHandler.mogoMapListenerHandler.unregisterHostMapListener(TAG) - super.onDestroyView() EventBus.getDefault().unregister(this) + if (mPresenter != null) { + mPresenter?.onDestroy(this) + } + super.onDestroyView() } override fun onMapLoaded() { diff --git 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 index 70269a4e3d..ce45c1af95 100644 --- 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 @@ -85,6 +85,9 @@ public class ShuttleFragment extends BaseShuttleTabFragment(), override fun onDestroyView() { MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE,moFanglistener) + if (mPresenter != null) { + mPresenter?.onDestroy(this) + } super.onDestroyView() EventBus.getDefault().unregister(this) }