yangjie #22

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

View File

@ -12,20 +12,26 @@ import { role } from '@/config/role';
let time = null as any; let time = null as any;
const JoinSetting = forwardRef((_props: any, ref: any) => { const JoinSetting = forwardRef((_props: any, ref: any) => {
useImperativeHandle(ref, () => ({ useImperativeHandle(ref, () => ({
changeModal: (roomNum: string = '') => { changeModal: async (roomNum: string = '') => {
let userInfo = JSON.parse(storage.getItem('user') as string) let userInfo = JSON.parse(storage.getItem('user') as string)
setUser(userInfo) setUser(userInfo)
setJoinRoomSettingModal(true) setJoinRoomSettingModal(true)
if (location.hash.indexOf('/meeting') === -1) {
await agora.init()
}
setJoinRoomSettingForm((res: any) => { setJoinRoomSettingForm((res: any) => {
res.forEach((item: any) => { res.forEach((item: any, index: number) => {
if (index === 0) {
agora.getAudioMediaList().then(res => {
item.active = res.ecordingList.length ? true : false
})
} else {
item.active = false item.active = false
}
}); });
return res return res
}) })
setRoomNumber(roomNum) setRoomNumber(roomNum)
if (location.hash.indexOf('/meeting') === -1) {
agora.init()
}
getDeviceList() getDeviceList()
} }
})) }))

View File

@ -595,7 +595,7 @@ const Meeting: React.FC = () => {
message.success(`操作成功`) message.success(`操作成功`)
await agora.updateChannelMediaOptions(item.user.isRoomManager) await agora.updateChannelMediaOptions(item.user.isRoomManager)
await postOpenMicrApi(item.user.isRoomManager, userInfo.uid, false) await postOpenMicrApi(item.user.isRoomManager, userInfo.uid, false)
await postOpenCameraApi(item.user.isRoomManager, userInfo.uid) await postOpenCameraApi(false, userInfo.uid) // 不管身份如何改变都关闭摄像头
await stopScreenCapture() await stopScreenCapture()
} else { } else {
message.success(`${item.user.userName}已结束发言`) message.success(`${item.user.userName}已结束发言`)