marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

还原

This commit is contained in:
yj 2024-08-20 14:25:59 +08:00
parent e3d3d03e58
commit 5464d9a35b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/page/Meeting/index.tsx
View File

@ -322,6 +322,11 @@ const Meeting: React.FC = () => {
break; break;
// 发言人用户信息刷新 // 发言人用户信息刷新
case 'ManagerRefresh': case 'ManagerRefresh':
if (item.user.uid === userInfo.uid) {
await agora.updateChannelMediaOptions(item.user.isRoomManager)
await postOpenMicrApi(item.user.isRoomManager, userInfo.uid)
await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
}
setAllUserListData('ManagerRefresh', item) setAllUserListData('ManagerRefresh', item)
break; break;
} }
@ -389,7 +394,7 @@ const Meeting: React.FC = () => {
}); });
} }
setRoomUserList((res: any) => { setRoomUserList((res: any) => {
res.forEach((item: any) => { res.forEach(async (item: any) => {
if (item.roleId === '1') { if (item.roleId === '1') {
item.role = 'admin' item.role = 'admin'
} else if (item.isRoomManager) { } else if (item.isRoomManager) {
@ -404,8 +409,8 @@ const Meeting: React.FC = () => {
footerListTemplate[0][1].title = item.enableCamera ? '关闭视频' : '开启视频' footerListTemplate[0][1].title = item.enableCamera ? '关闭视频' : '开启视频'
footerListTemplate[0][1].active = !item.enableCamera footerListTemplate[0][1].active = !item.enableCamera
setFooterList(footerListTemplate) setFooterList(footerListTemplate)
agora.muteLocalAudioStream(!item.enableMicr) await agora.muteLocalAudioStream(!item.enableMicr)
agora.muteLocalVideoStream(!item.enableCamera) await agora.muteLocalVideoStream(!item.enableCamera)
} }
if (userSearchValue) { if (userSearchValue) {
if (item.userName.indexOf(userSearchValue) !== -1) { if (item.userName.indexOf(userSearchValue) !== -1) {
@ -417,7 +422,7 @@ const Meeting: React.FC = () => {
item.isShow = true; item.isShow = true;
} }
}); });
return res return sortUsersByRole(res)
}) })
} }
// 替换数据 // 替换数据
@ -426,20 +431,14 @@ const Meeting: React.FC = () => {
case 'OperMicr': case 'OperMicr':
case 'OperCamera': case 'OperCamera':
case 'ManagerRefresh': case 'ManagerRefresh':
setRoomUserList(async (res: any) => { setRoomUserList((res: any) => {
let userItem = res.find((row: any) => row.uid === item.user.uid) let userItem = res.find((row: any) => row.uid === item.user.uid)
if (userItem) { if (userItem) {
for (const key in item.user) { for (const key in item.user) {
userItem[key] = item.user[key]; userItem[key] = item.user[key];
} }
} }
if (key === 'ManagerRefresh') { setRoomUserList(res)
if (item.user.uid === userInfo.uid) {
await agora.updateChannelMediaOptions(item.user.isRoomManager)
await postOpenMicrApi(item.user.isRoomManager, userInfo.uid)
await postOpenCameraApi(item.user.isRoomManager, userInfo.uid)
}
}
return res return res
}) })
break; break;
@ -1567,7 +1566,7 @@ const meetingContentUser = (item: any, bool?: boolean) => {
<img src={ImageUrl.icon32} alt="" /> <img src={ImageUrl.icon32} alt="" />
</div> : null} </div> : null}
{!item.enableMicr ? <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" /> : ''} {!item.enableMicr ? <img src={item.enableMicr ? ImageUrl.icon22 : ImageUrl.icon22Active} alt="" /> : ''}
<span style={{ maxWidth: bool ? '' : '8vw' }} title={`${item.userName}${item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}`}> <span style={{ width: bool ? '' : '8vw' }} title={`${item.userName}${item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}`}>
{item.userName} {item.userName}
{item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''} {item.roleId === '1' || item.isRoomManager ? item.roleId === '1' ? '(管理员)' : '(发言人)' : ''}
</span> </span>