From 2f8df79621565262af523c1fff64457a30b97d3d Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 9 Sep 2024 15:08:27 +0800 Subject: [PATCH] =?UTF-8?q?[6.6.0][=E8=A7=86=E8=A7=92=E5=8F=98=E6=8D=A2]?= =?UTF-8?q?=20B2=E8=BD=A6=E5=9E=8B=E7=9A=84=E9=BB=98=E8=AE=A4=E8=A7=86?= =?UTF-8?q?=E8=A7=92=E5=8F=AA=E5=AF=B9=E4=B9=98=E5=AE=A2=E5=B1=8F=E7=94=9F?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/angle/scenes/CrossRoad.kt | 4 ++-- .../java/com/mogo/eagle/core/function/angle/scenes/Default.kt | 2 +- .../java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 785c3f12c1..e74451a697 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 @@ -17,7 +17,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON Scene(delayTime, unit) { override fun getVisualAngleMode(): VisualAngleMode { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { return VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS } return MAP_STYLE_VR_ANGLE_CROSS_NEW @@ -36,7 +36,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON } override fun getScreenToOriginDis(): ScreenToOriginDis { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { return NONE } return DOWN diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt index 1d2ce42466..524e5fb898 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Default.kt @@ -16,7 +16,7 @@ class Default(val delayTime: Long = 0, val unit: TimeUnit = TimeUnit.SECONDS, va override fun getVisualAngleMode(): VisualAngleMode { Log.d("Default", "---- 1 --------------") - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { Log.d("Default", "---- 2 --------------") return VisualAngleMode.MAP_STYLE_VR_ERHAI_B2 } 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 0221013516..7398ca28a4 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 @@ -27,7 +27,7 @@ abstract class Scene(private val delay: Long, private val unit: TimeUnit = TimeU * 单位:(毫秒) * 表示多长时间之后切换到当前视角场景 */ - final fun getDelay(): Long = unit.toMillis(delay) + fun getDelay(): Long = unit.toMillis(delay) /** * 单位:(毫秒)