From 25e5e1d3216d0e03b9716aa9932906636bb4cab7 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 21 Apr 2026 20:52:08 +0800 Subject: [PATCH] =?UTF-8?q?[8.5.0]=20[b2=E3=80=81b1=20=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E5=8F=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passenger/ui/BusPassengerRouteFragment.java | 8 ++++---- .../passenger/ui/line/PM2DrivingInfoFragment.kt | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java index d318aeeba8..27cd98245a 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java @@ -288,14 +288,14 @@ public class BusPassengerRouteFragment extends return; } if (isArrived){ + mCurrentArriveStationTitle.setText(ResourcesUtils.getString(R.string.shuttle_p_jl_cur_next_station_title)); + mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_un_arrived_bg); + handleArrivingSpeakIconDrawable(); + }else { mCurrentArriveStationTitle.setText(ResourcesUtils.getString(R.string.shuttle_p_jl_cur_station_title)); mCurrentArriveTip.setText(ResourcesUtils.getString(R.string.shuttle_p_jl_cur_station_arrived_tip)); mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg); handleArrivedSpeakIconDrawable(); - }else { - mCurrentArriveStationTitle.setText(ResourcesUtils.getString(R.string.shuttle_p_jl_cur_next_station_title)); - mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_un_arrived_bg); - handleArrivingSpeakIconDrawable(); } } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt index 1686735bd2..c67b0fa35b 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt @@ -70,22 +70,22 @@ class PM2DrivingInfoFragment : return PM2DrivingPresenter(this) } - fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) { + fun updateStationsInfo(stations: MutableList, i: Int, isLeave: Boolean) { if(stations.isEmpty()){ emptyView.visibility = View.VISIBLE arriveView.visibility = View.GONE lineView.visibility = View.GONE lineView.clear() }else{ - if(isArrived&&i!=0){ + if(isLeave&&i!=0){ + emptyView.visibility = View.GONE + arriveView.visibility = View.GONE + lineView.visibility = View.VISIBLE + }else{ emptyView.visibility = View.GONE arriveView.visibility = View.VISIBLE lineView.visibility = View.GONE arriveView.setArrivedStation(stations.get(i)) - }else{ - emptyView.visibility = View.GONE - arriveView.visibility = View.GONE - lineView.visibility = View.VISIBLE } }