From 5d6c43e27ab8562d25fa819d9395fef578306af5 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Wed, 18 Dec 2024 15:21:48 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index ccf0a00..e79289e 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1642,7 +1642,10 @@ const Meeting: React.FC = () => { const stopRecorderMedia = async (): Promise => { setRecorder((res: any) => { if (res) { - res.stop(); + try { + res.stop() + } catch (error) { + } } return res }) @@ -1650,7 +1653,10 @@ const Meeting: React.FC = () => { if (res.length) { res.forEach((item: any) => { item.getTracks().forEach((track: any) => { - track.stop() + try { + track.stop() + } catch (error) { + } }); }); } From e26d8f0c3f74cbe64226fc708850e09c39671342 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 19 Dec 2024 15:33:24 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E5=8D=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index e79289e..9fc9e5d 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -871,7 +871,22 @@ const Meeting: React.FC = () => { useEffect(() => { if (recorder) { - recorder.start(); + recorder.start() + recorder.onstart = async () => { + message.success('开始录制') + } + recorder.onerror = async () => { + setRecorder('') + setMediaStream([]) + setIsClickedMediaSteam(false) + changeStatusList({ + title: '录制中' + }, 1, 3) + message.error('录制失败，请重新录制！') + } + recorder.onstop = async (event: any) => { + + } recorder.ondataavailable = async (event: any) => { const blob = await fixWebmDuration(event.data); const reader = new FileReader() as any; From c9ca37d323c90c8346619df4662f441970ebb946 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 19 Dec 2024 15:43:08 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 9fc9e5d..5ba8ea5 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1692,7 +1692,7 @@ const Meeting: React.FC = () => { } else { navigate('/home/index') } - }, 1000) + }, 2000) } // 分享屏幕 const clickSharedScreen = async (): Promise => { From 2284b01d89387e180e4e176807e17ae6df00eeb6 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 19 Dec 2024 16:13:53 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 5ba8ea5..884b7d7 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -171,6 +171,7 @@ const Meeting: React.FC = () => { }) const [networkOther, setNetworkOther] = useState({}) const [isComputerAudio, setIsComputerAudio] = useState(false) + const [_isLeave, setIsLeave] = useState(false) const [isScreenCapture, setIsScreenCapture] = useState(false) const [isFluencyPriority, setIsFluencyPriority] = useState(false) const [open, setOpen] = useState(false) @@ -884,7 +885,7 @@ const Meeting: React.FC = () => { }, 1, 3) message.error('录制失败，请重新录制！') } - recorder.onstop = async (event: any) => { + recorder.onstop = async () => { } recorder.ondataavailable = async (event: any) => { @@ -915,6 +916,16 @@ const Meeting: React.FC = () => { onCancel() { } }) + setIsLeave(bool => { + if (bool) { + if (userInfo.isAnonymous) { + storage.setItem('userLogin', false) + } else { + navigate('/home/index') + } + } + return false + }) }; reader.readAsArrayBuffer(blob); } @@ -1680,6 +1691,7 @@ const Meeting: React.FC = () => { } // 退出房间 const leaveChannel = async (bool: boolean = true): Promise => { + setIsLeave(true) await stopScreenCapture() await stopRecorderMedia() if (bool) { @@ -1687,12 +1699,19 @@ const Meeting: React.FC = () => { } await agora.leaveChannel() setTimeout(() => { - if (userInfo.isAnonymous) { - storage.setItem('userLogin', false) - } else { - navigate('/home/index') - } - }, 2000) + setRecorder((res: any) => { + if (res) { + + } else { + if (userInfo.isAnonymous) { + storage.setItem('userLogin', false) + } else { + navigate('/home/index') + } + } + return res + }) + }, 1000) } // 分享屏幕 const clickSharedScreen = async (): Promise => { From 1ad41eaf266e48e11ef16e85f89bb5e30001b02c Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Fri, 20 Dec 2024 10:03:12 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=95=E5=88=B6?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=AF=94=E7=89=B9=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 884b7d7..35121d6 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1604,7 +1604,7 @@ const Meeting: React.FC = () => { // 开始录制 const mediaRecorder = new MediaRecorder(combinedSource, { mimeType: 'video/webm;codecs=vp9,opus', - videoBitsPerSecond: 1.5e6, + videoBitsPerSecond: 1500, }); setRecorder(mediaRecorder); }); From 3bc5994506835852ec953e9d68f97922b27c0a51 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 26 Dec 2024 15:15:36 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=BF=AB=E9=80=9F=E9=80=80=E5=87=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=97=A0=E6=95=88=E6=88=BF=E9=97=B4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 35121d6..75467da 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1692,13 +1692,13 @@ const Meeting: React.FC = () => { // 退出房间 const leaveChannel = async (bool: boolean = true): Promise => { setIsLeave(true) - await stopScreenCapture() - await stopRecorderMedia() - if (bool) { - await getLeave() - } - await agora.leaveChannel() - setTimeout(() => { + setTimeout(async () => { + await stopScreenCapture() + await stopRecorderMedia() + if (bool) { + await getLeave() + } + await agora.leaveChannel() setRecorder((res: any) => { if (res) { From c07de8d2a18b6fe64358d50d1566b10064bba5eb Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Fri, 27 Dec 2024 15:25:59 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=81=9C=E6=AD=A2=E9=87=87=E9=9B=86?= =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/package/agora.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts index c3ba703..78b4c1c 100644 --- a/src/utils/package/agora.ts +++ b/src/utils/package/agora.ts @@ -436,7 +436,7 @@ export const agora = { }, // 停止采集摄像头 stopCameraCapture: async () => { - await rtcEngine.stopCameraCapture() + await rtcEngine.stopCameraCapture(VideoSourceType.VideoSourceCamera) }, // 加入频道 setJoinChannel: async (data: any) => { From 3723873d714ea3193e7b9528c5ecce32813b126a Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Fri, 27 Dec 2024 16:49:44 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=91=E7=B9=81?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=8D=A1=E9=A1=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 75467da..7f2b0df 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1226,22 +1226,18 @@ const Meeting: React.FC = () => { // 刷新 const refreshVideoView = async (userItem: any): Promise => { if (userItem.uid === userInfo.uid) { - setTimeout(async () => { - await agora.setupLocalVideo({ - uid: Number(userItem.uid), - view: document.getElementById(`video-${userItem.uid}`), - channelId: state.channelId, - sourceType: VideoSourceType.VideoSourceCameraPrimary, - }) - }, 1500); + await agora.setupLocalVideo({ + uid: Number(userItem.uid), + view: document.getElementById(`video-${userItem.uid}`), + channelId: state.channelId, + sourceType: VideoSourceType.VideoSourceCameraPrimary, + }) } else { - setTimeout(async () => { - await agora.setupRemoteVideoJoin({ - uid: Number(userItem.uid), - view: document.getElementById(`video-${userItem.uid}`), - channelId: state.channelId, - }) - }, 1500); + await agora.setupRemoteVideoJoin({ + uid: Number(userItem.uid), + view: document.getElementById(`video-${userItem.uid}`), + channelId: state.channelId, + }) } } // 替换数据 From d2d20d3efd8029a5803ea67bfc4f0838174ad5d7 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Mon, 30 Dec 2024 13:34:19 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 7f2b0df..e85500f 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1688,26 +1688,24 @@ const Meeting: React.FC = () => { // 退出房间 const leaveChannel = async (bool: boolean = true): Promise => { setIsLeave(true) - setTimeout(async () => { - await stopScreenCapture() - await stopRecorderMedia() - if (bool) { - await getLeave() - } - await agora.leaveChannel() - setRecorder((res: any) => { - if (res) { + await stopScreenCapture() + await stopRecorderMedia() + if (bool) { + await getLeave() + } + await agora.leaveChannel() + setRecorder((res: any) => { + if (res) { + } else { + if (userInfo.isAnonymous) { + storage.setItem('userLogin', false) } else { - if (userInfo.isAnonymous) { - storage.setItem('userLogin', false) - } else { - navigate('/home/index') - } + navigate('/home/index') } - return res - }) - }, 1000) + } + return res + }) } // 分享屏幕 const clickSharedScreen = async (): Promise => { From 488724aa62de7445a68631211a24584ecc9073a7 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 2 Jan 2025 11:42:29 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 8 ++++-- preload.js | 55 ++++++++++++++++++++++++++++++++++++-- src/page/Meeting/index.tsx | 39 ++++----------------------- src/render.d.ts | 2 +- src/utils/package/agora.ts | 6 +++++ 5 files changed, 71 insertions(+), 39 deletions(-) diff --git a/main.js b/main.js index 0415f85..bfcd67b 100644 --- a/main.js +++ b/main.js @@ -610,10 +610,14 @@ app.on('ready', () => { } } } else { - if (childWindow[config.key].isVisible()) { + if (config.bool) { childWindow[config.key].hide() } else { - childWindow[config.key].show() + if (childWindow[config.key].isVisible()) { + childWindow[config.key].hide() + } else { + childWindow[config.key].show() + } } } }); diff --git a/preload.js b/preload.js index 55a0c47..4879689 100644 --- a/preload.js +++ b/preload.js @@ -116,8 +116,59 @@ window.electron = { ipcRenderer.invoke('setRegistry', uuid) }, // 创建子窗口 - createChildWindow: (config) => { - ipcRenderer.invoke('createChildWindow', config) + createChildWindow: (str) => { + switch (str) { + case 'show': + ipcRenderer.invoke('setChildWindowShow', { + key: 'shareScreenWindow', + }) + ipcRenderer.invoke('setChildWindowShow', { + key: 'chatSmallWindow', + }) + break; + case 'hide': + ipcRenderer.invoke('createChildWindow', { + url: location.origin + `/#/noticeWindow`, + width: 388, + height: 150, + key: 'noticeWindow', + }) + ipcRenderer.invoke('createChildWindow', { + url: location.origin + `/#/shareScreenWindow`, + width: 400, + height: 80, + key: 'shareScreenWindow', + }) + ipcRenderer.invoke('createChildWindow', { + url: location.origin + `/#/chatSmallWindow`, + width: 200, + height: 150, + key: 'chatSmallWindow', + }) + ipcRenderer.invoke('createChildWindow', { + url: location.origin + `/#/chatBigWindow`, + width: 540, + height: 640, + key: 'chatBigWindow', + }) + ipcRenderer.invoke('createChildWindow', { + url: location.origin + `/#/userListWindow`, + width: 440, + height: 540, + key: 'userListWindow', + }) + break; + case 'stop': + ipcRenderer.invoke('setChildWindowShow', { + key: 'shareScreenWindow', + bool: true + }) + ipcRenderer.invoke('setChildWindowShow', { + key: 'chatSmallWindow', + bool: true + }) + break; + } }, // 关闭子窗口 closeChildWindow: (key) => { diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index e85500f..4db2a3b 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -209,6 +209,7 @@ const Meeting: React.FC = () => { const channel = new BroadcastChannel('meeting_channel'); let storeDevice: any; useEffect(() => { + window.electron.createChildWindow('hide') let time: NodeJS.Timeout; setUser(userInfo) window.electron.getIsMaximized().then((res: boolean) => { @@ -485,6 +486,7 @@ const Meeting: React.FC = () => { window.removeEventListener('wheel', handleWheelChange); clearInterval(time) channel.close(); + window.electron.closeChildWindow('shareScreenWindow') }; }, []); @@ -1728,39 +1730,7 @@ const Meeting: React.FC = () => { const isOpen = await getKeyOpenChildWindow('shareScreenWindow') setIsScreenCapture(true) if (!isOpen) { - window.electron.createChildWindow({ - url: location.origin + `/#/noticeWindow`, - width: 388, - height: 150, - key: 'noticeWindow', - show: true, - }) - window.electron.createChildWindow({ - url: location.origin + `/#/shareScreenWindow`, - width: 400, - height: 80, - key: 'shareScreenWindow', - show: true, - }) - window.electron.createChildWindow({ - url: location.origin + `/#/chatSmallWindow`, - width: 200, - height: 150, - key: 'chatSmallWindow', - show: true, - }) - window.electron.createChildWindow({ - url: location.origin + `/#/chatBigWindow`, - width: 540, - height: 640, - key: 'chatBigWindow', - }) - window.electron.createChildWindow({ - url: location.origin + `/#/userListWindow`, - width: 440, - height: 540, - key: 'userListWindow', - }) + window.electron.createChildWindow('show') setKeyOpenChildWindow('shareScreenWindow', true) window.electron.setMainWindowSize({ width: 250, @@ -1819,9 +1789,10 @@ const Meeting: React.FC = () => { const footerListTemplate = [...footerList] await agora.leaveChannelEx(userInfo.screenShareId) agora.stopScreenCapture() + await agora.destroyRendererByView() footerListTemplate[1][0].title = '共享屏幕' setFooterList(footerListTemplate) - window.electron.closeChildWindow('shareScreenWindow') + window.electron.createChildWindow('stop') setKeyOpenChildWindow('shareScreenWindow', false) setIsScreenCapture(bool => { if (bool) { diff --git a/src/render.d.ts b/src/render.d.ts index 95e2967..ad0eae5 100644 --- a/src/render.d.ts +++ b/src/render.d.ts @@ -29,7 +29,7 @@ export interface IElectronAPI { isVisible: () => Promise; setRegistry: (uuid: string) => any; getRegistry: () => any; - createChildWindow: (config: any) => void; + createChildWindow: (str: string) => void; setChildWindow: (config: any) => void; setChildWindowShow: (config: any) => void; closeChildWindow: (key: string) => void; diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts index 78b4c1c..d4d544d 100644 --- a/src/utils/package/agora.ts +++ b/src/utils/package/agora.ts @@ -385,6 +385,12 @@ export const agora = { destroyRendererByConfig: async (uid: number, channelId?: string) => { await rtcEngine.destroyRendererByConfig(VideoSourceType.VideoSourceRemote, channelId, uid); }, + destroyRendererByView: async () => { + let dom = document.getElementById(`meetingAbsoluteVideo`); + if (dom) { + await rtcEngine.destroyRendererByView(dom); + } + }, // ai降噪 setAINSMode: async (enabled: boolean, mode: AudioAinsMode) => { rtcEngine.setAINSMode(enabled, mode) From d51d1f98445658993e29bf4bcab7b93e28902393 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 2 Jan 2025 13:45:29 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/main.js b/main.js index bfcd67b..c942700 100644 --- a/main.js +++ b/main.js @@ -402,6 +402,9 @@ app.on('ready', () => { case 'show': mainWindow.show() mainWindow.focus(); + mainWindow.setSkipTaskbar(false) + mainWindow.setResizable(true) + mainWindow.setAlwaysOnTop(false) break; } }); @@ -485,6 +488,11 @@ app.on('ready', () => { }); // 设置桌面应用基础属性 ipcMain.handle('setMainWindowSize', (event, config) => { + if (config.width === 250) { + mainWindow.setSkipTaskbar(true) + mainWindow.setResizable(false) + mainWindow.setAlwaysOnTop(true, 'screen-saver') + } // 设置最小窗口尺寸 mainWindow.setMinimumSize(config.width, config.height); // 设置最大尺寸 @@ -572,9 +580,6 @@ app.on('ready', () => { childWindow[k] = "" } } - mainWindow.setSkipTaskbar(false) - mainWindow.setResizable(true) - mainWindow.setAlwaysOnTop(false) } else { childWindow[key].close() childWindow[key] = "" @@ -719,9 +724,6 @@ function windowOperation(config) { case 'shareScreenWindow': x = Math.round((display.workArea.width - child.getSize()[0]) / 2); child.setPosition(x, 0); - mainWindow.setSkipTaskbar(true) - mainWindow.setResizable(false) - mainWindow.setAlwaysOnTop(true, 'screen-saver') break; case 'chatSmallWindow': y = height - child.getSize()[1]; From 5c5780d15096447404660f77ba76872605ae9cdf Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 2 Jan 2025 15:46:56 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 4db2a3b..7c91287 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1029,8 +1029,8 @@ const Meeting: React.FC = () => { channelId: connection.channelId, sourceType: VideoSourceType.VideoSourceCameraPrimary, }) - getShowUser(); - }, 1500); + }, 1000); + getShowUser(); } } }, @@ -1045,7 +1045,7 @@ const Meeting: React.FC = () => { view: document.getElementById(`video-${remoteUid}`), channelId: connection.channelId, }) - }, 1500); + }, 1000); } } }, From d0ca3c9321f597c113e469a422bbb430e635d203 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 2 Jan 2025 16:29:02 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=A9=E7=95=A5?= =?UTF-8?q?=E5=9B=BE=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 7c91287..e8c251e 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -1753,7 +1753,7 @@ const Meeting: React.FC = () => { } // 获取桌面可共享屏幕的引用 const getDesktopCapturerVideo = (): void => { - agora.getDesktopCapturerVideo({ width: 300, height: 300 }, { width: 300, height: 300 }, true).then((res: any) => { + agora.getDesktopCapturerVideo({ width: 50, height: 50 }, { width: 30, height: 30 }, true).then((res: any) => { res.forEach((item: any, index: number) => { if (item.type === 1) { item.sourceTitle = '桌面' + (index + 1) From 1c6f551a3b4a326ea54eef28b26078e3eb230ab2 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Fri, 3 Jan 2025 09:12:51 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=85=B3=E9=97=AD=E6=97=B6=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E5=8D=A1=E4=BD=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/package/agora.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts index d4d544d..90b9860 100644 --- a/src/utils/package/agora.ts +++ b/src/utils/package/agora.ts @@ -366,7 +366,6 @@ export const agora = { }, // 退出第二个房间 allLeaveChannelEx: async () => { - await agora.stopCameraCapture(); await rtcEngine.leaveChannelEx({ channelId: option.channelId + 'a', localUid: Number('1' + option.screenShareId) }) }, // 停止/恢复接收指定的视频流。 From 92cfef8f91aaca3d71c56697d805ce95170017ed Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Fri, 3 Jan 2025 09:16:11 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=88=BF=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Meeting/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index e8c251e..7f2103e 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -2755,7 +2755,8 @@ const Meeting: React.FC = () => {
会议监控 - { + { + await agora.allLeaveChannelEx() setStatusList({ userList: false, userChatList: false,