Merge branch 'dev_robotaxi-d_230912_6.1.0' into dev_minibus-d_230926_6.1.0

2023-10-12 16:49:30 +08:00
parent a1a3074477 51c8dd2230
commit b6d979c976
1 changed files with 1 additions and 2 deletions
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt
@@ -238,8 +238,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel<UnmannedState, TaskUiIntent>(),
                && result.order!!.orderStatus < TaxiOrderStatusEnum.ArriveAtStart.code) {
                VoiceNotice.showNotice("已为您接到订单")
            }
-            if (result.taskType == TaskTypeEnum.ToOrderStartTask.code
-                && result.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
+            if (result.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code){
                VoiceNotice.showNotice("已到达上车地点，等待乘客上车")
            }
        }