From e32b64cf7de83bdc333178995ad58ef59ee28053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Wed, 28 Oct 2020 21:07:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=92=88=E5=AF=B9=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E7=9A=84=E8=B4=B4=E5=9B=BE=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/marker/V2XMarkerAdapter.java | 33 ++++++++++++++++--- .../scene/pushVR/V2XPushVREventMarker.java | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java index d11dd68ad9..443a466bed 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerAdapter.java @@ -5,6 +5,7 @@ import android.graphics.Bitmap; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.V2XPoiTypeEnum; +import com.mogo.module.common.entity.V2XPushMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.utils.ImageUtil; @@ -149,14 +150,38 @@ public class V2XMarkerAdapter { } - - /** * TODO 都是模拟数据 * 获取VR道路事件 */ - public static Bitmap getV2XVRRoadEventViewPng() { - Bitmap bitmap = ImageUtil.createBitmap(V2XUtils.getApp(),R.drawable.v2x_duixiang_laiche_che_xian); + public static Bitmap getV2XVRRoadEventViewPng(V2XPushMessageEntity alarmMessage) { + Bitmap bitmap = ImageUtil.createBitmap(V2XUtils.getApp(), + R.drawable.v2x_vr_ziche); + switch (alarmMessage.getSceneId()) { + case "200001"://后方VIP车辆提示 + bitmap = ImageUtil.createBitmap(V2XUtils.getApp(), + R.drawable.v2x_duixiang_laiche_che); + break; + case "200002"://前车急刹 + break; + case "200003"://后方危险车辆预警 + break; + case "200004"://逆向车辆路线预判 + bitmap = ImageUtil.createBitmap(V2XUtils.getApp(), + R.drawable.v2x_duixiang_laiche_che); + break; + case "200005"://VIP变灯通行 + break; + case "200006"://障碍物绕行 + break; + case "200007"://行人预警,行人路线预测 + break; + case "200008"://拥堵路线推荐 + break; + case "200009"://双闪车辆,自动绕行 + break; + } + return bitmap; } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java index a233e815bd..3ab9a28af0 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java @@ -53,7 +53,7 @@ public class V2XPushVREventMarker implements IV2XMarker { .longitude(entity.getLon()); optionsRipple.anchor(0.5f, 0.5f); - optionsRipple.icon(V2XMarkerAdapter.getV2XVRRoadEventViewPng()); + optionsRipple.icon(V2XMarkerAdapter.getV2XVRRoadEventViewPng(entity)); mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); drawablePloyLine(entity);