diff --git a/src/assets/icon22-active.png b/src/assets/icon22-active.png index b5cfda2..87bce29 100644 Binary files a/src/assets/icon22-active.png and b/src/assets/icon22-active.png differ diff --git a/src/assets/暂时无用.png b/src/assets/暂时无用.png new file mode 100644 index 0000000..b5cfda2 Binary files /dev/null and b/src/assets/暂时无用.png differ diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 37f56b3..4a971bf 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -367,17 +367,7 @@ const Meeting: React.FC = () => { message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`) } if (!item.user.isRoomManager) { - setRoomUserList((list: any) => { - let row = list.filter((i: any) => i.roleId === '1' || i.isRoomManager) - setCurrentLookUserAccount((res: any) => { - let has = row.find((x: any) => x.uid === res.uid) - if (!has) { - renderVideo(row[0].uid) - } - return res - }) - return list - }) + changeVideo() } }) break; @@ -576,6 +566,20 @@ const Meeting: React.FC = () => { } changeAgoraDevice() } + // 修改当前观看用户 + const changeVideo = (): void => { + setRoomUserList((list: any) => { + let row = list.filter((i: any) => i.roleId === '1' || i.isRoomManager) + setCurrentLookUserAccount((res: any) => { + let has = row.find((x: any) => x.uid === res.uid) + if (!has) { + renderVideo(row[0].uid) + } + return res + }) + return list + }) + } // 网络 const handleNetworkChange = (): void => { if (navigator.onLine) { @@ -662,6 +666,7 @@ const Meeting: React.FC = () => { await GetShowUser(state.channelId).then(async (res) => { if (res.code === 200 && res.data) { renderVideo(res.data) + changeVideo() } }) } @@ -959,7 +964,7 @@ const Meeting: React.FC = () => { return message.error('房间内最多20个开启麦克风') } } - postOpenMicrApi(enableMicr, uid, isAll) + await postOpenMicrApi(enableMicr, uid, isAll) } else { message.error(msgTips) } @@ -1003,7 +1008,7 @@ const Meeting: React.FC = () => { return message.error('房间内最多20个开启摄像头') } } - postOpenCameraApi(enableCamera, uid) + await postOpenCameraApi(enableCamera, uid) } else { message.error(msgTips) } @@ -1116,6 +1121,8 @@ const Meeting: React.FC = () => { icon: , content: `确定将用户${userName}移出会议?`, centered: true, + okText: '确定', + cancelText: '取消', async onOk() { await GetRoomKickout(channelId, uid) }, @@ -1530,21 +1537,32 @@ const Meeting: React.FC = () => { type="primary" className='m-ant-btn' size={'small'} - onClick={(event) => { + onClick={async (event) => { event.stopPropagation(); - postOpenMicr(!roomUserItem.enableMicr, roomUserItem.uid) + await postOpenMicr(!roomUserItem.enableMicr, roomUserItem.uid) + await GetRoomUserItem(state.channelId, item.uid).then((res: any) => { + if (res.code === 200) { + console.log(res.data); + setRoomUserItem(res.data) + } + }) }} >{roomUserItem.enableMicr ? '静音' : '解除静音'} : null} {roomUserItem.isRoomManager ? : null} - :
加载中
+ :
用户不在房间内
}>