diff --git a/preload.js b/preload.js index 8b40b5d..5fa46a0 100644 --- a/preload.js +++ b/preload.js @@ -1,7 +1,5 @@ // // 在 preload 脚本中。 -const { default: createAgoraRtcEngine } = require('agora-electron-sdk') const { ipcRenderer } = require('electron') -let rtcEngine; window.electron = { // 设置窗口大小 setMainWindowSize: (config) => { @@ -70,16 +68,5 @@ window.electron = { // 关闭会议监控窗口 closeMonitorWindow: () => { ipcRenderer.invoke('closeMonitorWindow') - }, - // 获取rtcEngine - getRtcEngine: () => { - return rtcEngine - }, - // 设置rtcEngine - setRtcEngine: () => { - rtcEngine = createAgoraRtcEngine(); - rtcEngine.initialize({ - appId: 'dcfc466a6ecb4a1f972630065dfb1e75', - }); - }, + } } diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 76b98b9..ae4bf99 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -543,7 +543,7 @@ const Meeting: React.FC = () => { uid: userInfo.uid, screenShareId: userInfo.screenShareId, token: state.token, - tokenA: state.tokenA, + // tokenA: state.tokenA, }) } // 状态更新 diff --git a/src/render.d.ts b/src/render.d.ts index 928afe2..e0a5232 100644 --- a/src/render.d.ts +++ b/src/render.d.ts @@ -16,8 +16,6 @@ export interface IElectronAPI { quitAndInstall: (callBack: Function) => void; getVersion: () => Promise; oepnWindow: (data: any) => any; - getRtcEngine: () => any; - setRtcEngine: () => any; closeMonitorWindow: () => void } diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts index a613d13..0fe2c60 100644 --- a/src/utils/package/agora.ts +++ b/src/utils/package/agora.ts @@ -1,4 +1,5 @@ import { + createAgoraRtcEngine, ClientRoleType, VideoSourceType, VideoViewSetupMode, @@ -9,6 +10,7 @@ import { import { GetRoomRtcToken } from "@/api/Home/Index"; import { storage } from '@/utils'; const option: any = { + appId: 'dcfc466a6ecb4a1f972630065dfb1e75', token: '', tokenA: '', channelId: '', @@ -19,8 +21,10 @@ let rtcEngine: any = ''; export const agora = { // 初始化 init: async (bool: boolean = false) => { - await window.electron.setRtcEngine() - rtcEngine = window.electron.getRtcEngine() + rtcEngine = createAgoraRtcEngine(); + await rtcEngine.initialize({ + appId: option.appId, + }); await agora.setDeviceManager(bool) }, // 获取rtcEngine