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 af3b7f4fd7..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 @@ -24,7 +24,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON } override fun isCanTouch(): Boolean { - return AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) + return false } override fun isCanSwitch(): Boolean { @@ -38,8 +38,7 @@ class CrossRoad(private val delayTime: Long = 0, unit: TimeUnit = TimeUnit.SECON override fun getScreenToOriginDis(): ScreenToOriginDis { if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { return NONE - } else { - return DOWN } + 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 cd5d3c443a..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 @@ -3,7 +3,6 @@ package com.mogo.eagle.core.function.angle.scenes import android.util.Log import com.mogo.eagle.core.data.config.FunctionBuildConfig 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.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode @@ -16,7 +15,9 @@ import java.util.concurrent.TimeUnit class Default(val delayTime: Long = 0, val unit: TimeUnit = TimeUnit.SECONDS, val forceClosePrev: Boolean = false): Scene(delayTime, unit) { override fun getVisualAngleMode(): VisualAngleMode { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + Log.d("Default", "---- 1 --------------") + if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + Log.d("Default", "---- 2 --------------") return VisualAngleMode.MAP_STYLE_VR_ERHAI_B2 } return CallerMapUIServiceManager.getMapUIController()?.getVrAngleDefaultMode() ?: MODE_MEDIUM_SIGHT @@ -25,11 +26,4 @@ class Default(val delayTime: Long = 0, val unit: TimeUnit = TimeUnit.SECONDS, va override fun toString(): String { return "Default(delay=${getDelay()}, unit=$unit, angle=${getVisualAngleMode()}, priority=${getPriority()}, closePrevious=$forceClosePrev)" } - - override fun getScreenToOriginDis(): ScreenToOriginDis { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - return ScreenToOriginDis.NONE - } - return ScreenToOriginDis.DEFAULT - } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt index 14a8a81126..3189dcd1e7 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/LongSight.kt @@ -1,9 +1,6 @@ package com.mogo.eagle.core.function.angle.scenes -import com.mogo.eagle.core.data.config.FunctionBuildConfig 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.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.MODE_LONG_SIGHT import java.util.concurrent.TimeUnit @@ -17,11 +14,4 @@ class LongSight(private val delayTime: Long = 0, private val unit: TimeUnit = Ti override fun toString(): String { return "LongSight(delayTime=${delayTime}, priority=${getPriority()}, displayThreshold: ${getDisplayThreshold()}, priority=${getPriority()})" } - - override fun getScreenToOriginDis(): ScreenToOriginDis { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - return ScreenToOriginDis.NONE - } - return ScreenToOriginDis.DEFAULT - } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt index 2a91f20d6b..b2b97f9b79 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/RoadEvent.kt @@ -2,7 +2,6 @@ package com.mogo.eagle.core.function.angle.scenes import com.mogo.eagle.core.data.config.FunctionBuildConfig 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.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode @@ -25,11 +24,4 @@ class RoadEvent(delayTime: Long, unit: TimeUnit): Scene(delayTime, unit) { override fun toString(): String { return "RoadEvent(mode: ${getVisualAngleMode()}, priority=${getPriority()}, displayThreshold: ${getDisplayThreshold()}," } - - override fun getScreenToOriginDis(): ScreenToOriginDis { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - return ScreenToOriginDis.NONE - } - return ScreenToOriginDis.DEFAULT - } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt index 67b8ede09e..640d5bf2eb 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/scenes/Roma.kt @@ -1,9 +1,6 @@ package com.mogo.eagle.core.function.angle.scenes -import com.mogo.eagle.core.data.config.FunctionBuildConfig 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.utilcode.mogo.AppIdentityModeUtils import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ROMA import java.util.concurrent.TimeUnit @@ -28,11 +25,4 @@ class Roma(val delayTime: Long = 2, val unit: TimeUnit = TimeUnit.SECONDS): Scen override fun getPriority(): Int { return 1 } - - override fun getScreenToOriginDis(): ScreenToOriginDis { - if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - return ScreenToOriginDis.NONE - } - return ScreenToOriginDis.DEFAULT - } } \ No newline at end of file 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 53e38d5dac..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 @@ -1,6 +1,6 @@ package com.mogo.eagle.core.function.api.map.angle -import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.NONE +import com.mogo.eagle.core.function.api.map.angle.ScreenToOriginDis.DEFAULT import com.mogo.map.uicontroller.* import java.util.concurrent.TimeUnit @@ -58,6 +58,6 @@ abstract class Scene(private val delay: Long, private val unit: TimeUnit = TimeU * 3. [ScreenToOriginDis.UP]: 偏上 * 4. [ScreenToOriginDis.DOWN]: 偏下 */ - open fun getScreenToOriginDis(): ScreenToOriginDis = NONE + open fun getScreenToOriginDis(): ScreenToOriginDis = DEFAULT }