marking
/
WGShare.Client.Electron
18
0
Fork 0
Code Pull Requests 1 Actions Releases 4 Activity

优化

This commit is contained in:
yj 2024-08-19 10:38:48 +08:00
parent d470ebd528
commit b2996bae68
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/page/Meeting/index.module.scss
View File

@ -257,11 +257,6 @@
padding: 10px; padding: 10px;
box-sizing: border-box; box-sizing: border-box;
.active {
// border: 1px solid rgb(106, 106, 106);
box-sizing: border-box;
}
.boxShadow { .boxShadow {
box-shadow: 0px 0px 13px 0px #7B96FF; box-shadow: 0px 0px 13px 0px #7B96FF;
border: 2px solid #7B96FF; border: 2px solid #7B96FF;

38
src/page/Meeting/index.tsx
View File

@ -121,6 +121,7 @@ const Meeting: React.FC = () => {
const [isSharePopConfirm, setIsSharePopConfirm] = useState<any>(false) const [isSharePopConfirm, setIsSharePopConfirm] = useState<any>(false)
const [isShareUser, setIsShareUser] = useState<any>(null) const [isShareUser, setIsShareUser] = useState<any>(null)
const [currentLookUserStatus, setCurrentLookUserStatus] = useState<0 | 1 | 2 | 3 | 4>(1) const [currentLookUserStatus, setCurrentLookUserStatus] = useState<0 | 1 | 2 | 3 | 4>(1)
const [clickCurrentLookUserStatus, setClickCurrentLookUserStatus] = useState<boolean>(true)
let userInfo = JSON.parse(storage.getItem('user') as string) let userInfo = JSON.parse(storage.getItem('user') as string)
const msgTips = '您不是管理员或发言人，无法开启此功能！' const msgTips = '您不是管理员或发言人，无法开启此功能！'
useEffect(() => { useEffect(() => {
@ -458,10 +459,10 @@ const Meeting: React.FC = () => {
} }
// 渲染视频 // 渲染视频
const renderVideo = async (uid: string): Promise<void> => { const renderVideo = async (uid: string): Promise<void> => {
if (currentVideoId === uid) { if (currentVideoId === uid || clickCurrentLookUserStatus === false) {
message.error('您已经在看这个视频了。')
return return
} }
setClickCurrentLookUserStatus(false)
setCurrentLookUserStatus(0) setCurrentLookUserStatus(0)
setRoomUserList((res: any) => { setRoomUserList((res: any) => {
let item = res.find((item: any) => item.uid === uid || item.screenShareId === uid) let item = res.find((item: any) => item.uid === uid || item.screenShareId === uid)
@ -475,46 +476,50 @@ const Meeting: React.FC = () => {
if (String(uid).length === 9) { if (String(uid).length === 9) {
// 共享屏幕 // 共享屏幕
setCurrentLookUserStatus(2) setCurrentLookUserStatus(2)
setTimeout(() => { setTimeout(async () => {
agora.setupLocalVideo({ await agora.setupLocalVideo({
uid: Number(uid), uid: Number(uid),
view: document.getElementById(`video-source-screen`) as HTMLElement, view: document.getElementById(`video-source-screen`) as HTMLElement,
channelId: state.channelId, channelId: state.channelId,
sourceType: VideoSourceType.VideoSourceScreen, sourceType: VideoSourceType.VideoSourceScreen,
}) })
setClickCurrentLookUserStatus(true)
}, 1000); }, 1000);
} else { } else {
// 摄像头 // 摄像头
setCurrentLookUserStatus(1) setCurrentLookUserStatus(1)
setTimeout(() => { setTimeout(async () => {
agora.setupLocalVideo({ await agora.setupLocalVideo({
uid: Number(uid), uid: Number(uid),
view: document.getElementById(`video-source-camera-primary`) as HTMLElement, view: document.getElementById(`video-source-camera-primary`) as HTMLElement,
channelId: state.channelId, channelId: state.channelId,
sourceType: VideoSourceType.VideoSourceCameraPrimary, sourceType: VideoSourceType.VideoSourceCameraPrimary,
}) })
setClickCurrentLookUserStatus(true)
}, 1000); }, 1000);
} }
} else { } else {
if (String(uid).length === 9) { if (String(uid).length === 9) {
// 摄像头 // 摄像头
setCurrentLookUserStatus(3) setCurrentLookUserStatus(3)
setTimeout(() => { setTimeout(async () => {
agora.setupRemoteVideoJoin({ await agora.setupRemoteVideoJoin({
uid: Number(uid), uid: Number(uid),
view: document.getElementById(`video-source-remote-camera`) as HTMLElement, view: document.getElementById(`video-source-remote-camera`) as HTMLElement,
channelId: state.channelId, channelId: state.channelId,
}) })
setClickCurrentLookUserStatus(true)
}, 1000); }, 1000);
} else { } else {
// 共享屏幕 // 共享屏幕
setCurrentLookUserStatus(4) setCurrentLookUserStatus(4)
setTimeout(() => { setTimeout(async () => {
agora.setupRemoteVideoJoin({ await agora.setupRemoteVideoJoin({
uid: Number(uid), uid: Number(uid),
view: document.getElementById(`video-source-remote-screen`) as HTMLElement, view: document.getElementById(`video-source-remote-screen`) as HTMLElement,
channelId: state.channelId, channelId: state.channelId,
}) })
setClickCurrentLookUserStatus(true)
}, 1000); }, 1000);
} }
} }
@ -969,7 +974,7 @@ const Meeting: React.FC = () => {
} }
}} }}
> >
<div className={`${styles.meetingContentSwiperCardVdeio} ${currentVideoId === item.uid ? styles.active : ''} ${item.roleId === '1' || item.isRoomManager ? styles.boxShadow : ''}`} id={`video-${item.uid}`}> <div className={`${styles.meetingContentSwiperCardVdeio} ${item.roleId === '1' || item.isRoomManager ? styles.boxShadow : ''}`} id={`video-${item.uid}`}>
<div className={styles.meetingContentSwiperCardVdeioLoading}> <div className={styles.meetingContentSwiperCardVdeioLoading}>
<Avatar name={item.userName} /> <Avatar name={item.userName} />
</div> </div>
@ -1070,7 +1075,7 @@ const Meeting: React.FC = () => {
</div>} </div>}
</div> </div>
{meetingContentUser(currentLookUserAccount, true)} {meetingContentUser(currentLookUserAccount, true)}
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount, true)}
</div> : null} </div> : null}
{currentLookUserStatus === 2 && currentLookUserAccount ? {currentLookUserStatus === 2 && currentLookUserAccount ?
<div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}> <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
@ -1089,7 +1094,7 @@ const Meeting: React.FC = () => {
</div> </div>
</div> </div>
{meetingContentUser(currentLookUserAccount, true)} {meetingContentUser(currentLookUserAccount, true)}
{currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount)} {currentLookUserAccount.enableCamera ? null : meetingContentError(currentVideoId, currentLookUserAccount, true)}
</div> : null} </div> : null}
{currentLookUserStatus === 4 && currentLookUserAccount ? {currentLookUserStatus === 4 && currentLookUserAccount ?
<div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}> <div className={`${styles.meetingContentSwiperCard} ${setMeetingContentSwiperCardClass()}`}>
@ -1399,10 +1404,13 @@ const meetingContentUser = (item: any, bool?: boolean) => {
</> </>
) )
} }
const meetingContentError = (currentVideoId: any, item: any) => { const meetingContentError = (currentVideoId: any, item: any, bool?: boolean) => {
return ( return (
<> <>
<div className={`${styles.meetingContentError} ${currentVideoId === item.uid ? styles.active : ''}`}> <div
className={`${styles.meetingContentError} ${currentVideoId === item.uid ? styles.active : ''}`}
style={{ left: !bool ? 'calc(50% + 2px)' : '', top: !bool ? 'calc(50% + 2px)' : '' }}
>
<Avatar name={item.userName} /> <Avatar name={item.userName} />
</div> </div>
</> </>