From f95783cfeedd87ef94ce4e9eee6a23ee11d1ee0f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 22 Aug 2023 11:41:38 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E6=8B=89=E5=8F=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E8=AE=BE=E7=BD=AE=E4=B8=BA120s=20,=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE10s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt | 6 +++--- .../src/main/java/com/mogo/och/taxi/model/TaxiModel.kt | 2 +- .../java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt index 4b262da6c9..05f225fa84 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt @@ -73,11 +73,11 @@ class TaxiUnmannedConst { const val TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L - const val TIMER_PREPARE_TASK_INTERVAL = 30 * 1000L //30s再次获取任务 + const val TIMER_PREPARE_TASK_INTERVAL = 120 * 1000L //120s再次获取任务 - const val COUNTDOWN_INTERVAL = 5 * 1000L //30s再次获取任务 + const val COUNTDOWN_INTERVAL = 10 * 1000L // 自动启动自驾倒数计时 - const val START_AUTOPILOT_ANIMATION_INTERVAL = 7 * 1000L //30s再次获取任务 + const val START_AUTOPILOT_ANIMATION_INTERVAL = 12 * 1000L // 12s 开启自驾闪烁动画 } } \ No newline at end of file diff --git a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt index caa598f175..14d84aae8e 100644 --- a/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt +++ b/OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt @@ -1078,6 +1078,6 @@ object TaxiModel { toStartTask() //状态流转 startAutoPilot() //自驾开启 VoiceNotice.showNotice("车辆正在自动开启自动驾驶") - },COUNTDOWN_INTERVAL) // 5s后开启自驾, 状态流转 + },COUNTDOWN_INTERVAL) // 10s后开启自驾, 状态流转 } } \ No newline at end of file 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 509717343e..3b9385d0da 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 @@ -314,7 +314,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ d(TAG, "queryCurrentTaskOnce1 = pullTask" ) }else{ - startPrepareTask30S(result.endSite!!.siteId) + startPrepareTask120S(result.endSite!!.siteId) d(TAG, "queryCurrentTaskOnce1 = startPrepareTask30S" ) } @@ -405,7 +405,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ if (data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code){//完成 //获取新的任务 if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.endSite != null){ - startPrepareTask30S(mCurrentTaskAndOrder!!.endSite!!.siteId) + startPrepareTask120S(mCurrentTaskAndOrder!!.endSite!!.siteId) } mCurrentTaskAndOrder = null updateNoTaskAndOrderUi() @@ -431,7 +431,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ } } - private fun startPrepareTask30S(siteId: Long) { + private fun startPrepareTask120S(siteId: Long) { UiThreadHandler.postDelayed({ pullTask(siteId) }, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL) @@ -453,7 +453,7 @@ class TaxiUnmannedViewModel : BaseViewModel(){ override fun onFail(code: Int, msg: String?) { d(SceneConstant.M_TAXI + TAG, "$code $msg") if (isLogin() && isOpeningOrderStatus()){ - startPrepareTask30S(siteId) //失败后30s再次调用获取下一任务 + startPrepareTask120S(siteId) //失败后30s再次调用获取下一任务 } }