yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev2_aiSdk' into dev2_aiSdk_datalink

Browse Source
This commit is contained in:
zhongchao
2021-05-26 11:40:07 +08:00
parent 47d840e550 a7fa26ef19
commit a0c66454fe
13 changed files with 97 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
View File

@@ -570,8 +570,8 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
}
if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, clickListener);
mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
mAlarmInfoMarker.showInfoWindow();
// 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);

1
modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
View File

@@ -5,6 +5,7 @@
android:id="@+id/llEventMore"
android:layout_width="@dimen/module_v2x_panel_width"
android:layout_height="@dimen/module_v2x_panel_width"
android:visibility="gone"
android:background="@drawable/module_ext_drawable_shadow_bg"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">