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("已到达上车地点,等待乘客上车") + } } } }