From fe9517623ef0dc45c331c01c05e1bc77ee788838 Mon Sep 17 00:00:00 2001
From: yj <1336058017@qq.com>
Date: Thu, 22 Aug 2024 09:41:56 +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/icon22-active.png | Bin 1384 -> 709 bytes
 src/assets/暂时无用.png      | Bin 0 -> 1384 bytes
 src/page/Meeting/index.tsx   |  54 +++++++++++++++++++++++------------
 3 files changed, 36 insertions(+), 18 deletions(-)
 create mode 100644 src/assets/暂时无用.png

diff --git a/src/assets/icon22-active.png b/src/assets/icon22-active.png
index b5cfda26b51a7e5f18687fd23c73da72cb193fd7..87bce292041089493107cd684e7da9738ddb12b6 100644
GIT binary patch
delta 670
zcmV;P0%85=3dIE>iBL{Q4GJ0x0000DNk~Le0000S0000S2nGNE0CElAl#wAce*#)b
zL_t(|0qvE)PUAoj#y=aR&|UHd&J$b^C5<B}QzQ}{1>pstL*kEgix45A;Y3S;=|M?B
ziIg;SAh;*M_XMN_B(gWNJBD1agB|Wf!zZm)-d)dc=iBud_|iX?gN)KUJ3b~RO3*q_
zkD;@<8Dx1s7N`M_Cc-!4dwV~qe^W!lysqr5uZKt>HwMN*JJgqkVD%Un%j5M(DK}=U
zDnV`p9%&WH@@PXo#sQL*)6{Ltqax_Bwi_sojHLDG`6Qq~6?Mz7=Tiq;c7Km|fO(7y
z6lg$QS)d;F_kqhxd{pkJNxrGniij*eKL<`vfrkhD7vKO`VPOH7ngXt`e}Th8yle4C
zfJQSjz{(0xC|DRnV=UH6<;Mc*-Q5yhb*&qXstkn&wzdY$&RSd9Vs6&r(5%YkZs@&s
zW*}U*XUW<(eZPP5GFPeC#ujsyoNcEQ63B!7gcAK8SxYGZSCA4OAB)lMC7=~sdvp|?
zXAkr9x0svrX_GZ)W22ode?u$IDo>dlJ4$iJWf{9QfI^{*#l_mox{C`RtyV7ymP(Xm
zV9v7HY>8!W*EE}}x>C`a55TrNJ?O-MQvIF?^b@bOG@y{bsP*VK^<7Gu56<}NY8hu|
z2e7b^+O`ysY(Rn51v*?a+3FKIXT`QlW{TR9%-0Cg&I}v?dvKfsbjqyCmjh2vT{+*s
z*S$ig9lNRVfF@X@5fF3<&(EH-we>s8yOU`bN(Hf1#C5;P^(fM~*)(MtriqijwDC8X
z%iWpAcAD)@cA_z=O!YKjQfCPMWAyu8;;id-@uknuA2mhks{162bpQYW07*qoM6N<$
Eg8a=k%>V!Z

delta 1351
zcmV-N1-Saf1?UPPiBL{Q4GJ0x0000DNk~Le0000v0000u2nGNE07pbnAdw+7e+2zW
zL_t(|0qvSSY|~m4$B!#e8YZ*7iKY`_;ic2-8&KWl!Gb6YT`C%;w;<XIvA_^#Kw^1H
zBC))wtzfByXrEZxDFK!;wIDsITP}!!4YM?rKr-jp*Kl)VJN~$CBjlfS>-Jv9zW<#6
z{qS)Ca&mHVMg?<x+yF(`wryZ(e_+|f(&ooyEG0N8>c!%cSuEP-nKP>>wgd@55p!6&
zb~vk9i`C=`N0g@R;jcQcV%XbR^XP~{46x%hx?IH58J1a1(->sH*g%b@t-?=%1c~m}
zip6D!NKAq5JpkHSMRZVPp>Q34w&ZFIc>^unFm+uIyC8P70`UZTl(4Kqe+Fnl4HP+S
zq=?9(LhVZv3myze4%xN?3K<J(sP}qJ?C})1<3+?7vwrsFb~7Lyi=ddXutq0Zg~Al}
zeqCzPJ^M=a6-bW(iqWE;$nD$kY5HMbjHC&!#nW{P0fmf3J(1gY5(4atOHUO>l*l3p
z$G#XfKl{?svwioj^6{jCf5f)H$eAc?z?%BR1T1cEJIBPGIw`x#U{p=`_HAJHwcfvn
z^($B4;Kd6V6%vai%&%Yf9s2@oiS;COV}2f9K70tHfHGSI+4r}L7h!&5BbI$f#;!7C
z-@hI`YU$_B_0@lR_s+2|d-V!V3S}aRKkwYJ7I$`_bm>xGy*Exzf6Bf}MH0^Jib7`|
zJQ!%}pvd*hmmSf^iE@!128wjXqGVt8`n3~Pvhi_|SR`)Y^kL_euU>VcN|TQWMe^V2
z>B#n_dqufl5Q#+c$EnYhw~?AG`CPK^-@Chk_T9K~L$<Fa-K&I$F27&o2lrI)yp70&
z&}M`sbM~G*v76`5f7?#}NGQ#6+5XI!cUoJz-==VhE+imHB$@R0tnm9j_(apAvasOT
zS01Mn$<~Dno_*zgaV6y5k%%o4*J)YEqR>Y5t+3CNeU}an;E&t42inNK|4dF^^HMC_
zswLr+mym!&I}4u_$5}4Wn~?UT&iS(c^eODzy9Y;KzQ|3^f74E_*P|U&Rj8lhUveyx
z&aQRo?;qPaE|x6JU<hPinv`Vw0?!ccK7L#k>R1wiPM;tld=e-LRecF4ZnZW<h^Y19
zL%mfllLMCIwrRBW%>DZ?uIsn(`fHGYG$QBluqjkA@JSHkc~x*bFXw+K;xx%Lz0U+?
z2x%N!j7`Q(e{g%G+U@&{O$Gs(a6VQ&p)4p{{_)M5#<QC@mod6>lV#&Dandj`Nh{KC
zl3`ftajnI#MVpH%O+?!`A-%<k$%m%d>#aZxQa`tajJ-81>%$VoTpZb%b~Al8eYUXB
z`TzNI!{=kM-p?p`I2|&{FmN*mZ{g>RtMhZOfooyEe|;&r!Q?NX{H|@`jaN|U8Vo_%
z6F83ujhD0;JBH<!=m7rukTMSg*QPI`c6eA1yP(oE1HoVT(AY8{9^P)L>1`}zf>JCn
z#J<W!dT<NVIQt!f1(TQ#mjAG91&I?ePoJ*9sZ+Fcm82$yU%-lac(^5hCNq&TD4MJ+
zF7{`me~9vfk5h8XoZRMT-^?-tK3Gy`5(y;8mbi>u$8T<6EYkZJe0=MR=5dNtj+5Ya
z^S-RF!M1-Lkpv3uaG~zz9itm%S;+*lk(ecb45$?fzUh%HmJkE{XVV#}K4@)Q%j&;C
zlt51$c6!>N7}aAkaoSM8fKkSF^P^omImefF9n8te$;rtX&Ua*=CLoGX*lYj*002ov
JPDHLkV1hr&pbP*2

diff --git a/src/assets/暂时无用.png b/src/assets/暂时无用.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5cfda26b51a7e5f18687fd23c73da72cb193fd7
GIT binary patch
literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq0021v001}$1^@s6M?_E{00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1pP@wK~#7F?V3Go
z(^?eAk1J3bCbPYXrW0Y|rPJ#hP~GLhf+!1JDjKG@AleGCzz}CZVtGm;vAn6RV5x*?
zpIF){0hThgAU&yDE{K5*vow`JGUwRWaC2ij{<v-<<ezlw_Fl)n|D6B*@Nofha&mG;
z1#^7d07clgZD46&*~HT3$7L)fI4SDI;*wb`+UA)vt0=Yv2|*EaSh{vNt67WH<O)ZW
zrtRUcI<I2b+gbDIh(Qdn<2AZm#M2p;SxwUzWWd-!ji#-_Pk{u9?$(OMWr#>jf$lv3
z+F3<(P-LNS9e=juY7BV;E!;45T@Sk;cC-TV1bURPtU?B8K@Ai+Y@~?DqC)LU6AK;;
zNDkSy0}2@nYN+>mP3-X$xZ_2{8MA)&<#sb59gCotv9LxbT7|+C_I_Pz(mnf1^%Y2u
z0gBP0p2+Rn@M-#CUyP&)uEo=J3IT<TMLm(*cM<~Zi%U-xMwG}R3CF$|H9z~((zAW{
zuJZAug2cAK$eAc?z?%BR1T1cEJIBPGIw`x#U{p=`_HAJHwcfvn^($B4;Kd6V6%vai
z%&%Yf9s2@oiS;COV}2f9K70tHfHGSI+4r}L7h!&5BbI$f#;!7C-@hI`YU$_B_0@lR
z_s+2|d-V!V3S}aRKkwYJ7I$`_bm>xGy*Exz%DzfP63*<3LT4U47-;LD$o0#Y9nr^$
za*-Yeigd=JWMB6BwG&mc@o|w@ByQpKVds>uUUi~MlaB~R^55y{$o8dsMY&%PiA3_p
zsn3+Rk(w;|T(a-qySst*-MDc>wy!1KtAvLxzhC4B_f+t_jmU)1W`rek_MSYko9EBl
zPX0(J&2riP%$RptTe{z-aEUG?AW0;d^!Kdr`#$(Y)1$Jm;Mi9lrxeN7g$tg2<$ZA_
z<ld2pEfUvhS;(T$M)j?*&y#(Z4i4at+qVbW$iDwfPG0j;EZnLk;gpw<fJ8eBpA^Sg
zF3_8h_N31Fvj6lc?A*HtM_<0kP0rI!t=FR+R8^>-;$LzslFqJm>F*!gIWCqg%wPy)
zUz(I;`vT7p?mm8873x?Lfli+wA$$@j2~~XwC~mbjM2M*M;X}PuE|UY6<hE(F_00YI
zFs|#j@cL_zfHWfK@USUVG4M$c<9StZJ1^&dDB?89G`-IRWe8~;TZ~P{O>ldp+U@&{
zO$Gs(a6VQ&p)4p{{_)M5#<QC@mod6>lV#&Dandj`Nh{KCl3`ftajnI#MVpH%O+?!`
zA-%<k$%m%d>#aZxQa`tajJ-81>%$VoTpZb%b~Al8eYUXB`TzNI!{=kM-p?p`I2|&{
zFmN*mZ{g>RtMhZOfooyEeJQ!Y<S(H7u5ICsS5W903_;lwIFAU8m$Vr>hUJ#%0RH-r
zG7kgSrZ1v)cvug+pwcu0!C&~$*fJm<-fpSsZ7gJhQY<jUzRE><a0}Bo`yGM>lb8;c
z|FCQYi4!qTpRT~EQ?zuIq$Y-6z>0ZzxFvrkGm$bVnyf4?_GhDr@`I04a?70D=4ao`
zG6OzXQfCqgB*>Pyj9kZWZeT3Z`xtzD>x<@bid2r1;CA!Atgpege;tto3hi*A?&ck%
z8)aF^1hSEsC4da56$-xTkt~)F1N>*x8L2*KZClIgzd)2gPaJl7+MpQKV={5tP{4pu
q#&+|gT{}6)mv+p_$;rvd8P0cPpC%xRP}pn$0000<MNUMnLSTX=+M@*k

literal 0
HcmV?d00001

diff --git a/src/page/Meeting/index.tsx b/src/page/Meeting/index.tsx
index 37f56b3..4a971bf 100644
--- a/src/page/Meeting/index.tsx
+++ b/src/page/Meeting/index.tsx
@@ -367,17 +367,7 @@ const Meeting: React.FC = () => {
               message.success(`管理员${item.user.isRoomManager ? '设置' : '取消'}${item.user.userName}为发言人`)
             }
             if (!item.user.isRoomManager) {
-              setRoomUserList((list: any) => {
-                let row = list.filter((i: any) => i.roleId === '1' || i.isRoomManager)
-                setCurrentLookUserAccount((res: any) => {
-                  let has = row.find((x: any) => x.uid === res.uid)
-                  if (!has) {
-                    renderVideo(row[0].uid)
-                  }
-                  return res
-                })
-                return list
-              })
+              changeVideo()
             }
           })
           break;
@@ -576,6 +566,20 @@ const Meeting: React.FC = () => {
     }
     changeAgoraDevice()
   }
+  // 修改当前观看用户
+  const changeVideo = (): void => {
+    setRoomUserList((list: any) => {
+      let row = list.filter((i: any) => i.roleId === '1' || i.isRoomManager)
+      setCurrentLookUserAccount((res: any) => {
+        let has = row.find((x: any) => x.uid === res.uid)
+        if (!has) {
+          renderVideo(row[0].uid)
+        }
+        return res
+      })
+      return list
+    })
+  }
   // 网络
   const handleNetworkChange = (): void => {
     if (navigator.onLine) {
@@ -662,6 +666,7 @@ const Meeting: React.FC = () => {
     await GetShowUser(state.channelId).then(async (res) => {
       if (res.code === 200 && res.data) {
         renderVideo(res.data)
+        changeVideo()
       }
     })
   }
@@ -959,7 +964,7 @@ const Meeting: React.FC = () => {
             return message.error('房间内最多20个开启麦克风')
           }
         }
-        postOpenMicrApi(enableMicr, uid, isAll)
+        await postOpenMicrApi(enableMicr, uid, isAll)
       } else {
         message.error(msgTips)
       }
@@ -1003,7 +1008,7 @@ const Meeting: React.FC = () => {
             return message.error('房间内最多20个开启摄像头')
           }
         }
-        postOpenCameraApi(enableCamera, uid)
+        await postOpenCameraApi(enableCamera, uid)
       } else {
         message.error(msgTips)
       }
@@ -1116,6 +1121,8 @@ const Meeting: React.FC = () => {
       icon: <ExclamationCircleFilled />,
       content: `确定将用户${userName}移出会议？`,
       centered: true,
+      okText: '确定',
+      cancelText: '取消',
       async onOk() {
         await GetRoomKickout(channelId, uid)
       },
@@ -1530,21 +1537,32 @@ const Meeting: React.FC = () => {
                                     type="primary"
                                     className='m-ant-btn'
                                     size={'small'}
-                                    onClick={(event) => {
+                                    onClick={async (event) => {
                                       event.stopPropagation();
-                                      postOpenMicr(!roomUserItem.enableMicr, roomUserItem.uid)
+                                      await postOpenMicr(!roomUserItem.enableMicr, roomUserItem.uid)
+                                      await GetRoomUserItem(state.channelId, item.uid).then((res: any) => {
+                                        if (res.code === 200) {
+                                          console.log(res.data);
+                                          setRoomUserItem(res.data)
+                                        }
+                                      })
                                     }}
                                   >{roomUserItem.enableMicr ? '静音' : '解除静音'}</Button> : null}
                                   {roomUserItem.isRoomManager ? <Button
                                     type="primary"
                                     className='m-ant-btn'
                                     size={'small'}
-                                    onClick={(event) => {
+                                    onClick={async (event) => {
                                       event.stopPropagation();
-                                      postOpenCamera(!roomUserItem.enableCamera, roomUserItem.uid)
+                                      await postOpenCamera(!roomUserItem.enableCamera, roomUserItem.uid)
+                                      await GetRoomUserItem(state.channelId, item.uid).then((res: any) => {
+                                        if (res.code === 200) {
+                                          setRoomUserItem(res.data)
+                                        }
+                                      })
                                     }}
                                   >{roomUserItem.enableCamera ? '关闭视频' : '打开视频'}</Button> : null}
-                                </div> : <div style={{ color: 'white' }}>加载中</div>
+                                </div> : <div style={{ color: 'white' }}>用户不在房间内</div>
                               }>
                               <div>
                                 <div><Avatar name={item.userName} /></div>