Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robobus-d_241202_6.8.4_autopilot

This commit is contained in:
xyz
2025-01-02 10:12:27 +08:00
3 changed files with 13 additions and 4 deletions

View File

@@ -304,6 +304,15 @@ object LineModel {
}
fun isLastStation(end: BusStationBean):Boolean{
return if (stationList.isNullOrEmpty()) {
false
}else{
val last = stationList?.last()
return last==end
}
}
fun getTaskTime():String {
return DateTimeUtil.formatLongToString(
currentTask?.taskStartTime?:System.currentTimeMillis(),

View File

@@ -111,7 +111,7 @@ object ThirdDeviceData {
lineInfo.lineName,
start.name,
end.name,
LineModel.isLastStation() == true
LineModel.isLastStation(end)
)
}
}