From 069231f5cd89e62c393c3a1fcad02534675ea8ea Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 25 Sep 2023 19:48:21 +0800 Subject: [PATCH] =?UTF-8?q?[6.1.0]=20=E8=AE=BE=E7=BD=AE=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=AB=99=E7=82=B9=E9=80=BB=E8=BE=91=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 1f1ad22ba6..801aa96ed5 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 @@ -580,7 +580,6 @@ object TaxiTaskModel { } if (isArriveAtEndSite) { - updateLocalCalculateStation() //取消自驾,D档位会溜车 map3.6.0 修改 cancelAutopilot() } @@ -797,9 +796,9 @@ object TaxiTaskModel { } fun updateLocalCalculateStation() { - if (mCurrentTaskWithOrder == null) return - if (mCurrentTaskWithOrder!!.startSite != null && mCurrentTaskWithOrder!!.endSite != null - && mCurrentTaskWithOrder!!.currentStatus == TaskStatusEnum.StartTask.code + if (mCurrentTaskWithOrder != null && + mCurrentTaskWithOrder?.startSite != null && mCurrentTaskWithOrder?.endSite != null + && mCurrentTaskWithOrder?.currentStatus == TaskStatusEnum.StartTask.code ) { d(TAG, "updateLocalCalculateStation start") val curTaskAndOrder = getCurrentTaskWithOrder() ?: return