From a4e323b9434c9a027bdb6ace0ab72c3557be06d3 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 21 Dec 2020 12:33:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E7=A0=94=20=E5=9C=B0=E5=9B=BE=20?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E5=9B=BE=E6=A0=87(2d)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/impl/MoGoV2XMarkerManager.java | 20 ++++++++++++++----- .../src/main/res/raw/scenario_seek_help.json | 4 ++-- 2 files changed, 17 insertions(+), 7 deletions(-) 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 b0c1ef448d..425e390239 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 @@ -243,6 +243,11 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { roadEventEntity.setLocation(markerLocation); roadEventEntity.setBindObj(v2XMarkerEntity); + MarkerShowEntity markerShowEntity = new MarkerShowEntity(); + markerShowEntity.setBindObj(v2XMarkerEntity); + markerShowEntity.setChecked(false); + markerShowEntity.setMarkerLocation(markerLocation); + // 重置告警信息 V2XServiceManager.getV2XStatusManager().setAlarmInfo(roadEventEntity); @@ -263,8 +268,14 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { optionsRipple.icons(V2XMarkerAdapter.getV2XRoadEventViewGif(context, roadEventEntity)); optionsRipple.period(1); } - - mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); + if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { + mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, null); + mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions())); + mAlarmInfoMarker.showInfoWindow(); + } else{ + optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); + mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); + } // 当前Marker设置为最上面 mAlarmInfoMarker.setToTop(); // 绘制连接线 @@ -559,10 +570,9 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { mAlarmInfoMarker.showInfoWindow(); } else { IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(context, markerShowEntity, optionsRipple); - Bitmap bitmap = ViewUtils.fromView(iMarkerView.getView()); - optionsRipple.icon(bitmap); - IMogoMarkerManager i = V2XServiceManager.getMarkerManager(); + optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); + mAlarmInfoMarker.setMarkerIconView((IMogoMarkerIconViewCreator) iMarkerView); } // 当前Marker设置为最上面 mAlarmInfoMarker.setToTop(); diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json index f7316d824e..1252a70ebf 100644 --- a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json +++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json @@ -3,8 +3,8 @@ { "createTime": 1593678359872, "distance": 1100, - "lat":39.969057, - "lon":116.417831, + "lat": 39.969057, + "lon": 116.417831, "sn": "ZD801B1932L00041", "targetId": 20007, "targetName": "故障车",