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

yangjie #51

Open
yangqiang wants to merge 34 commits from yangjie into master
pull from: yangjie
merge into: marking:master
Conversation 0 Commits 34 Files Changed 31 +12 -3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c2ce66ed0d - Show all commits

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

@ -224,6 +224,7 @@ const Meeting: React.FC = () => {
const channel = new BroadcastChannel('meeting_channel'); const channel = new BroadcastChannel('meeting_channel');
let storeDevice: any; let storeDevice: any;
let agoraTime: NodeJS.Timeout; let agoraTime: NodeJS.Timeout;
let FreedomModeStatus = false
useEffect(() => { useEffect(() => {
window.electron.createChildWindow('hide') window.electron.createChildWindow('hide')
let time: NodeJS.Timeout; let time: NodeJS.Timeout;
@ -642,6 +643,17 @@ const Meeting: React.FC = () => {
} }
}, [isShare, roomUserList]); }, [isShare, roomUserList]);
useEffect(() => {
if (meetingMode === 'FreedomMode') {
FreedomModeStatus = true;
} else {
if (FreedomModeStatus) {
FreedomModeStatus = false;
getShowUser()
}
}
}, [meetingMode]);
useEffect(() => { useEffect(() => {
roomUserList.forEach(async (item: any) => { roomUserList.forEach(async (item: any) => {
if (meetingMode === "FreedomMode") { if (meetingMode === "FreedomMode") {
@ -2251,9 +2263,6 @@ const Meeting: React.FC = () => {
const handleCustomStorageChange = async (e: any): Promise<void> => { const handleCustomStorageChange = async (e: any): Promise<void> => {
switch (e.key) { switch (e.key) {
case 'meetingMode': case 'meetingMode':
if (e.value !== 'FreedomMode') {
await getShowUser()
}
setMeetingMode(e.value) setMeetingMode(e.value)
break; break;
case 'quitMeeting': case 'quitMeeting':