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

yangjie #47

Merged
yangqiang merged 49 commits from yangjie into master 2025-01-24 13:43:09 +08:00
Conversation 0 Commits 49 Files Changed 21 +6 -5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ad16a0867b - Show all commits

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

@ -1261,6 +1261,7 @@ const Meeting: React.FC = () => {
} }
// 刷新 // 刷新
const refreshVideoView = async (userItem: any): Promise<void> => { const refreshVideoView = async (userItem: any): Promise<void> => {
agora.destroyRendererByConfig(Number(userItem.uid), state.channelId)
if (userItem.uid === userInfo.uid) { if (userItem.uid === userInfo.uid) {
await agora.setupLocalVideo({ await agora.setupLocalVideo({
uid: Number(userItem.uid), uid: Number(userItem.uid),
@ -1295,12 +1296,12 @@ const Meeting: React.FC = () => {
if (userItem.uid === userInfo.uid) { if (userItem.uid === userInfo.uid) {
userItem.enableCamera ? agora.startCameraCapture() : agora.stopCameraCapture() userItem.enableCamera ? agora.startCameraCapture() : agora.stopCameraCapture()
} }
refreshVideoView(userItem)
} }
if (key === 'OperMicr') { if (key === 'OperMicr') {
userItem.enableMicr = item.user.enableMicr; 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)
} }
if (key === 'ManagerRefresh') { if (key === 'ManagerRefresh') {
callBack && callBack() callBack && callBack()
@ -1837,7 +1838,7 @@ const Meeting: React.FC = () => {
const footerListTemplate = [...footerList] const footerListTemplate = [...footerList]
await agora.leaveChannelEx(userInfo.screenShareId) await agora.leaveChannelEx(userInfo.screenShareId)
agora.stopScreenCapture() agora.stopScreenCapture()
await agora.destroyRendererByView() await agora.destroyRendererByViewScreenCapture()
footerListTemplate[1][0].title = '共享屏幕' footerListTemplate[1][0].title = '共享屏幕'
setFooterList(footerListTemplate) setFooterList(footerListTemplate)
window.electron.createChildWindow('stop') window.electron.createChildWindow('stop')

6
src/utils/package/agora.ts
View File

@ -391,9 +391,9 @@ export const agora = {
}, },
// 销毁视频渲染dom // 销毁视频渲染dom
destroyRendererByConfig: async (uid: number, channelId?: string) => { destroyRendererByConfig: async (uid: number, channelId?: string) => {
await rtcEngine.destroyRendererByConfig(VideoSourceType.VideoSourceRemote, channelId, uid); await rtcEngine.destroyRendererByConfig(option.uid === uid ? VideoSourceType.VideoSourceCameraPrimary : VideoSourceType.VideoSourceRemote, channelId, uid);
}, },
destroyRendererByView: async () => { destroyRendererByViewScreenCapture: async () => {
let dom = document.getElementById(`meetingAbsoluteVideo`); let dom = document.getElementById(`meetingAbsoluteVideo`);
if (dom) { if (dom) {
await rtcEngine.destroyRendererByView(dom); await rtcEngine.destroyRendererByView(dom);
@ -465,7 +465,7 @@ export const agora = {
return await rtcEngine.getScreenCaptureSources(thumbSize, iconSize, includeScreen) return await rtcEngine.getScreenCaptureSources(thumbSize, iconSize, includeScreen)
}, },
// 共享屏幕采集 // 共享屏幕采集
setDesktopCapturerVideo: async (targetSource: any, isComputerAudio: boolean, isFluencyPriority: boolean, token:string) => { setDesktopCapturerVideo: async (targetSource: any, isComputerAudio: boolean, isFluencyPriority: boolean, token: string) => {
const user = JSON.parse(storage.getItem('user') as string) const user = JSON.parse(storage.getItem('user') as string)
agora.stopScreenCapture(); agora.stopScreenCapture();
if (isComputerAudio) { if (isComputerAudio) {