From e3ab2fa45e301e3eabd922038eaedfe6625e3545 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 22 Aug 2023 12:04:13 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B610s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/common/module/wigets/StartAutopilotAnimationView.kt | 2 +- .../main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt index 535e7486de..0325441080 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/StartAutopilotAnimationView.kt @@ -28,7 +28,7 @@ class StartAutopilotAnimationView @JvmOverloads constructor( ) : RelativeLayout(context, attrs, defStyleAttr){ companion object { - private const val ALL_CLOSE_TIMER = 5000L + private const val ALL_CLOSE_TIMER = 10000L private const val TAG = "StartAutopilotAnimationView" } diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt index 5bab148120..ba0ecf4e75 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt @@ -344,7 +344,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ if (result.taskType <= TaskTypeEnum.ToOrderStartTask.code && result.currentStatus == TaskStatusEnum.GetTask.code){//自动去启动自驾 - if (result.order != null && result.order!!.orderStatus < TaxiOrderStatusEnum.ArriveAtStart.code){ + if (!(result.order != null && result.order!!.orderStatus >= TaxiOrderStatusEnum.ArriveAtStart.code)){ d(TAG, "queryCurrentTaskOnce1 = autoStartDriving" ) TaxiModel.autoStartDriving() return