yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
1 changed files with 18 additions and 13 deletions
Showing only changes of commit b96e5853a1 - Show all commits

View File

@ -341,6 +341,8 @@ const Meeting: React.FC = () => {
const setting = await JSON.parse(storage.getItem('setting') as string); const setting = await JSON.parse(storage.getItem('setting') as string);
const stateInfo = await JSON.parse(storage.getItem('stateInfo') as string); const stateInfo = await JSON.parse(storage.getItem('stateInfo') as string);
if (stateInfo && setting.isRecordingTips && !recorder) { if (stateInfo && setting.isRecordingTips && !recorder) {
setRecorder((data: any) => {
if (!data) {
confirm({ confirm({
title: '提示', title: '提示',
icon: <ExclamationCircleFilled />, icon: <ExclamationCircleFilled />,
@ -357,6 +359,9 @@ const Meeting: React.FC = () => {
} }
}) })
} }
return data
})
}
}, 10000); }, 10000);
getDesktopCapturerVideoTime = setInterval(() => { getDesktopCapturerVideoTime = setInterval(() => {
setSharedScreenItem((i: any) => { setSharedScreenItem((i: any) => {