Merge branch 'release_robotaxi-d_231031_6.2.0.2' into 6.2.0_merge_master

# Conflicts: # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/fragment/BaseSweeperCloudTabFragment.java # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java # OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/model/SweeperOperateTaskModel.java # OCH/sweeper/sweeper/build.gradle # OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java # OCH/sweeper/sweeper/src/main/java/com/mogo/och/sweeper/view/BusArcView.java # app/script/functions/och.gradle # app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt # core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt # core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml # core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml # core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
2023-12-04 11:01:17 +08:00
parent 0dd41f3227 2bf65101ce
commit cce998c410
1322 changed files with 15039 additions and 15346 deletions
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt
@@ -28,5 +28,8 @@ data class UrlConfig(
    @SerializedName("secure_refresh_url")
    val secureRefresh: String,
    @SerializedName("secure_auth_url")
-    val secureAuth: String
+    val secureAuth: String,
+    @SerializedName("heart_beat_interval")
+    val heartBeatInterval: Int
+
 )
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt
@@ -35,6 +35,6 @@ fun TrafficLightStatus.time():Int{
 data class TrafficLightStatus(
    val phaseNo: String, //相位编号
    val color: String,   //灯态： 红灯-R，绿灯-G，绿闪-FG，黄-Y，B-黑
-    val remain: String //倒计时-秒 todo 云端string类型 如果返回 -- 解析异常
+    val remain: String //倒计时-秒
 ) {
 }
--- 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
@@ -49,6 +49,14 @@ object FunctionBuildConfig {
    @JvmField
    var detouringSpeed = 3

+    /**
+     * 超车目标障碍物速度阈值
+     * 默认 10 m/s
+     */
+    @Volatile
+    @JvmField
+    var overTakeSpeed = 10.0f
+
    /**
     * 是否是感知优化模式
     * 默认开启
@@ -119,6 +127,14 @@ object FunctionBuildConfig {
    @JvmField
    var adasConnectIP = "192.168.1.102"

+    /**
+     * acc 加速度值阈值
+     * 默认 -2.5
+     */
+    @Volatile
+    @JvmField
+    var accThreshold = -2.5f
+
    /**
     * 自车位置使用哪种外部数据源
     * 0 = Android系统/GD
@@ -334,4 +350,12 @@ object FunctionBuildConfig {
    @JvmField
    var sweeperCurrentMode = "Cloud"

+
+    /**
+     * 是否支持卡顿检测
+     */
+    @Volatile
+    @JvmField
+    var isSupportJunkDetect = false
+
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/badcase/AiDataEntity.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/badcase/AiDataEntity.kt
@@ -0,0 +1,6 @@
+package com.mogo.eagle.core.data.deva.badcase
+
+/**
+ * AI数据采集实体
+ */
+data class AiDataEntity(var id: Int,var name: String,var content: String,var isChecked: Boolean)
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/badcase/RecordOptionEntity.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/badcase/RecordOptionEntity.kt
@@ -0,0 +1,10 @@
+package com.mogo.eagle.core.data.deva.badcase
+
+/**
+ * 录包原因数据实体
+ */
+class RecordOptionEntity {
+    var optionName: String = "" //一级列表原因
+    var optionCode: String = "" //原因Code
+    var children: ArrayList<RecordOptionEntity> = ArrayList() //二级列表
+}
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
@@ -3,7 +3,7 @@ package com.mogo.eagle.core.data.deva.chain
 class ChainConstant {

    companion object{
-
+        //业务源 source
        // 与云平台数据链路交互
        const val CHAIN_SOURCE_CLOUD = 0
        // 与工控机相关交互
@@ -21,16 +21,15 @@ class ChainConstant {
        // OCH业务
        const val CHAIN_SOURCE_OCH = 13

-        const val CHAIN_TYPE_INIT_STATUS = 0 // 各个业务初始化信息,配置信息.链接状态
+        //业务类型与下方文件名一一对应
+        const val CHAIN_TYPE_STATUS = 0 // 各个业务初始化信息,配置信息.链接状态,点击信息
        const val CHAIN_TYPE_GNSS = 1 // 工控定位数据
-        const val CHAIN_TYPE_SOCKET_AUTOPILOT = 2 // 包括自动驾驶状态,reportMsg,planning数据,全局路径数据
+        const val CHAIN_TYPE_SOCKET_AUTOPILOT = 2 // 包括自动驾驶状态,reportMsg,planning数据,全局路径数据,FM
        const val CHAIN_TYPE_SOCKET_DATA_TRACKED = 3 // 感知数据,现阶段记录云端漫游
        const val CHAIN_TYPE_SOCKET_TRAJECTORY = 4 // 前车引导线,用于调试
        const val CHAIN_TYPE_SOCKET_VEHICLE = 5 // 底盘数据
        const val CHAIN_TYPE_SOCKET_TRAFFIC_LIGHT = 6 // 多元红绿灯聚合数据
-        const val CHAIN_TYPE_HMI = 7 // 包括魔方和应用按钮点击
        const val CHAIN_TYPE_V2X = 100 // V2X(V2I、V2N)
-        const val CHAIN_TYPE_HD_MAP = 200
        const val CHAIN_TYPE_ANR_LEAK = 300
        const val CHAIN_TYPE_WEAK_NETWORK = 400
        const val CHAIN_TYPE_OCH = 500
@@ -43,9 +42,7 @@ class ChainConstant {
        const val CHAIN_LINK_LOG_ADAS_TRAJECTORY = "-adasTrajectory"
        const val CHAIN_LINK_LOG_ADAS_VEHICLE = "-adasVehicle"
        const val CHAIN_LINK_LOG_ADAS_TRAFFIC_LIGHT = "-UnionTrafficLight"
-        const val CHAIN_LINK_LOG_HMI_ACTIONS = "-eagleHMIActions"
        const val CHAIN_LINK_LOG_V2X = "-eagleCloudWSV2X"
-        const val CHAIN_LINK_LOG_HD_MAP_BIZ = "-eagleHDMapBiz"
        const val CHAIN_LINK_LOG_RECORD_ANR = "-eagleRecordANR"
        const val CHAIN_LINK_LOG_RECORD_WEAK_NETWORK = "-eagleRecordWeakNetwork"
        const val CHAIN_LINK_LOG_OCH = "-eagleOch"
@@ -58,6 +55,7 @@ class ChainConstant {
        const val CHAIN_CODE_ADAS_ABILITY = "CHAIN_CODE_ADAS_ABILITY"
        const val CHAIN_CODE_ADAS_STATUS = "CHAIN_CODE_ADAS_STATUS"
        const val CHAIN_CODE_ADAS_SEND = "CHAIN_CODE_ADAS_SEND"
+        const val CHAIN_CODE_ADAS_FM_MSG = "CHAIN_CODE_ADAS_FM_MSG"
        const val CHAIN_CODE_ADAS_ARRIVE = "CHAIN_CODE_ADAS_ARRIVE"
        const val CHAIN_CODE_ADAS_ROUTE = "CHAIN_CODE_ADAS_ROUTE"
        const val CHAIN_CODE_ADAS_ROUTE_REQ = "CHAIN_CODE_ADAS_ROUTE_REQ"
@@ -71,6 +69,7 @@ class ChainConstant {
        const val CHAIN_CODE_ADAS_P_ACTIONS = "CHAIN_CODE_ADAS_P_ACTIONS"
        const val CHAIN_CODE_ADAS_STATUS_QUERY_RESP = "CHAIN_CODE_ADAS_STATUS_QUERY_RESP"
        const val CHAIN_CODE_ADAS_PARALLEL = "CHAIN_CODE_ADAS_PARALLEL"
+        const val CHAIN_CODE_ADAS_MAP_PARAM = "CHAIN_CODE_ADAS_MAP_PARAM"

        const val CHAIN_CODE_RECORD_NATIVE_LEAK = "CHAIN_CODE_RECORD_NATIVE_LEAK"
        const val CHAIN_CODE_RECORD_ANR = "CHAIN_CODE_RECORD_ANR"
@@ -83,9 +82,12 @@ class ChainConstant {
        const val CHAIN_CODE_INIT_ENV_RESTART = "CHAIN_CODE_INIT_ENV_RESTART"
        const val CHAIN_CODE_INIT_ON_MAP_LOADED = "CHAIN_CODE_INIT_ON_MAP_LOADED"
        const val CHAIN_CODE_INIT_ON_MAP_INIT = "CHAIN_CODE_INIT_ON_MAP_INIT"
+        const val CHAIN_CODE_BINDING_CAR = "CHAIN_CODE_BINDING_CAR"
        const val CHAIN_CODE_UPGRADE_APP = "CHAIN_CODE_UPGRADE_APP"
        const val CHAIN_CODE_MO_FANG_CONNECT = "CHAIN_CODE_MO_FANG_CONNECT"
        const val CHAIN_CODE_MAIN_BLOCK = "CHAIN_CODE_MAIN_BLOCK"
+        const val CHAIN_CODE_DISPATCH_RECEIVE = "CHAIN_CODE_DISPATCH_RECEIVE"
+        const val CHAIN_CODE_DISPATCH_START = "CHAIN_CODE_DISPATCH_START"

        const val CHAIN_CODE_CLOUD_INIT = "CHAIN_CODE_CLOUD_INIT"
        const val CHAIN_CODE_CLOUD_PASSPORT_TOKEN = "CHAIN_CODE_CLOUD_PASSPORT_TOKEN"
@@ -115,6 +117,7 @@ class ChainConstant {
        const val CHAIN_CODE_EAGLE_START_AUTOPILOT_RESULT = "CHAIN_CODE_EAGLE_START_AUTOPILOT_RESULT"

        // 漫游业务code
+        const val CHAIN_CODE_ROMA_RANGE = "CHAIN_CODE_ROMA_RANGE"
        const val CHAIN_CODE_ROMA_CLICK = "CHAIN_CODE_ROMA_CLICK"
        const val CHAIN_CODE_ROMA_CLOSE_CLICK = "CHAIN_CODE_ROMA_CLOSE_CLICK"
        const val CHAIN_CODE_ROMA_REQUEST = "CHAIN_CODE_ROMA_REQUEST"
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
@@ -898,14 +898,6 @@ enum class EventTypeEnumNew(
                TYPE_ERROR_WEAKNESS.poiType ->{
                    TYPE_ERROR_WEAKNESS.poiTypeStr
                }
-                //学校
-                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType ->{
-                    TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeStr
-                }
-                //禁止停车
-                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType ->{
-                    TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeStr
-                }
                //超速行驶
                TYPE_USECASE_ID_SLW.poiType ->{
                    TYPE_USECASE_ID_SLW.poiTypeStr
@@ -918,10 +910,6 @@ enum class EventTypeEnumNew(
                TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType ->{
                    TYPE_USECASE_ID_BREAKDOWN_WARNING.poiTypeStr
                }
-                //道路积水
-                FOURS_PONDING.poiType ->{
-                    FOURS_PONDING.poiTypeStr
-                }
                //异常停车
                TYPE_USECASE_ID_ROAD_PARKING.poiType ->{
                    TYPE_USECASE_ID_ROAD_PARKING.poiTypeStr
@@ -1093,10 +1081,6 @@ enum class EventTypeEnumNew(
                FOURS_BLOCK_UP.poiType -> {
                    R.drawable.icon_warning_v2x_congestion
                }
-                //积水
-                FOURS_PONDING.poiType -> {
-                    R.drawable.v2x_icon_jishui_vr
-                }
                //结冰
                FOURS_ICE.poiType -> {
                    R.drawable.v2x_icon_jiebing_vr
@@ -1210,9 +1194,6 @@ enum class EventTypeEnumNew(
                TYPE_ERROR_WEAKNESS.poiType -> {
                    R.drawable.icon_warning_v2x_abnormal_vehicle
                }
-
-                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr
-                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr
                TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.poiTypeSrcVr
                TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.poiTypeSrcVr
                TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.poiTypeSrcVr
@@ -1232,13 +1213,13 @@ enum class EventTypeEnumNew(
                TYPE_VEHICLE_QUEUE.poiType -> TYPE_VEHICLE_QUEUE.poiTypeSrcVr
                TYPE_NO_PASSING.poiType -> TYPE_NO_PASSING.poiTypeSrcVr
                TYPE_NO_TURNING_AROUND.poiType -> TYPE_NO_TURNING_AROUND.poiTypeSrcVr
+                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr
                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.poiTypeSrcVr
                TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.poiTypeSrcVr
                TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiTypeSrcVr
                TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.poiTypeSrcVr
                TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.poiTypeSrcVr
                TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.poiTypeSrcVr
-                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiTypeSrcVr
                TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.poiTypeSrcVr
                TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.poiTypeSrcVr
                TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.poiTypeSrcVr
@@ -1284,18 +1265,12 @@ enum class EventTypeEnumNew(
                TYPE_ERROR.poiType -> TYPE_ERROR.content
                TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.content
                GHOST_PROBE.poiType -> GHOST_PROBE.content
-
                TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.content
                TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.content
-
                TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.content
                TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.content
                TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.content
                TYPE_ERROR_WEAKNESS.poiType -> TYPE_ERROR_WEAKNESS.content
-
-                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content
-                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content
-                TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.content
                TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.content
                TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.content
                TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.content
@@ -1318,10 +1293,10 @@ enum class EventTypeEnumNew(
                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.content
                TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.content
                TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.content
+                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content
                TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.content
                TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.content
                TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.content
-                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.content
                TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.content
                TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.content
                TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.content
@@ -1353,18 +1328,12 @@ enum class EventTypeEnumNew(
                TYPE_ERROR.poiType -> TYPE_ERROR.tts
                TYPE_OPTIMAL_ROUTE_RECOMMEND.poiType -> TYPE_OPTIMAL_ROUTE_RECOMMEND.tts
                GHOST_PROBE.poiType -> GHOST_PROBE.tts
-
                TYPE_USECASE_ID_IVP_RED.poiType -> TYPE_USECASE_ID_IVP_RED.tts
                TYPE_USECASE_ID_IVP_GREEN.poiType -> TYPE_USECASE_ID_IVP_GREEN.tts
-
                TYPE_USECASE_ID_VRUCW_PERSON.poiType -> TYPE_USECASE_ID_VRUCW_PERSON.tts
                TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.tts
                TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType -> TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.tts
                TYPE_ERROR_WEAKNESS.poiType -> TYPE_ERROR_WEAKNESS.tts
-
-                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts
-                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts
-                TYPE_FOURS_ROAD_WORK.poiType -> TYPE_FOURS_ROAD_WORK.tts
                TYPE_USECASE_ID_SLW.poiType -> TYPE_USECASE_ID_SLW.tts
                TYPE_USECASE_ID_TJW.poiType -> TYPE_USECASE_ID_TJW.tts
                TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType -> TYPE_USECASE_ID_BREAKDOWN_WARNING.tts
@@ -1387,10 +1356,10 @@ enum class EventTypeEnumNew(
                TYPE_USECASE_ID_ROAD_NO_PARKING.poiType -> TYPE_USECASE_ID_ROAD_NO_PARKING.tts
                TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType -> TYPE_USECASE_ID_ROAD_NO_TOOTING.tts
                TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType -> TYPE_USECASE_ID_ROAD_SPEED_LIMIT.tts
+                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts
                TYPE_USECASE_ID_BUS_WARNING.poiType -> TYPE_USECASE_ID_BUS_WARNING.tts
                TYPE_USECASE_ID_NARROW_RIGHT.poiType -> TYPE_USECASE_ID_NARROW_RIGHT.tts
                TYPE_USECASE_ID_GAS_STATION.poiType -> TYPE_USECASE_ID_GAS_STATION.tts
-                TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType -> TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.tts
                TYPE_USECASE_ID_ACCIDENT.poiType -> TYPE_USECASE_ID_ACCIDENT.tts
                TYPE_ATTENTION_CONFLUENCE.poiType -> TYPE_ATTENTION_CONFLUENCE.tts
                TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.tts
--- 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
@@ -0,0 +1,23 @@
+package com.mogo.eagle.core.data.msgbox
+
+import fault_management.FmInfo
+import java.io.Serializable
+
+/**
+ * FM数据的类型
+ */
+data class FMInfoMsg(
+    var fmInfoList: List<FmInfo.FaultInfo>?,
+    var policyCode: String?,
+    var policyTime: Long?,
+    var isShow: Boolean
+) : Serializable
+
+/**
+ * 数据中心使用，用于过滤变更数据
+ */
+data class FMFilterInfoMsg(
+    var fmInfoList: List<FmInfo.FaultInfo>?,
+    var policyCode: String?,
+    var cacheFilterList: MutableList<String>?
+)
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxBean.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxBean.kt
@@ -6,4 +6,7 @@ data class MsgBoxBean(val type: MsgBoxType, val bean: Any) {
    var timestamp: Long = 0
    var bean2Json: String = ""
    var sourceType: DataSourceType = DataSourceType.DEFAULT
+    override fun toString(): String {
+        return "MsgBoxBean(type=$type, bean=$bean, timestamp=$timestamp, bean2Json='$bean2Json', sourceType=$sourceType)"
+    }
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxCountDownBean.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxCountDownBean.kt
@@ -2,6 +2,6 @@ package com.mogo.eagle.core.data.msgbox

 import android.os.CountDownTimer

-class MsgBoxCountDownBean(val msgBoxBean: MsgBoxBean){
+class MsgBoxCountDownBean(var msgBoxBean: MsgBoxBean){
    var countDownTimer: CountDownTimer ?= null
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxType.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgBoxType.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.data.msgbox

 enum class MsgBoxType {
-    // 按功能划分为几大类：运营、通知、V2X模块、OBU模块、工控机Report、录制、交通等
-    OPERATION, NOTICE, V2X, OBU, REPORT, RECORD, TRAFFIC
+    // 按功能划分为几大类：运营、通知、V2X模块、OBU模块、工控机Report、录制、交通、FM、语音等
+    OPERATION, NOTICE, V2X, OBU, REPORT, RECORD, TRAFFIC, FMINFO, VOICE
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgCategory.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/MsgCategory.kt
@@ -1,6 +1,6 @@
 package com.mogo.eagle.core.data.msgbox

 enum class MsgCategory {
-    // 按UI展示划分为三大类：通知、系统信息、录制
-    NOTICE, SYS_INFO, RECORD_BAG
+    // 按UI展示划分为三大类：通知、系统信息、录制、FM消息、语音(如小智)
+    NOTICE, SYS_INFO, RECORD_BAG, FM_INFO, VOICE_INFO
 }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/RecordBagMsg.kt
@@ -2,4 +2,4 @@ package com.mogo.eagle.core.data.msgbox

 import java.io.Serializable

-data class RecordBagMsg(var key: Long, var stat: Int, var id: Int, var type: Int, var fileName: String, var note: String): Serializable
+data class RecordBagMsg(var key: Long, var stat: Int, var id: Int, var type: Int, var fileName: String, var note: String,var isShow: Boolean): Serializable
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/VoiceMsg.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/VoiceMsg.kt
@@ -0,0 +1,12 @@
+package com.mogo.eagle.core.data.msgbox
+
+/**
+ * ASR识别后传输的数据结构
+ */
+data class VoiceMsg(
+    var isWakeUp: Boolean,// 是否是唤醒事件,false代表正常语音识别后的字符串
+    var isWakeUpEnd: Boolean,// 是否是唤醒的结束事件,反之为开始事件
+    var msg: String?,// 消息
+    var isLastMsg: Boolean,// 是否是最后一条消息
+    var isResp: Boolean// false:用户说的,true:表示反馈
+)