From dbd9fcf617e98bfaa3ea0dc39c074ef872ad8bdd Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 8 Aug 2024 17:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon43.png | Bin 0 -> 234 bytes src/assets/icon44.png | Bin 0 -> 279 bytes .../InvitingPersonnelModal/index.tsx | 1 + src/page/Meeting/index.module.scss | 17 ++++++++-- src/page/Meeting/index.tsx | 31 ++++++++++++++---- src/utils/package/imageUrl.ts | 4 +++ 6 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 src/assets/icon43.png create mode 100644 src/assets/icon44.png diff --git a/src/assets/icon43.png b/src/assets/icon43.png new file mode 100644 index 0000000000000000000000000000000000000000..0d4e11e1fc77001b7cf3cd1d07b0030ef265c042 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBe!ZuQV@L(#+bJ7)8x#aw`8OnpZo3dT$K}om z-Vzoor{fYP3noN3FFttWztpVbdtdcgKKENSAt-8U(5)!zqI2KdtW&?ASaXhd7jb3=VPp bx2R!Up{b#9i7B}p=oAJ|S3j3^P6 z9OUlAuCw#vn}yR)-sXgf_XCHnZ%8CtV6rNH3c*>>a>QCp)KQ@DxBXF(h^~o&)`3h~vI}bnS z)|Q!Cd%(IuVyn(+RyBk7E0cTHs$Y#-AN5*X;LzhEiF}h67P!gVa@KeM+kf{WJJ-Gm X`ug8qA3kdjbT@;itDnm{r-UW|B@$yo literal 0 HcmV?d00001 diff --git a/src/components/InvitingPersonnelModal/index.tsx b/src/components/InvitingPersonnelModal/index.tsx index fd5dbff..095bdde 100644 --- a/src/components/InvitingPersonnelModal/index.tsx +++ b/src/components/InvitingPersonnelModal/index.tsx @@ -65,6 +65,7 @@ const InvitingPersonnelModal = forwardRef((props: any, ref: any) => { }) ]).then(res => { 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({ ...list, total: res[1].data.total, diff --git a/src/page/Meeting/index.module.scss b/src/page/Meeting/index.module.scss index aaba83b..a3cdaf5 100644 --- a/src/page/Meeting/index.module.scss +++ b/src/page/Meeting/index.module.scss @@ -236,7 +236,7 @@ .meetingContentSwiperCard { height: 160px; - width: calc(100% / 4); + width: calc(100% / 6); border-radius: 10px; overflow: hidden; position: relative; @@ -541,6 +541,7 @@ margin-right: 30px; cursor: pointer; position: relative; + &:last-child { margin: 0; } @@ -639,10 +640,20 @@ height: 30px; line-height: 30px; border-radius: 5px; - color: #EEEEEE; - text-align: center; margin-bottom: 8px; cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + + >span { + color: #EEEEEE; + } + + >img { + height: 16px; + margin-right: 10px; + } &:last-child { margin: 0; diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx index 4c67739..8b8fee2 100644 --- a/src/page/Meeting/index.tsx +++ b/src/page/Meeting/index.tsx @@ -110,7 +110,7 @@ const Meeting: React.FC = () => { let [currentSeconds, setCurrentSeconds] = useState(0) const [currentEffective, setCurrentEffective] = useState(0) const [isComputerAudio, setIsComputerAudio] = useState(true) - const [isFluencyPriority, setIsFluencyPriority] = useState(true) + const [isFluencyPriority, setIsFluencyPriority] = useState(false) const [open, setOpen] = useState(false) const [modeOpen, setModeOpen] = useState(false) const [meetingMode, setMeetingMode] = useState('') @@ -127,7 +127,11 @@ const Meeting: React.FC = () => { let time = null as any; setUser(userInfo) setTimeout(() => { - window.electron.setViewStatus('maximize') + window.electron.getIsMaximized().then((res: boolean) => { + if (!res) { + window.electron.setViewStatus('maximize') + } + }) }, 1000) setMeetingMode('StandardMode'); agora.init(true) @@ -699,7 +703,7 @@ const Meeting: React.FC = () => { case 'StandardMode': return '标准模式' case 'SpeakerMode': - return '演讲者模式' + return '演讲模式' case 'SingleScreenMode': return '单画面模式' case 'DualScreenMode': @@ -723,7 +727,9 @@ const Meeting: React.FC = () => { } return ( <> -
+
{ + + }}>
@@ -731,7 +737,7 @@ const Meeting: React.FC = () => {
{changeCurrentSeconds()}
-
会议号：{state.channelId}
+
会议号：{state.channelId} 会议名称：{state.roomName}
{
{ setModeOpen(false) storage.setItem('meetingMode', 'StandardMode') - }}>标准模式
+ }}> + + 标准模式 +
{ setModeOpen(false) storage.setItem('meetingMode', 'SpeakerMode') - }}>演讲者模式
+ }}> + + 演讲模式 +
+
{ + setModeOpen(false) + }}> + 取消 +
} title="" diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts index 73bb60b..8e072f4 100644 --- a/src/utils/package/imageUrl.ts +++ b/src/utils/package/imageUrl.ts @@ -53,6 +53,8 @@ import icon41 from '@/assets/icon41.png' import icon41Active from '@/assets/icon41-active.png' import icon42 from '@/assets/icon42.png' import icon42Active from '@/assets/icon42-active.png' +import icon43 from '@/assets/icon43.png' +import icon44 from '@/assets/icon44.png' export default { error, icon, @@ -109,4 +111,6 @@ export default { icon41Active, icon42, icon42Active, + icon43, + icon44, } \ No newline at end of file