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

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

Browse Source 
# Conflicts:
#	OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java
#	OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt
This commit is contained in:
yangyakun
2024-10-23 18:07:24 +08:00
parent 535fde1cf3 1fb1d517ce
commit eea89a6c03
14 changed files with 238 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
View File

@@ -43,7 +43,6 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
private val prevScene by lazy { AtomicReference<Scene>() }
private var timerJob: Job? = null
private val listener = object : IMoGoMapRoadListener {
private val roadId = AtomicReference<String>()
@@ -207,23 +206,7 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
DOWN -> CallerMapUIServiceManager.getMapUIController()?.setScreenToOriginDis(5.0f)
}
if (target !is Roma) {
if (target is LongSight) {
timerJob?.safeCancel()
scope.launch {
CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(false)
itx.changeMapVisualAngle(angle, null)
delay(3000)
CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(true)
}.also {
it.invokeOnCompletion {
CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(true)
}
timerJob = it
}
} else {
timerJob?.safeCancel()
itx.changeMapVisualAngle(angle, null)
}
itx.changeMapVisualAngle(angle, null)
}
} finally {
if (prev == null || prev.javaClass != target.javaClass) {