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

修改共享屏幕token

This commit is contained in:
yj 2025-01-17 15:08:27 +08:00
parent 36e1bda441
commit c6887b2747
3 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "WGShare.Metting", "name": "WGShare.Metting",
"private": true, "private": true,
"version": "0.6.3", "version": "0.6.5",
"main": "main.js", "main": "main.js",
"authors": "yj", "authors": "yj",
"description": "智汇享", "description": "智汇享",

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

@ -1182,6 +1182,7 @@ const Meeting: React.FC = () => {
} }
}, },
onTokenPrivilegeWillExpire: async (connection: RtcConnection, _token: string) => { onTokenPrivilegeWillExpire: async (connection: RtcConnection, _token: string) => {
console.log(connection);
await GetRoomRtcToken(connection.channelId || '').then(res => { await GetRoomRtcToken(connection.channelId || '').then(res => {
if (res.code === 200) { if (res.code === 200) {
agora.refreshToken({ agora.refreshToken({
@ -1766,10 +1767,12 @@ const Meeting: React.FC = () => {
agora.setSubscribeVideoBlocklist([Number(user.screenShareId)], 1) agora.setSubscribeVideoBlocklist([Number(user.screenShareId)], 1)
} }
if (data) { if (data) {
GetRoomRtcToken(state.channelId).then(async res => {
if (res.code === 200) {
const footerListTemplate = [...footerList] const footerListTemplate = [...footerList]
footerListTemplate[footerListIndex.itemIndex][footerListIndex.rowIndex].title = '停止共享' footerListTemplate[footerListIndex.itemIndex][footerListIndex.rowIndex].title = '停止共享'
setIsSharedScreenModal(false) setIsSharedScreenModal(false)
await agora.setDesktopCapturerVideo(sharedScreenItem, isComputerAudio, isFluencyPriority) await agora.setDesktopCapturerVideo(sharedScreenItem, isComputerAudio, isFluencyPriority, res.data)
await allUserLook(user.screenShareId, user.userName) await allUserLook(user.screenShareId, user.userName)
const isOpen = await getKeyOpenChildWindow('shareScreenWindow') const isOpen = await getKeyOpenChildWindow('shareScreenWindow')
setIsScreenCapture(true) setIsScreenCapture(true)
@ -1791,6 +1794,8 @@ const Meeting: React.FC = () => {
}) })
}, 1500); }, 1500);
} }
}
})
} else { } else {
message.error('请选择应用!') message.error('请选择应用!')
} }

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

@ -329,10 +329,10 @@ export const agora = {
) )
}, },
// 共享屏幕单独用户 // 共享屏幕单独用户
joinChannelEx: async (uid: any) => { joinChannelEx: async (uid: any, token: string) => {
await agora.leaveChannelEx(uid) await agora.leaveChannelEx(uid)
await rtcEngine.joinChannelEx( await rtcEngine.joinChannelEx(
option.token, token,
{ channelId: option.channelId, localUid: Number(uid) }, { channelId: option.channelId, localUid: Number(uid) },
{ {
autoSubscribeAudio: false,//设置是否自动订阅所有音频流 autoSubscribeAudio: false,//设置是否自动订阅所有音频流
@ -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) => { 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) {
@ -501,7 +501,7 @@ export const agora = {
} }
); );
} }
await agora.joinChannelEx(user.screenShareId) await agora.joinChannelEx(user.screenShareId, token)
}, },
// 获取系统中所有的视频设备列表。 // 获取系统中所有的视频设备列表。
getVideoDeviceManager: async (): Promise<any> => { getVideoDeviceManager: async (): Promise<any> => {