From eebd017bab12a4ab07ace15d7c1762a099ea02c6 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 1 Sep 2023 16:05:30 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E9=80=81=E9=A9=BE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=B0=E7=AB=99=E4=B8=8D=E6=8B=89=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?,=20=E7=82=B9=E5=87=BB=E6=9C=8D=E5=8A=A1=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=89=8D=E5=8E=BB=E6=8B=89=E5=8F=96=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 6fdf8e9864..bcdb68c347 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -705,7 +705,8 @@ object TaxiTaskModel { // 主要是解决A-B演练任务同时接到A-B订单状态流转的问题 //注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务 if (result?.currentStatus == TaskStatusEnum.CompleteTask.code - && !QueryCurrentTaskRespBean.isOrderArriveAtStart(result) + && (!QueryCurrentTaskRespBean.isOrderArriveAtStart(result) + || !QueryCurrentTaskRespBean.isOrderArriveAtEnd(result)) ) { mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value