diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt index 7c50279532..89174a62da 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/LineModel.kt @@ -320,6 +320,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(), diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt index cf6986c4f7..fa113cadb8 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/ThirdDeviceData.kt @@ -111,7 +111,7 @@ object ThirdDeviceData { lineInfo.lineName, start.name, end.name, - LineModel.isLastStation() == true + LineModel.isLastStation(end) ) } }