This commit is contained in:
parent
583794ff13
commit
98602ad6be
|
|
@ -26,6 +26,7 @@ const SharedFilesModel = forwardRef((props: any, ref: any) => {
|
|||
setRoomUserItem(res.data)
|
||||
}
|
||||
})
|
||||
getRoomFile()
|
||||
}
|
||||
}))
|
||||
const { state } = useLocation();
|
||||
|
|
|
|||
|
|
@ -75,10 +75,13 @@ const UserVideo: React.FC = () => {
|
|||
// 获取轮训用户
|
||||
const getPolling = async (): Promise<void> => {
|
||||
setUserList([])
|
||||
GetPolling(state.channelId?.split('a')[0] as string, from.viewPeopleValue).then((res: any) => {
|
||||
if (res.code === 200) {
|
||||
setUserList(res.data)
|
||||
}
|
||||
setFrom((res: any) => {
|
||||
GetPolling(state.channelId?.split('a')[0] as string, res.viewPeopleValue).then((res: any) => {
|
||||
if (res.code === 200) {
|
||||
setUserList(res.data)
|
||||
}
|
||||
})
|
||||
return res
|
||||
})
|
||||
};
|
||||
return (
|
||||
|
|
@ -134,7 +137,7 @@ const UserVideo: React.FC = () => {
|
|||
userList.map((item: any, index: number) => {
|
||||
return <div className={styles.userVideoContentListItem} key={index}>
|
||||
<div className={styles.userVideoContentListItemVideo} id={`video-${item.screenShareId}`}>
|
||||
<div>{item.userName}{item.isRoomManager ? '(发言中)' : '' }</div>
|
||||
<div>{item.userName}{item.isRoomManager ? '(发言中)' : ''}</div>
|
||||
</div>
|
||||
</div>
|
||||
})
|
||||
|
|
|
|||
|
|
@ -209,6 +209,18 @@
|
|||
}
|
||||
}
|
||||
|
||||
.scrollButton {
|
||||
position: absolute;
|
||||
top: 80px;
|
||||
right: 20px;
|
||||
padding: 4px 10px;
|
||||
transform: translate(0, -50%);
|
||||
cursor: pointer;
|
||||
z-index: 3;
|
||||
color: white;
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
// 自由者模式
|
||||
.meetingContentBodyLeftFreedomMode {
|
||||
width: 100%;
|
||||
|
|
@ -282,7 +294,7 @@
|
|||
position: absolute !important;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
height: calc(100% - 160px) !important;
|
||||
height: calc(100% - 170px) !important;
|
||||
width: 100% !important;
|
||||
z-index: 2;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1294,6 +1294,15 @@ const Meeting: React.FC = () => {
|
|||
}
|
||||
}
|
||||
}
|
||||
// 滚动按钮
|
||||
const getScrollButton = (): any => {
|
||||
return <div className={`${styles.scrollButton} drag`} title='滚动' onClick={() => {
|
||||
const element = document.getElementById('videoView') as HTMLElement;
|
||||
element.scrollLeft += 100; // 每次点击向右滚动100像素
|
||||
}}>
|
||||
滚动
|
||||
</div>
|
||||
}
|
||||
// 加入房间
|
||||
const getJoin = async (enableMicr: boolean, enableCamera: boolean): Promise<void> => {
|
||||
await GetJoin({
|
||||
|
|
@ -1389,6 +1398,7 @@ const Meeting: React.FC = () => {
|
|||
<div className={styles.meetingContentBody}>
|
||||
<div className={`${styles.meetingContentBodyLeft} drag`}>
|
||||
{isAdmin && currentLookUserAccount ? getSettingIcon() : null}
|
||||
{roomUserList.length > 6 ? getScrollButton() : null}
|
||||
<div className={getMeetingContentBodyLeftModeClass()} id='videoView'>
|
||||
{roomUserList.map((item: any, index: number) => {
|
||||
return (index <= 19 && item.isRoom && item.isAdmin ? <div
|
||||
|
|
|
|||
Loading…
Reference in New Issue