diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt index 08609c5556..b185e1543e 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt @@ -66,6 +66,13 @@ object DataManager { mutableListOf() } + /** + * FSM消息(缓存数据库时使用) + */ + private val fmInfoList by lazy { + mutableListOf() + } + private val scope by lazy { Utils.getApp().lifeCycleScope } @@ -122,6 +129,12 @@ object DataManager { } CallerMsgBoxListenerManager.invokeListener(MsgCategory.NOTICE, msg) } + MsgBoxType.FMINFO -> { + CallerMsgBoxListenerManager.invokeListener(MsgCategory.FM_INFO, msg) + } + MsgBoxType.VOICE -> { + CallerMsgBoxListenerManager.invokeListener(MsgCategory.VOICE_INFO, msg) + } MsgBoxType.OBU, MsgBoxType.NOTICE, MsgBoxType.OPERATION -> { synchronized(this) { notifyList.add(msg) diff --git 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 new file mode 100644 index 0000000000..1cf28fc5b6 --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/FMInfoMsg.kt @@ -0,0 +1,16 @@ +package com.mogo.eagle.core.data.msgbox + +import java.io.Serializable + +/** + * FM数据的类型 + */ +data class FMInfoMsg( + var level: Int,// 级别 + var faultName: String?,// 故障名称 + var timeStamp: Long,// 接收消息的时间戳 + var faultResult: String?,// 故障后果 + var faultId: String?,// 故障码(ID) + var policyCode: String?,//故障策略 + var faultAction: String?// 建议操作 +) : Serializable \ No newline at end of file diff --git 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 index 4848a3300c..d96f98507c 100644 --- 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 } \ No newline at end of file diff --git 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 index e89b9032f4..9b9b0361c5 100644 --- 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 } \ No newline at end of file diff --git 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 new file mode 100644 index 0000000000..3a5bab65c0 --- /dev/null +++ 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:表示反馈 +) \ No newline at end of file