From 18d1137627c30f6cd94ae561b146b49b744afaaf Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 21 Sep 2022 12:04:45 +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

---
 .../BusPassengerLineStationsAdapter.java      | 15 ++++++++------
 .../mogo/och/bus/fragment/BusFragment.java    | 20 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
index bdcdac6271..6a5cf47c32 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
@@ -55,10 +55,12 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
             viewHolder.stationStationTag.setBackground(mContext.getDrawable(R.drawable.bg_bus_p_start_tag_bg));
             viewHolder.groupStationTagPanel.setVisibility(View.VISIBLE);
             viewHolder.curArrowBg.setVisibility(View.GONE);
-            if (station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving()){//到达未离开
+            if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
+                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_green);
             }else {
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
+                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
             }
         }else{
             if (position == mStations.size() - 1){
@@ -70,24 +72,25 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
             }
             viewHolder.curArrowBg.setVisibility(View.VISIBLE);
             BusPassengerStation preStation = mStations.get(position -1);
-            if (station.getDrivingStatus() == STATION_STATUS_LEAVING){ //过站
+            if (station.getDrivingStatus() == STATION_STATUS_LEAVING ||
+                    (station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving())){ //过站
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
                 viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_grey);
-                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_gray);
+                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
             } else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
                 viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_grey);
-                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_green);
+                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_green);
             }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING && preStation.isLeaving()){//即将到站
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_current_station_txt_color));
                 viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_green);
-                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_green);
+                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_green);
             }else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
                     (preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
                             || preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
                 viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_station_txt_color));
                 viewHolder.curArrowBg.setImageResource(R.drawable.bus_p_line_blue);
-                viewHolder.stationStationTag.setImageResource(R.drawable.bus_p_point_blue);
+                viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_blue);
             }
         }
     }
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 54bee8d812..e7dad27d26 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
@@ -191,13 +191,14 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
                     startStation.getLat(), startStation.getLon(),R.raw.star_marker);
             setOrRemoveMapMaker(true, BusConst.BUS_END_MAP_MAKER,
                     endStation.getLat(), endStation.getLon(),R.raw.end_marker);
-        }else {
+        }else{
+            if (isArrived){
+                // 重置滑动按钮文字
+                showSlidePanle("滑动出发");
+            }
 
             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()
@@ -227,12 +228,17 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
         secondStationItem.setVisibility(View.VISIBLE);
         thirdStationItem.showOrHideStationArrowBg(false);
 
-        if (arrivingOrArrivedIndex == 0){
+        if (arrivingOrArrivedIndex == 0 || arrivingOrArrivedIndex -1 == 0){
             firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start));
+        }else {
+            firstStationItem.setStationTag("");
         }
-        if (arrivingOrArrivedIndex + 1 == stationList.size() - 1
-                || arrivingOrArrivedIndex + 2 == stationList.size() - 1){ //确认是否显示 "终"
+
+        if (arrivingOrArrivedIndex + 1 == stationList.size() - 1 || arrivingOrArrivedIndex == stationList.size() - 1
+                || (arrivingOrArrivedIndex == 0 && arrivingOrArrivedIndex + 2 == stationList.size() - 1)){ //确认是否显示 "终"
             thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end));
+        }else {
+            thirdStationItem.setStationTag("");
         }
 
         //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站