yangjie #49

Merged
yangqiang merged 71 commits from yangjie into master 2025-03-10 14:21:26 +08:00
2 changed files with 19 additions and 14 deletions
Showing only changes of commit 1a98b6e7d4 - Show all commits

View File

@ -34,6 +34,9 @@ const StupWizard = forwardRef((_props: any, ref: any) => {
}
}
storage.setItem('setting', JSON.stringify(setting))
},
getStupWizardModal: () => {
return isStupWizard
}
}))
const [list, setList] = useState([

View File

@ -1409,25 +1409,27 @@ const Meeting: React.FC = () => {
})
} else if (reason === 3 || reason === 4) {
message.error({
content: <div><span style={{ color: '#606fc7', cursor: 'pointer' }} onClick={() => {
content: <div><span style={{ color: '#606fc7', cursor: 'pointer' }} onClick={() => {
stupWizardRef.current.changeModal(1);
}}></span></div>,
duration: 60,
duration: 15,
key: 'cameraTemporarily'
});
} else if (_state === 3) {
await PostOpenCamera({
roomNum: state.channelId,
uid: userInfo.uid,
enableCamera: false
})
message.error({
content: <div><span style={{ color: '#606fc7', cursor: 'pointer' }} onClick={() => {
stupWizardRef.current.changeModal(1);
}}></span></div>,
duration: 60,
key: 'cameraTemporarily'
});
if (!stupWizardRef.current.getStupWizardModal()) {
await PostOpenCamera({
roomNum: state.channelId,
uid: userInfo.uid,
enableCamera: false
})
message.error({
content: <div><span style={{ color: '#606fc7', cursor: 'pointer' }} onClick={() => {
stupWizardRef.current.changeModal(1);
}}></span></div>,
duration: 15,
key: 'cameraTemporarily'
});
}
}
},
onTokenPrivilegeWillExpire: async (connection: RtcConnection, _token: string) => {