Merge branch 'dev_robotaxi-d_240401_6.4.0' into dev_robotaxi-d_240401_6.4.0_yyk

# Conflicts: # app/script/vehicleFlavors/C1.gradle
2024-04-15 14:54:13 +08:00
parent f8210c5915 e2967a2c04
commit 03cfb628bf
82 changed files with 1803 additions and 968 deletions
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -308,7 +308,7 @@ object FunctionBuildConfig {
     */
    @Volatile
    @JvmField
-    var unableLaunchAutopilotGear: Set<Chassis.GearPosition>? = null
+    var launchAutopilotGear: Set<Chassis.GearPosition>? = null

    /**
     * 当前应用是否支持patch升级
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/DataSourceType.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/DataSourceType.kt
@@ -8,7 +8,8 @@ enum class DataSourceType(name: String) {
    MAP("HDMAP"),
    TELEMATIC("TELEMATIC"),
    AICLOUD("AI云"),
-    SUMMARY("汇总");// V2X事件汇总
+    SUMMARY("汇总"),// V2X事件汇总
+    WORKORDER("工单建议");


    companion object{
@@ -19,6 +20,7 @@ enum class DataSourceType(name: String) {
                TELEMATIC -> "TELEMATIC"
                AICLOUD -> "AI云"
                SUMMARY -> "汇总"
+                WORKORDER -> "工单建议"
                else -> "defalut"
            }
        }
--- 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
@@ -17,21 +17,6 @@ enum class TrafficTypeEnum(
    var traffic3DIconId: Int,
    var traffic3DNightIconId: Int
 ) {
-
-    TYPE_TRAFFIC_ID_501(
-        501,
-        "未知数据",
-        R.raw.traffic_xiankuang,
-        R.raw.traffic_xiankuang,
-        R.raw.traffic_xiankuang
-    ),
-    TYPE_TRAFFIC_ID_502(
-        502,
-        "未知数据",
-        R.raw.traffic_xiankuang,
-        R.raw.traffic_xiankuang,
-        R.raw.traffic_xiankuang
-    ),
    TYPE_TRAFFIC_ID_WEI_ZHI(
        100,
        "未知数据",
@@ -95,12 +80,12 @@ enum class TrafficTypeEnum(
        R.raw.special_vehicle,
        R.raw.special_vehicle
    ),
-    TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG(
+    TYPE_TRAFFIC_ID_CONE(
        12,
-        "道路施工",
-        R.raw.v2x_shigong_warning,
-        R.raw.v2x_shigong_warning,
-        R.raw.v2x_shigong_warning
+        "三角锥",
+        R.raw.sanjiaozhui,
+        R.raw.sanjiaozhui,
+        R.raw.sanjiaozhui
    ),
    TYPE_TRAFFIC_ID_LUCE_TA_CHE(
        103,
@@ -122,6 +107,20 @@ enum class TrafficTypeEnum(
        R.raw.lucedaba,
        R.raw.lucedaba,
        R.raw.lucedaba
+    ),
+    TYPE_TRAFFIC_ID_DAO_LU_SHI_GONG(
+        501,
+        "道路施工",
+        R.raw.v2x_shigong_warning,
+        R.raw.v2x_shigong_warning,
+        R.raw.v2x_shigong_warning
+    ),
+    TYPE_TRAFFIC_ID_DAO_LU_SHI_GU(
+        502,
+        "道路事故",
+        R.raw.v2x_shigu_sanjiaopai,
+        R.raw.v2x_shigu_sanjiaopai,
+        R.raw.v2x_shigu_sanjiaopai
    );

    companion object {
@@ -134,6 +133,7 @@ enum class TrafficTypeEnum(
                TYPE_TRAFFIC_ID_TA_CHE.type -> TYPE_TRAFFIC_ID_TA_CHE
                TYPE_TRAFFIC_ID_MOTO.type -> TYPE_TRAFFIC_ID_MOTO
                TYPE_TRAFFIC_ID_BUS.type -> TYPE_TRAFFIC_ID_BUS
+                TYPE_TRAFFIC_ID_CONE.type -> TYPE_TRAFFIC_ID_CONE
                TYPE_TRAFFIC_ID_TRUCK.type -> TYPE_TRAFFIC_ID_TRUCK
                TYPE_TRAFFIC_ID_CAMERA.type -> TYPE_TRAFFIC_ID_CAMERA
                TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> TYPE_TRAFFIC_ID_SPECIAL_VEHICLE
@@ -153,6 +153,7 @@ enum class TrafficTypeEnum(
                    TYPE_TRAFFIC_ID_TA_CHE.type ->  R.raw.taxi_traffic_tachexiaoche
                    TYPE_TRAFFIC_ID_MOTO.type -> R.raw.taxi_traffic_motuoche
                    TYPE_TRAFFIC_ID_BUS.type -> R.raw.taxi_traffic_daba
+                    TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
                    TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.taxi_traffic_daba
                    TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
                    TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
@@ -170,6 +171,7 @@ enum class TrafficTypeEnum(
                   TYPE_TRAFFIC_ID_TA_CHE.type ->  R.raw.traffic_tachexiaoche_day
                   TYPE_TRAFFIC_ID_MOTO.type -> R.raw.traffic_motuoche_day
                   TYPE_TRAFFIC_ID_BUS.type -> R.raw.traffic_daba_day
+                   TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
                   TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.traffic_daba_day
                   TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
                   TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
@@ -190,6 +192,7 @@ enum class TrafficTypeEnum(
                    TYPE_TRAFFIC_ID_TA_CHE.type ->  R.raw.taxi_traffic_tachexiaoche
                    TYPE_TRAFFIC_ID_MOTO.type -> R.raw.taxi_traffic_motuoche
                    TYPE_TRAFFIC_ID_BUS.type -> R.raw.taxi_traffic_daba
+                    TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
                    TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.taxi_traffic_daba
                    TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
                    TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
@@ -207,6 +210,7 @@ enum class TrafficTypeEnum(
                    TYPE_TRAFFIC_ID_TA_CHE.type ->  R.raw.traffic_tachexiaoche
                    TYPE_TRAFFIC_ID_MOTO.type -> R.raw.traffic_motuoche
                    TYPE_TRAFFIC_ID_BUS.type -> R.raw.traffic_daba
+                    TYPE_TRAFFIC_ID_CONE.type -> R.raw.sanjiaozhui
                    TYPE_TRAFFIC_ID_TRUCK.type -> R.raw.traffic_daba
                    TYPE_TRAFFIC_ID_CAMERA.type -> R.raw.shexiangtou
                    TYPE_TRAFFIC_ID_SPECIAL_VEHICLE.type -> R.raw.special_vehicle
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/FMInfoMsg.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/FMInfoMsg.kt
@@ -19,5 +19,6 @@ data class FMInfoMsg(
 data class FMFilterInfoMsg(
    var fmInfoList: List<FmInfo.FaultInfo>?,
    var policyCode: String?,
-    var cacheFilterList: MutableList<String>?
+    var cacheFilterList: MutableList<String>?,
+    var receiveTime: Long
 )
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgFmData.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgFmData.kt
@@ -15,19 +15,19 @@ class MsgFmData{
        val faultLevel: Int//故障处理级别
    ){
        //请求平行驾驶接管
-        FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER("恢复策略","请求平行驾驶接管","FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER","如planing出站时，规划失败",5),
+        FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER("恢复策略","请求平行驾驶接管","FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER","如planing出站时，规划失败",3),
        //请求人工驾驶接管
-        FM_ACT_NEED_MANNUAL_DERVING("恢复策略","请求人工驾驶接管","FM_ACT_NEED_MANNUAL_DERVING","如planing规划失败，且存在弱网判断",6),
+        FM_ACT_NEED_MANNUAL_DERVING("恢复策略","请求人工驾驶接管","FM_ACT_NEED_MANNUAL_DERVING","如planing规划失败，且存在弱网判断",0),
        //系统重启
-        FM_ACT_NEED_RESTART_SYSTEM("恢复策略","系统重启","FM_ACT_NEED_RESTART_SYSTEM","如检测到出现多个节点奔溃",4),
+        FM_ACT_NEED_RESTART_SYSTEM("恢复策略","系统重启","FM_ACT_NEED_RESTART_SYSTEM","如检测到出现多个节点奔溃",2),
        //整车下电重启
-        FM_ACT_MUST_VEHICLE_POWER_RESET("恢复策略","整车下电重启","FM_ACT_MUST_VEHICLE_POWER_RESET","如底盘无数据，需要下电重启",7),
+        FM_ACT_MUST_VEHICLE_POWER_RESET("恢复策略","整车下电重启","FM_ACT_MUST_VEHICLE_POWER_RESET","如底盘无数据，需要下电重启",1),
        //请联系硬件工程师
-        FM_ACT_CONTACT_HARDWARE_ENGINEER("人工处理","请联系硬件工程师","FM_ACT_CONTACT_HARDWARE_ENGINEER","硬件接线，域控启动等故障",3),
+        FM_ACT_CONTACT_HARDWARE_ENGINEER("人工处理","请联系硬件工程师","FM_ACT_CONTACT_HARDWARE_ENGINEER","硬件接线，域控启动等故障",4),
        //请联系运维工程师
-        FM_ACT_CONTACT_OPERATIONS_ENGINEER("人工处理","请联系运维工程师","FM_ACT_CONTACT_OPERATIONS_ENGINEER","系统配置不对，网络等故障",2),
+        FM_ACT_CONTACT_OPERATIONS_ENGINEER("人工处理","请联系运维工程师","FM_ACT_CONTACT_OPERATIONS_ENGINEER","系统配置不对，网络等故障",4),
        //请联系软件工程师
-        FM_ACT_CONTACT_SOFTWARE_ENGINEER("人工处理","请联系软件工程师","FM_ACT_CONTACT_SOFTWARE_ENGINEER","节点挂掉，无法启动等故障",1);
+        FM_ACT_CONTACT_SOFTWARE_ENGINEER("人工处理","请联系软件工程师","FM_ACT_CONTACT_SOFTWARE_ENGINEER","节点挂掉，无法启动等故障",4);

        companion object{