diff --git a/src/page/Meeting/ShareScreenWindow/index.tsx b/src/page/Meeting/ShareScreenWindow/index.tsx index 25984a4..ac6780f 100644 --- a/src/page/Meeting/ShareScreenWindow/index.tsx +++ b/src/page/Meeting/ShareScreenWindow/index.tsx @@ -153,11 +153,11 @@ const ShareScreenWindow: React.FC = () => { <>
- {changeCurrentSeconds(timeStr)} 共享中 + {changeCurrentSeconds(timeStr)} {networkIcon(currentEffective)} - 网络质量:{networkQuality.level} - 延迟:{networkOther.lastmileDelay}ms + {/* 网络质量:{networkQuality.level} */} + 延迟:{networkOther.lastmileDelay}ms {isExpand ? { @@ -223,7 +223,7 @@ const ShareScreenWindow: React.FC = () => {
{ setIsExpand(!isExpand) window.electron.setChildWindow({ - width: isExpand ? 440 : 440 / 2, + width: isExpand ? 440 : 440 / 1.6, key: 'shareScreenWindow', }) }}> diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index d6d287e..05eb526 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -8,7 +8,7 @@ import { SearchOutlined, EllipsisOutlined, ExclamationCircleFilled, FullscreenEx import { useLocation, useNavigate } from 'react-router-dom'; import { thumbImageBufferToBase64 } from '@/utils/package/base64' import { storage } from '@/utils'; -import { GetRoomUser, PostOpenMicr, PostOpenCamera, GetLeaveAll, PostRoomManager, DeleteRoomManager, GetRoomKickout, GetShowUser, PostShowUser, PostMuteAll, GetRoomUserItem, GetApplySpeak, PostSharedScreen } from '@/api/Meeting'; +import { GetRoomUser, PostOpenMicr, GetSharedScreen, PostOpenCamera, GetLeaveAll, PostRoomManager, DeleteRoomManager, GetRoomKickout, GetShowUser, PostShowUser, PostMuteAll, GetRoomUserItem, GetApplySpeak, PostSharedScreen } from '@/api/Meeting'; import ImageUrl from '@/utils/package/imageUrl' import { agora } from '@/utils/package/agora' import dayjs from 'dayjs'; @@ -1688,8 +1688,15 @@ const Meeting: React.FC = () => { case '共享屏幕': await getUserRoomInfo().then(async (res) => { if (res) { - getDesktopCapturerVideo() - setIsSharedScreenModal(true) + GetSharedScreen(state.channelId).then(req => { + if (req.code === 200) { + if (res.data) { + setIsShare(res.data) + } + getDesktopCapturerVideo() + setIsSharedScreenModal(true) + } + }) } else { message.error(msgTips) } @@ -2591,7 +2598,7 @@ const Meeting: React.FC = () => { {isAdmin && currentLookUserAccount ? getSettingIcon() : null}
{roomUserList.map((item: any, index: number) => { - return (index <= 19 && item.isRoom && item.isAdmin ?
{
: null) } )} - {roomUserList.length > 6 ?
+ {isAdmin > 6 ?
{meetingMode === "StandardMode" ?
{ const container = document.getElementById('videoView') as HTMLElement; container.scrollLeft -= 100