From aca4b4c56cff63c61825addf2324a707ce1e7456 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 23 Oct 2024 16:59:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[6.7.0][=E8=A7=86=E8=A7=92=E5=8F=98?= =?UTF-8?q?=E6=8D=A2]=20=E4=BC=98=E5=8C=96=E5=88=87=E8=BF=9C=E8=A7=86?= =?UTF-8?q?=E8=A7=92=E6=97=B6=EF=BC=8C=E6=89=8B=E5=8A=BF=E6=8B=96=E5=8A=A8?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=97=B6=EF=BC=8C=E5=9C=B0=E5=9B=BE=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E8=B7=B3=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../angle/MoGoVisualAngleChangeProvider.kt | 19 +------------------ gradle.properties | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt index c0f26e90e5..944cee49d4 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt @@ -43,7 +43,6 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider { private val prevScene by lazy { AtomicReference() } - private var timerJob: Job? = null private val listener = object : IMoGoMapRoadListener { private val roadId = AtomicReference() @@ -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) { diff --git a/gradle.properties b/gradle.properties index e8f322c1e7..9b947b67b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 From 344a63edffc8f146dd9ede2dc8c76adb416e0bc2 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 23 Oct 2024 17:03:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[6.7.0][=E8=A7=86=E8=A7=92=E5=8F=98?= =?UTF-8?q?=E6=8D=A2]=20=E4=BC=98=E5=8C=96=E8=A7=86=E8=A7=92=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=8E=A7=E4=BB=B6=E7=9A=84=E6=8B=96=E5=8A=A8=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/viewport/VisualAngleToggleView.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/viewport/VisualAngleToggleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/viewport/VisualAngleToggleView.kt index 8cb7971cd9..816b466873 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/viewport/VisualAngleToggleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/viewport/VisualAngleToggleView.kt @@ -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 }