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

Merge remote-tracking branch 'origin/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.0

Browse Source
This commit is contained in:
yangyakun
2024-10-23 17:17:28 +08:00
parent 08582dabde 344a63edff
commit cf9e9e4071
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/viewport/VisualAngleToggleView.kt
View File

@@ -39,21 +39,30 @@ class VisualAngleToggleView : FrameLayout, IMoGoVisualAngleChangeProvider.OnMoGo
val defaultSlop = AutoSizeUtils.dp2px(context, 12.0f)
val scrollSlop = max(context.let { ViewConfiguration.get(it).scaledTouchSlop }, defaultSlop)
val gestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
private var flag = false
override fun onDown(e: MotionEvent): Boolean {
flag = false
return true
}
override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
if (flag) {
return super.onScroll(e1, e2, distanceX, distanceY)
}
val absX = abs(e2.x - e1.x)
val absY = abs(e2.y - e1.y)
if (absY <= absX) {
return false
}
if (e2.y - e1.y >= scrollSlop) {
flag = true
moveToBottom()
return true
}
if (e1.y - e2.y >= scrollSlop) {
flag = true
moveToTop()
return true
}

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) {

2
gradle.properties
View File

@@ -81,7 +81,7 @@ MOGO_LOCATION_VERSION=1.4.7.42
MOGO_TELEMATIC_VERSION=1.4.7.42
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=3.4.1.15
MAP_SDK_VERSION=3.4.1.16
MAP_SDK_DATA_VERSION=1.0.0.9
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket