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

Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into dev_arch_opt_3.0

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
donghongyu
2022-12-28 12:16:21 +08:00
parent d9077e8847 609afa2c14
commit b8cbc713c1
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerVisualAngleManager.kt
View File

@@ -314,14 +314,14 @@ object CallerVisualAngleManager {
private fun CoroutineScope.doRealVisualAngleChange(triggerTime: Long, target: Scene, displayed: Record? = null) {
if (target is Default) {
Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 1 ---")
displayed?.also {
queue -= it
}
defaultDelayJob?.safeCancel()
launch {
val delay = target.unit.toMillis(target.delay)
Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 2 ---")
delay(delay)
displayed?.also {
queue -= it
}
Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 3 ---")
doChangeAngle(Record(target, triggerTime = triggerTime))
}.also { itx ->
@@ -337,7 +337,24 @@ object CallerVisualAngleManager {
defaultDelayJob?.safeCancel()
if (displayed == null || displayed.target.priority < target.priority) {
Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 6 ---")
queue -= displayed
displayed?.also {
queue -= it
}
if (target is Turning) {
if (!target.open) {
Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 7 ---")
changeVisualAngle(Default())
return
}
}
if (target is CrossRoad) {
if (!target.open) {
Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 8 ---")
changeVisualAngle(Default())
return
}
}
Log.d("${M_DEVA}${TAG}", "--- doRealVisualAngleChange --- 10 ---")
doChangeAngle(Record(target, triggerTime = triggerTime))
}
}