yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d_260311_8.4.0' into dev_robotaxi-d_260311_8.5.0_yyk

Browse Source
This commit is contained in:
yangyakun
2026-04-21 20:54:00 +08:00
parent a9b7e5beac 25e5e1d321
commit bf2bd70538
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -288,14 +288,14 @@ public class BusPassengerRouteFragment extends
return; return;
} }
if (isArrived){ 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)); 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.setText(ResourcesUtils.getString(R.string.shuttle_p_jl_cur_station_arrived_tip));
mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg); mCurrentArriveTip.setBackgroundResource(R.drawable.shuttle_p_jl_cur_station_arrived_bg);
handleArrivedSpeakIconDrawable(); 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();
} }
} }

12
OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt
View File

@@ -70,22 +70,22 @@ class PM2DrivingInfoFragment :
return PM2DrivingPresenter(this) return PM2DrivingPresenter(this)
} }
fun updateStationsInfo(stations: MutableList<BusStationBean>, i: Int, isArrived: Boolean) { fun updateStationsInfo(stations: MutableList<BusStationBean>, i: Int, isLeave: Boolean) {
if(stations.isEmpty()){ if(stations.isEmpty()){
emptyView.visibility = View.VISIBLE emptyView.visibility = View.VISIBLE
arriveView.visibility = View.GONE arriveView.visibility = View.GONE
lineView.visibility = View.GONE lineView.visibility = View.GONE
lineView.clear() lineView.clear()
}else{ }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 emptyView.visibility = View.GONE
arriveView.visibility = View.VISIBLE arriveView.visibility = View.VISIBLE
lineView.visibility = View.GONE lineView.visibility = View.GONE
arriveView.setArrivedStation(stations.get(i)) arriveView.setArrivedStation(stations.get(i))
}else{
emptyView.visibility = View.GONE
arriveView.visibility = View.GONE
lineView.visibility = View.VISIBLE
} }
} }