[2.13.0] Taxi乘客屏:订单结束或者取消清除全览模式的marker

OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java

@@ -11,6 +11,7 @@ import androidx.lifecycle.LifecycleOwner;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
+import com.mogo.eagle.core.function.call.map.CallerSmpManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean;
@@ -167,6 +168,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
             TaxiPassengerModel.getInstance().recoverNaviInfo();
             TaxiPassengerGeocodeSearchModel.getInstance(getContext()).destroyGeocodeSearch();
             TaxiPassengerModel.getInstance().startOrStopReadyToAutopilotLoop(false);
+            clearV2XMarkers();
             return;
         }
         // 20 司机到达上车点
@@ -216,16 +218,22 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
                 mView.showOrHideServingOrderFragment(false,true);
                 mView.showOrHideArrivedEndLayout(true, order.endSiteAddr,order.orderNo);
             });
+            clearV2XMarkers();
             return;
         }
         // 60 服务完成  页面
         if (TaxiPassengerOrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){
             TaxiPassengerGeocodeSearchModel.getInstance(getContext()).destroyGeocodeSearch();
             mCurrentPassengerOrder = null;
+            clearV2XMarkers();
             return;
         }
     }
 
+    public void clearV2XMarkers(){
+        CallerSmpManager.clearV2XMarkers();
+    }
+
     public void checkAndUpdateStatus(String phone){
         TaxiPassengerModel.getInstance().checkPhoneAndUpdateStatus(phone, new ITaxiPassengerCommonCallback() {
             @Override