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 0abed40487..2a352f1cb5 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
@@ -304,6 +304,9 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     @Override
     public void onDestroyView() {
         mapBizView.onDestroy();
+        if(smallMapView != null){
+            smallMapView.onDestroy();
+        }
         super.onDestroyView();
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
         EventBus.getDefault().unregister(this);
@@ -549,9 +552,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if(smallMapView != null){
-            smallMapView.onDestroy();
-        }
         MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG);
     }
 
diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
index c4a20f9d92..4179b73ce3 100644
--- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
+++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
@@ -292,6 +292,7 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
 
     override fun onDestroyView() {
         mapBizView!!.onDestroy()
+        smallMapView?.onDestroy()
         super.onDestroyView()
         CallerAutopilotRecordListenerManager.removeListener(TAG)
         EventBus.getDefault().unregister(this)
@@ -333,7 +334,6 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
 
     override fun onDestroy() {
         super.onDestroy()
-        smallMapView?.onDestroy()
         mogoMapListenerHandler.unregisterHostMapListener(TAG)
     }
 
diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
index 35423a8c0f..4e6bf92d3f 100644
--- a/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
+++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginPassengerFragment.kt
@@ -9,6 +9,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
+import com.mogo.och.biz.BuildConfig
 import com.mogo.och.biz.R
 import com.mogo.och.biz.login.callback.ILoginViewCallback
 import com.mogo.och.biz.login.presenter.LoginPassengerPresenter
@@ -63,7 +64,9 @@ class LoginPassengerFragment : MvpFragment<LoginPassengerFragment?, LoginPasseng
         actv_app_version?.text = FlavorUtils.getInfo()
 
         actv_app_version?.setOnLongClickListener {
-            bv_switch_business?.selectBusniess()
+            if(BuildConfig.DEBUG){
+                bv_switch_business?.selectBusniess()
+            }
             true
         }
 
diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt
index e65cf29f6f..f429a6fb8e 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt
@@ -93,6 +93,7 @@ object MediaDataSourceManager {
         if (mMediaDataSourceListenerMap.containsKey(tag)) {
             mMediaDataSourceListenerMap.remove(tag)
         }
+        mLastMediaDataSourceList.clear()
     }
 
     /**
diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
index a5a92462e9..4c959d31da 100644
--- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
+++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java
@@ -307,6 +307,9 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
     @Override
     public void onDestroyView() {
         mapBizView.onDestroy();
+        if(smallMapView != null){
+            smallMapView.onDestroy();
+        }
         super.onDestroyView();
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
         EventBus.getDefault().unregister(this);
@@ -560,9 +563,6 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
     @Override
     public void onDestroy() {
         super.onDestroy();
-        if(smallMapView != null){
-            smallMapView.onDestroy();
-        }
         MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG);
     }
 
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 8fdebdd688..f22c9a5ee1 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -284,15 +284,15 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     @Override
     public void onDestroyView() {
         mapBizView.onDestroy();
+        if(smallMapView != null){
+            smallMapView.onDestroy();
+        }
         super.onDestroyView();
         CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG);
     }
 
     @Override
     public void onDestroy() {
-        if(smallMapView != null){
-            smallMapView.onDestroy();
-        }
         super.onDestroy();
     }
 
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java
index 16f9e966b9..f99df1959b 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiAmapNaviFragment.java
@@ -42,22 +42,25 @@ public class TaxiAmapNaviFragment extends BaseTaxiUIFragment implements AMapNavi
     @Override
     protected void initViews(Bundle savedInstanceState) {
         super.initViews(savedInstanceState);
-        if (mAMapNaviView != null)
-        mAMapNaviView.onCreate(savedInstanceState);
+        if (mAMapNaviView != null) {
+            mAMapNaviView.onCreate(savedInstanceState);
+        }
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        if (mAMapNaviView != null)
-        mAMapNaviView.onResume();
+        if (mAMapNaviView != null) {
+            mAMapNaviView.onResume();
+        }
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        if (mAMapNaviView != null)
-        mAMapNaviView.onPause();
+        if (mAMapNaviView != null) {
+            mAMapNaviView.onPause();
+        }
     }
 
     @Override
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
index 3cfe0bcdcd..b0523b9914 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
@@ -55,8 +55,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
         implements View.OnClickListener, ICommonNaviChangedCallback {
 
     public static final String TAG = "OCHTaxiBeingServerd";
-    private static Activity mActivity;
-    private static TaxiFragment mTaxiFragment;
+    private Activity mActivity;
+    private TaxiFragment mTaxiFragment;
     private String mOrderNo;
     private volatile  int mTtsLessThan200Tip = 0;//离终点200米提示播报
     private OrderQueryRespBean.Result mCurrentOrder = null;
@@ -97,12 +97,12 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
     private volatile int saveOrderState = -1;
 
     public static TaxiBeingServerdOrdersFragment newInstance(Activity activity, TaxiFragment taxiFragment) {
-        mActivity = activity;
-        mTaxiFragment = taxiFragment;
         Bundle args = new Bundle();
 
         TaxiBeingServerdOrdersFragment fragment = new TaxiBeingServerdOrdersFragment();
         fragment.setArguments(args);
+        fragment.mActivity = activity;
+        fragment.mTaxiFragment = taxiFragment;
         return fragment;
     }
 
@@ -434,6 +434,8 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        mTaxiFragment = null;
+        mActivity = null;
         AmapNaviToDestinationModel.getInstance(getContext()).destroyAmaNavi();
     }
 
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java
index 0796ebd2e9..850ea6ede0 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java
@@ -37,16 +37,14 @@ public class TaxiReserveOrdersFragment extends BaseTaxiUIFragment {
     private View mBootRefreshNoDataView;
     private List<OrderQueryRespBean.Result> mDatas = new ArrayList<>();
     private ToBeServedOrdersAdapter mAdapter;
-    private static TaxiFragment mTaxiFragment;
-    private static Activity mActivity;
+    private TaxiFragment mTaxiFragment;
     private boolean isUpwardSliding = false;
 
     public static TaxiReserveOrdersFragment newInstance(Activity activity, TaxiFragment taxiFragment){
-        mActivity = activity;
-        mTaxiFragment = taxiFragment;
         Bundle args = new Bundle();
         TaxiReserveOrdersFragment fragment = new TaxiReserveOrdersFragment();
         fragment.setArguments( args );
+        fragment.mTaxiFragment = taxiFragment;
         return fragment;
     }
 
@@ -179,4 +177,10 @@ public class TaxiReserveOrdersFragment extends BaseTaxiUIFragment {
             }
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        mTaxiFragment = null;
+    }
 }
diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
index 44a9cb1b2d..25e5d02ec1 100644
--- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
+++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
@@ -179,6 +179,14 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
             return mTabTitles[position];
         }
     }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        beingServerdOrdersFragment = null;
+        reserveOrdersFragment = null;
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.P)
     public void updateCurrentOrderStatusChanged(OrderQueryRespBean.Result order){
         if (beingServerdOrdersFragment != null){
diff --git 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
index e53cbf3565..7a718a996d 100644
--- 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
@@ -287,16 +287,12 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
 
     override fun onDestroyView() {
         mapBizView.onDestroy()
+        smallMapView?.onDestroy()
         startAutopilotAnimationView.cancelCountdown()
         CallerAutopilotRecordListenerManager.removeListener(TAG)
         super.onDestroyView()
     }
-
-    override fun onDestroy() {
-        smallMapView?.onDestroy()
-        super.onDestroy()
-    }
-
+    
     /**
      * 改变自动驾驶状态
      *
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 6bd22ae7fe..fb21d39407 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
@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentTransaction
 import com.mogo.commons.AbsMogoApplication
+ import com.mogo.commons.module.status.IMogoStatusChangedListener
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.eagle.core.data.temp.EventLogout
@@ -48,6 +49,22 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
     private var personalDialogFragment: WeakReference<TaxiOperationalDialogFragment>? = null
     private var routingVerifyFragment: WeakReference<TaxiRoutingFragment>? = null
 
+    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 {
+                    if (isTrue) {
+                        showRoutingFragment()
+                    } else {
+                        showTaskFragment()
+                    }
+                    updateOperationBtnStatusOnModeChange(isTrue)
+                }
+            }
+        }
+
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun changeOverview(eventLogout: EventLogout) {
         if (eventLogout.messgae == EventLogout.LOGOUT_TYPE) {
@@ -153,18 +170,7 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
         MogoStatusManager.getInstance()
             .registerStatusChangedListener(
                 TAG, StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE
-            ) { descriptor, isTrue ->
-                if (StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE == descriptor) {
-                    UiThreadHandler.post {
-                        if (isTrue) {
-                            showRoutingFragment()
-                        } else {
-                            showTaskFragment()
-                        }
-                        updateOperationBtnStatusOnModeChange(isTrue)
-                    }
-                }
-            }
+            ,moFanglistener)
     }
 
     private fun showTaskFragment() {
@@ -218,6 +224,8 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
     }
 
     override fun onDestroyView() {
+        MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG,
+            StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE,moFanglistener)
         super.onDestroyView()
         EventBus.getDefault().unregister(this)
     }
diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt
index d8499cdd83..ac805f8248 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/debug/DebugView.kt
@@ -204,6 +204,8 @@ public class DebugView @JvmOverloads constructor(
         super.onDetachedFromWindow()
         removeTaskWithOrderDataListener()
         removeCurrentBusinessModeListener()
+        LocalBroadcastManager.getInstance(context).unregisterReceiver(broadcastReceiver)
+        logHistoryTextView = null
     }
 
     private fun initView() {
diff --git 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
index c88af948f9..f59464cd56 100644
--- 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
@@ -82,14 +82,6 @@ class TaxiPassengerBaseFragment() :
         overMapView.onCreateView(savedInstanceState)
         overMapView.hideResetView()
 
-        (ARouter.getInstance().build(MogoServicePaths.PATH_STATUS_VIEW_MANAGER)
-            .navigation() as? IStatusViewLayout)?.apply {
-            val statusView = getStatusView(requireContext())
-            if (statusView is StatusBarView) {
-                statusBarView = statusView
-            }
-        }
-
         val commonService = ARouter.getInstance().build(OchCommonConst.TAXI_UNMANNED_PASSENGER).navigation();
         if(commonService is CommonService){
             context?.let {
diff --git a/app/config/MusicUrlConfig.json b/app/config/MusicUrlConfig.json
index 7c5040283a..62399dadfa 100644
--- a/app/config/MusicUrlConfig.json
+++ b/app/config/MusicUrlConfig.json
@@ -1,6 +1,6 @@
 {
   "mogo": {
-    "t1t2passengeroch": {
+    "t1t2passenger": {
       "musics": [
         {
           "id": "1",
@@ -502,7 +502,7 @@
     }
   },
   "saas": {
-    "t1t2passengeroch": {
+    "t1t2passenger": {
       "musics": [
         {
           "id": "1",
diff --git a/app/config/productWithVehicle.json b/app/config/productWithVehicle.json
index e5d6c670b5..3c94c7772a 100644
--- a/app/config/productWithVehicle.json
+++ b/app/config/productWithVehicle.json
@@ -2,8 +2,7 @@
   "mogo": {
     "B1":["shuttle","bus"],
     "B2":["shuttle","bus"],
-    "T1T2":["taxi"],
-    "M1":["charter"]
+     "T1T2":["taxi"]
   },
   "dali": {
     "B1":["shuttle"],
@@ -19,6 +18,6 @@
     "T1T2":["taxi"],
     "B1":["shuttle","bus"],
     "B2":["shuttle","bus"],
-    "M1":["charter"]
+    "M1":["charter","shuttle"]
   }
 }
diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index 6bf15c7855..202e7b7db8 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -3,8 +3,7 @@
     "C1":["driver"],
     "B1":["driver","passenger"],
     "B2":["driver","passenger"],
-    "T1T2":["driver","passenger"],
-    "M1":["driver","passenger"]
+    "T1T2":["driver","passenger"]
   },
   "dali": {
     "B1":["driver","passenger"],
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
index e39d2b3223..c2c8e9d9cc 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt
@@ -663,10 +663,12 @@ class OverMapView @JvmOverloads constructor(
         CallerPlanningRottingListenerManager.removeListener(TAG)
         CallerV2XListenerManager.removeListener(TAG)
         CallerAutoPilotStatusListenerManager.removeListener(TAG)
+        CallerFuncBizListenerManager.removeListener(TAG)
         frequentHandler?.looper?.quitSafely()
         nonFrequentHandler?.looper?.quitSafely()
         frequentHandler = null
         nonFrequentHandler = null
+        callback = null
     }
 
     override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {