yangjie #47

Merged
yangqiang merged 49 commits from yangjie into master 2025-01-24 13:43:09 +08:00
1 changed files with 10 additions and 2 deletions
Showing only changes of commit 0e37a751ea - Show all commits

View File

@ -166,6 +166,7 @@ const Meeting: React.FC = () => {
const [currentVideoId, setCurrentVideoId] = useState('') const [currentVideoId, setCurrentVideoId] = useState('')
const [currentVideoUid, setCurrentVideoUid] = useState('') const [currentVideoUid, setCurrentVideoUid] = useState('')
let [currentSeconds, setCurrentSeconds] = useState(0) let [currentSeconds, setCurrentSeconds] = useState(0)
const [isNetworkQuality, setIsNetworkQuality] = useState(false)
const [currentEffective, setCurrentEffective] = useState(3) const [currentEffective, setCurrentEffective] = useState(3)
const [networkQuality, setNetworkQuality] = useState({ const [networkQuality, setNetworkQuality] = useState({
level: '佳', level: '佳',
@ -534,12 +535,14 @@ const Meeting: React.FC = () => {
level: '非常差', level: '非常差',
text: '完全无法沟通' text: '完全无法沟通'
}) })
setIsNetworkQuality(true)
setCurrentEffective(1) setCurrentEffective(1)
} else if (data.lastmileDelay < 500 && data.lastmileDelay > 100) { } else if (data.lastmileDelay < 500 && data.lastmileDelay > 100) {
setNetworkQuality({ setNetworkQuality({
level: '差', level: '差',
text: '勉强能沟通但不顺畅' text: '勉强能沟通但不顺畅'
}) })
setIsNetworkQuality(true)
setCurrentEffective(2) setCurrentEffective(2)
} }
} else { } else {
@ -2310,6 +2313,7 @@ const Meeting: React.FC = () => {
<> <>
<div className={styles.meeting} onClick={() => { <div className={styles.meeting} onClick={() => {
setContextMenu('') setContextMenu('')
setIsNetworkQuality(false)
}}> }}>
{isScreenCapture ? <div className={`${styles.meetingAbsolute}`} id='meetingAbsoluteVideo'> {isScreenCapture ? <div className={`${styles.meetingAbsolute}`} id='meetingAbsoluteVideo'>
<div style={{ top: '0px' }} className={`${styles.meetingAbsoluteText}`}>{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}</div> <div style={{ top: '0px' }} className={`${styles.meetingAbsoluteText}`}>{currentSpeakUser.length ? '正在说话:' + currentSpeakUser.join(';') : '正在说话:'}</div>
@ -2424,8 +2428,9 @@ const Meeting: React.FC = () => {
<div className={styles.meetingHeader}> <div className={styles.meetingHeader}>
<div> <div>
{isScreenCapture ? null : <Popover {isScreenCapture ? null : <Popover
open={isNetworkQuality}
content={ content={
<div style={{ color: 'white' }}> <div style={{ color: 'white' }} onMouseLeave={() => setIsNetworkQuality(false)}>
<div> <div>
<span></span> <span></span>
<span>{networkQuality.level}</span> <span>{networkQuality.level}</span>
@ -2463,7 +2468,10 @@ const Meeting: React.FC = () => {
title="" title=""
trigger="hover" trigger="hover"
> >
<div className='drag'> <div className='drag'
onMouseEnter={() => setIsNetworkQuality(true)}
>
{networkIcon(currentEffective)} {networkIcon(currentEffective)}
<span></span> <span></span>
</div> </div>