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

yangjie #49

Merged
yangqiang merged 71 commits from yangjie into master 2025-03-10 14:21:26 +08:00
Conversation 0 Commits 71 Files Changed 50 +8 -9
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7093367904 - Show all commits

13
src/App.tsx
View File

@ -15,7 +15,6 @@ import * as CryptoJS from 'crypto-js';
import { GetCheckOnline, PostLogin } from "@/api/Login"; import { GetCheckOnline, PostLogin } from "@/api/Login";
import { agora } from "@/utils/package/agora"; import { agora } from "@/utils/package/agora";
import QuitTips from "@/components/QuitTips"; import QuitTips from "@/components/QuitTips";
import { GetLeave } from "@/api/Meeting";
import ShareScreenWindow from "@/page/Meeting/ShareScreenWindow"; import ShareScreenWindow from "@/page/Meeting/ShareScreenWindow";
import UserListWindow from "@/page/Meeting/UserListWindow"; import UserListWindow from "@/page/Meeting/UserListWindow";
import ChatSmallWindow from "@/page/Meeting/ChatSmallWindow"; import ChatSmallWindow from "@/page/Meeting/ChatSmallWindow";
@ -229,8 +228,10 @@ const App: React.FC = () => {
if (item.msg) { if (item.msg) {
message.error(item.msg) message.error(item.msg)
} }
await leaveChannel(true) await leaveChannel()
setTimeout(() => {
toSrc('/login') toSrc('/login')
}, 5000);
break; break;
} }
}) })
@ -252,7 +253,7 @@ const App: React.FC = () => {
} }
}) })
}; };
const leaveChannel = async (bool?: boolean): Promise<void> => { const leaveChannel = async (): Promise<void> => {
if (location.hash.indexOf('/meeting') === 1) { if (location.hash.indexOf('/meeting') === 1) {
window.electron.closeChildWindow('shareScreenWindow') window.electron.closeChildWindow('shareScreenWindow')
setKeyOpenChildWindow('shareScreenWindow', false) setKeyOpenChildWindow('shareScreenWindow', false)
@ -269,11 +270,9 @@ const App: React.FC = () => {
}) })
}) })
const data = JSON.parse(localStorage.stateInfo); const data = JSON.parse(localStorage.stateInfo);
if (!bool) { await window.electron.onInvoke('levelChannel', {
await GetLeave({ roomNum: data.channelId
roomNum: data.channelId,
}) })
}
await agora.leaveChannel() await agora.leaveChannel()
} }
}; };