From 1f29dd88c3f5912615c50b4f73ac5a102e4b129b Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 26 Dec 2023 15:29:13 +0800 Subject: [PATCH] =?UTF-8?q?[6.2.6][Fix]=E6=A8=A1=E5=9E=8B=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E8=8C=83=E5=9B=B4=E4=B8=BATaxi=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt | 2 +- .../biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java | 2 +- .../java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt | 2 +- .../java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt index 9f5bdca951..87737bc785 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -25,7 +25,7 @@ class V2XAiRoadEventMarker { .Builder(V2XConst.V2X_MARKER_OWNER, Level.MAP_MARKER) .longitude(entity.location.lon) .latitude(entity.location.lat) - .scale(if (EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.poiType == entity.poiType && AppIdentityModeUtils.isTaxi( + .scale(if (EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.poiType == entity.poiType && AppIdentityModeUtils.isTaxiPassenger( FunctionBuildConfig.appIdentityMode)) 0.6f else 1.0f) .icon3DRes(EventTypeEnumNew.getMarker3DRes(entity.poiType)) .set3DMode(true) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java index cda673686c..c04fe1fcb6 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java @@ -58,7 +58,7 @@ public class V2XRoadEventMarker implements IV2XMarker { .longitude(entity.getLocation().getLon()) .latitude(entity.getLocation().getLat()) .set3DMode(true) - .scale(EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.getPoiType().equals(entity.getPoiType()) && AppIdentityModeUtils.isTaxi( + .scale(EventTypeEnumNew.TYPE_SOCKET_ROAD_SHIGU.getPoiType().equals(entity.getPoiType()) && AppIdentityModeUtils.isTaxiPassenger( FunctionBuildConfig.appIdentityMode) ? 0.6f : 1.0f) .icon3DRes(EventTypeEnumNew.getMarker3DRes(entity.getPoiType())).build(),DEFAULT); if (point != null) { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt index 5c9b981be8..7706c91269 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt @@ -740,7 +740,7 @@ enum class EventTypeEnumNew( TYPE_SOCKET_ROAD_SHIGONG.poiType -> R.raw.v2x_shigong_warning// 施工气泡 TYPE_SOCKET_ROAD_JINGZHI.poiType -> R.raw.v2x_zhangai TYPE_SOCKET_ROAD_SHIGU.poiType -> { - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { R.raw.v2x_shigu_sanjiaopai } else { R.raw.taxi_sanjiaopai diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt index 0f25dfee53..e0fd288f8d 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt @@ -124,7 +124,7 @@ enum class TrafficTypeEnum( @JvmStatic fun getMarker3DRes(type: Int): Int { // Taxi和Bus使用不同的模型 - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { return when (type) { TYPE_TRAFFIC_ID_WEI_ZHI.type -> R.raw.traffic_xiankuang TYPE_TRAFFIC_ID_PEOPLE.type -> R.raw.taxi_traffic_people @@ -158,7 +158,7 @@ enum class TrafficTypeEnum( @JvmStatic fun getMarkerNight3DRes(type: Int): Int { // Taxi和Bus使用不同的模型 - if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) { return when (type) { TYPE_TRAFFIC_ID_WEI_ZHI.type -> R.raw.traffic_xiankuang TYPE_TRAFFIC_ID_PEOPLE.type -> R.raw.taxi_traffic_people