yangjie #22

Merged
yangqiang merged 99 commits from yangjie into master 2024-10-22 16:11:46 +08:00
2 changed files with 8 additions and 15 deletions
Showing only changes of commit 9aaf69b7d7 - Show all commits

View File

@ -93,15 +93,8 @@ const ShareScreenWindow: React.FC = () => {
}
})
return () => {
setTimeStr(res => {
channel.postMessage({
type: 'shareScreenWindowTime',
shareScreenWindowTime: res
});
clearInterval(timeout)
channel.close();
return res
})
};
}, []);
const changeCurrentSeconds = (time: number): string => {
@ -144,7 +137,8 @@ const ShareScreenWindow: React.FC = () => {
<span>{changeCurrentSeconds(timeStr)} </span>
{isExpand ? <span className='drag' onClick={() => {
channel.postMessage({
type: 'shareScreenWindowClose'
type: 'shareScreenWindowClose',
shareScreenWindowClose: timeStr
});
}}></span> : <span style={{ visibility: 'hidden' }}></span>}
</div>
@ -208,7 +202,8 @@ const ShareScreenWindow: React.FC = () => {
</div>
<Button type="primary" style={{ backgroundColor: '#FF5219', marginRight: '14px' }} size={'small'} onClick={() => {
channel.postMessage({
type: 'shareScreenWindowClose'
type: 'shareScreenWindowClose',
shareScreenWindowClose: timeStr
});
}}>

View File

@ -208,7 +208,7 @@ const Meeting: React.FC = () => {
const {
type,
shareScreenWindowfooterListsTitle,
shareScreenWindowTime,
shareScreenWindowClose,
userListWindowPostOpenMicr,
userListWindowPostOpenCamera,
userListWindowDeleteRoomManager,
@ -237,12 +237,10 @@ const Meeting: React.FC = () => {
}))
break;
case 'shareScreenWindowClose':
setCurrentSeconds(shareScreenWindowClose)
await stopScreenCapture()
await allUserLook(userInfo.uid, userInfo.userName)
break;
case 'shareScreenWindowTime':
setCurrentSeconds(shareScreenWindowTime)
break;
case 'shareScreenWindowfooterListsTitle':
switch (shareScreenWindowfooterListsTitle) {
case '静音':