From 674a5f8a53b4a6b1fd35550a47256bb9abdb4e6d Mon Sep 17 00:00:00 2001
From: fuenmao <980740792@qq.com>
Date: Wed, 4 Dec 2024 11:54:49 +0800
Subject: [PATCH] =?UTF-8?q?RtcEngine=E4=BF=AE=E6=94=B9=E4=B8=BARtcEngineEx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../images/2.0x/meeting_main_share_close.png    | Bin 0 -> 618 bytes
 .../images/3.0x/meeting_main_share_close.png    | Bin 0 -> 863 bytes
 .../assets/images/meeting_main_share_close.png  | Bin 0 -> 362 bytes
 .../lib/pages/metting/meeting_main_logic.dart   |  16 ++++++++--------
 .../lib/pages/metting/meeting_main_state.dart   |   2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 wgshare/assets/images/2.0x/meeting_main_share_close.png
 create mode 100644 wgshare/assets/images/3.0x/meeting_main_share_close.png
 create mode 100644 wgshare/assets/images/meeting_main_share_close.png

diff --git a/wgshare/assets/images/2.0x/meeting_main_share_close.png b/wgshare/assets/images/2.0x/meeting_main_share_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..b127c03b82c1517b8ed4fd54db83a0f464737551
GIT binary patch
literal 618
zcmV-w0+s!VP)<h;3K|Lk000e1NJLTq001li001lq1^@s69)wx}00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0sl!vK~#7F?U>zd
zgD?=sk4}(o;1MzcBXop3<vANbCm<WZ1{r}7@*3qK?g9~PaJ|Fi3mb6waH-^<WK|G)
z`N{dqJ_F$Kcsy@|04pBwUm)3phNK~2VFb+^B)OwMNqt$;_y)ub=AZF02!aycg@iL2
z_%gQJ0*eA2u!A9xWUNUGfhZ-;jD(?Ze(M}Rq*p5nM}{*pT=+@)pw0Gf_l`u$B9_mN
z6RxBYHyA}YA|fFT`f1SSr<q8YIUbc{Q@TGQ;Zv>Hop4o7($|OjY{#*ca9xjQT)Gjy
zVT#Cljd;26+PAO&hi;%~sVQ2dXA)-eT#txaRlY3ia;^{VgsbvW&1`eF0V2!VYq!FR
z)VR?A<Xyc;ODvoSi|RRwg0|79>(Ee>7jn~H-z)q9<H)FC`Kc{RIGsum;`wvF$Zrur
zm0NDCc+AsG^~`WsKa;%NHLW7NW1i0vyO})_JY$jZlQdPmM{}d$4d{=ACHCc;R}p>b
z>)L2$7nW!PH%m?F&BoM=I9Vm^ND^~IUZoc#T<J)2ME3iI3Nw7vYKzGAI*Bl^1QMr)
zBhr-q{48*RC-pnVV;DeDpWK%Ts+TsIVWZ)9Bh&4MI3CduH#JalGHD!-&}!-tIl@%n
zc!aU;<D_nURTjWN+P=`1dzaT%pJYj{^BIrF<MFuX7v4Emt|?}i+W-In07*qoM6N<$
Eg6}&LqyPW_

literal 0
HcmV?d00001

