From 019ad17dc15ddcbc4a803b05654a383b17044f0a Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 8 Apr 2022 20:59:13 +0800
Subject: [PATCH] =?UTF-8?q?[driver=20passenger=20]=20bus=20=E4=B9=98?=
 =?UTF-8?q?=E5=AE=A2=E7=AB=AF=EF=BC=9A=E5=88=B0=E7=AB=99=E7=89=8C=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/BusPassengerBaseFragment.java    | 15 +++++++++++++--
 .../src/main/res/values/strings.xml               |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
index 6758ad1bf5..d3b0d2dbd3 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerBaseFragment.java
@@ -31,6 +31,8 @@ public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragme
     private static final String TAG = BusPassengerBaseFragment.class.getSimpleName();
 
     private TextView mCurrentArriveStation;
+    private TextView mCurrentArriveStationTitle;
+    private TextView mCurrentArriveTip;
     private ImageView mAutopilotIv;
     private BusPassengerRouteLineDialogFragment mRouteFragment;
     /**
@@ -56,6 +58,8 @@ public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragme
         CallerSmpManager.INSTANCE.hidePanel();
 
         mCurrentArriveStation = findViewById(R.id.bus_p_cur_station_name);
+        mCurrentArriveStationTitle = findViewById(R.id.bus_p_cur_station_title);
+        mCurrentArriveTip = findViewById(R.id.bus_p_cur_station_tip);
         mAutopilotIv = findViewById(R.id.bus_p_autopilot_iv);
 
         showRouteFragment();
@@ -74,10 +78,17 @@ public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragme
         mRouteFragment.showNow(getChildFragmentManager(),"RouteFragment");
     }
 
-    public void updateArrivedStation(String station){
+    public void updateArrivedStation(String station,int currentIndex){
         if (null == station){
             mCurrentArriveStation.setText("----");
         }else {
+            if (currentIndex == 0){
+                mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init));
+                mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip_init));
+            }else {
+                mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title));
+                mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
+            }
             mCurrentArriveStation.setText(station);
         }
 
@@ -102,7 +113,7 @@ public class BusPassengerBaseFragment extends MvpFragment<BusPassengerBaseFragme
 
     public void updateStationsInfo(List<BusPassengerStation> stations, int currentStationIndex){
         if (mRouteFragment != null) mRouteFragment.updateStationsInfo(stations);
-        updateArrivedStation(stations.get(currentStationIndex).getName());
+        updateArrivedStation(stations.get(currentStationIndex).getName(),currentStationIndex);
     }
 
     public void routeResult(List<LatLng> models){
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/values/strings.xml b/OCH/mogo-och-bus-passenger/src/main/res/values/strings.xml
index aac0b4dbcb..34622a5bc2 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/values/strings.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/values/strings.xml
@@ -5,5 +5,7 @@
     <string name="bus_p_start_station_txt_tag">起</string>
     <string name="bus_p_end_station_txt_tag">终</string>
     <string name="bus_p_cur_station_title">到达站：</string>
+    <string name="bus_p_cur_station_title_init">始发站：</string>
     <string name="bus_p_cur_station_arrived_tip">请携带好随身物品下车。</string>
+    <string name="bus_p_cur_station_arrived_tip_init">欢迎乘坐蘑菇车联无人驾驶车。</string>
 </resources>
\ No newline at end of file