diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt index e6a7e8a738..b351d5fb28 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/WarningHelper.kt @@ -46,12 +46,12 @@ object WarningHelper { mMarkersCaches[trackId] ?: return@Consumer if (planningObj.type == 0) { //0是leading障碍物,障碍物车身红色提示 pncWarningBeautyTrafficData[trackId] = PlanningTrack( - "#D65D5AFF", + "#D65D5AFF-drawColor", getCurWgs84SatelliteTime() ) } else if (planningObj.type == 1) { //1是避障和择机的障碍物,障碍物车身黄色提示 pncWarningBeautyTrafficData[trackId] = PlanningTrack( - "#E4DD94FF", + "#E4DD94FF-drawColor", getCurWgs84SatelliteTime() ) } @@ -77,12 +77,12 @@ object WarningHelper { mMarkersCaches[trackId] ?: return@Consumer if (planningObj.type == 0) { //0是leading障碍物,障碍物车身红色提示 pncWarningOriginTrafficData[trackId] = PlanningTrack( - "#D65D5AFF", + "#D65D5AFF-drawColor", getCurWgs84SatelliteTime() ) } else if (planningObj.type == 1) { //1是避障和择机的障碍物,障碍物车身黄色提示 pncWarningOriginTrafficData[trackId] = PlanningTrack( - "#E4DD94FF", + "#E4DD94FF-drawColor", getCurWgs84SatelliteTime() ) } @@ -122,7 +122,9 @@ object WarningHelper { color.invoke(planningTrack.color) } else { pncWarningBeautyTrafficData.remove(uuid) + color.invoke("resetColor") } + return } color.invoke("") } else { @@ -133,7 +135,9 @@ object WarningHelper { color.invoke(planningTrack.color) } else { pncWarningOriginTrafficData.remove(uuid) + color.invoke("resetColor") } + return } color.invoke("") } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java index 634bcdad77..06031fb70b 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java @@ -117,8 +117,16 @@ public class ObjectUtils { markerOptions.setLon(trafficData.getLongitude()); markerOptions.setTime(Double.valueOf(trafficData.getSatelliteTime() * 1000).longValue()); if(!trafficData.getColor().isEmpty()){ - markerOptions.setColor(trafficData.getColor()); + if(trafficData.getColor().contains("-drawColor")){ + markerOptions.setColorType(3); + markerOptions.setColor(trafficData.getColor().split("-")[0]); + } + if(trafficData.getColor().contains("resetColor")){ + markerOptions.setColorType(4); + markerOptions.setColor("#00000000"); + } }else{ +// markerOptions.setColorType(0); markerOptions.setColor("#00000000"); } } catch (Exception e) {