From 78bf858c2ac198508c4080d54fae7dc346fd38c8 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Tue, 20 Sep 2022 20:59:05 +0800
Subject: [PATCH] =?UTF-8?q?[2.11.0/1.6.0]=20bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=EF=BC=8C=E4=B9=98=E5=AE=A2=E5=B1=8F=E8=B7=AF=E7=BA=BF=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/BusPassengerBaseFragment.java          |  3 ++
 .../ui/BusPassengerRouteFragment.java         |  1 +
 .../main/res/layout/bus_p_base_fragment.xml   |  2 +-
 .../res/layout/bus_p_stations_common_item.xml |  3 +-
 .../mogo/och/bus/fragment/BusFragment.java    | 45 +++++++++----------
 5 files changed, 28 insertions(+), 26 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 e2b0ac575c..143e4d1cc4 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
@@ -22,6 +22,7 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.constant.BusPassengerConst;
 import com.mogo.och.common.module.utils.NumberFormatUtil;
+import com.mogo.och.common.module.wigets.OCHBorderShadowLayout;
 
 /**
  * Created on 2022/3/31
@@ -102,6 +103,8 @@ public abstract class BusPassengerBaseFragment<V extends IView, P extends Presen
     public void updateArrivedStation(String station,int currentIndex,boolean isArrived){
         if (null == station){
             mCurrentArriveStation.setText("----");
+            mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title_init));
+            mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip));
         }else {
             mCurrentArriveStation.setText(station);
             if (currentIndex == 0){
diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
index 29ccf56f35..11361fb6e7 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
@@ -213,6 +213,7 @@ public class BusPassengerRouteFragment extends
         } else {
             mNoLineInfoView.setVisibility(View.VISIBLE);
             mRouteInfoView.setVisibility(View.GONE);
+            updateArrivedStation(null,0,true);
         }
     }
 
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
index 03e16a4146..69625e4573 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml
@@ -27,7 +27,7 @@
         app:layout_constraintTop_toTopOf="parent"/>
 
     <com.mogo.och.common.module.wigets.OCHBorderShadowLayout
-        android:id="@+id/iv_bg"
+        android:id="@+id/arrive_station_shadow"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin_left"
diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
index b550a71eeb..9756db9d25 100644
--- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
+++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_stations_common_item.xml
@@ -45,7 +45,8 @@
         android:layout_height="@dimen/bus_p_station_tag_width_height"
         android:background="@drawable/bg_bus_p_end_tag_bg"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        app:layout_constraintTop_toTopOf="@+id/bus_p_circle"
+        app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
     <TextView
         android:id="@+id/bus_p_tag_txt"
         android:layout_width="@dimen/bus_p_station_tag_width_height"
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 62fd42cd80..54bee8d812 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
@@ -173,40 +173,37 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         startStation = stationList.get(0);
         endStation = stationList.get(stationList.size() - 1);
 
-        //切换路线和结束路线按钮切换
-        if (arrivingOrArrivedIndex == 0 && isArrived){
-            showOrHideSwitchLineBtn(true);
-        }else {
+        if (arrivingOrArrivedIndex == stationList.size() - 1 && isArrived){
+            //切换路线和结束路线按钮切换
             showOrHideSwitchLineBtn(false);
-        }
 
-        if (arrivingOrArrivedIndex == 0){
-            setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
-                    , startStation.getLon(),R.raw.star_marker);
-            setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
+            showSlidePanle("单程结束");
+
+            setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
                     , endStation.getLon(),R.raw.end_marker);
-        }else if (arrivingOrArrivedIndex == stationList.size() - 1){
-            if (isArrived) {
-                setOrRemoveMapMaker(false, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                        , endStation.getLon(),R.raw.end_marker);
-            } else {
-                setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
-                        , endStation.getLon(),R.raw.end_marker);
-            }
+        }else if (arrivingOrArrivedIndex == 0 && isArrived){
+
+            showOrHideSwitchLineBtn(true);
+
+            showSlidePanle("滑动出发");
+
+            setOrRemoveMapMaker(true, BusConst.BUS_START_MAP_MAKER,
+                    startStation.getLat(), startStation.getLon(),R.raw.star_marker);
+            setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER,
+                    endStation.getLat(), endStation.getLon(),R.raw.end_marker);
         }else {
+
+            showOrHideSwitchLineBtn(false);
+
+            // 重置滑动按钮文字
+            showSlidePanle("滑动出发");
+
             setOrRemoveMapMaker(false, BusConst.BUS_START_MAP_MAKER, startStation.getLat()
                     , startStation.getLon(),R.raw.star_marker);
             setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER, endStation.getLat()
                     , endStation.getLon(),R.raw.end_marker);
         }
 
-        // 重置滑动按钮文字
-        if (arrivingOrArrivedIndex == stationList.size() -1 && isArrived) {
-            showSlidePanle("单程结束");
-        } else if (isArrived){
-            showSlidePanle("滑动出发");
-        }
-
         if (stationList.size() > 2){ //只有两个站点
             updateMoreThanTwoStationsUI(stationList,arrivingOrArrivedIndex,isArrived);
         }else {