diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 0570c61..e073465 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -362,14 +362,26 @@ const Meeting: React.FC = () => { // 发言人用户信息刷新 case 'ManagerRefresh': setAllUserListData('ManagerRefresh', item, async () => { - if (item.user.uid === userInfo.uid) { - message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`) - await agora.updateChannelMediaOptions(item.user.isRoomManager) - await postOpenMicrApi(item.user.isRoomManager, userInfo.uid, false) - await postOpenCameraApi(item.user.isRoomManager, userInfo.uid) - await stopScreenCapture() + if (item.user.uid === item.uid) { + if (item.user.uid === userInfo.uid) { + message.success(`操作成功`) + await agora.updateChannelMediaOptions(item.user.isRoomManager) + await postOpenMicrApi(item.user.isRoomManager, userInfo.uid, false) + await postOpenCameraApi(item.user.isRoomManager, userInfo.uid) + await stopScreenCapture() + } else { + message.success(`${item.user.userName}已结束发言`) + } } else { - message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`) + if (item.user.uid === userInfo.uid) { + message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}您为发言人`) + await agora.updateChannelMediaOptions(item.user.isRoomManager) + await postOpenMicrApi(item.user.isRoomManager, userInfo.uid, false) + await postOpenCameraApi(item.user.isRoomManager, userInfo.uid) + await stopScreenCapture() + } else { + message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`) + } } if (!item.user.isRoomManager) { changeVideo() @@ -1763,6 +1775,7 @@ const Meeting: React.FC = () => { case '结束发言': if (user.roleId !== '1') { return { diff --git a/src/utils/package/signalr.ts b/src/utils/package/signalr.ts index 6d71483..86baed7 100644 --- a/src/utils/package/signalr.ts +++ b/src/utils/package/signalr.ts @@ -138,10 +138,11 @@ export const onSignalr = (callBack: Function) => { }) }); // 发言人用户信息刷新 - connection.on("ManagerRefresh", (user: any) => { + connection.on("ManagerRefresh", (user: any, uid: string) => { callBack({ key: 'ManagerRefresh', - user + user, + uid }) }); // 申请发言 @@ -168,6 +169,7 @@ export const offSignalr = () => { connection.off('OperMicr'); connection.off('OperCamera'); connection.off('ManagerRefresh'); + connection.off('ApplyToSpeak'); } } export const onInvoke = async (str: string, data: any) => {