From bfaa738c928c9e957a6b3e598cd4249ad38071e3 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 21 Sep 2023 14:52:35 +0800
Subject: [PATCH] =?UTF-8?q?[6.1.0]=20=E8=AE=A2=E5=8D=95=E5=88=B0=E7=AB=99?=
 =?UTF-8?q?=E6=9C=AA=E7=BB=93=E6=9D=9F=E6=97=B6,=E6=9A=82=E5=81=9C?=
 =?UTF-8?q?=E6=8E=A5=E5=8D=95=E5=92=8C=E5=BC=80=E5=A7=8B=E6=8E=A5=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
index c56d65498d..a2e1d7f630 100644
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
+++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt
@@ -1051,6 +1051,10 @@ object TaxiTaskModel {
                                     currentStatus < TaskStatusEnum.CompleteTask.code -> return
                                 }
                             }
+                            if (currentStatus == TaskStatusEnum.None.code && order != null){
+                                //订单送驾到站, 但是还没点服务完成的情况, 此时endSite == null currentStatus == 0
+                                return
+                            }
                         }
                         mDriveToNearestStationTask = data.data
                         mTaxiCarServiceCallback?.onCarStartServiceSuccess(