Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

This commit is contained in:
yangyakun
2024-10-18 16:44:48 +08:00
6 changed files with 64 additions and 44 deletions

View File

@@ -774,20 +774,17 @@ class OperatePanelLayout : LinearLayout {
if (isChecked) {
if (CallerHmiManager.isTaxiUnmanedDriverPerformTask()) {
ToastUtils.showLong("请先结束当前任务")
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_SELF_ROUTING_VERIFY_MODE)?.also { changeValue(it, false) }
return true
return false
}
if (CallerHmiManager.isTaxiUnmanedDriverTakingOrders()) {
ToastUtils.showLong("请先结束接单状态")
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_SELF_ROUTING_VERIFY_MODE)?.also { changeValue(it, false) }
return true
return false
}
CallerHmiManager.setTaxiUnmanedDriverLineRoutingVerifyMode(true)
} else {
if (CallerHmiManager.isTaxiUnmanedDriverLineRoutingPerformTask()) {
ToastUtils.showLong("请先结束当前任务")
preferenceScreen.findPreferenceReal<SwitchPreferenceCompat>(KEY_SELF_ROUTING_VERIFY_MODE)?.also { changeValue(it, true) }
return true
return false
}
CallerHmiManager.setTaxiUnmanedDriverLineRoutingVerifyMode(false)
}