diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt index 88ed084a7a..4e19e9c60f 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt @@ -20,7 +20,6 @@ import com.mogo.och.taxi.bean.QueryOrdersRespBean import com.mogo.och.taxi.bean.QueryTaskRespBean import com.mogo.och.taxi.constant.OperationalOrderStatusEnum import com.mogo.och.taxi.constant.StationTypeEnum -import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.constant.TaxiOrderStatusEnum /** @@ -174,8 +173,8 @@ class OrderListAdapter(val context: Context, holder.orderStatusBt.text = if (orderInfo.status <= OperationalOrderStatusEnum.WaitingForTravel.code) { OperationalOrderStatusEnum.valueOf(OperationalOrderStatusEnum.WaitingForTravel.code)?.value - } else if (orderInfo.status == TaxiOrderStatusEnum.ArriveAtEnd.code){ // 到达目的地算已完成 - OperationalOrderStatusEnum.valueOf(OperationalOrderStatusEnum.JourneyCompleted.code)?.value + } else if (orderInfo.status == TaxiOrderStatusEnum.ArriveAtEnd.code){ // 到达目的地且未点击服务完成算做行程中 + OperationalOrderStatusEnum.valueOf(OperationalOrderStatusEnum.DuringTheJourney.code)?.value }else OperationalOrderStatusEnum.valueOf(orderInfo.status)?.value when (orderInfo.status) {