Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

# Conflicts: # gradle.properties
2022-01-19 12:02:36 +08:00
parent dd14ff9d90 2b4ae4993f
commit 705f58849e
4 changed files with 122 additions and 93 deletions
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/TrafficTypeEnum.kt
@@ -16,10 +16,10 @@ enum class TrafficTypeEnum(
 ) {

    TYPE_TRAFFIC_ID_WEI_ZHI(
-        0,
+        100,
        "未知数据",
-        R.raw.special_vehicle,
-        R.raw.special_vehicle
+        R.raw.v2x_shigong_warning,
+        R.raw.v2x_shigong_warning
    ),
    TYPE_TRAFFIC_ID_PEOPLE(
        1,