diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 041d853..7d29f14 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -161,10 +161,10 @@ const Meeting: React.FC = () => { agora.setCameraCapture() agora.setJoinChannel({ channelId: state.channelId, - userid: userInfo.account, + uid: userInfo.uid, token: state.token, }) - setCurrentVideoId(userInfo.account) + setCurrentVideoId(userInfo.uid) storage.setItem('noViewChatList', 0) window.addEventListener('customStorageChange', handleCustomStorageChange); window.addEventListener('online', handleNetworkChange); @@ -183,7 +183,7 @@ const Meeting: React.FC = () => { useEffect(() => { roomUserList.forEach((item: any) => { - if (item.account === user.account) { + if (item.uid === user.uid) { const footerListTemplate = [...footerList] footerListTemplate[0][0].title = item.enableMicr ? '关闭声音' : '开启声音' footerListTemplate[0][0].active = !item.enableMicr @@ -253,18 +253,18 @@ const Meeting: React.FC = () => { }, [currentVideoId]) useEffect(() => { - const userItem = allUserList.find((item: any) => item.account === currentLookUserAccount) + const userItem = allUserList.find((item: any) => item.uid === currentLookUserAccount) if (userItem) { - if (userItem.account === user.account) { + if (userItem.uid === user.uid) { // agora.setupLocalVideo({ - // account: Number(userItem.account), + // account: Number(userItem.uid), // view: document.getElementById(`look-video`) as HTMLElement, // channelId: state.channelId, // sourceType: VideoSourceType.VideoSourceCameraPrimary, // }) } else { // agora.setupRemoteVideoJoin({ - // account: Number(userItem.account), + // account: Number(userItem.uid), // view: document.getElementById(`look-video`) as HTMLElement, // channelId: state.channelId, // sourceType: VideoSourceType.VideoSourceCameraPrimary, @@ -371,7 +371,7 @@ const Meeting: React.FC = () => { break; case '录制': const setting = await JSON.parse(storage.getItem('setting') as string) - if (currentVideoId === user.account) { + if (currentVideoId === user.uid) { message.error('请勿自己录制自己!') } else { try { @@ -454,12 +454,14 @@ const Meeting: React.FC = () => { if (res[0].code === 200 && res[1].code === 200) { setRoomUserList(res[0].data.map((item: any) => { return { + ...item, isShow: true, - ...item + uid: item.id, } })) res[1].data.items.forEach((item: any) => { - const itemUser = res[0].data.find((row: any) => row.account === item.account) + item.uid = item.id; + const itemUser = res[0].data.find((row: any) => row.id === item.id) if (itemUser) { item.isRoom = true; for (const itemUserKey in itemUser) { @@ -570,8 +572,8 @@ const Meeting: React.FC = () => { return '' } // 设置单个视频样式 - const setMeetingContentSwiperCardClass = (account: string, bool: boolean = false): string => { - if ((bool || currentVideoId === account) && (meetingMode === 'StandardMode' || meetingMode === 'SpeakerMode')) { + const setMeetingContentSwiperCardClass = (uid: string, bool: boolean = false): string => { + if ((bool || currentVideoId === uid) && (meetingMode === 'StandardMode' || meetingMode === 'SpeakerMode')) { switch (meetingMode) { case 'StandardMode': return styles.meetingContentSwiperCardStandardMode @@ -601,7 +603,7 @@ const Meeting: React.FC = () => {