diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index e5d04039b0..b51f204e6e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -161,9 +161,7 @@ object TaxiPassengerModel { ) //目前后端将一个订单拆分成了多个任务,乘客屏只关心 送驾 类型的任务 //20230829 后端修改了逻辑,在乘客屏startTask后taskType才会变成3 - if (data.data.taskType == TaskType_NONE || - data.data.taskType == TaskType_VIRTUAL - ) { + if (data.data.taskType == TaskType_VIRTUAL) { d( M_TAXI_P + TAG, "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data" @@ -181,6 +179,15 @@ object TaxiPassengerModel { } } return + } else if (data.data.taskType == TaskType_NONE) { + //0905 当车一直在标定站点时,taskType=None 如果此时有运营单过来,此时需要弹出验证手机号弹框(后端不会自动匹单并更新taskType) + if (data.data?.order == null) { + d( + M_TAXI_P + TAG, + "queryInAndWaitOrders data.taskType=${data.data.taskType} and order=null, discard data" + ) + return + } } if (data.data?.order == null) { if (currentOCHOrder != null) {