From 4af3265ce10eb17c4bdf33347a21ea86ef24f2e3 Mon Sep 17 00:00:00 2001 From: ding_chengjie Date: Thu, 11 Apr 2024 15:03:49 +0800 Subject: [PATCH] =?UTF-8?q?safe-area=E5=8F=91=E5=B8=83npm:4.7.4-0.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- harmony/safe_area.har | Bin 19233 -> 19397 bytes harmony/safe_area/oh-package.json5 | 4 ++-- .../src/main/ets/SafeAreaProvider.ets | 2 +- .../src/main/ets/SafeAreaProviderModifier.ets | 2 +- .../safe_area/src/main/ets/SafeAreaView.ets | 2 +- .../src/main/ets/SafeAreaViewModifier.ets | 2 +- .../src/main/ets/SafeAreaViewPackage.ts | 4 ++-- .../src/main/ets/SafeViewTurboModule.ts | 4 ++-- package.json | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/harmony/safe_area.har b/harmony/safe_area.har index e99c4f9a3e4eb651303a16118553c6b86f998f1f..f37bafc196ee9f21046814e823decaa1ed2c82e4 100644 GIT binary patch literal 19397 zcmY(qRaD(<*98g`D-g->Kf;}#~q~^%Xza~`JO;yX@W=(*xm=lZ6~a!+UU;u>o{*1^OPGb}7D z)VGWgvvshAg$4Eu`buli_?wA^KsyUqjEc9rB~@I}Y%okr$p*iuKrjxsmC^l($j@xf z<)=h0bI!G2(J58g4u9zehjJq=F6=J#7alQmMZ6-jQS}1T(jvMEWS$J>iw-TCqzK&% zD_r@BLM+u^b7^XTq%58jM(Un-MfY}$^)9hB} z6C7z7B@-voc7s6C+=>g|BB`gCEW7 z^P1!fO#9{!=pdxYv`YbNoISm->xsH-woqjWANUFAMd7Qk3TSExC54Oo{Lk14+13{u zMRpwVB~)L|H=4o{hJEEk#whM7Do=-dCJy(-)ECU`NM`ln1XbW`mV8U7$P*yBK}e01 zkKzC->c`bKGJGUCx&<|}l7fj8r-eWQn(ksi#;L%4RT&*8E|2-X(Ka1YWP$zz9o2iD zX+=qqUZEIuUoLmRm;f$P>55o;sxs12Yz0Z!RXj2dPEkQ>-Mm;$noz=JRS`UbC1Od3 zYn!uxAziKsu6;_A0Yeq$q7s9l#DFtH*d#W+W%H!^^ov(%;#P&8kZ!TE&mGk3(C(oQ z8fI6wK3(FNRXGQ@^7^s?GuC2!NlR;+k3(h4AJ{A&P2mh(%m#yX8Vv;7lDeQ=aoBP# znlBAeBGwOfKK1c}>Uzu?Ocd1A3fS}+5D)hnUk_&7y3}Z^vUR6YrXO2pA2nKiZ!>JI ze%aQy{Ap8L=Tlv#vC~i~X$b=~EA0&QTEHYt9WE{9RgQ$cwT`Y-qUDBaG&eCPhFeZ* zOs`ZvG>Vi)Dqv1~umWv5h1OO(d^MKt2BIi*#vJ#jFr+FgM^{9wouNjRp=Vy|VTJ>+ z?lNe)b^PSr&p328Rx1*3%abU|?2_o*Htq(TNyBanO>nK8+Zr0GfrE74xOtMqC}|2B&Fbhi8{`j#ZkTsd1BGPwGeqsZ(6oS~bvd-}fe0XhfQ z|GHz(eg~4WqhEmYi&#M5MK@#gq~^&a4Q?tS>Mtvo8Cq;C=dd^zrUfUb>aDQ6uqvDt zB%=0bHL_Y67;Bu5YFSRedeSq_0_nDu8)jxs^(GY0178lvUQ3OIl< zl{J@Z>jJ{Lm+gRap&Fknaue;S+RRGj1yot)gr-uh z|0MR(l5sniCR3(Bb2f!;M&pm(F5`=s$>^`V-~IXk62^$G_8vVepbHOLH6{%Bp0~$G zkDp0)y63S%w)S>O2v(I!BiKu0w90PlF8c^nx_=P_Aku7{O*|N^oqOXMoSob%(&xgV z132xaJb&xV)^g~pW1#58M>Go84T<;_jt>D4g-Q3uPdqbDa<1KGN1nObFKquF|n zXJ%JgX_>#BrIX~+rG08AARa3*si+wWU&cqmsB`rEyC3(9!XAq3QYm7l#KPx$$5=CL z9n0lgSGnc829%KS7Y=aV%~46wDMUsR-4BZF+`3v_vl>J2w91SLt(Ei#B_aW0I&8H} z87)EM(ZMOE(;N-Bri?$TMqSmZQ%H)88>QG|z!wXbnm?|(UjN-lf?p;o&upJ<^2+|! ztyGPiZVIJTd2NzMNA(8F=1J8VU;ffF+x|U+)5h#OBmh8&O+9g4IM@UPBIE zcKn3QUh-`CyRnzLNJ@A_z{j&aLmzqkmiLFFp(}6efZ*|JfzGEp@YQqvk7vavpS#6Q z!?&D&_zD*?hkZ7D^5C@1B}(}|k5fw1%v2K1Q^CbZ)|S|9*tMX*g`L8NK63w5*!JF6 zx0=ZIoUP-o_kj&&gFnzMgRw0wL$8%Fj$6O?p5K|rK;Dmq7}(VG_@ax*uk&36h(?$1ufWUq z+pTu+!yIqUI)>k$;}J_1(y2`ncx#?2y-P$}{W*26Bh_AAn*KL80-dNcc+(>dK|pvC zj=wf6;!_~Z=jFv#=MqZ|;tgejeu@~H|2uik|%$>-!iVj9Rar(BPP~9Z3P{hYR zKX!GtMun>WPo({QEm%7<$2A9hh<(U5^Pl1#zPZOKT#8yo4*~p8_LVA{4LFnc%UCMu z=64e-e8f?m)M=Jj;#t+>_5DSWD6*$cfuvZIC8=I7T1dT-JxW@G0Q&qkdq!ZBmLhb3C(hui9BRMabXk~ZfE07G~N z!m=k4$>&L{GD_(1jM61}dz}YyidlKyuP2kQ3G^4TKZ*Sj%+&DbUjAp$iv2UlN^~C%$Srax8`UN=Cxe8LBQ;tvoLv;7j}jre;HO zIR~n!#y9k;hGzui@3kuRQoliiivJncmDly@MYYebBh6|hR`BBl_~~+~`}1)G+di%S z?qB&vj3W{7KBs|vBgTOUyo(56NMSbg8A;8I)$NaMfi4j7Y+E&f5<4$=zldFjqMnIh z+mw{_B9+kXVvsASYY4gHNp31#@yp(4heQ~O#l*ebn@kvJ_S<=!lTuK4=G^Y1R1hI9 zD>F%@skXMl9YDAG6Vy~~T3<;|GfCBmPgrigczByfOeOiKqPxo~8N6b>d(bCZ*LS1@ z2y-huO=_!ZN?I*jRdXftTQE634mGUkavflUXN1hs#A{hmOPSqw{DA*LLQpWvr}22} z>Yn5!m6@5zMRxD39d*QcLGgofrmaHHPtaJt`{u9{-*D@F$&dhe-S_Ft`FyS-_Rgwv zz1Gz7rhhb75qIC*UQ`QEs!!h#e|lZw92TU}|5W6ey{z%|^FzRIU%o%SU)omBO}UVf z2}cD*Z~boeJUj60{GPkIt>y}V<) zJo1JH5bX?7yZbyH-hd2=z$e9aU6!h$Og8heF7urqctN)ll}mnKF_#cZKrauMpz6(+ zYl){uL0910%?9wp_9?6R(&vU2<`-xY&K>;z^knd&{j?|u{B_2YKjXO7{d9|;`(h&B zc{5RoLQQRVnw(}e ztfpG@5~-sZ!0w`RVjeUmGOy624nu69M&!lOsy(GLRH+!&5Grccep$iZNZ=q`Ca-tx4NzW=?}$V5-N0 zt#dEC4T{kFQ%z{A=;Mnhsi?~s zPY^b(N5a=_n%!L96z#Q#8e0xl*)q~)&CwIkVF7!E6P5M6FBcbCjV50Qx_-5^#es)< zCr?{dN^7)N@&Ja{7c_%(c3ChfDZkEwx;STDdQ?gqR%;{}27k2U{ndsGea~SzUPRRe zYj7g1ej1rgBVm50Zi1^Gr+O!PjQ3Hj;{#2w(P~_sBKhrs+K${$cDUYQ3cAJKSjTmk+>_)IC~uo*VqNssX5_rX z{Is-%nF^d+c>vnk-z|ar&gJ8BwKhZ)3{_M63c9qCt0WcSfCh?tD@tV7gz0kM-fZMq zIyp{gm8_l&;pmYwO*+`N_vS6u?De7H+eyvp&5zS5ehHim37vrKV)Mdal%4^O-!3og zLe}in)@FUWjpM*DPqIbagZK)J&Kb(?TbZMv+fsnlXkh-A(EYNj6twofo0s9q@2V`X zs_WXp(U9Chxz0YOo}D#!CbdpJ#m>gtzkY+=o}DLMKFLi?>*B3%qZK1l>a=m)g4QhAf^U z9go&~x80tj>it8;WCGpx$d{Rf)f;()9_ zT97^m?Qi0*8{0paUuOc!I<@t0?bO}7eU2`xs|AM>wzD+B>)uC|yv>{4pn>kUtFdY& z=r+fXQqUvzxe@Z+S)=a8R5zc`i@Vs2wKe@`1eSg}Y|q8mSHl?sK2KyB0+El=7FO=5 zR!nv{!~$u>Fz>*iTaGVWQ zwPO|+EuR0{Z@}+h4%f29`8eBJ#>wOoro=!=_-iwVXoHW7)VNXc9qG*6y>x6FVOn{O z2kJ&sQ+@8IgbZoPMm&$yzj<9qpYWb08)7S}f4*HfYvZ7KNxy@eB- zwSL%DMJTGewKOpeR>7b|qH+VNmBolUJa3D!{3;v8ETSJ0CME>3rytX?-Ls#$x_5Rde4sgc%sClE>@a*ID=@{>{>*43;>TfWE z=ea%J5eu-K`hEjeHemfc&GXEU+|TaUg7mc!%vMi>~w%`HUB;+_%YOBnu@|}I_XW^mj4m_rmRB+8aLrw?*#ArtEbZ9XM!ePGeaGlhD`Jmj|FrrnQ5%1aSs45S zO^O5+(EU92S+x#jJ$)cLR5^ZhfgY!X6v2-upJiSInKblRh{Y~i;r9f4@BoGprZqMJ zF7h~Q)6CEZJ3H@LG`J~NKlBYOpy2iqGn@#0s4l~r*-ihut`NT+|xW-<~sN>w3rEa9~1B+S?JGm75^ zV8+mnD`kFFjVApi=SW|)-m7c=?3KL9<(NdMYZl1#U4B!PTs~2&Zn1lNfa?(O`bk#? zMGk>Y-F~v_{Kw&(ZFLFSNqLB~RdH!XPn9Dr)U4lZUs+eKRE>=$=D?7cB1jCe{G_-1 zB1@JiAly5WK3C^Y1HqM)O=+ZBB83qt=P2DfIoy&gLOqK?RB5!&WKgH*cY=O?Iphy3 z+3*EDp@nI=t0s1vE!FX>kOaX{LdApQ*63CU;I$u^rGMQI%*epP7s7Pd;PJU?&=WRI)`w7fjVcB*qH^RxhAgTFoO$J6t@i)kKZ6Z7h;x> zX=GNALN062lnC|o_4kHlqiEhptfltpxCREbK^%q8EA}Evf)wtN3V$dmF@DO@SN$hT zp!1(>bXAbTGUl*RG55+YG`pxwm!Tx_{__MI49reVP1ikD{$2P62$Q1gZ)=7IL$D0 z5=c(Hb(52ZKC1MN@{M~~Vcb<9S+rgalu)gPkkPX(94GpB8Eec8%%!=)qq@wHcw3{H z%~XZ0Vr3s;mmAb*5(L{3WY?g~*Dy-vr2)}a^H;bQ-o@rMT6F^5+PTo6|`i@ORe49JEDq&$F z%%Xdqbgz8_j+-hlD?JcY4Q^e5nF0wS-pzoBKg-%D!4S9pOuY&%gD6T`p;CxYx89514AdSggoN*e!{Hr>i|;n3@Gp)IJ_7Mz3Hg9w;5PRk zK^LH6;53-gV;4Nh#31nmCNGu(W1oP@-VF=DpvO~ilRft6hik4^VdYgBet)09EOh+- z&wt%0_TQMm6BFijac@6t@WejQ^=^hDhqm_wbM#ZA27&V&^Uq(}3D}AHA_X(Q{=Fe) zMB@D5`1qy_6^$4p@Y)^3Jq6lAyo-qYaNNg`0spw6=tqLnf9g+A9CVYuN2G^xQn&w} z@}3xm6grs}NVb1+sTJKZEzg$vXpdE6SntQUd9DFK zRzM|TZu=^piv7xX%<2IHP{K>JjEJa@d*2$S zjr^$orYan>oW)_*Xj3$V6`k6CAL^CX z)N3p=*;OUYe1*SCy8c>ip=l<(IPH$y2|?O}h^Rc6D95X}4ERBURaqf<-XS*i+nPv< z0%}bZf8mA-{NVWFUA;p3CsNJy81UKw&YWnu09$TD;QZ(K3cxY<;J6RLS+JnPE4Y|b zzpR;}fKGjU;6{%u7~dLC4d(2mtZeVTtW3?-&LoGCenIQ|Utd5$dRuqtV$Hu@Po6mb zrvkc7^#%Imf7sY}3H|kgfxF3YXi-!B;@9<&5#CNhV771e9oeEBzLW_-x?o62__VFVM0B`APIP)_nOI2uw)lSha@HUi?V z)|gEV0p&;-#RKbxBd-u!Q3eTgN8RT*0~LNzSp?Ac5?#=WIrqVG0UT|R#4xCrbRAg; zRDqP%VDV#n_~6}&KPmyrb9Yc*3LB!4LV0neY)b9RG`L30F^*u_gnQavA#YwQXUC9n zy@x^pQOTas2~!YCGO*~=a3~V@q|>>kJkVHAwm6>l*qvJ9C4LUl`vd}klh^O^K0^nt%(}^8_B2p1Hd51bj#{A!un*9IFc>3~boh37B^+jzp=wX(=wXBR zMBLdKYVhneQMqz)L1|tD?&SW~TfJfLCSe-Y-|G><% z;Hc#PIl+i~VBE)5?Hm|p9o%I$e3J65HK#2`-vjTYoNZHa%_A9Ar}w55D@21_BO~58 z7khLdtM{qdSP1ID-LsC2Q#sl>wJcw8w-E3;;VObWFG)3BhdF&`HcYn@qrRsm3QM=5 za64B_d7?SZAs&s+9i;18(V!c7=ri;n+8;e2ErwE5bqdRW{=fy-#!2gMBEgIMmQ=Gw zv~{AKD+!6(sR;Yv$p!Nr&Owb35AIa>M2|==!AAx{BR=sq06$^!+HBL(E@qZ)k_RHG`{;T z*MwdlY!l*%DY*SO49w5Yo0Aqc3Cu4#e#6cJ|GhJG`S3iS1UBhQTt$Vh+A8&FIoPVt z4@x^WH8#f+uJ|VDi8JFmGf5V_9&()S0d*2o(7X0?5<4eqD6K2bt2^mehY2o~OsZ4My zbhS+ijG5*xL0g!bx(#5jElrFyJG_?SFVYOwG4E6YI)8|84aAL)1zQDvp57#ydHLbL zlKFi3>k!&hr}J6nBWrx3It3kZ939tlGm3=fF3H*COi0@P_1*n( z!4(KwbQt($3-LY-+{E?cEDl`vOZjapPWAu%lKAbGDK+@(E6@OJ0A*~YZr`XzIdM_W zWV<xN@8f0_ z=mMNv*X4vsZ;?kCkT;uKCG33(X2+fS5KPI6x&%uq%zO}Efd2>Ru&)aPy&%?pC^;RlK%6YR^yj2lFqXlr!Q`Ul`}I zItvX3ej+@?>o$vluN%iGBy!T{t;4?0Ojq z7bl|C$-`1XUruzwG4E>$kYPq|Gf;hB@E(GpEP3_duiv8VMIp_y@u0W_Rki4A{SbX6 zAp7Gh{+`i-1rR1oV zvo^iHPSc_35)~_Mh)TW5wUWyjUG@vMAWRJTGR>UD;dVqZJ#v)w$VFCga_H*@is!4a zT2sb-Q7O%4?Vs2}7;$6nWOx!3drO?#Oq;7qfO(++6O{J%!MAjm@5AAh&a+E2!z!SV zBrt$do=5}YoE$vC{QCmPUjLa6I*0FfOMOKA2Ov-)_?eJ?QE=IjCU4pgmju%p#{Zii zrgVaPC{gqXyc&RfMXNQu#+h@({(2l7AutbNuWixeCIMgTXN&&f!uOC8Fx}iQ8BXvo z%yx!4kbqO@uh6?adFUT>M4a0E(mE59ES{(tqCc+$80==0m$~s|@~=Z>roAc#-M1pR zZLv}dwbJH=s`jngeI9zb5@d~tD>ni+4>($RWwMgEBG(>bDuOR49$ev&; zKj$zd)XKhO6e%}fV-o3qPAru}`SB&u6ZX<6r)>qCP1a0=N)8Ntu9;n5C`Hyu(()jq zWvQnKxBHhDgjo(bW36wmuXKinM1INPa?^_oPm<*bV5U?- z8p-wI*jA^s4z{eMZIn|ns(w9I?{6JXp)C50 zc%q_TQ0}Bj5|^b5E-VRop3}c*9O9B41^t|9m~QdXf!)#?N;Uy#6}j^gRM_?a=vuLK zj6}S=#E8IH@9wV$EOo*s2lL<9*zn0M{!y4Gy2MSE@(t4u2=J=HH%+$uSZP|`vQur1 zsp$A?Lkb&t`LSnp0$JOp8t6poVIj+AYI6noFqLi)zyv7YeAl)i(D;WKHA$Iq$<+Va zO;4aN^(5Q%)VH?E#-M8h6LN|_bSir-wG@L zJ#xu@Gnw%c;_I~Qy*fUBXk(~Ac5AoRq+cHKTJOy97N|I!KWUPe6AnNlw+%y|D2xM zv_;@==mZHDX5Z!z29*YaOQVqPDhlS)19TxDlfhU=bq3(87dbQV|JNybp6_=Aa+bMCQ)UK5&L~*{zoQ?tqtloM9oV`BYjl z_V@bANMG~e_j#tXxbhQb1EY4#Z<19Q;%2Oys2YLZIMW?mHIm`p1U)zoDbmvfbO>Kh z%*f4eY7+sdgPATKu`_}0QmRI`$ClfEFF4r(WrihZTGEM5gn*{Wdl|xvH)m}Gx80+N zN>n|$(o0JMy1#XiiEj0!X&xxQCO6w${@;?}NngNj1A^zg76wT8N1g2&;ui*~GJmyU5U?@-Z0&5~FOyin#R_Vvp;U+J{f(&Znjlzy4pI zs&2T?^+ksNKYXJ>+;<%#O<+JDbrF%@w5LMw+<9a2PH>h0&uq0JoHws{4JycG8r#ki zrzWe*C``f_XZqed)n~iZzy#;{d?d98wwHB4Z}KXMwjmN3Wh9DO`&%;ZcTQp+ygSit z4IVzJzY6had?WC`_5p+SXj9e2ntE|1Cm9-$obIj+`X>_|qzl*C^A72)dA?#P{sN`N zA4BOGP5F{>d{hPl0sIiFy5M@2?$n14F!zs76Nt(rdsi#~husUteH`7)g1HdVKGtGO zdUgyZEj}BSBvSNq*j`La%~F}X;eFkiFZ#%pHtEg&cf-Z%lzzzem|tcf1BK+&HSnG5 zVWE;8c6HWKo`MVZ(ksb*ce7Q<5u)zVls_QX5Bxw!eojV@XI zBjda{b9*!zCdhpqFTt&@GEMmM#VzC~Dr=FZ4lifL*Qw3mub8W6LX2A9ds=nQX-Nk8 zl`}EemUl9y>X3K64CW3R22Zq&g03fj-avcmYAhVIRTOk2V~WMhR;MpL_AVwsYrq_4 z-8N4-HIQ`LdK!%3xjJ#FBIDo*!t~?lioV&dPZPaQ5S<+8I#;5^_y@pIT*pXiud(dE z07(#IeQpdb`ECr4*dpTIhlXi+z>-Jc<2T|gFme4I`2F`gXXek4F}wb&mTgUi+3JRa z25%W>%sfbJ^a*iyud>pPyfWY+Av@v9jDVQ2MewFW$p z=NK?qn0Ix=s*m&7mIW_#wquAZaC{~bO>_X~=DM8m8gtl~$DDWhglPhi*Q-bTx-+Iv z8Gc#Ed(Z5Mim3_FgXFvz1mEF*#>kHQG*-!5gO4Uh1dmSr|LvWzv_|Y8%|LSncB*qV7yAZ1k;rAP# zhi1&i(VVrnp^3^n5t!z7$yD==|8;TPZ~3!rckP@Vg#Ha=+~ZzmnxHPjx^ev$EWX-$ zD@;TZF|Ex$2`YS#*w9$*t}K_~?ekWA@pW_-53ljm_QzG*yLurhL2X%;1u0BVL;@js z=N$)KhbrZ(g}lk2=WAQ@)7sFVc>J;v+*rS-AN1%olpD%OODMDM2@r|#XIQeX+*T|7T5#W6WkVehE0Y`fK*@2A8+i zJwq0L=G;-!Qn}=udzNs<2i!=tLayYEVy3BW7mUvuQgRDj><@5SnyoowpPZ1`c{hjy zDPW)RONPszfgqwAb`b&|zaEDn1ZNGUakl=vB4wC?DyrAX*N@-fsJLBKa{kTqF*{eI zNNXr75nxpOW^AU2F2V+4*18)tvfYzOi}uC{S2peo2-oYqUCLC2pLL9sH4$W+b`ls@ za816jyl#K~wLJX^_u4d*Dg7I!3-}e#EnKkeks#*er24e$WdT)KX@|lX*ho#V6&C48 z?1=tJy#Va_c7^AvqOH1EcxO7> zP3ZBO><;D_5? z5D40;P2cy}U5oi=vgBS*@J}bDL=d)V{-G1^!n6^8QfcR^*Tg+iqd5Q<+@=Kov-;SP z^?bqhan1@MDnh1?w9&}NrefIW`E%sp0QhL}NTcX`-vpi*XS7(q1p;^zK2vw)PZmP* z7Wf~4_b9=hW`8{45W*M7Db!7z=gFuftLmEWn}egum~4wq_pYhoH<=S7iiOaSzLWEa zDf`0D@b~$DV_17KhTWPq-lKl_QSd0y4SRB7HkG@afX*}}!IPN{t01ecy1;AO5_T3p zl9TzG#Fv?gItjo?^I0H?biP7sGF#t^%=;`ueL_${&;4+gZia^<1sZE{t_jc`T8~-Z z{r=UJy0*B$T;V|H7j^}7_39>OzBD30CY z8J7H{yl4Nq###nylJ{z~i@MU2(;&1d9&mw{8cUq97}zXZNNl=f7wcbxFxRVpuLF@n zbV7HYH^MFM!r;<`1cct8-59prFgWlpcAK_; zm5JtrJE5R!LI7fggO8`((d8cZe-Zh8^Y|{bD>|jHh~Gql4yEVEN9}#GC-qYpdRLZD z3W56~I!%mh+XxS4xEhvRY5GX`7=1YAi?3%fAHt%hk0%4=+XHYNX1HhbV{;z#0kkmo znY{aOECAz+hW|%fezKV2uiZnM;H5LFO*Gq)k16{plD$aWBlv$Xnhf}2glk{}YzuxegF(?K zHMGk8_cxfS^M6#T_BZ}jW~Wl~CCXJ05^P`bCB$E}BwGU-Y2dG*1-xOw%V%;3X+%>V~1na(05GyM1MJ1(oJWWGa4Y9n8f(5?M zNGN~#tQ)YgvH7mR=11i3TgSBj$I6hufNv7Opx{FnIFdUo3Rb>#<>Bqi$)QX76x}|& z;YAts!C-ql5tAhCrwB;WDdZPlVQEsYSl28mgX>w$@>+ZJ%`2$oIeG<$vQmxe=+pyg%7!7@4oF%msuF4*=n`Oa0t$4RyLXI z4xd7m!?KEg?uutvEyNnGMP4Gyjlt#K0HGLMC~{~@~o7k z^tP$&_R+k6%xd7rY<$r5K&s)ua$&^z!-FigDO|r{PA9of_xH<4$eqamu~fb*PS}DI z&?O4$&sUNa92QIFAwi*e(z221-*Ys2*D0koC}_6c93H&C&rs4g8Cu40l!{}CC@v}L zrf^u`xP*VN83dTgd*$?_6Q;F?3o(C#=7{|gE;Lmyi8a(;D7I}`DTy=mNo$A5=l``a z_6^awWSTClNe$6UV7e|ICd2vWa}~5_V?=m`6xy|Qe%PanmM{N8p;%flT}=@JJ)Gns zU!zIOOwpQ_vQHh(=)wl#v_R6#uXWkUmz6}-0JD#BIuV1a#jijyE9W8wU|eqT*BmJ@ z`U#NieQK`|{B!F=V=_s>-rlY-+s1HSZ zh`8UqFTneb0x!|vHl1oyesjFNf2K~L?x2BzG^r1K&i_w0%iwlvKXBdus~?`TYGppZ zzI|Tl(L%6Ifz%|%(S_m)DsI+AA6(k}?;s7&Mw>W$i9+8d z&))w#-C~W&sAmm_(T8Zad}%h?*lctj=c}S}>4^G>8RxeO^k}&;iWwi#Du6GHY>6LA z0bbQ8V`FPS>;^!w{F~>x0Jlst#OghJUsJl68QPCV)nuR14+XVYPKNsgy7%! z%N}!|WTNysOK1|_i^gh0cU_AZgXbB8;Wq{n8MLE+5V*w@Um~~_`i@+s=W39}afEJZ zDhs4sD-cmLdA9R=6qs_a<0m_>O87mz@TN#jv&GSOxd`sl?Tp2 zND`eRiZUtJ@=3MP*+ZQkdP1Z=+F*4PNt$w&ckY9LM9Ob=5CI9blZ~iqX5r{ZCHSbn z%`Z@!8JhfMd6N*=U@oso!mv5==pm%q5<_X=B!9TdtdBWY)Xy4B4!)EF^CjAP}&cjg( zs;4FP3AkE?QiX|SW3JlLgz!uuS$?N(fo=2KTx#CGQ^~|f5m8eQ9Dk!WKw+DV!@Bnu zA-$(q>lNrX+H1^r6d6m$M2yzsb$?tayF1I8VV)4CYOhbCbu4Ng7qAq1^cGV7@}<&4 zpV&6`L_oB#+Bb!#nkoL_WKnW@%T!fDgz5%oS2l?0(~hPY?uZ?D+xf?)mx$+8(tk;r zZautSlkH{SLUnV;AOUH_vA@r0S&eT;x35oDRb-6G>kt2lstbqS!v^}lcS1(=!mOHF z?mp8PrzzUq!L%IQ%g6JV?`kV^E$yOwON$hQ^i-kKW7&=Nz&*GHBqWQ4CUq7E&F}N2 zi^0?iJx;nlsPr|DwleQsAdmHWt(8W>8A-)I+X{J>Gl&P36Bw8a2c6NL6ZQUIeVo4= zkEW^ZD}QEkehTFt!esy`A^sGy>ZfC^QYlyRu-)}30)k)b<*S~sk%(*Z3k?8*P~UMN zsR=2Z!SgXQ8XA{R4j0iCOE^V%2H&F7KhrV}7Arndrr<=g&JcUT!d+p@ip1+wH^-uL zqTJ7aNt9j<+behOdpaMwS6NZWIY7W-& z-_A#c{yZUfiwe=zVu!s^2n9-OO^dwey*%k5Qty39wP zfoYeDf8QxXkI~y@r-4uO?#ozT4-X->V&+7yp7br!B)n`J=V=?RFVdE_v6N1$qM@8f z4n<#CJv~bRQ&IRCrX0GS??m4;3hP$qW4`u}%tDw>`y7R8HV8L4uw4NY1=1GH?o@zq zcU8JFPNXWl%=)of3gLkg#;~vgaFEVSY6pvK=EOC~8Ie;&W12&LV5U01`YP`T^!So5xCreRNEBorq=jV-4K3SGhrg_@7 zs$o-ZqZ-u0G-h>bJtl1to-qoLsG>6#jyQ$wp-r?IGLh@Q;S#>#<-3&}r^P{7wt}Bg zU=0k7@nEt*XG$)}UNOOX;KaU51#;!Al)HONO&SAqu4Gi?9q^5hY69~LiK;7C>Auyu|=1tHZzWt1IP#s|Qgs9!mVE1VVX)t+m1>mUr?zoR1vtR-L z*DV8{rMU6H&c~j=FV(Ifd?TfER+7gb@W=oXx2zER$ilLhzw>r;B0)NYs@H3|3iunj zEg>6B;FYO+_uroTpJyXdC`S8M2y-bJ+0AFg$;hK^DhRC1-#%y2yHbK!|3r+~m$Xwg z*FZ5uMZ%WElr|o7a=?67DxT(adEpJ=xI1qDoUKLkelSzaH|DkSiS=WPV z@IioY`$A|Idm(AN9oJ!Gl@JZ9&J}F3kx=642@B|+T0_pcr~mm+-DLJaY7FCf93wC- z4YeKPho#6RAV{yBaM;D=&YtChv`E3ogc2u5*~n@I>g>hs--nxU$NKVL%v~lgFQ zl-nwB$J%+i(kwp;b9i=(5slVN8&A(hPqY5yq5WMV6l&`T&GNfe`7f zgPXK{AkrgNNRZYb^npo>h3xqe&%FA3+W^WKbI7= z#V3M=kd?3}C})0R!9}3NSNHa&ym!bM%Vq@Orh&b+TGD~sYPa~B>9m6p>VE!4_qETu z*Kc+|{+Mt-3$gB7AJbe{gLVP5!u1S2$9wZafR0 zZ0Jee(~M@={e2F8JKLpO!0`d7(=gmTNS4I`)kR6cBM$k%-DMHIdB9d42bpGxpgGCS z2QYjU!O|QKC}boYh)33+_8+{{M~oYZSb)2SQzRjHtwBmvC9~Ry$9axifM7swHx1S( z4HPuRa~2wCXe#M$8z=Zk?O~=(#&75|z5|!>p?SuSXiiV}WJPK=JMp-?Yr&U{2^W&S zg;L_-#!Ye`r06nt4$iJBmH;^I`CzJ=AB^w&z@UPu7X*;XH7b7IP_CnYB6Jm74OS}DqP55%of*q8YakFCF@NJRJ8`*k>sBc^u( ze2bhdeGWA~E|=8SByzkA<9O+sgabKU`kwB*4wqhr;^MTul z^tJyP(f9L-{_+177oGUubBhrFeI~mIHbIg7&uGcV{)f<)Pm%pkWd9S{|3vmbkD&d} z(EgtR7A#?0KcU=IXbYrZ!-9wE@X2Ek-q~}&8;QxVj-CQN{G2=mDWivjr*ApG<4-up zPG4|CId%4>TpwzT>de`i@TCfl(dbAy`RM(hk(00fe?E%;80r5b{ePtYe+=~hrA@Z`B>BhJ4Q56V@;V@G z8k`3y@k2c1!3nULnekAd`})gH`TEQ9@0r?euRguC9K`&-Q6CH)OD5(%#})G40zIE5 za(qqZv&!q^p)i$Gy=K=w7VvJZJKwHl&EcZlWF z&iT{I@u#Lm>^L!4@y;2Mz~a#OQY`>B??HI~WrRTa&uv0~zvRDcW{!LRac*&z$bWNl zQT*?bldt?Y8_9o>{1?f8k^J}Q%73;*wJ$3*bzd;Qpjm>{UO13~*hbNJb94T6!P!e0F969mX z{XV>9V-h4Ei6JUD@sPDp$L6|Zn6x2VhD^2P{I1-T&5jis1I4kfQ@1CtD;(A#u7jYQ zrFg1M%>0ci`7=p0by|{}lr_?QhcF)S5og$-RjF;@9P+WT#=0(eBT?Dzq)W|)EU#^z znsEOtnGzF=IrDcwuc_79MsaFPDFp$G6Mt*CqIL zx%K<5A$p3=ao${mEJ&-^o@(8Oh!tT1)5#0r3$Sj=nDbAeFeJ`dx+e(RhdR#Yqn!bK zA_XChcFGsZmBNNI6ZhOhK?XxRn7OLO9pqV)C0sSBcOa*L?({D1a;RkE*{g;tW`Q&0 zy($Tp_S|}seVqNsRG`3Y+5(?~^$`z1DR#2VzA;T!i zxFLTt=Dj|on+*}!toaqpXivK9@yxtGABR>FCr6-QcrJ&A<8)|PZifcuc*BjKa}P`$ z%~2d5RIvs}M`3PKuEl+H^Vx^#aP^2KU;SU(l$*vV8b2}hzW<$D%w%o-Uv_bB{)tR> zVKE!s|Bjq|^nZlDe2Vmck^V2z|3&)0M@jz|%KOSz{}I#NGOklED@VQN*iZ4kT13_( zRm9-Fe4yC9wnEqdEQ+gGH(h4$aY@&$uwfT3G06kOXGzynO{~<-2DMyWa7U69?CdXQ zQ(!VG{GTXN@re}44pLaG5vH(J|O19tk^$Tt=i3JgDX-u2vTb1QXkLe&xxQZ1n zpvvbymlLNYH%XqViXZ%ZS?IywqMk(cB-%|P37k5Fdfd=l*6X`c{5yvmlG#WR-+;J| zPN13j`NUBY3HkMad`iGw`W1fA64FuPatKn8g;Y^XXHMlQ61bPN#4)*pEC=I>0 z0^R12t0b&uT9Os1dy0I|RbtoMUdC=N>0V;iIKn?EoeTi^v+n%4>-=et&4@ChNB)O{ zSX-}RBfTpbI6WeGk}{dh;^JbE{7?VpWz|e}adu`NJux2w_Q>h)Oa3Q+^Qp)9V`b-D zc^ng9i1DABnTy7M)HLGw|Ddt6y7{oiKO2qz$Z4qY2mO!F&Gdb=|DRi!ap`}+{y(z+ z8aYM!pGf}`>3<^q&*P^5;Z-$4P;NLanX2}j^TZIl=Mr-0Rh5th*HF*(c$mn0_eNio zu;16Q-fyro?AI6U9QI}e`|W8$xJy3ZD|YxF?DE&iuiBcsoLo)}2F9cJ`9G7LpL3u8XR`~l(fNPW6z2R- zgr*oB-B=D?q&F9~F;xs4En_(p)1*4yF&gTA%)V}mU4>f>>m$8)RkRjjQ!2(8wO)#B ztsc=7djB7R0SvMJXBHy+uaQ%<{-e|{g_i#w@cNJ9|BRlZ^&h1uMJY;A3QGS!hmkkg H0EhwrkID#Y literal 19233 zcmZ6x18`>15-l8ClT2)9V%yHdnb@}NFPV5^+Y{TiZQHi>egE8B_pkTrovO1=)u}qW zcJ=A*-D`CdN5X;q_d>Yxv+=+miMQ;QJUJC=jMu}66G7W`VG^G&mL4@$_tpJfuOTHB zh6f?$Oa>N|jVor zd?J#*wr~rwh;=JvWHF|g|5;!gN@w~m`-_bYBTi6`qCj-SogGmL_q#%^lcI)ik0uoN2$a_4}ows^q4k@#XXWpU|?4Pgm2`v^Oe8^G(>KVJ2>m zktZ=ZXh(uV`BNvLrK6#7>n3Mfx4{|E-Tq`F7pSCoq{I-YIQe~K;Z4X=X%g_$fTfb& zA)!K2-eK+i&E;f#^iVs*G~2 z7Q6F`miHWIU&&iuQ3GrAe`bZ5MbrI2@!>$<)(bVLI9eC;HN!X+6vF zbDT-$Upy zRrESK-|qV*L+CZe-iOy^CuEZ;6SPYEJ*X7*^|w3g-R%;EW1>TrrY=mcShX~}6oB4d zZa)-h0S(>CW$I(=!*4DVbQc<_bZBjz?VeBT^Y`bGwUf39OB^`U6U?RH=f`+`cs!Ly zKQZ&GR5`I~dQbX`jw&WHR~}Ag^z^rNB}!9QI7cD03|3cl^*i0&jDji+HZ%_Py7^Zb-Mewq!$v8S7@JPnHcw%NLsCp=cmtX~5FW|jdTP4GWLuH{ zJ%RKZB(3*9Y))*NbJj`+-sQ0CQ#lY_2JDAwjYdoZ z$tm`-fXH~q89TT045n@rRi_OTA7(bA(|V7}IYoz(&v27Wt7)bCBKR3D$s zA6G}W+P7X5_89N~6yLiIQPviPj3jb?wy)3+RHeg2a5N$WW1KgObU@cEOXjfLP%(2c zdb4gKnTVK58 zx3Z0w$|^I*+y4g_uo^%eomKivF8mS|sm@O>4h|OFBoI|(Vq)1Rm!&irXi5;ZOW_)f z3r3wY^#|r3+=3QsDn>k)beqgnDG=?$=jWSCL$9$%)K-kd3QG9veq|XCeS-hp5ZFqU z7bEp#OhkO#S!Ba2BJk!EtC9vK8iQO$*5=#=H`b;m6KrpnReqwk-(uyM^>U(El9WswQspyFRpV;J3?cXhyAdCEI|_c8AGj29^Mn zlWmJ6me;+afe`R@d!Pn%c$f_cDo=UjOU{rfN2#ni9&q@axNGtM*!{T4@qOrsa|aFF z@Oz&uh4lc}$B2alfy*<*oxrKY+^?^@8Xy~63Qjy?NKNlMH)WyY=g14u=krFa{>OBX zP#56-nd=(x88#9K2lo|oMs|PO)9vqk)1iMPW^?AaH;}iQ*zs7c175f{<^XWIZ&1{N zei8Bm9exmd<+0o!ybyhzg0eav+S49SQym1~??BgG`~A(w{AJ@KtGRO>Da$Z{urva4 za?&KOH#XBa5Ylkjgu?xHx0h)%Z_)2_AvgE)TBCDcvB&BDu0|nJ16h1O zUnAbRa-^>gy*|ONut;lE>``90312FZkV}nz&39p&50OPUhPF|sL;u%}AE@sI;Pbg4 zl>7OKFMuSUx4IlB+$X3G@oE2D?mwHP4ELOmWeNrp5o=qtQweTxn-8T3OUORPxa`nw z2U{*zXAM5#u9KYQ@&RnoJ`+R+#l}#(gpOjj4XWAG5cMtAXx=54?n(!tfp|e)z;&^6 z6x1=G!5`s(*&P_0`g17mYsS>dnJOC;6iV>`$YG8^kf7ZB`+2BPr$nEm6e6$@T4#3I ze9X%1qWqkXxOb`l14rK6##}EqmiV}pTa-#u^yQ~(mFCC*xF-(TWe!CsJ zM}*yyZvdKd?F&+uatmT8Pjl6h5qcwj1|+)P0@2bc`}@S*zQHtoKLB~**?(uLrE5pN zimDi=s@-b^w7pPSyvB=Tm&a(cGLMSzOo&$27|NDf=DzM3khc<{VH4U)HhP)HDgKk@ z)$FEmk9C3O_C?w9&o=t{{{06SurhWg_hUYF^zNfZ=<~?tMacI7m@5eF_1%Qn|9#> zS-fIp3swAH+b!JXo2Ln{7x{EwPxLHjn!QRL>T$-I~>t8C-d5>CV8vWPB-WhY;e&1*z`R zih&P@lwv)yF@thh&Bpo!(rP465T=?I=CJDeQQ|c0{g$|%L@%t_zI41f{_Amh<-&cG zjK=u81MZ`u9rDN0oKnZfT3;#Gt^uc7f~7&HtsD=$Cn#!Z1YW=F)CaRxr$xka`S}0R z`KBk`o8qVJ>rDj9j}@#jGtdSuu^paDXH|~ZI}?qDxaRCE;3K=ZM**=~nBn@RtmOvB zGrRkW=Yt7m&%@{G3^`DOJ7|z(;y~Ihchu8oD?JaV1B%4JgIGoXdyiT(p*J8bwS#Xo zy(<9*TOSmU*Oyw_MI#)~+m=r(@JK^9=>EMWw&zKwxas#=;4abEyItBieLAu@Sy|oa z*u@SX@Nh}0=M|3D|1p}&aIwA}H;lA}Tgcr4g$H;DJNkRu_oeS;$M3d=xOVP_JjOd1 z74WpnwZr4}QJ4sN1t-2Kf-p+NGi8Y+=()oSy5Gt5#YmsMSAkC3!XI$}eDx^`@%vv1 z#q>N~5A=W*?mTvUU;BKJCcpk|{x%o%G`HgK`8l>D_Q4bF|Mgs`VIVbyU332Q?~E%s znTf_84axdbJ6aNVBY2jf{U%5vIK-l_>KzQobux+5S3s1>x=LIgY}&L0_L_{dZ1 zkWkq6{F)Q$R)l|=Y9a1^$8((yitT~#^1Xj|AOh|q=X$aDYgJ(UEPgnd6v%b+esVP4 z8F1bsdb^D06*gbymlWc)NK8aqPD_EO`{4`)m?N__P8`C#YW82MCCnrM9pKyU{v`0v zo|}{EFJh6Vm-}1Rv|%Ec_PgQc_3&A_5}%LnWX5SoW!c*5${j_?UbL->>h{XKq|NLM zu)z{=Vy?H6647s(54C2yHD+H~t+%GFX|SWMy-kwd!>y~U^?EVByx$ZZJ$`~wx+S1Qmt3z%D^(riv&#fv5z$yw8q9zy@0#}%4A==*L`4*hPq`5!IBN7Y^_y` zP1wX(5t`;>)h!ny^%+S$_(#kp$tGi`YD~~X+1@!ZiUxpJ{-!lHw~=2p=m;t59$eR~ z=L^d_J_$#Vjp&y$xwlmUJ2K%rX)3I5|GtB;jKTBiqMy~84k2Jj@#3f_}Ui!7E+Mok!pRdnB!eUmXlhB>1 zw)t>6Z}GaUF{2XPmqM~2YXE^(Qt^<<37;XM4^PbOh1EEP){bOGY$1o-*gAY;mj7hN z&9;$2OrjncdCtnG?A3(t$@vY1kgDOa1-ap8n9-qT1Hs@YKRk&VBczO1R`!w5_>qKt zv8Kzj3**X(b4f{3p_`KW5N$@XHhb<+y_c<;_^}eC*0*Xr(K3boDVh;_%@!^@XV6T~ z9)DY8{83P>(amjG8qqSLPh~U%G31`+juiI7={DvI7=8t_!Rhao(+rTxi}==l(!_)A zrFg18LnBJJZr7rSe0rmsaQvofvF$Azfdtu(RFvUOESwMSGOR1MXgMO?MQ^CSc6DcG zlb2st0yS8k9TP66?KP@l$*!FwPAvMGj%0uqWCrj1a5?II>VY6H zVk(_ZZweMS1b#*2yn@VVuiZB;&*|A_s(?y5eM9W7UaQ#WbOvkFpICg&CY(XpL6DUM zOJ=@#_+tMWWOpPN zA);xd8vo3s5v0cCkb4g-cQlG!Vyz=&6$fsQ5w$mP75tcSvl@5tV?W~APCD_n|HB^8 z$q79&m+0{Q$9IIJwz(cXZe0fz>idS-D0&J*>!hqOedScV!N_lKQ)wo#aJ=6lt|H$c z=tHm{+JXw~0{5#I2Y-6=`8uS)@?d1{^qC(9m*R6#QX&XhTAz7DEFwAG8Ap(+b`71I zTb6mho_QEi-*bEXM(qZ|u1*QP9$tkJe-8XRwQP_A4{kn3?sSN6qj_R#Rs?zcL4}DL z05Qz$>Sl=Mmywt5u%99#Ax{6!R>9Yyk8nn{?C9!wN-PgC)ig3W7Sz1ho%g4^n(fee zRH3hUI52mWk()0x@X>L!V8?%nT5-EgigQ_=+rAX}>-a`Mj9^iD^Fy#A>x{V#=IJ$i zhZuCZl<2YJb35I##lF8Z=-3WAV^Zi2)$YY-g2F6O=$JE`I8*ba{iE4}5B$pYB-U;1 zrAR_cG`3#2Fb`YxF)vXr!CThp(`}i>+y$e6`n_LcmJxFkrAngNUPjn^YqpI5*Y8*x zes-BJuO%jS5f|#DW1)bpxxFdEg;-^@P{=!R$sKoeowH3QcbSx_Ef&q^BB(84KyRVw zqU%6E;qK%Bu6y2N_=}pM*s@3qxpLT2MGE8GzG>G#JtenCyJ1o?s0>F$aJdeX1DUF4 zIqAr=~weP&~LMbQz5rGGI?LqW;{34E26Zg;VCu6bO6pBusA^fi|v9X}D zjmLj)1i69NHL*f|SFhM0gxnE_ZbY`jSMs#Ao-oDgA=CE>joK-ZTnh9U@A2PZ`2p68 zineuE*8)s|={KZ47C>66wTdOiG<%rXdS1 z2QYxVz!svu{xT$~y|$1HkRf@di8Jq~_n>=t4Mt3`CGu$(4s;TD(618C<02)(nf~T? zVVs|384Kl!f|2CTj5hyOgP*a$O%q4^9^FJ(Xyu#y;SHWw9O19Xzz=I0f9o*QDVt`3 z<)HX!UR&ev};MC?3D}Uu`>Op6_h6E4Y7GLhHI34@T%fpBrQ`Ce^5uM@ed&wA*P+d=nb;y4<_wc_0dk)5)x&Q+H7h$C( zfQy@Jz$=wl0z!)7XfGu)B3j1SbKiC4q!@|O*_94)nWiBE#5(y9^N`Qp=>rx)$l9H3 zVSdpmv+aXiR&Aw7cf1T>T%Gt$V5>?@OAwv|?HY)}$ZysR0o;chO<)BceOUg{@byE` z_MxhARg8mTk#h5s*CO^*$zX@O)gWY(4I;iG-q{f!b1H3+20gk}RsV;9GBr0pvbfx< zZWZXV1!oiZqK74kZ+`Wx#38Kr4EU8;0Q7LidlFhG16thXT>|oIaMFM!WqcXCt`HP! z_NO-L+3hn2zX%q0<9`G@dgf&fZC#QMK*?&ZZUzq_VL__C&*D4m5m$4paIWZAR;qJi zIqG$F`ZlSM$lAEpRnZ5o$}||WYiVx>937rNL97VuVRp8XH~uDKVRD3py(T!2oO1wI zTlv&g&cH^dYY>OUpRCz1KZwyE`5W+oEWagDcipR&18&zCT6+8&#J}Z`7JLGVOYSi^ zyWddWo_BEkV<<9%w#mr7WPdb1X_H{NlRJMGa`JM zgmfnR%+#R0uyCeHoTl9{TbVJFCbO;hmtQL&C?1{ydDZ}tl&GKQ&sK*FgvROYWT1yMR(Nn9J~SjSxDUe z*ugj`8bd$-C&)01$(2ft(MmMPJH$BiqV`&ZRI$D&b1YF4WjL`)vC^Xl2) zZ~Ck*br{SORt=IA&fr}_R6K3?pG}&AU*u#Um^)2;P?dY-BG{89oNQvpl28s%g~`&t zjP~|$MCQ*-?Ae)R8Mo?en|iA`LpsR6*qZMhP)!YfO`f4VuwEvTp2RHIx|P0d{wSvr zd)Voi^7pI|zWD@rJM-)PGo{}I;NHy|@?b6m^h>X%5|o*at9bPLr2u%t&ZVo_iWePLvBNj&?d|XgyW*$Jd>@mwr~H(vL9B)QcqpDCciC z?|w{P8uzOqUELSqxgZS6T+qXt5DI?pKUd)X`wmhC<(`9neSx$VK!7qks}6Z&@yHCu z%>y1;hM&W$MYQc4>TC>zDdp-@^MrbJrkKyiMLNPSjqP3@nC@kqJv$3MYc8@m!sl0xe)h>Mez5dP0rvF3f3)xGk)bFPc=SG;vg#MDOE9vq^Ms%itL1 zW)K({Tb|87@%Z^@LW61L!DAQ+8Xr@dcx>mbIlEjp`3Ap_Nf9RXt?@}%+BF$07e-#J z@zFZz%oCw;G&0E$+@X2Em^p(`KN)q1A&uHox5$E`6*_AC;A=re_O?6K*~`xeUTaU8 z5t|IXYo19ancXB$0S`909PEMai4(Wge)elKkoFU*v_z9eRE=!ya4)!GTck}_C;;AW z(U3v6Fw$6kZ46Vq`&^SS?RI89QYfUFKPhvdrafgZb>dQR$aXm2@)r*DYxacsX~y}` z98>rfC*g>#_uM7MKK^@5F0PO>_Sbt6R=w1Z)g}EHtsQ)ymg|ndfPr# zUZGhJa(kuZrG=PZlUJ*gL;Aus^tQVT)OT@fl+hx+Qs06*f*eW;;7OzUQ)`>xasCLM zSivhy%_1U2&6AkzcO}OEUFIdpxXZ~T*UBe%`EHv>=xNZC=`&4TSRbpo1jbRF`<<|t z23KAfnkehkFR$;t5tUw{0{`4io>RmiDoejp!~}d7So@RiUVc`LmJFwfPhXGBO4sdsV7_zSKJ0G zj5`sAhElBp?i#C-eSm?&^4D0m=H7R$?KOM@f)lUFX1ITm?QE?c3Jg2`z@jN1+0MB_ou} zW<6l$Fvz9&X-CgcD;BdTbu6rT=st#xfhE&jg;$Knsxs!TOdwbb-z6`J>->B4M|Sx| zl|tfzZj+u6g|AK)wXF#rjeWzE{-hvtsZ9KLwyVgwvZSryzYSHwaxmY!m?WDzgrMWW z?3D;Jz|Nh{bcqy`X(_=d{pxwH6%ULi9Sp{@EbU(kBo!;s6`4yu(r4H6H7FTj!Z zDHC!T8|&+Ab|*6A2#==)_g|5Mhdntn(ECR{ceo&+ zfg+GjzWAmGi9qFzDH-%%n9lm7J_AX7eZU}yMVdEQH4g{7aTrc@)U~^t(YHQ_R{AI_ zJi6UD@wVOKomL!)-lG^Si)FO+nI+R$4Y+Lp9{{E6fYjcJpG4W?CQt;RFI6PkY@1Vz3V5IQ zbC%ba8f@mN=U5zK7^Vadd&`(6znYI1pJ{gK^`DNw1LA#x`UAEE_0}?(cj}SOr}FG0 zzLeI@R0?OB-DjDbcmoQc-{LEE9dJZmz5RI^eSWmp$!UDUbI)T?mZzk(Bb zGn~aXnx3LODn7)th@n1?h*_eT)ta@DX(9S2`|`(JGLbm-9HEFSE5_Z2m}W>tJ@u-- zLSXP8FxP=uOw#h1a19MdRR8koaCVd%^W4u@SWldpoM&!DX&^5mY1t=g;U2nRo7K}E z*7_9C!{%UU@Z<~*=VTP2BGaVw3^GfLm}LIh;vlCMzsth7^RRz*ka zqv~t3#w6mxmKIRG7~PtUP8;3BBuHLDS=5rjA=*4DbXD=7+pIxxkUN{5Js(unP1nXVOhb2E}NuSH2-RPjLp zbFr~JuR%jZ*1hezY=%r^fvY5o5kh{7Uu`sxdUx@pQcmdBs=A~jNO3qyO?FTm4*S@W zwoUSo%TSR#(RElM>jZ8VqrS^hMZy)TJ8B~#MbH<|sTHfix<(ovX_c;JChTCk>IIV3 zwb65Hj4u~XwJLJ~F|2{RPf5Y{_r%SPXj{agj3=O?+c%+4+W!=`r2mU-mA9LRAE2i) zP$E|6OyhMdIK0iwYXvy&u?bc?6L)!<&jUcUEl@35Q9U)KT+C!C|8XWg&U1kzl;R#l z(r$oMcMq_#hFF03w|3c`Dv+4{?>&GPRPrAHNFIXhpL?1{Pqq|9oHiHy$<*+vRq#>& zl0L^>=Z^z?&42wYjNk&|JRh?bXh5-snJe4wMkB`B@aM zwsP%-Gx!$1;!ffTJU=$tU4|N?YBET|xwuEr;>H{D(@JU|DCU)kdpn_`21?5UxnJ8& z3aD$*1qNw^`f$8`Sza%VPy2@c@=NUJ{rL4J$CB*k&>q@~kSi=^Lf2V7GOeNdB|8E{l@XE!F_(~_hG_BlqHvIn86W_7|# z(h?JhmB|Y5Vlt(msN)|gz-JsQ1n(_Ar{QV1vD3*MP+W^5B5$g+oLf>2Ea#obEK^o# z0#Ke;wbEB=Ul*vfiqvkB4V6p{o$IVI&}56@zZWJU#Gw@`W-1AiUnJ}MkI|4fkQ!sj zt0;_toqhIqb*fZqrlZ%oO?REu4*?z|j=pQX6|X7G8reP(OUlPaEa?>l%g(YYCg7_0 z#g_S9-=4eGw;d^1l*4OED6(^=@VCRFT>z^cy-BthXl4Lgesh$1HVjrVoV&kz^*#Yq z)W2^)G1%1RR0|I~B4Xaa%p6ehNzd8aO*$Wl!(H3WFHBc!RZ~l+t6NR4RW}d`F_l($ zEMzLAiY^Y86^B7UFxJC)QV#uONK7ZQ#_8WsiNk})9EGn2dIyf>1pH>gp#s#3;O8Y|jc8|W z;zPMM6>%TvPa%hX60gz#;K-r_7{{kB|NMaRq#W}gf@(N-^S`DYp?bbzJy_^dkb)#Px zF~ML#jg%B%ENbDECu1l-B@jh{|3jcd<6_HDqfVE(#6Y0Oq<(v;7Z=t~>ETBGJ-uj( zddB*8WID3hXVD-iJ;dp$mPB=~&~__`U&_*}(fgp;YMU!)7uN$`X>J4xVFHD`wDtS$ zbjX%08G*AX16?ZlDFsnFdY4g{{f_H1{R3m7+Z)5DPPWz8mVRN6r7?DL}>}}zf>(F zK~d796%)uniC!{n&4M~DOz*VI4ex>@F|O6?2(6phbOs5o*KHY*8%)Q8D0`0E!k+ED zU%z6dPwRsASOHZ#z}Kyvewx?s<8HV~c{6OjmC0=1efxIAhW$40C?ZWDn;uYlwf zr;tjmyMJQMcSMd&+{&!|cbI@)3%!;R zT?_#Fp@UV+wq*eNQ%Z1)tajp26-gB~4veLtsnvr0oW@YA7p8%BGjOc`(8UcZO(4le zI6t0{49{Swf!`IhnaVj?ejLUUD;za|@we?5i(<*XCc`aTu*{0*yAl*wd2Floa^rBQ z6))oQmCb}EYbK)bb?QAn@3YZPu%ZG@O934BH>i5cvTnE}#Ox7uz1qVyD5yVRvM73A zIRPg_{-=rpZmY!wIc9^QTAGlj|CnD9|HF=qs3klZ-7@GFjmz1ZzDUEFyMBN92lo6- zGlb%WtA~fm5(m?d#oz7g77)qer4|G4%1B1bh-+sCbH@RRHM-_fA8u1~vr!oj);Qb{ zIE{Rh1>r2bJDcSfc4uoF6dEDJcBPbb5Stnk3=)IE)PEjSpmuyCm9HgrqimqEmZ1a? zr_ttk7&8wXCNjV_EHV32FjZsct29@i`xg?$u_TW5lr}70wc}pr^H=I&t_b>)AUhDfYkWpyVF(ivm;;Z1bD|J}!r7M^0lnQmwA6(dsV1dFk(1S~)Ak zu1bY^*2{eDN(NCy4KRIejYWj^Rwdq;Gva^Boi-7p%vbn;WBIKl6N9SuiXatH-*Jic zf!Qri=?K1yuywJI+?jB}z=exSsl;|m!8~#F6hf(M451#Wv7$fOpHQ1Z-q1kdQnklp##?0HT3aM+;%JqAyJ=PL#XNCWe zEB`^Lx``Jp6j*|e-N^k-*L1u^fu7u7YiMS!&V4S#jIK@RdIZ#h)$=#PwJqzH8YV2d zlaP+ZDhgJ*_DjM*AGbr9)Lf~p_t-@7-&cBi%U>_bc`Lg9`ZmoCf%(zd=DOssWzi;YC3SDAQux!<<|5=>p_#kQlTy%ktOE@MZG63_^l z&_qWX{q_)qrFhAN!T2W{gG}Z4rBv==Ru!Jj)mr5CFxpGfs6TgpAP>-Z zA)*;B(9tzX6MS=Ck%24RGF3jO>&kgPHhv;CNc50s1-wUp1<9iG}8`xDQ@dMp`cNjfE9^`T(q>)?}# zpAGxT&tI=RfHLm60e%b@>0;+*S5`k{w#M(JZYgY;I!u4OSz*zBBkG$%eoY-$KofiX zrDJ;v27Htb7XTZ!kAz8ks;K=AEH&>ZpYF+L%DWj7>YIS z;Ke}5|EgugVUy4QMNjTY+vW4PgI=9c-p_A~-&7wA^Tj#Rz*v>$+apNjo)i2}z;h`o z>u{tTJTsK7@bjZ*l`adC!%KBQ=S&qVnop2F-y|B+ce>+Be#2Bh^9A zuJYl(ZeRFt`LttffSP8>TYD?VCUEGS}_5I-Z>40s*G$aUM z++7=OXH)GnTLnvB?n~I7^$2W2E==nr}k^!(7mzaEWA zCUjVoAnLFwMdQzbC~~8ukTuc6R&=@V9nmz)8=~ObccOCYr?;ISNgcIj-dNO9G1Q}} zZm=*CvLd!9{5)MIYvf(7e2OJDihsLL=XuB3$SS|>HEfl%<9~BQY%g$30U^tk*CR&8 z;O?Pw93>%7`CGwwOysD|?1^Kr;Pzyq<{UtC9%ZM1R}#%oS`@-w`+Dk1at+qx=|pO7 z{b5l*jjmt+ zlx3f~&IG=tuypR!>;)=U7WT3%+>i?%*Ae`zC=w+((oisECIpJrRst#lRg6xH-&Tf7 zycOMxk@oCB)=3!(-GyHP;q3_}U7U5-5>H~ZhLc)J)tTur;&9|!?||60#0Q(*kNjm2 zJS>TT&qtWp=NsttanbbjYeyBt6&&{;CDWiBB>M!g&;Vh3px^vya{aF_Ikzw3{xw_d zkDiFT-FJhG^o$Id6_CjPB~GpBfIR+D2kJ-W4|O*aCmS;(FE<+}KR?9q=Ei4MUNH5$ zqGu)%_`;$W_0o+c;jS$_-Ve+ToFLGIMyz{B>tfSI!qt~|P(IB@Q0d@d29ri=i($qt z$*Gie`zrqTkhDXq@L@(rnG1-vqn2|lN4m(;MXiUyLa9Cm9x5W};q5?L!TPdmM73=6 zYcDlqSNFFq4AdQTlPk^9*eB%EXY8t3P9$gu1p5R*Cgo`|?P zTR$$l$B!txqU+r%U$8KX^{Zqr$&+jyZfuuqbHQpT#;}o{x=`fC;k$fV5|$J;BpAoV zb8*)Xk!b&@sBgaDe^f)r9<;#e>L9k2p6{DgCr*8lJ*A)W)F#ZqE+i5;2kMNDiHVSJ zh!8aaapYaLjl%TDGkVEm{#s|bsF;qy4yLNmY+MevD=T{=f=??aH{rRQ{jg%fue(lU za=9;f5c8LQFC*dHK5@2iX%DFf#N_9m6*4=X4LYs2*a2QynmR#q8zURun~%q-9Z2AA zFlSEt3J%Y>5XW%T2o5tganlh!`7aSDlX_-(D?Si-W8h|aOb=36VS`1cyBeEPIAKFF zreX3v3%1nYIhO6P!VVNe{CinQ0X^c>A`Z6))CzgOE11=NAZzfpAUrjUA8B&2e8TI6lPT>;H0Wdr;*Tx_Y41Z9a>c8J7 z^#7Ffxw~gK$NvV&Z0KxcSE|)HX+aO#MeSw0*U_U(4_7SX6-H?~iTmcCdAXWOGVBDH zNhj_@F)g>ZblqzLmEZE8h)q%W_3bmN>Wr$y9^)*itiLRJhMLMXGjjS{%dYcaQFAMv za=);G>OnOb9Ubjzj+cA8a~)qhk4W3_3FCmEkpDwY8z@29LKf^!!f^tHM%NHC0eb@X z{}~s6#$zM%{AdXIlkIgEd1v_dfLEQ0;T@|_f~CwZaJJQeYLe36=Q>MO@o}q+X-w4T z5h=!1%q9OFAXd5v$wy}A`m(@&#WrAY^hqG944rpdq`QIl^nMblX)_pmJ)?+YjCUxU zK4|jgi^Q@cJ} z2J_slDGEFck{5QSOoYxR6PXarwZU*NUD2{B#IshqyL4W1P>8z^1u+SCcRN(vpP^1! z!tk{@ykg;q z&oJO!8JsLPYtcbPZ!cWhp+wXhEIw0jN`84(smnntP8DGT9c`sxM$^f;r$8^24*W&F z)<>083q20h7_G6_M_Gh=@y){7%#H&&!xv-j$yz*qYjg*0V@WW}DGCoxmG?D#gpLI( z%@K$s5b<4DCs6aPM>Qio3*`b3SqAjjjT;A*edhiL0Fp-l+F!38^GXhoiVoiYM8#5k zm?o7%EBp$5+Md*KsT#d+4f)W6p;VsChJ%z-%SSjp`>707$O8lojscI#+EvgO#grnq z6M3-^8*O>r9^$sit^>)IQX{ga2(Dkqf6bx5R9ld~imuwtBoV5om!Z48W|y66`VsG< z6Ef5NVrb%=Q$I0HO<=y?*@Ta?lEK+cuEF}%G?zYL=9b{=WUj2x^&g9z88Y8~-qY$hZPbO6u-l>`DB! z73E$ZveCape|sK6)Ase0z50a${3VHd!dG;RxXu2&-s_&9Umqp0nDu2bzRx})y($>V zrxN8I_z>mRp1D07D-j2rEY>hcH?^^b`4zLz&%?^4*dkn@-3!^D4ke*zi1!_z6XAlW zXyQ)n`Hc62&yL;0kP1Yt)KC)?ho}dU<5aR=@%g9v5w9Nkv&ssc3dnp?e0xOU# z5I4@+urGde_Z9&$#U!%(+%+ar3n2&x@@^s*v|Tl*)&PHNKd{X}WQOISqpKJ_-~W8^ z-iqDIYZ&G2ji;=npL6lcK}NuVZwp|Ygv~%iV%G^K9H*!0_5?!770B8+T7Wriycgp_ z>~ZuKS~pWNYTU~ybBc@;&-`-HU#TPJQN~z9H_zfqv{H$a59#n3tL0FOrQWLzu~pC_ z8xv05f#$z8s@6{S@Z{+Hbio8JqJO6R^%Gq6LS?c76er6GT89QCDa z*^2_oBbZ;RTUSqqfmwNLl?QIxD~E*|g^^b7E$EM+Um_;Vtl2`jWm6ZN(hT+~zJRa@ z35j%!)?P!@M%Hd6%FSc_yffrL$t5yHME0*bB`_w+atTocsbq><&s=4&=a_H~q62QK z4j@}*BDI)^i$Rxri^^K5fVzk`D__nJSiV!5X%d=v;L1ROkbooh*Uh2aDA2>#+M9I= zgo3B?A3Yqi$jg;7h;% zcn{lWeBPlwZKDfqfUnp=@JXKUx&>43Ue}iv+8w*xoXMrlw9PNE&OokkKomcWx~+sA zkt;2$MbJ7F-8cqX?m$neALPmQ$$F0c&J5Z}9Zc0UP7lsM_;rvl|Bgn_s`wKz>RQMi zlM33lifwsmVDZx3{+@0|2A&piZAgU?kp9@mEZUwOj_|kCxKt96emP;eV#}VO(l|b} z<=!lWQcfE^=-9jZPv*Hfc?r6_8_UZ$vze_aX$k@D5~m$4!bq)PijkND*thG`OsWN_ zH()oyP`S`Wep5#ZJf!QKZJMXg1Oe__!UX~w8Il=lp>X`)JTo`Q{Uqt816HbY{VbDL zLZY&74{THroH(MD$^@k65&F}f!4rq+peBML{_!L3YiLHv;ihWDG3ZGco2^iFE?#$Z z?}n_g-Vn#1wK(xS;(=Ad1VR4+a1yt z*eFL#^pN^_>u1&ZGxbFoKIP3g^?S|4iF_`%Qhq=K>`q}!ZS`>{I{c`~Y9w;u77T@2 zW0{C{LIJuR9`E|WueQ^K?vgDQB`*fJpVtM1->E|ADjBP9n- zOx*@%qFQm!*9JLc`Q$#dB+~WPH|=eXU&YAztowPxm*-m)#0Ja)WHLSBC(cNPx-EG?sI4-t) z_a7oavEOb#>+}V1&MuDmEZ4>4vu6i?vI?5?f-wN;lH9jsI~a-WE9)TEzy#|l6VUz9 zhM#P~d@zwXh(0ypr>cb2wZ(rCj)OHkcIHpE8s)6rdOnNruU8HF_2QMO!in*U`=}yR z*DB^DW+Y3w{7P{pq1KbyAZk%B8nE^}M7A~+dY#-I$edGs(F`3GoNdn9hL-)~dss)O z-lgd8Q1&8!13@_?9M(6T%L>B}xhtp1FPP*LI={3pja94Z38m^bBE?F_ERRJVOQUCt zGKCM*N(Vk!rgYy&6X{YMCI5HRM_sq+wI!Ub(XOSxFCb< zs`>Hk$LyPQBDBGy z0;m^(r`^@YYnkQ>^JQPI_vqrq2nD*YF#h5qtSiAKg>z~)&=KZ}AaRQ1}QG(HpiNF4ffbjb^7QmK+=NF(SwBzkdAMZ;#)& zcl_?Vl>51e9l!Z5iw#uhWgzoH%gFOW!l;-~7C%P)ToT&BR{2E~_m*_pb?C_88hO?o ztnm0Exb5;s1xeN+83V;^7Y+D4$qXeLqEGdMo?UQ`jyZz(J?AeBh&+W!n1Qv09O{wKBnN$r2msQphD|IY{umL#s9m~SMpol&%5 z!4q}(6fsEd?Ahaq#QAdx9X%y_sGK|{St7>4Q<+b-{YmE7sRY-TQ)gGob)m+f&YWFa zk~(t6lt>*pQ%BC!k@L(rat4Yd^WzK@>fens_2NvuI8!gq)QdCq;{2?8amH7K77=1K zU9w8X6Vf@bhafi~jWB;uz?DyOBkdgGOIng$CkDxwA-?doZ0gCz(N408<&)#1oPr|U zSR`BY74`wMB}L|xe!&q{3?7jtbW-lB|6gYr26+rLR{vj|n3@Xf|0gC&ss4Y^km~b@;-Oebg22s;V*qsZiXBmU#foo} zdd{s1%w0DyRT}fOfP#)LBxhUnRRy*S&6UNH+%r|wx?^T0jfRb@6?X1H-MUz>YqOzN zvvZeNPeHV&*)d4-S5gC>SFy+@bF|~bL~!wRW7O1iiJhfpDdCYJ6IkvVCDkHei++Mn zNC@Z>BIUoJas6q@f2HC?Dfs^TcxiGnegA#nkjj6l{Flmqsr+}=3k$&iJPv9N74 z4ClbT0E1+8%VN$=VTU(JD%4~ZEW;C|NbXexgw2zY%Np=~%I4S_LYWA9f^%%hq6Qqg zOca*X07mjTVzQkV;rZWi-)xbZc*+cTbFo-3a!2$U<}OE$b#^(b3kAB58753heJhy^c{6H5y!^XI1ltCw?n{CH*&phOUIDpyU#Y+lwSe|sj z3x&bZ1efSo5T2)WmXAj-0{KJ%FD}}uUaxLeR{W8;6YL7w8SVY?JMFBGJg;&CCM)v+ z6x7TI@!11zle|CUN(62u@Vh*&kaRRJ%qK(P(np5^1Ln~d@e~0G)mviiegPUCQN$fg z!7?m9q7WNz!6FzN(?WThd`LZlK-6Iaf)_p;}HZdeU`33 z^NKAg&ydyZgI0~W_eA6&3rc>0rzHJNZFp{YTu!^I8BUL!UF4~XDc8$vQ*gWh6Zb*q z!u3Y+wmzm*uam03Y1P-nl3YcpX_ZjSu&>hRDlY>otkz%?)(Uv3GD^iWYGIDbp0p8e zw^5F_3fEf+dE#E3lRe}ZpzcQ66#J4(%ybeZ{s#l8k>x335h{I`*gZhotdE2|8*Rr zVGpA5lSBOZ@8nFe6wv>bre{j2{%_!r>i<&xU#kC0^?zqg|Ch)w%TxbRqur{$%lxl= zm7H%`C3y{@aR+uI0fYFgW?AlqVmEGbX$3`YhzB95wd?FL zo7U;z9g~s;{*6)rjY*~d$YPinXqHkhndK5mGP@;idU~h`%%Pz-iZ_8L!QT@9JI?=3 z+>ERXlP7t$DgJkw|DB01_E$XH|8Q&dsxL(sWDXKE*Z56X1%&Sj_!d4VF`53Fx=CAq z6f+#80k`R1Bv2D$pD)Y9QWzx9)Z_$}mkZlW+_3UwH&3u6K0uo zWgmA^qRHZg-LxIWJpEsxn9B%6s|gc!PH<54$S1soaf1E7!or}iId{|^=h?EkOsZ7r@oss5ix`+wljSO25_M{$~ciuV7L(+d0l zsmWCTGiXTlKdJsF)&HdWpR=a_5mhzPb=|mIa?JMg{^LXZY)pz_$6Hbq9$h^j^JG!@ zypFv!;k~@$zU<&dc<(ZJG5j?N{vE19I)C053m%9c{J_|caLzm>dE8{H2nE+%byQ6{rMOarN;xX0CQS|BDCsP1W??=Gn^C+l)X$fCq1s^cfI^r zmH)1mALBi#6*)ZEZKYgM_=FboQwrVo|2n(aYM^aE&+`8`Ry_+eM8|>u5Gr-EAb0)-R+Av7A>^<{t#yf7y+`&@~H<6vYw%Sd?hg9agZwPxc zwaHJSaw~$!=d(88HDxLoWhjjj@Aq{CrLmHyO{|68~ Jtv>*W0ssyGhN=Jn diff --git a/harmony/safe_area/oh-package.json5 b/harmony/safe_area/oh-package.json5 index 916cb4a1..84c4e4f3 100644 --- a/harmony/safe_area/oh-package.json5 +++ b/harmony/safe_area/oh-package.json5 @@ -8,8 +8,8 @@ "name": "@react-native-oh-tpl/react-native-safe-area-context", "description": "Please describe the basic information.", "main": "index.ets", - "version": "4.7.4-0.1.6", + "version": "4.7.4-0.1.1", "dependencies": { - "rnoh": "file:../rnoh" + "@rnoh/react-native-openharmony": "file:../rnoh" } } diff --git a/harmony/safe_area/src/main/ets/SafeAreaProvider.ets b/harmony/safe_area/src/main/ets/SafeAreaProvider.ets index 5deb8444..b087903b 100644 --- a/harmony/safe_area/src/main/ets/SafeAreaProvider.ets +++ b/harmony/safe_area/src/main/ets/SafeAreaProvider.ets @@ -32,7 +32,7 @@ import { ViewDescriptorWrapperBase, RNViewManager, ViewBaseDescriptor -} from 'rnoh' +} from '@rnoh/react-native-openharmony' import { SafeAreaViewTurboModule } from "./SafeViewTurboModule" import { Event, Tag } from './common/SafeAreaType'; diff --git a/harmony/safe_area/src/main/ets/SafeAreaProviderModifier.ets b/harmony/safe_area/src/main/ets/SafeAreaProviderModifier.ets index 229249bf..2308c5f9 100644 --- a/harmony/safe_area/src/main/ets/SafeAreaProviderModifier.ets +++ b/harmony/safe_area/src/main/ets/SafeAreaProviderModifier.ets @@ -22,7 +22,7 @@ * SOFTWARE. */ -import { TransformMatrix } from 'rnoh'; +import { TransformMatrix } from '@rnoh/react-native-openharmony'; import { SafeAreaProviderDescriptorWrapper } from './SafeAreaProvider'; import matrix4 from '@ohos.matrix4'; diff --git a/harmony/safe_area/src/main/ets/SafeAreaView.ets b/harmony/safe_area/src/main/ets/SafeAreaView.ets index 1853acae..3d5e03ea 100644 --- a/harmony/safe_area/src/main/ets/SafeAreaView.ets +++ b/harmony/safe_area/src/main/ets/SafeAreaView.ets @@ -38,7 +38,7 @@ import { CompactValue, Edges, Point -} from 'rnoh' +} from '@rnoh/react-native-openharmony' import { SafeAreaViewModifier } from './SafeAreaViewModifier' import { SafeAreaViewTurboModule } from "./SafeViewTurboModule" diff --git a/harmony/safe_area/src/main/ets/SafeAreaViewModifier.ets b/harmony/safe_area/src/main/ets/SafeAreaViewModifier.ets index d1232973..afe3032b 100644 --- a/harmony/safe_area/src/main/ets/SafeAreaViewModifier.ets +++ b/harmony/safe_area/src/main/ets/SafeAreaViewModifier.ets @@ -22,7 +22,7 @@ * SOFTWARE. */ -import { TransformMatrix } from 'rnoh' +import { TransformMatrix } from '@rnoh/react-native-openharmony' import { SafeAreaViewDescriptorWrapper } from './SafeAreaView' import matrix4 from '@ohos.matrix4' diff --git a/harmony/safe_area/src/main/ets/SafeAreaViewPackage.ts b/harmony/safe_area/src/main/ets/SafeAreaViewPackage.ts index eb14da46..6f7ce689 100644 --- a/harmony/safe_area/src/main/ets/SafeAreaViewPackage.ts +++ b/harmony/safe_area/src/main/ets/SafeAreaViewPackage.ts @@ -22,8 +22,8 @@ * SOFTWARE. */ -import { RNPackage, TurboModulesFactory } from 'rnoh/ts'; -import type { TurboModule, TurboModuleContext } from 'rnoh/ts'; +import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts'; +import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts'; import { SafeAreaViewTurboModule } from './SafeViewTurboModule'; class SafeAreaTurboModulesFactory extends TurboModulesFactory { diff --git a/harmony/safe_area/src/main/ets/SafeViewTurboModule.ts b/harmony/safe_area/src/main/ets/SafeViewTurboModule.ts index 42007a8d..246c737c 100644 --- a/harmony/safe_area/src/main/ets/SafeViewTurboModule.ts +++ b/harmony/safe_area/src/main/ets/SafeViewTurboModule.ts @@ -24,8 +24,8 @@ import window from '@ohos.window'; -import { TurboModule } from 'rnoh/ts'; -import type { TurboModuleContext } from 'rnoh/ts'; +import { TurboModule } from '@rnoh/react-native-openharmony/ts'; +import type { TurboModuleContext } from '@rnoh/react-native-openharmony/ts'; import type { EdgeInsets, Frame, Event } from './common/SafeAreaType'; const TAG: string = '[RNOH]SafeAreaViewTurboModule' diff --git a/package.json b/package.json index d08372d4..76c51d52 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@react-native-oh-tpl/react-native-safe-area-context", - "version": "4.7.4-0.1.6", + "version": "4.7.4-0.1.1", "description": "A flexible way to handle safe area, also works on Android and web.", "main": "lib/commonjs/index.js", "module": "lib/module/index.js",