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

共享小窗显示优化&会议箭头大于6人显示&共享偶现无提示优化

This commit is contained in:
yj 2025-02-11 10:35:04 +08:00
parent 0c052a6cd0
commit f70074aa6d
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/page/Meeting/ShareScreenWindow/index.tsx
View File

@ -153,11 +153,11 @@ const ShareScreenWindow: React.FC = () => {
<>
<div className={styles.shareScreenWindow} style={{ width: isExpand ? '100%' : '100%' }}>
<div className={styles.shareScreenWindowTitle}>
<span>{changeCurrentSeconds(timeStr)} 共享中
<span>{changeCurrentSeconds(timeStr)}
{networkIcon(currentEffective)}
<span style={{ color: 'white', marginLeft: '30px' }}>
<span style={{ marginRight: '10px' }}>网络质量：{networkQuality.level}</span>
<span>延迟：{networkOther.lastmileDelay}ms</span>
{/* <span >网络质量：{networkQuality.level}</span> */}
<span style={{ marginRight: '6px' }}>延迟:{networkOther.lastmileDelay}ms</span>
</span>
</span>
{isExpand ? <span className='drag' style={{ flexShrink: 0 }} onClick={() => {
@ -223,7 +223,7 @@ const ShareScreenWindow: React.FC = () => {
<div className={`${styles.shareScreenWindowExpand} drag`} onClick={() => {
setIsExpand(!isExpand)
window.electron.setChildWindow({
width: isExpand ? 440 : 440 / 2,
width: isExpand ? 440 : 440 / 1.6,
key: 'shareScreenWindow',
})
}}>

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

@ -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) {
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}
<div className={getMeetingContentBodyLeftModeClass()} id='videoView' style={meetingMode === 'SpeakerMode' && isVideoFullScreen ? { width: '0' } : {}}>
{roomUserList.map((item: any, index: number) => {
return (index <= 19 && item.isRoom && item.isAdmin ? <div
return (item.isRoom && item.isAdmin ? <div
id={item.uid}
className={`${styles.meetingContentSwiperCard} intersectionObserver-view`}
key={index}
@ -2714,7 +2721,7 @@ const Meeting: React.FC = () => {
</div> : null)
}
)}
{roomUserList.length > 6 ? <div>
{isAdmin > 6 ? <div>
{meetingMode === "StandardMode" ? <div className={`${styles.meetingContentSwiperCaret}`} style={{ left: '20px', top: '66px' }} onClick={() => {
const container = document.getElementById('videoView') as HTMLElement;
container.scrollLeft -= 100