diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt index 1a90437eb1..34a3e97e42 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt @@ -11,6 +11,7 @@ import com.mogo.commons.mvp.BaseFragment import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.OrderDetail import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.constant.TaskStatusEnum import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment import kotlinx.android.synthetic.main.task_fragment_current.endStationName @@ -53,7 +54,8 @@ class TaxiNextTaskFragment : BaseFragment() { return } - if (model.taskType == TaskTypeEnum.VirtualTask.code) { + if (model.taskType == TaskTypeEnum.VirtualTask.code && + model.currentStatus != TaskStatusEnum.CompleteTask.code) { val order = model.order updateOrderUI(order!!) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt index 053f6d8641..7da87e3ce9 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskTabFragment.kt @@ -18,6 +18,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean +import com.mogo.och.taxi.constant.TaskStatusEnum import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.ui.base.TaxiFragment import com.mogo.och.taxi.ui.task.TaxiCurrentTaskFragment @@ -193,7 +194,7 @@ class TaxiTaskTabFragment : BaseFragment() { fun updateOrderChanged(model: QueryCurrentTaskRespBean.Result?) { if (null == nextTaskFragment) return if (model != null && model.taskType == TaskTypeEnum.VirtualTask.code - && model.order != null) { + && model.order != null && model.currentStatus != TaskStatusEnum.CompleteTask.code) { VoiceNotice.showNotice("已为您提前接到下一订单,待完成当前任务后服务") wait_order_num.visibility = View.VISIBLE } else {