From c145028f0de911ea3397da088b53e585bc1ce956 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 18 Feb 2022 17:01:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[Taxi/Bus=20Driver=202.5.1]=20bus=20?=
 =?UTF-8?q?=E5=87=BA=E8=BD=A6textsize=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
index b03ae16ab8..0a257a4014 100644
--- a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -90,7 +90,7 @@
     <dimen name="module_mogo_och_autopilot_order_bg_height">414px</dimen>
 
 
-    <dimen name="module_mogo_och_autopilot_status_text_size">44px</dimen>
+    <dimen name="module_mogo_och_autopilot_status_text_size">36px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_padding_top">13px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_m_l">350px</dimen>

From 6a2a29f9fcfd39c2292caad349cf6055417435f7 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 18 Feb 2022 17:08:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[Taxi/Bus=20Driver=202.5.1]=20bus=20?=
 =?UTF-8?q?=E6=94=B6=E8=BD=A6=E6=B6=88=E9=99=A4=E8=B5=B7=E7=BB=88=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/och/bus/fragment/OchBusFragment.java    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
index 9673c91ce4..83491d952f 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java
@@ -42,6 +42,8 @@ public class OchBusFragment extends BaseOchBusTabFragment< OchBusFragment, OchBu
 
     private View mBus;
 
+    private OchBusStation startStation = null;
+    private OchBusStation endStation = null;
 
     @Override
     public String getTagName() {
@@ -163,8 +165,8 @@ public class OchBusFragment extends BaseOchBusTabFragment< OchBusFragment, OchBu
         // 获取当前站点的名称
         currentStationName = stationList.get( currentStation ).getName();
 
-        OchBusStation startStation = stationList.get(0);
-        OchBusStation endStation = stationList.get(stationList.size() - 1);
+        startStation = stationList.get(0);
+        endStation = stationList.get(stationList.size() - 1);
 
         // 是否到达起点
         if ( currentStation == 0 ) {
@@ -278,6 +280,16 @@ public class OchBusFragment extends BaseOchBusTabFragment< OchBusFragment, OchBu
             tvOperationStatus.setText("出车");
             hideSlidePanel();
             hidPanel();
+
+            //移除起点终点
+            if (null != startStation){
+                setOrRemoveMapMaker(false, OchBusConst.BUS_START_MAP_MAKER,startStation.getLat()
+                        ,startStation.getLon(),R.drawable.icon_station_start_end);
+            }
+            if (null != endStation){
+                setOrRemoveMapMaker(false, OchBusConst.BUS_END_MAP_MAKER,endStation.getLat()
+                        ,endStation.getLon(),R.drawable.icon_station_start_end);
+            }
         }
     }