diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 890f4ce..ef57f3c 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -301,8 +301,8 @@ const Meeting: React.FC = () => { if (item.user.uid === userInfo.uid) { await agora.updateChannelMediaOptions(item.user.isRoomManager) if (!item.user.isRoomManager) { - postOpenMicr(false, userInfo.id) - postOpenCamera(false, userInfo.id) + await postOpenMicrApi(false, userInfo.uid) + await postOpenCameraApi(false, userInfo.uid) } } setAllUserListData('ManagerRefresh', item) @@ -733,34 +733,39 @@ const Meeting: React.FC = () => { // 开关麦克风 const postOpenMicr = async (enableMicr: boolean, uid: string, isAll?: boolean): Promise => { if (getUserRoomInfo()) { - if (isAll) { - await PostMuteAll({ - roomNum: state.channelId, - enableMicr - }) - } else { - let msg = ''; - if (uid === user.uid) { - await agora.getAudioMediaList().then(res => { - if (!res.ecordingList.length) { - msg = '未检测到麦克风!' - } - }) - } - if (msg) { - message.error(msg) - return - } - await PostOpenMicr({ - roomNum: state.channelId, - uid, - enableMicr - }) - } + postOpenMicrApi(enableMicr, uid, isAll) } else { message.error(msgTips) } } + // 开关麦克风 + const postOpenMicrApi = async (enableMicr: boolean, uid: string, isAll?: boolean): Promise => { + if (isAll) { + await PostMuteAll({ + roomNum: state.channelId, + enableMicr + }) + } else { + let msg = ''; + if (uid === user.uid) { + await agora.getAudioMediaList().then(res => { + if (!res.ecordingList.length) { + msg = '未检测到麦克风!' + } + }) + } + if (msg) { + message.error(msg) + return + } + await PostOpenMicr({ + roomNum: state.channelId, + uid, + enableMicr + }) + } + } + // 开关视频 const postOpenCamera = async (enableCamera: boolean, uid: string): Promise => { if (getUserRoomInfo()) { @@ -776,20 +781,24 @@ const Meeting: React.FC = () => { message.error(msg) return } - if (enableCamera) { - await agora.startCameraCapture() - } else { - await agora.stopCameraCapture(); - } - await PostOpenCamera({ - roomNum: state.channelId, - uid, - enableCamera - }) + postOpenCameraApi(enableCamera, uid) } else { message.error(msgTips) } } + // 开关视频 + const postOpenCameraApi = async (enableCamera: boolean, uid: string): Promise => { + if (enableCamera) { + await agora.startCameraCapture() + } else { + await agora.stopCameraCapture(); + } + await PostOpenCamera({ + roomNum: state.channelId, + uid, + enableCamera + }) + } // 演讲者模式 // const changeSpeakerMode = (): void => { // speakerModeModalRef.current.changeSpeakerMode() @@ -1120,7 +1129,7 @@ const Meeting: React.FC = () => { {item.userName}{item.uid === user.uid ? '(我)' : ''} {item.roleId === '1' || item.isRoomManager ? - {item.roleId === '1' ? '主持人' : '临时主持人'} + {item.roleId === '1' ? '主讲人' : '主讲人'} : null}