This commit is contained in:
yj 2024-08-08 17:02:07 +08:00
parent 703596bd4a
commit dbd9fcf617
6 changed files with 43 additions and 10 deletions

BIN
src/assets/icon43.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

BIN
src/assets/icon44.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

View File

@ -65,6 +65,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => {
}) })
]).then(res => { ]).then(res => {
if (res[0].code === 200 && res[1].code === 200) { if (res[0].code === 200 && res[1].code === 200) {
res[1].data.items.splice(res[1].data.items.findIndex((item: any) => item.uid === user.uid), 1)
setList({ setList({
...list, ...list,
total: res[1].data.total, total: res[1].data.total,

View File

@ -236,7 +236,7 @@
.meetingContentSwiperCard { .meetingContentSwiperCard {
height: 160px; height: 160px;
width: calc(100% / 4); width: calc(100% / 6);
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
@ -541,6 +541,7 @@
margin-right: 30px; margin-right: 30px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
&:last-child { &:last-child {
margin: 0; margin: 0;
} }
@ -639,10 +640,20 @@
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
border-radius: 5px; border-radius: 5px;
color: #EEEEEE;
text-align: center;
margin-bottom: 8px; margin-bottom: 8px;
cursor: pointer; cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
>span {
color: #EEEEEE;
}
>img {
height: 16px;
margin-right: 10px;
}
&:last-child { &:last-child {
margin: 0; margin: 0;

View File

@ -110,7 +110,7 @@ const Meeting: React.FC = () => {
let [currentSeconds, setCurrentSeconds] = useState(0) let [currentSeconds, setCurrentSeconds] = useState(0)
const [currentEffective, setCurrentEffective] = useState(0) const [currentEffective, setCurrentEffective] = useState(0)
const [isComputerAudio, setIsComputerAudio] = useState(true) const [isComputerAudio, setIsComputerAudio] = useState(true)
const [isFluencyPriority, setIsFluencyPriority] = useState(true) const [isFluencyPriority, setIsFluencyPriority] = useState(false)
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)
const [modeOpen, setModeOpen] = useState(false) const [modeOpen, setModeOpen] = useState(false)
const [meetingMode, setMeetingMode] = useState('') const [meetingMode, setMeetingMode] = useState('')
@ -127,7 +127,11 @@ const Meeting: React.FC = () => {
let time = null as any; let time = null as any;
setUser(userInfo) setUser(userInfo)
setTimeout(() => { setTimeout(() => {
window.electron.setViewStatus('maximize') window.electron.getIsMaximized().then((res: boolean) => {
if (!res) {
window.electron.setViewStatus('maximize')
}
})
}, 1000) }, 1000)
setMeetingMode('StandardMode'); setMeetingMode('StandardMode');
agora.init(true) agora.init(true)
@ -699,7 +703,7 @@ const Meeting: React.FC = () => {
case 'StandardMode': case 'StandardMode':
return '标准模式' return '标准模式'
case 'SpeakerMode': case 'SpeakerMode':
return '演讲模式' return '演讲模式'
case 'SingleScreenMode': case 'SingleScreenMode':
return '单画面模式' return '单画面模式'
case 'DualScreenMode': case 'DualScreenMode':
@ -723,7 +727,9 @@ const Meeting: React.FC = () => {
} }
return ( return (
<> <>
<div className={styles.meeting}> <div className={styles.meeting} onClick={() => {
}}>
<div className={styles.meetingHeader}> <div className={styles.meetingHeader}>
<div> <div>
<div> <div>
@ -731,7 +737,7 @@ const Meeting: React.FC = () => {
</div> </div>
<div>{changeCurrentSeconds()}</div> <div>{changeCurrentSeconds()}</div>
</div> </div>
<div>{state.channelId}</div> <div>{state.channelId} {state.roomName}</div>
<div className='drag'> <div className='drag'>
<Popover <Popover
content={ content={
@ -739,11 +745,22 @@ const Meeting: React.FC = () => {
<div onClick={() => { <div onClick={() => {
setModeOpen(false) setModeOpen(false)
storage.setItem('meetingMode', 'StandardMode') storage.setItem('meetingMode', 'StandardMode')
}}></div> }}>
<img src={ImageUrl.icon43} alt="" />
<span></span>
</div>
<div onClick={() => { <div onClick={() => {
setModeOpen(false) setModeOpen(false)
storage.setItem('meetingMode', 'SpeakerMode') storage.setItem('meetingMode', 'SpeakerMode')
}}></div> }}>
<img src={ImageUrl.icon44} alt="" />
<span></span>
</div>
<div onClick={() => {
setModeOpen(false)
}}>
<span></span>
</div>
</div> </div>
} }
title="" title=""

View File

@ -53,6 +53,8 @@ import icon41 from '@/assets/icon41.png'
import icon41Active from '@/assets/icon41-active.png' import icon41Active from '@/assets/icon41-active.png'
import icon42 from '@/assets/icon42.png' import icon42 from '@/assets/icon42.png'
import icon42Active from '@/assets/icon42-active.png' import icon42Active from '@/assets/icon42-active.png'
import icon43 from '@/assets/icon43.png'
import icon44 from '@/assets/icon44.png'
export default { export default {
error, error,
icon, icon,
@ -109,4 +111,6 @@ export default {
icon41Active, icon41Active,
icon42, icon42,
icon42Active, icon42Active,
icon43,
icon44,
} }