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

yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
Conversation 0 Commits 99 Files Changed 34 +13 -9
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69ffdd3c71 - Show all commits

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

@ -1151,8 +1151,19 @@ const Meeting: React.FC = () => {
setRoomUserList((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 keys in item.user) {
userItem[key] = item.user[key]; if (keys !== 'enableCamera' && keys !== 'enableMicr') {
userItem[keys] = item.user[keys];
}
}
if (key === 'OperCamera') {
userItem.enableCamera = item.user.enableCamera;
if (userItem.uid === userInfo.uid) {
userItem.enableCamera ? agora.startCameraCapture() : agora.stopCameraCapture()
}
}
if (key === 'OperMicr') {
userItem.enableMicr = item.user.enableMicr;
} }
userItem.isAdmin = role.ID.includes(item.user.roleId) || item.user.isRoomManager; userItem.isAdmin = role.ID.includes(item.user.roleId) || item.user.isRoomManager;
refreshVideoView(userItem) refreshVideoView(userItem)
@ -1160,13 +1171,6 @@ const Meeting: React.FC = () => {
if (key === 'ManagerRefresh') { if (key === 'ManagerRefresh') {
callBack && callBack() callBack && callBack()
} }
if (key === 'OperCamera' && item.user.uid === userInfo.uid) {
if (item.user.enableCamera) {
agora.startCameraCapture()
} else {
agora.stopCameraCapture();
}
}
return res return res
}) })
break; break;