diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index bd14999026..bef7d59ab0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java @@ -59,7 +59,7 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { @Override public void drawableLastAllPOI() { - //Logger.w(MODULE_NAME, "V2X---绘制上一次的POI,回调给Launcher底层逻辑让其进行绘制"); + Logger.w(MODULE_NAME, "V2X---绘制上一次的POI,回调给Launcher底层逻辑让其进行绘制"); // 清除连接线 V2XServiceManager.getMoGoV2XPolylineManager().clearLine(); clearAlarmPOI(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt index 3059bcd6a7..2efee0e7e2 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt @@ -6,10 +6,10 @@ import android.graphics.Bitmap import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout -import com.mogo.module.service.utils.ViewUtils -import com.mogo.module.v2x.R import com.mogo.module.common.entity.V2XPoiTypeEnum import com.mogo.module.common.entity.V2XRoadEventEntity +import com.mogo.module.service.utils.ViewUtils +import com.mogo.module.v2x.R import kotlinx.android.synthetic.main.view_marker_event_car.view.* /** @@ -23,7 +23,7 @@ import kotlinx.android.synthetic.main.view_marker_event_car.view.* * version: 1.0 */ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) : - ConstraintLayout(context) { + ConstraintLayout(context) { val TAG = "V2XMarkerRoadEventView" init { @@ -32,13 +32,13 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) : fun initView(context: Context, alarmInfo: V2XRoadEventEntity) { if (alarmInfo.poiType == V2XPoiTypeEnum.ALERT_FRONT_CAR || - alarmInfo.poiType == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING.toString() + alarmInfo.poiType == V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING.toString() ) { LayoutInflater.from(context) - .inflate(R.layout.view_marker_event_car, this) + .inflate(R.layout.view_marker_event_car, this) } else { LayoutInflater.from(context) - .inflate(R.layout.view_marker_event_road, this) + .inflate(R.layout.view_marker_event_road, this) } updateIcon(alarmInfo) } @@ -82,6 +82,10 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) : V2XPoiTypeEnum.FOURS_ACCIDENT -> { ivCar.setImageResource(R.drawable.v_to_x_marker_7) } + //事故 + V2XPoiTypeEnum.FOURS_LIVING -> { + ivCar.setImageResource(R.drawable.v_to_x_marker_1) + } //红绿灯数据 V2XPoiTypeEnum.ALERT_TRAFFIC_LIGHT_SUGGEST -> { ivCar.setImageResource(R.drawable.v_to_x_marker_3) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java index 801ee51a9f..f44fd5ff4b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java @@ -95,6 +95,8 @@ public class V2XIllegalParkMarker implements IV2XMarker> V2XServiceManager.getMoGoV2XPolylineManager().clearLine(); // 移除事件POI V2XServiceManager.getMoGoV2XMarkerManager().clearAlarmPOI(); + // 绘制上次的数据 + V2XServiceManager.getMoGoV2XMarkerManager().drawableLastAllPOI(); } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java index 9ba13d8dd1..a13c6142c3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java @@ -127,8 +127,6 @@ public class EventTypeUtils { case V2XPoiTypeEnum.FOURS_FOG://浓雾 case V2XPoiTypeEnum.FOURS_ICE://结冰 case V2XPoiTypeEnum.FOURS_ACCIDENT://事故 - case V2XPoiTypeEnum.FOURS_NEALY://身边 - case V2XPoiTypeEnum.FOURS_LIVING://实时路况 isRoadEvent = true; break; }