From cc01781109143e269a74aa02ca5b1b0f272d723f Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Fri, 10 Nov 2023 17:30:17 +0800
Subject: [PATCH] =?UTF-8?q?[6.2.0]=20=E8=AE=A2=E5=8D=95=E5=88=B0=E8=BE=BE?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=9C=B0=E7=9A=84=E4=B8=94=E6=9C=AA=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=9C=8D=E5=8A=A1=E5=AE=8C=E6=88=90=E7=AE=97=E5=81=9A?=
 =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/taxi/ui/operational/TaskOrOrderAdapter.kt   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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) {