From 504ff7b7aa343c27f1f6a60bc76e2ba6cbb7bbb2 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 5 Sep 2023 16:30:28 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=201=E3=80=81=E4=B9=98=E5=AE=A2=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E6=88=90=E5=8A=9F=E5=90=8E=E5=86=8D=E6=AC=A1=E6=92=AD?= =?UTF-8?q?=E6=8A=A5=E6=8E=A5=E5=88=B0=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202=E3=80=81=E6=96=B0=E5=A2=9E=E5=88=B0=E8=BE=BE=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E4=B8=8A=E8=BD=A6=E7=82=B9=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 6e8b75a4b1..42cf8f08ea 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -354,7 +354,9 @@ class TaxiCurrentTaskFragment : BaseFragment(), if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { handleOrderView(order) updateOrderUI(order) - VoiceNotice.showNotice("已为您接到订单") + if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){ + VoiceNotice.showNotice("已为您接到订单") + } } } @@ -376,7 +378,9 @@ class TaxiCurrentTaskFragment : BaseFragment(), if (order != null && currentStatus == TaskStatusEnum.CompleteTask.code) { updateOrderUI(order) - VoiceNotice.showNotice("已为您接到订单") + if (order.orderStatus <= TaxiOrderStatusEnum.ArriveAtStart.code){ + VoiceNotice.showNotice("已为您接到订单") + } return } if (startSite == null || endSite == null) return @@ -396,6 +400,11 @@ class TaxiCurrentTaskFragment : BaseFragment(), updatePathwayPoint(taskType,endSite?.siteName) handleOrderView(it) updateOrderUI(it) + if (taskType == TaskTypeEnum.ToOrderStartTask.code + && currentStatus == TaskStatusEnum.CompleteTask.code + && order.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){ + VoiceNotice.showNotice("已到达上车地点，等待乘客上车") + } } } }