diff --git a/wgshare/assets/images/3.0x/meeting_main_share_close.png b/wgshare/assets/images/3.0x/meeting_main_share_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..6739d32bde7e971f763e1e58f671cf12f61eda14
GIT binary patch
literal 863
zcmV-l1EBngP)<h;3K|Lk000e1NJLTq002S&002S=1^@s6<5U3X00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0`y5lK~#7F?V8Pz
z+CUJ6pIp8hZv?vReM4X~AOkA|eA%nm2p|L2*S$anv?IV90nPwt(C(2`yZp_MB-99Y
zzN#)2NTb%g(VLMPfJh_~i9{liNJIq&#u7O`Ga^7L!BwoyXM8rK(*udkju2dZ9^nQ_
zY&)dGFS7Yz**y_izRUI-`p54iNnUU+M2PIf9q|#vA@gR#J!OJ(Qq2)|G18QIz2+W5
z=mP2V%qoV7$%K0bp(`q@Y^`F9Mt!mhp-Y0S(q4?M#D?2J=$c|#9gn#~t7JtUISV(3
zph1ypI(3VYWiqx~Za}t^M^3^`PD0S&J)N<EvBP<-k{#qqxxQ5h8tkPsqi#mub$85W
zT!ZXHzJbI`jdKt*IGH-n-C~$|CCn-#N8ZqRgP?&meLbrfRhAN>P%#$_s~C84kJxV&
zf(Fh@Fda3|6gDvia+g0nt$iK#<oC@R1PwR@pH+Y<T2P6x?!OQQ^B&@|O8Ib>q9K(S
zS0IGJSmpkH;}F9<wr6O7oISrDAw-IzjnptaR>^DRH+RCyk&~bS*CTyz2MpQut`cAs
zE?1U~CnrGz4rhMU*1Wjg-TA~AS@KQ;^Aa@RaE1r%%xJEPJ^ocC-)ZNwLa&9`9<(_g
z&BemEs;v3-HRJj(UIYySFJ`%O{M>p}$kXU*#n&vvq&hYaI@)KIdNmG$27wooRT0j7
zUOs}`#0amP6Exs3LYBE>LagGioD($QFy`EbcI7~V2CRiC2fD0cubdM!U`?8p0|^?i
zHm0&w&ng5B_)>&d&IuZDvl9Dx2(ilB+Y%aZS!cW)A(eArT&GV7TEIK6*cTy5GPvs)
zGl^&E<Uiax?E5{oWjXMwsKi(}#Mt_*(#jgv3#-a=9rBnY$=|~-+5Dx+V-@M}PiVp2
zlUj2F4<4&LoND(4H-?P(AK5%g(23p8)qWkgd(xom*sq)~T*rPzH~d1k1TBY2DFmUM
pJM`v;NF)-8L?V$$Boc}2^B)8(LU3@kp2z?I002ovPDHLkV1l&9eKG(5

literal 0
HcmV?d00001

diff --git a/wgshare/assets/images/meeting_main_share_close.png b/wgshare/assets/images/meeting_main_share_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b1de965ee49c09faef80129aa9c8467a6192e7c
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4foCO|{#S9GG!XV7ZFl&wkP>``W
z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eB{(nyw$B+ufw^R1=9x@Pc(-&e+Y3XTj@toW>
ztF5c8%Su{6?SS+Ht5CBBMx{!Y!z_u-{MLnaDMGC69a{cYC#Ri1f9+?=B1vfhRxPJl
z9P3s0O%z)nHfPft&paEO^N;6hKRf2cD$v$2rNH5mz>S<sPI4>_0<n`Ky6+riIQ})N
z>#Ip$ZefDcuI}!Tn<utMD|qrnWjr-1FFcx8uK&a(Xn*rm={`|$=>nUgA9iOL)hCxr
zg?9;sao<`Rxt{ft%>EAh+e%#l<-V6EDQDd|`m|}6Nsq6_Ht)^%U$=kF)Y{_1`u_E-
zf4$6G_&R!GLd@fNcAWph`bs_7YsRXFLA~)NpT+OJImEV7>8#s2U{El4y85}Sb4q9e
E01B~*9smFU

literal 0
HcmV?d00001

diff --git a/wgshare/lib/pages/metting/meeting_main_logic.dart b/wgshare/lib/pages/metting/meeting_main_logic.dart
index 526a8cf..6dd7c02 100644
--- a/wgshare/lib/pages/metting/meeting_main_logic.dart
+++ b/wgshare/lib/pages/metting/meeting_main_logic.dart
@@ -201,7 +201,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin{
   Future<void> doHttpGetTvAnchor() async {
     BaseStructureResult res = await getClient().getTvAnchor(state.roomNumber.value);
     /*var s = 2;
-    // if(res.data!.toString().length != 9){
+    if(res.data!.toString().length != 9){
     if(s == 2){
       state.remoteUid.value = "18";
       setEnableVideo();
@@ -222,12 +222,12 @@ class MeetingMainLogic extends GetxController with RequestToolMixin{
         changePageState(1);
       }*//*
     }*/
-    Future.delayed(const Duration(milliseconds: 500), () {
-      state.remoteUid.value = "18";
-      setEnableVideo();
-      changePageState(1);
-    });
-
+    state.remoteUid.value = res.data!.toString();
+    if(res.data!.toString().length != 9){
+      Future.delayed(const Duration(milliseconds: 1000), () {
+        changePageState(1);
+      });
+    }
   }
 
   /// --------------------------signalR Socket相关
@@ -463,7 +463,7 @@ class MeetingMainLogic extends GetxController with RequestToolMixin{
     PermissionHandler.requestMicrophonePermission();
 
     // 创建 RtcEngine 对象
-    state.rctEngine.value = createAgoraRtcEngine();
+    state.rctEngine.value = createAgoraRtcEngineEx();
 
     // 初始化 RtcEngine，设置频道场景为 channelProfileLiveBroadcasting（直播场景）
     await state.rctEngine.value?.initialize(RtcEngineContext(
diff --git a/wgshare/lib/pages/metting/meeting_main_state.dart b/wgshare/lib/pages/metting/meeting_main_state.dart
index 02baad0..72d4a19 100644
--- a/wgshare/lib/pages/metting/meeting_main_state.dart
+++ b/wgshare/lib/pages/metting/meeting_main_state.dart
@@ -71,7 +71,7 @@ class MeetingMainState {
 
   /// 声网相关
   final String appId = "4a4f7be64fa1404ebda74784fe9ac381";
-  late Rx<RtcEngine?> rctEngine = Rx(null);
+  late Rx<RtcEngineEx?> rctEngine = Rx(null);
   /// 是否自动订阅所有视频流
   late RxBool isAutoSubscribeVideo = false.obs;
   /// 是否自动订阅所有音频流