yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.0.0] 拉取任务间隔设置为120s , 自动启动自驾10s

Browse Source
This commit is contained in:
wangmingjun
2023-08-22 11:41:38 +08:00
parent b43e3f9bff
commit f95783cfee
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/constant/TaxiUnmannedConst.kt
View File

@@ -73,11 +73,11 @@ class TaxiUnmannedConst {
const val TIMER_START_AUTOPILOT_INTERVAL = 20 * 1000L 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 开启自驾闪烁动画
} }
} }

2
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt
View File

@@ -1078,6 +1078,6 @@ object TaxiModel {
toStartTask() //状态流转 toStartTask() //状态流转
startAutoPilot() //自驾开启 startAutoPilot() //自驾开启
VoiceNotice.showNotice("车辆正在自动开启自动驾驶") VoiceNotice.showNotice("车辆正在自动开启自动驾驶")
},COUNTDOWN_INTERVAL) // 5s后开启自驾, 状态流转 },COUNTDOWN_INTERVAL) // 10s后开启自驾, 状态流转
} }
} }

8
OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiUnmannedViewModel.kt
View File

@@ -314,7 +314,7 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
d(TAG, "queryCurrentTaskOnce1 = pullTask" ) d(TAG, "queryCurrentTaskOnce1 = pullTask" )
}else{ }else{
startPrepareTask30S(result.endSite!!.siteId) startPrepareTask120S(result.endSite!!.siteId)
d(TAG, "queryCurrentTaskOnce1 = startPrepareTask30S" ) d(TAG, "queryCurrentTaskOnce1 = startPrepareTask30S" )
} }
@@ -405,7 +405,7 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
if (data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code){//完成 if (data.data.orderStatus == TaxiOrderStatusEnum.JourneyCompleted.code){//完成
//获取新的任务 //获取新的任务
if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.endSite != null){ if (mCurrentTaskAndOrder != null && mCurrentTaskAndOrder!!.endSite != null){
startPrepareTask30S(mCurrentTaskAndOrder!!.endSite!!.siteId) startPrepareTask120S(mCurrentTaskAndOrder!!.endSite!!.siteId)
} }
mCurrentTaskAndOrder = null mCurrentTaskAndOrder = null
updateNoTaskAndOrderUi() updateNoTaskAndOrderUi()
@@ -431,7 +431,7 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
} }
} }
private fun startPrepareTask30S(siteId: Long) { private fun startPrepareTask120S(siteId: Long) {
UiThreadHandler.postDelayed({ UiThreadHandler.postDelayed({
pullTask(siteId) pullTask(siteId)
}, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL) }, TaxiUnmannedConst.TIMER_PREPARE_TASK_INTERVAL)
@@ -453,7 +453,7 @@ class TaxiUnmannedViewModel : BaseViewModel<UnmannedState, UnmannedIntent>(){
override fun onFail(code: Int, msg: String?) { override fun onFail(code: Int, msg: String?) {
d(SceneConstant.M_TAXI + TAG, "$code $msg") d(SceneConstant.M_TAXI + TAG, "$code $msg")
if (isLogin() && isOpeningOrderStatus()){ if (isLogin() && isOpeningOrderStatus()){
startPrepareTask30S(siteId) //失败后30s再次调用获取下一任务 startPrepareTask120S(siteId) //失败后30s再次调用获取下一任务
} }
} }