From bf2f02a5c598d1362c89cca725746df55745913a Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 9 Sep 2022 18:28:50 +0800
Subject: [PATCH] =?UTF-8?q?[2.10.0]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=B7=AF=E7=BA=BF=E6=97=B6=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E5=8E=9F=E8=B7=AF=E7=BA=BF=E8=B5=B7=E7=BB=88=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../callback/IRefreshBusStationsCallback.java |  1 +
 .../mogo/och/bus/fragment/BusFragment.java    | 21 ++++++++++++-------
 .../com/mogo/och/bus/model/BusOrderModel.java |  6 ++++++
 .../och/bus/presenter/BusLinePresenter.java   |  1 +
 .../mogo/och/bus/presenter/BusPresenter.java  |  5 +++++
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java
index ae4a8b9713..40ea27c44a 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/callback/IRefreshBusStationsCallback.java
@@ -10,4 +10,5 @@ import java.util.List;
  */
 public interface IRefreshBusStationsCallback {
     void refreshBusStations(String lineName,List<BusStationBean> stationList, int currentStation, int nextStation, boolean isArrived);
+    void clearBusStationsMarkers();
 }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
index 645690253e..7278755f1a 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
@@ -317,14 +317,19 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
             hideSlidePanel();
             hidPanel();
             //移除起点终点
-            if (null != startStation) {
-                setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                        , startStation.getLon(),R.raw.star_marker);
-            }
-            if (null != endStation) {
-                setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                        , endStation.getLon(),R.raw.end_marker);
-            }
+            clearBusStationsMarkers();
+        }
+    }
+
+    public void clearBusStationsMarkers(){
+        CallerLogger.INSTANCE.d(M_BUS + TAG,"clearBusStationsMarkers()");
+        if (null != startStation) {
+            setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
+                    , startStation.getLon(),R.raw.star_marker);
+        }
+        if (null != endStation) {
+            setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
+                    , endStation.getLon(),R.raw.end_marker);
         }
     }
 
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
index 030b25eb34..54e2773b9e 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
@@ -819,6 +819,12 @@ public class BusOrderModel {
         BusTrajectoryManager.getInstance().syncTrajectoryInfo();
     }
 
+    public void clearBusStationDatas(){
+        if (refreshBusStationsCallback != null){
+            refreshBusStationsCallback.clearBusStationsMarkers();
+        }
+    }
+
     /**
      * 根据订单状态、获取下一站靠站的的站点
      *
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java
index c2f6fb57da..bafd9f298b 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java
@@ -53,6 +53,7 @@ public class BusLinePresenter extends Presenter<BusSwitchLineView> implements IB
 
     @Override
     public void onChangeLineIdSuccess() {
+        BusOrderModel.getInstance().clearBusStationDatas();
         runOnUIThread(() -> mView.onChangeLineIdSuccess());
     }
 
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
index 6ea7f617c4..15b161f032 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusPresenter.java
@@ -137,6 +137,11 @@ public class BusPresenter extends Presenter<BusFragment>
         }
     }
 
+    @Override
+    public void clearBusStationsMarkers() {
+        runOnUIThread(() -> mView.clearBusStationsMarkers());
+    }
+
     private void functionDemoModeChange() {
 //        CallerLogger.INSTANCE.d(M_BUS + "BusOrderModel ="," functionDemoModeChange ="+mCurrentStation);
         if (FunctionBuildConfig.isDemoMode