From f475ddb85a6a4bd57f42861bdddccd369b14917c Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 22 Aug 2024 11:32:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=86=E9=A2=91=E5=88=86?= =?UTF-8?q?=E8=BE=A8=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icon22-active.png | Bin 709 -> 1498 bytes src/assets/icon23-active.png | Bin 1150 -> 1179 bytes src/assets/暂时无用.png | Bin 1384 -> 0 bytes src/components/JoinSetting/index.tsx | 2 +- src/utils/package/agora.ts | 22 +++++++++++++--------- 5 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 src/assets/暂时无用.png diff --git a/src/assets/icon22-active.png b/src/assets/icon22-active.png index 87bce292041089493107cd684e7da9738ddb12b6..af608afe6423b47f9265acc08f4ae80de4f2a854 100644 GIT binary patch delta 1466 zcmV;r1x5PB1==5`8oC9#CBdvg#3}xChx`e`{sS$@4ff4 z0WvZ&GA~7&dU^@ps$f}pkR%g&y*>QDBW-LLFlItUR&%*E z3!sjTXkufkDAs@!Seu*6c#ay7xM-Sm$#IGeh{PULv0-oVZJrky`0Fnw6>2?xT%ps& z{JMd!#c>Ih10|C59L@z2B>J$D%atJ}2?g5M0CVGIOB>ZWPxr>A8clk51=^i`Lk+kML{9eGB%2I9%)Z=i8jQvY2u2=M$%2id%%j+ruPX1@*Hda)1sEL-1S1do z0<&+YQ{wjZQ%0eOefx?Lf2o3ChKh9H_Pq)b_C=v3m{4MiB$$11&J43JO+Bw(zZO28 zL?A&*u;+9XR`Hk946}0kHVm0*1~+PBBXzsNNYs;Vuvc~X@+A;`aR@`}#S8f7!v~lY zQi~+?v$J>1z5qM!auT|=wFP^7doT$IvqhABXJ=>O*ITy|*>_^>f9i+q`}4JH4ZoP9 zqa$Wt!!Y1mAxtFkQ?Y1L&{3~k@svB`^jq0is7QiE*Oe7mSXc2_~Z?D(#UC+I&(70isC8%@6)H{eu^cyg4%%; zq!n59e43f*H-_~lrWYZGP_i!trH~~b%MkAG@0VO<26s_nQi;U1WgFZgC;+(68@v8=ueGMk5iDTJI7FR z3>!qQ@N_Nx5a#jm)wG%XkyiU`zVs%Z42Z~tvvI2^j!+{iTmJ8zJGJeXFUuiIKNIsz zRhEWH$Y>(%hSMzt)m3bewQ&42Ap!hcG$)qGp0CiRe+LH#VPCCdUU(f6F!H{Qhk5Ez z)mPQT%t1@Kf4@EOcv~FVnN~9%n{ID!xBq_sUJE%a(ft`Ao6`Y8?FQj3I{5na0DIWr zWqG)Ci6SW7&MSaV9Ea|7>3k{)JGY5K*HLH_h9GPQ&U=K$%cvPU17E-K2+rVnUCKNJ z&Mirje_lB`85ntmrWpu!!^gfKqCqk!(ll@(Q0H@PfT$D;46(0pkq+F#G|qm6Xu&2n zx{VF|3&rh3iF2b*PZwZnil#2rS4G2OT|YSqtcu1a(hrIzE1&Noy4@e*hzf&`Q*z6) zzb?$aW6KN#==D5;(h4NVmN<>vL!niC8CCYj71QL*fB{@TaAtef)Ok7^XDd{Og3@YdK5A;GBPqUCWHS0J=aYC U5RBC9P5=M^07*qoM6N<$g82Wkg#Z8m delta 670 zcmV;P0%85y3&jN?iBL{Q4GJ0x0000DNk~Le0000S0000S2nGNE0CElAl#wAce*#)b zL_t(|0qvE)PUAoj#y=aR&|UHd&J$b^C5pstL*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<$ Eg4)J5zyJUM diff --git a/src/assets/icon23-active.png b/src/assets/icon23-active.png index bb1707439389dd84a641e4815434dc20cd42ac4a..91c0781728fdd39b42bbe0a4b0207d3b1723b2f5 100644 GIT binary patch delta 1108 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 diff --git a/src/assets/暂时无用.png b/src/assets/暂时无用.png deleted file mode 100644 index b5cfda26b51a7e5f18687fd23c73da72cb193fd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1384 zcmV-u1(*7XP)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=J3ITxGy*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-;$LzslFqJm>F*!gIWCqg%wPy) zUz(I;`vT7p?mm8873x?Lfli+wA$$@j2~~XwC~mbjM2M*M;X}PuE|UY6ldp+U@&{ zO$Gs(a6VQ&p)4p{{_)M5#lV#&Dandj`Nh{KCl3`ftajnI#MVpH%O+?!` zA-%#aZxQa`tajJ-81>%$VoTpZb%b~Al8eYUXB`TzNI!{=kM-p?p`I2|&{ zFmN*mZ{g>RtMhZOfooyEeJQ!YhUJ#%0RH-r zG7kgSrZ1v)cvug+pwcu0!C&~$*fJm<-fpSsZ7gJhQYlb8;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 { }) } if (msg) { - message.error('未检测到麦克风!') + message.error(msg) return } const list = [...joinRoomSettingForm] diff --git a/src/utils/package/agora.ts b/src/utils/package/agora.ts index ef7426f..2156645 100644 --- a/src/utils/package/agora.ts +++ b/src/utils/package/agora.ts @@ -235,7 +235,13 @@ const agora = { }, // 摄像头采集 startCameraCapture: async () => { - await rtcEngine.startCameraCapture(VideoSourceType.VideoSourceCamera, {}) + await rtcEngine.startCameraCapture(VideoSourceType.VideoSourceCamera, { + format: { + width: 640, + height: 360, + fps: 15, + } + }) }, // 停止采集摄像头 stopCameraCapture: async () => { @@ -259,14 +265,12 @@ const agora = { if (isComputerAudio) { rtcEngine.enableLoopbackRecording(true) } - let data = {}; - if (isFluencyPriority) { - data = { - frameRate: 60, - dimensions: { - window: 3840, - height: 2160, - } + + let data = { + frameRate: isFluencyPriority ? 30 : 15, + dimensions: { + window: 1920, + height: 1080, } } if (