From dc12815ff9be6835fa66d25684a0b4585705e69b Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 10 Nov 2023 18:29:52 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.0]=20=E6=BC=94=E7=BB=83=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=97=B6=E9=97=B4=E6=94=AF=E6=8C=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE,=20=E9=BB=98=E8=AE=A445s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 0a852cb70c..15ded8c048 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -7,6 +7,7 @@ import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.eagle.core.function.call.unmanned.CallerUnmannedListenerManager import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d @@ -301,9 +302,9 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), }else{ // 在已经接到订单的其他情况下, 取消倒计时任务拉取 TaxiTaskModel.removePrepareTaskDelay() } - }else{ //演练任务拉取 + }else{ //演练任务拉取 6.2.0使用配置的时间拉取, 默认45s TaxiTaskModel.startPrepareTaskDelay( - TaxiUnmannedConst.TIMER_PREPARE_VIRTUAL_TASK_INTERVAL, result?.endSite!!.siteId) + CallerUnmannedListenerManager.getPullTime().toLong(), result?.endSite!!.siteId) } clearDemoModeAndACParameters() @@ -334,8 +335,8 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), updateTaskAndOrderUi(null) //获取新的任务 val currentTaskWithOrder = TaxiTaskModel.getCurrentTaskWithOrder() - currentTaskWithOrder?.endSite?.also { - TaxiTaskModel.startPrepareTaskDelay(TaxiUnmannedConst.TIMER_PREPARE_VIRTUAL_TASK_INTERVAL, + currentTaskWithOrder?.endSite?.also {//使用配置的时间拉取, 默认是45s + TaxiTaskModel.startPrepareTaskDelay(CallerUnmannedListenerManager.getPullTime().toLong(), it.siteId) } }