From 28d7398b19b75530376d7861f692021b6f2b032e Mon Sep 17 00:00:00 2001
From: aibingbing <aibingbing@zhidaoauto.com>
Date: Mon, 29 Apr 2024 17:31:22 +0800
Subject: [PATCH] =?UTF-8?q?[v6.4.0]=20refactor:=20=E4=BC=98=E5=8C=96fragme?=
 =?UTF-8?q?nt=E7=A7=BB=E9=99=A4=E6=97=B6=E5=8F=8D=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=97=B6=E6=9C=BA=EF=BC=8C=E6=97=B6=E6=9C=BA=E6=8F=90=E5=89=8D?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/fragment/BaseBusTabFragment.java     | 2 +-
 .../main/java/com/mogo/och/bus/fragment/BusFragment.java  | 3 +++
 .../magic/mogo/och/charter/fragment/DriverM1Fragment.kt   | 3 +++
 .../com/mogo/och/charter/passenger/ui/MainFragment.kt     | 5 ++++-
 .../com/mogo/och/shuttle/fragment/ShuttleFragment.java    | 3 +++
 .../shuttle/passenger/ui/BusPassengerRouteFragment.java   | 8 ++++++++
 .../och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt    | 3 +++
 .../src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java  | 5 ++++-
 .../och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt    | 3 +++
 .../main/java/com/mogo/och/taxi/ui/base/TaxiFragment.kt   | 3 +++
 10 files changed, 35 insertions(+), 3 deletions(-)

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<V extends IView, P extends Presenter<V>
         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 bda3e60a12..6e24343c65 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<BusFragment, BusPresenter>
 
     @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<DriverM1Fragment?, DriverM1Presente
     }
 
     override fun onDestroyView() {
+        if (mPresenter != null) {
+            mPresenter?.onDestroy(this)
+        }
         super.onDestroyView()
     }
 
diff --git 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
index 263ae11877..0b56f36ae8 100644
--- 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
@@ -273,8 +273,11 @@ class MainFragment : MvpFragment<MainFragment?, BusPassengerPresenter?>(), 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<ShuttleFragment, Bus
     }
     @Override
     public void onDestroyView() {
+        if (mPresenter != null) {
+            mPresenter.onDestroy(this);
+        }
         super.onDestroyView();
     }
 
diff --git 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
index be3349ed89..6bb3927271 100644
--- 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
@@ -131,6 +131,14 @@ public class BusPassengerRouteFragment extends
         }
     }
 
+    @Override
+    public void onDestroyView() {
+        if (mPresenter != null) {
+            mPresenter.onDestroy(this);
+        }
+        super.onDestroyView();
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
diff --git a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt
index 6fdd0e0cc2..7f36c761cc 100644
--- a/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/ui/PM2DrivingInfoFragment.kt
@@ -126,6 +126,9 @@ class PM2DrivingInfoFragment :
 
     override fun onDestroyView() {
         overMapView?.onDestroy()
+        if (mPresenter != null) {
+            mPresenter?.onDestroy(this)
+        }
         super.onDestroyView()
     }
 
diff --git 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
index 3e36d47d47..9cb5677663 100644
--- 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
@@ -155,8 +155,11 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
 
     @Override
     public void onDestroyView() {
-        super.onDestroyView();
         EventBus.getDefault().unregister(this);
+        if (mPresenter != null) {
+            mPresenter.onDestroy(this);
+        }
+        super.onDestroyView();
     }
 
     /**
diff --git 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
index c6d1651944..fc0573f9ab 100644
--- 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
@@ -220,6 +220,9 @@ class TaxiPassengerBaseFragment() :
     override fun onDestroyView() {
         mapBizView!!.onDestroy()
         overMapView?.onDestroy()
+        if (mPresenter != null) {
+            mPresenter?.onDestroy(this)
+        }
         super.onDestroyView()
     }
 
diff --git 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
index fb21d39407..00ab1045b5 100644
--- 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
@@ -226,6 +226,9 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
     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)
     }