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

Merge branch 'lk' into dev_robotaxi-d-app-module_260_220304_2.6.0

Browse Source
This commit is contained in:
liujing
2022-03-22 17:07:40 +08:00
parent 1aa36e2471 bded16dbc7
commit 80802ea074
5 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_give_way.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_no_parking.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/icon_warning_v2x_traffic_lights_green.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
core/mogo-core-res/src/main/function-hmi-res/drawable-xxhdpi/v2x_icon_jiaotongjiancha_vr.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 16 KiB

5
modules/mogo-module-common/src/main/java/com/mogo/module/common/constants/DataTypes.java
View File

@@ -43,4 +43,9 @@ class DataTypes {
*OBU 识别的交通元素 *OBU 识别的交通元素
*/ */
public static final String TYPE_MARKER_OBU_DATA = "TYPE_MARKER_OBU_DATA"; public static final String TYPE_MARKER_OBU_DATA = "TYPE_MARKER_OBU_DATA";
/**
* 道路事件预警 水滴状道路事件类型替换为3D模型
*/
public static final String TYPE_MARKER_ROAD_WARNING_TYPE = "TYPE_MARKER_ROAD_WARNING_TYPE";
} }