From f5d4136b8744f1e1708eeb19ec5deaab3286fb07 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 28 Nov 2023 20:58:59 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20[=E7=BB=9F=E8=AE=A1]=20[=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E9=87=8D=E5=A4=8D=E9=A1=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaxiOperationalDialogFragment.kt | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) 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)