From e120cd7eaaadb30159df8f348e657587b1c38b7d Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 29 Nov 2022 18:58:57 +0800
Subject: [PATCH] =?UTF-8?q?[2.13.0]=20Taxi=E4=B9=98=E5=AE=A2=E5=B1=8F:?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=93=E6=9D=9F=E6=88=96=E8=80=85=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=B8=85=E9=99=A4=E5=85=A8=E8=A7=88=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E7=9A=84marker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/presenter/BaseTaxiPassengerPresenter.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
index 65cdd31aa6..1b3690a812 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
+++ b/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