diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDialogFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDialogFragment.kt index 52fd45a633..49780af52c 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDialogFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaxiOperationalDialogFragment.kt @@ -161,9 +161,22 @@ class TaxiOperationalDialogFragment : DialogFragment(), } } TaskTypeEnum.ToOrderEndTask.code -> { - var beanStart = - OrderTaskDetailStationBean(taskDetail.startSiteName,StationTypeEnum.OrderStartStation.code) - orderTaskDetailList.add(beanStart) + if(orderTaskDetailList.size>0){ + val last = orderTaskDetailList.last() + if (last.stationType==StationTypeEnum.PathwayStation.code && + last.stationName==taskDetail.startSiteName) { + last.stationType = StationTypeEnum.OrderStartStation.code + }else{ + val beanStart = + OrderTaskDetailStationBean(taskDetail.startSiteName,StationTypeEnum.OrderStartStation.code) + orderTaskDetailList.add(beanStart) + } + }else{ + val beanStart = + OrderTaskDetailStationBean(taskDetail.startSiteName,StationTypeEnum.OrderStartStation.code) + orderTaskDetailList.add(beanStart) + } + var beanEnd = OrderTaskDetailStationBean(taskDetail.endSiteName,StationTypeEnum.OrderEndStation.code) orderTaskDetailList.add(beanEnd)