Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map
This commit is contained in:
@@ -569,10 +569,8 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
|
||||
mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
|
||||
mAlarmInfoMarker.showInfoWindow();
|
||||
} else {
|
||||
IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(context, markerShowEntity, optionsRipple);
|
||||
optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity));
|
||||
mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
|
||||
mAlarmInfoMarker.setMarkerIconView((IMogoMarkerIconViewCreator) iMarkerView);
|
||||
}
|
||||
// 当前Marker设置为最上面
|
||||
mAlarmInfoMarker.setToTop();
|
||||
|
||||
@@ -22,9 +22,9 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivIconP"
|
||||
android:layout_width="@dimen/module_v2x_event_icon_size_vr"
|
||||
android:layout_height="@dimen/module_v2x_event_icon_size_vr"
|
||||
android:src="@drawable/icon_illegal_parking"
|
||||
android:layout_width="@dimen/dp_100"
|
||||
android:layout_height="@dimen/dp_100"
|
||||
android:src="@drawable/icon_illegal_parking_vr"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/leftImageView"
|
||||
app:layout_constraintEnd_toEndOf="@+id/leftImageView"
|
||||
app:layout_constraintStart_toStartOf="@+id/leftImageView"
|
||||
|
||||
Reference in New Issue
Block a user