fix(im): 补回录音格式探测和 IM 初始化门控
- 录音前按浏览器能力选择 MIME 类型,并按实际格式生成语音文件后缀 - 频道消息发送表单改用 UserSelectV2 多选接收人 - IM 外层壳完成本地库和缓存恢复后再挂载子路由im
parent
68c5f3fc4b
commit
e5bba07dec
|
|
@ -12,7 +12,7 @@
|
||||||
- 切 Tab 不重建组件,MessagePanel 滚动位置、输入框草稿等 UI 状态不丢
|
- 切 Tab 不重建组件,MessagePanel 滚动位置、输入框草稿等 UI 状态不丢
|
||||||
- Vue 3 里 keep-alive 不能直接包 <router-view>(会有警告),必须走 v-slot 拿 Component
|
- Vue 3 里 keep-alive 不能直接包 <router-view>(会有警告),必须走 v-slot 拿 Component
|
||||||
-->
|
-->
|
||||||
<router-view v-slot="{ Component }">
|
<router-view v-if="childRouteReady" v-slot="{ Component }">
|
||||||
<keep-alive>
|
<keep-alive>
|
||||||
<component :is="Component" />
|
<component :is="Component" />
|
||||||
</keep-alive>
|
</keep-alive>
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import { onMounted, onUnmounted, watch, nextTick } from 'vue'
|
import { onMounted, onUnmounted, ref, watch, nextTick } from 'vue'
|
||||||
import { useRoute } from 'vue-router'
|
import { useRoute } from 'vue-router'
|
||||||
|
|
||||||
import { useAppStore } from '@/store/modules/app'
|
import { useAppStore } from '@/store/modules/app'
|
||||||
|
|
@ -68,6 +68,7 @@ const channelStore = useChannelStore()
|
||||||
const { pullOnce, cancelPull } = useMessagePuller()
|
const { pullOnce, cancelPull } = useMessagePuller()
|
||||||
const { readActive, syncPrivateReadStatus } = useMessageSender()
|
const { readActive, syncPrivateReadStatus } = useMessageSender()
|
||||||
const voicePlayer = useVoicePlayer()
|
const voicePlayer = useVoicePlayer()
|
||||||
|
const childRouteReady = ref(false) // 子路由是否允许挂载
|
||||||
|
|
||||||
/** 初始化:先吃本地缓存让首屏立即渲染,再远端刷新最新数据,最后建实时通信拉离线消息 */
|
/** 初始化:先吃本地缓存让首屏立即渲染,再远端刷新最新数据,最后建实时通信拉离线消息 */
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
|
|
@ -87,6 +88,7 @@ onMounted(async () => {
|
||||||
channelStore.loadChannelList(),
|
channelStore.loadChannelList(),
|
||||||
groupRequestStore.loadGroupRequestList()
|
groupRequestStore.loadGroupRequestList()
|
||||||
])
|
])
|
||||||
|
childRouteReady.value = true
|
||||||
groupStore.markAllGroupMembersExpired()
|
groupStore.markAllGroupMembersExpired()
|
||||||
// 1.4 我管理的群下未处理加群申请红点:首登用 unhandled-list(服务端直接过滤未处理,语义精准、启动轻);
|
// 1.4 我管理的群下未处理加群申请红点:首登用 unhandled-list(服务端直接过滤未处理,语义精准、启动轻);
|
||||||
// pullGroupRequests 只在重连 / 后续补偿时跑(见 useMessagePuller.pullStateEvents),不进首登主链路
|
// pullGroupRequests 只在重连 / 后续补偿时跑(见 useMessagePuller.pullStateEvents),不进首登主链路
|
||||||
|
|
|
||||||
|
|
@ -915,13 +915,20 @@ function openVoice() {
|
||||||
voiceVisible.value = true
|
voiceVisible.value = true
|
||||||
emojiVisible.value = false
|
emojiVisible.value = false
|
||||||
}
|
}
|
||||||
/** VoiceRecorder 录完回传 blob,包成 webm File 后走通用 uploadAndSendMedia;duration 走 context */
|
/** VoiceRecorder 录完回传 blob,包成 File 后走通用 uploadAndSendMedia;duration 走 context */
|
||||||
async function onVoiceSend(payload: { blob: Blob; duration: number }) {
|
async function onVoiceSend(payload: {
|
||||||
|
blob: Blob
|
||||||
|
duration: number
|
||||||
|
extension: string
|
||||||
|
mimeType: string
|
||||||
|
}) {
|
||||||
const context = prepareMediaUpload()
|
const context = prepareMediaUpload()
|
||||||
if (!context) {
|
if (!context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const file = new File([payload.blob], `voice-${Date.now()}.webm`, { type: payload.blob.type })
|
const file = new File([payload.blob], `voice-${Date.now()}.${payload.extension}`, {
|
||||||
|
type: payload.mimeType
|
||||||
|
})
|
||||||
await uploadAndSendMedia({
|
await uploadAndSendMedia({
|
||||||
file,
|
file,
|
||||||
type: ImContentType.VOICE,
|
type: ImContentType.VOICE,
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ const props = withDefaults(
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
'update:modelValue': [value: boolean]
|
'update:modelValue': [value: boolean]
|
||||||
send: [payload: { blob: Blob; duration: number }] // 录制完成:返回录音 Blob 和时长(秒)
|
send: [payload: { blob: Blob; duration: number; extension: string; mimeType: string }] // 录制完成:返回录音 Blob 和时长(秒)
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const message = useMessage()
|
const message = useMessage()
|
||||||
|
|
@ -103,9 +103,18 @@ let audioChunks: Blob[] = []
|
||||||
let mediaStream: MediaStream | null = null
|
let mediaStream: MediaStream | null = null
|
||||||
let timer: ReturnType<typeof setInterval> | null = null
|
let timer: ReturnType<typeof setInterval> | null = null
|
||||||
let recordedBlob: Blob | null = null
|
let recordedBlob: Blob | null = null
|
||||||
|
let recordedMimeType = ''
|
||||||
|
let recordedExtension = 'webm'
|
||||||
/** 取消标记:录制中触发 resetAll 时让异步 'stop' 监听器丢弃数据,不进 preview */
|
/** 取消标记:录制中触发 resetAll 时让异步 'stop' 监听器丢弃数据,不进 preview */
|
||||||
let discarding = false
|
let discarding = false
|
||||||
|
|
||||||
|
const VOICE_MIME_TYPE_OPTIONS = [
|
||||||
|
{ mimeType: 'audio/webm;codecs=opus', extension: 'webm' },
|
||||||
|
{ mimeType: 'audio/webm', extension: 'webm' },
|
||||||
|
{ mimeType: 'audio/mp4', extension: 'm4a' },
|
||||||
|
{ mimeType: 'audio/ogg;codecs=opus', extension: 'ogg' }
|
||||||
|
]
|
||||||
|
|
||||||
/** 计时器展示文案:mm:ss */
|
/** 计时器展示文案:mm:ss */
|
||||||
const timerText = computed(() => formatSeconds(duration.value))
|
const timerText = computed(() => formatSeconds(duration.value))
|
||||||
|
|
||||||
|
|
@ -147,7 +156,15 @@ async function startRecord() {
|
||||||
}
|
}
|
||||||
audioChunks = []
|
audioChunks = []
|
||||||
discarding = false
|
discarding = false
|
||||||
mediaRecorder = new MediaRecorder(mediaStream)
|
const voiceMimeType = getSupportedVoiceMimeType()
|
||||||
|
if (!voiceMimeType) {
|
||||||
|
message.error('当前浏览器不支持录音格式')
|
||||||
|
cleanupStream()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
recordedMimeType = voiceMimeType.mimeType
|
||||||
|
recordedExtension = voiceMimeType.extension
|
||||||
|
mediaRecorder = new MediaRecorder(mediaStream, { mimeType: recordedMimeType })
|
||||||
mediaRecorder.addEventListener('dataavailable', (event: BlobEvent) => {
|
mediaRecorder.addEventListener('dataavailable', (event: BlobEvent) => {
|
||||||
if (event.data.size > 0) {
|
if (event.data.size > 0) {
|
||||||
audioChunks.push(event.data)
|
audioChunks.push(event.data)
|
||||||
|
|
@ -158,7 +175,7 @@ async function startRecord() {
|
||||||
if (discarding) {
|
if (discarding) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
recordedBlob = new Blob(audioChunks, { type: 'audio/webm' })
|
recordedBlob = new Blob(audioChunks, { type: recordedMimeType })
|
||||||
previewUrl.value = URL.createObjectURL(recordedBlob)
|
previewUrl.value = URL.createObjectURL(recordedBlob)
|
||||||
status.value = 'preview'
|
status.value = 'preview'
|
||||||
})
|
})
|
||||||
|
|
@ -202,7 +219,12 @@ function handleSend() {
|
||||||
if (!recordedBlob) {
|
if (!recordedBlob) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
emit('send', { blob: recordedBlob, duration: duration.value })
|
emit('send', {
|
||||||
|
blob: recordedBlob,
|
||||||
|
duration: duration.value,
|
||||||
|
extension: recordedExtension,
|
||||||
|
mimeType: recordedMimeType
|
||||||
|
})
|
||||||
visible.value = false
|
visible.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -224,6 +246,8 @@ function resetAll() {
|
||||||
timer = null
|
timer = null
|
||||||
}
|
}
|
||||||
audioChunks = []
|
audioChunks = []
|
||||||
|
recordedMimeType = ''
|
||||||
|
recordedExtension = 'webm'
|
||||||
duration.value = 0
|
duration.value = 0
|
||||||
status.value = 'idle'
|
status.value = 'idle'
|
||||||
clearPreview()
|
clearPreview()
|
||||||
|
|
@ -244,6 +268,14 @@ function cleanupStream() {
|
||||||
mediaStream = null
|
mediaStream = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 查询浏览器支持的录音格式 */
|
||||||
|
function getSupportedVoiceMimeType() {
|
||||||
|
if (typeof MediaRecorder === 'undefined') {
|
||||||
|
return undefined
|
||||||
|
}
|
||||||
|
return VOICE_MIME_TYPE_OPTIONS.find((item) => MediaRecorder.isTypeSupported(item.mimeType))
|
||||||
|
}
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
if (props.modelValue) {
|
if (props.modelValue) {
|
||||||
document.addEventListener('click', handleDocumentClick)
|
document.addEventListener('click', handleDocumentClick)
|
||||||
|
|
|
||||||
|
|
@ -28,21 +28,12 @@
|
||||||
label="接收用户"
|
label="接收用户"
|
||||||
prop="receiverUserIds"
|
prop="receiverUserIds"
|
||||||
>
|
>
|
||||||
<!-- TODO @芋艿:后续换成 userselect 组件 -->
|
<UserSelectV2
|
||||||
<el-select
|
|
||||||
v-model="formData.receiverUserIds"
|
v-model="formData.receiverUserIds"
|
||||||
multiple
|
:multiple="true"
|
||||||
filterable
|
placeholder="请选择接收用户"
|
||||||
placeholder="选择接收用户"
|
@change="handleReceiverUserChange"
|
||||||
class="!w-full"
|
/>
|
||||||
>
|
|
||||||
<el-option
|
|
||||||
v-for="user in userList"
|
|
||||||
:key="user.id"
|
|
||||||
:label="user.nickname"
|
|
||||||
:value="user.id"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
|
@ -54,7 +45,7 @@
|
||||||
|
|
||||||
<script lang="ts" setup>
|
<script lang="ts" setup>
|
||||||
import * as MessageApi from '@/api/im/manager/channel/message'
|
import * as MessageApi from '@/api/im/manager/channel/message'
|
||||||
import * as UserApi from '@/api/system/user'
|
import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
|
||||||
import ChannelSelect from '../list/components/ChannelSelect.vue'
|
import ChannelSelect from '../list/components/ChannelSelect.vue'
|
||||||
import MaterialSelect from '../material/components/MaterialSelect.vue'
|
import MaterialSelect from '../material/components/MaterialSelect.vue'
|
||||||
|
|
||||||
|
|
@ -69,7 +60,6 @@ const formData = ref({
|
||||||
receiverUserType: 'all' as 'all' | 'users', // 接收用户类型:全员 / 指定用户
|
receiverUserType: 'all' as 'all' | 'users', // 接收用户类型:全员 / 指定用户
|
||||||
receiverUserIds: [] as number[]
|
receiverUserIds: [] as number[]
|
||||||
})
|
})
|
||||||
const userList = ref<UserApi.UserVO[]>([]) // 全部启用用户(首次打开预拉)
|
|
||||||
|
|
||||||
const formRules = reactive({
|
const formRules = reactive({
|
||||||
channelId: [{ required: true, message: '请选择频道', trigger: 'change' }],
|
channelId: [{ required: true, message: '请选择频道', trigger: 'change' }],
|
||||||
|
|
@ -79,16 +69,19 @@ const formRules = reactive({
|
||||||
const formRef = ref() // 表单 Ref
|
const formRef = ref() // 表单 Ref
|
||||||
|
|
||||||
/** 打开弹窗 */
|
/** 打开弹窗 */
|
||||||
const open = async () => {
|
const open = () => {
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
resetForm()
|
resetForm()
|
||||||
// 加载用户列表
|
|
||||||
userList.value = await UserApi.getSimpleUserList()
|
|
||||||
}
|
}
|
||||||
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
|
||||||
|
|
||||||
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
const emit = defineEmits(['success']) // 定义 success 事件,用于操作成功后的回调
|
||||||
|
|
||||||
|
/** 接收用户变化 */
|
||||||
|
const handleReceiverUserChange = () => {
|
||||||
|
formRef.value?.validateField('receiverUserIds')
|
||||||
|
}
|
||||||
|
|
||||||
/** 提交表单 */
|
/** 提交表单 */
|
||||||
const submitForm = async () => {
|
const submitForm = async () => {
|
||||||
await formRef.value.validate()
|
await formRef.value.validate()
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue