Merge remote-tracking branch 'origin/dev_robotaxi-d_240401_6.4.0' into dev_robotaxi-d_240401_6.4.0

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();
     }
 
     /**

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();
     }
 

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()
     }
 

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() {

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();
     }
 

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();

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()
     }
 

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();
     }
 
     /**

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()
     }
 

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)
     }