From f496eb65ea38c7b7d974c6b4d89d4987cef51362 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 24 Jul 2024 20:12:43 +0800 Subject: [PATCH] =?UTF-8?q?[6.5.0][=E8=A7=86=E8=A7=92=E5=8F=98=E6=8D=A2]?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E8=87=AA=E8=BD=A6=E7=9B=B8=E5=AF=B9?= =?UTF-8?q?=E5=B1=8F=E5=B9=95=E4=BD=8D=E7=BD=AE=E8=AE=BE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/angle/MoGoVisualAngleChangeProvider.kt | 9 +++++++++ .../mogo/eagle/core/function/angle/scenes/CrossRoad.kt | 6 ++++++ .../com/mogo/eagle/core/function/api/map/angle/Scenes.kt | 8 ++++++++ 3 files changed, 23 insertions(+) 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 151b583b96..d904d799ce 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 @@ -14,6 +14,9 @@ import com.mogo.eagle.core.function.angle.scenes.Roma import com.mogo.eagle.core.function.api.map.angle.* import com.mogo.eagle.core.function.api.map.angle.IMoGoVisualAngleChangeProvider.OnMoGoVisualAngleSceneChangeListener import com.mogo.eagle.core.function.api.map.angle.Scene +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.DEFAULT +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.DOWN +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.UP import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.map.* @@ -189,6 +192,12 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider { } else { CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(true) } + val screenToOriginDis = target.getScreenToOriginDis() + when(screenToOriginDis) { + DEFAULT -> CallerMapUIServiceManager.getMapUIController()?.setScreenToOriginDis(4.0f) + UP -> CallerMapUIServiceManager.getMapUIController()?.setScreenToOriginDis(3.0f) + DOWN -> CallerMapUIServiceManager.getMapUIController()?.setScreenToOriginDis(5.0f) + } if (target !is Roma) { it.changeMapVisualAngle(angle, null) } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt index 29bf0ced6f..4b4227754f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt @@ -1,6 +1,8 @@ package com.mogo.eagle.core.function.angle.scenes import com.mogo.eagle.core.function.api.map.angle.Scene +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.DOWN import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS_NEW import java.util.concurrent.TimeUnit @@ -28,4 +30,8 @@ class CrossRoad(private val delayTime: Long = 0, private val unit: TimeUnit = Ti override fun toString(): String { return "CrossRoad(delayTime=${delayTime}, priority=${priority}, displayThreshold: ${displayThreshold}, priority=${priority})" } + + override fun getScreenToOriginDis(): ScreenToOriginDis { + return DOWN + } } diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt index 3a1552a35d..0e616f316f 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.api.map.angle +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.DEFAULT import com.mogo.map.uicontroller.* interface IAttach { @@ -9,8 +10,15 @@ interface IAttach { val delay: Long // 延迟多长时间切换 val isCanSwitch: Boolean // 是否可切换 val isCanTouch: Boolean // 是否响应地图触摸事件 + + fun getScreenToOriginDis(): ScreenToOriginDis = DEFAULT } +enum class ScreenToOriginDis { + DEFAULT, + UP, + DOWN +} interface Scene: IAttach