From b265831c558be8f7e241b5638c91181ab0e79610 Mon Sep 17 00:00:00 2001
From: hanrenchun <hanrenchun>
Date: Tue, 5 Aug 2025 18:29:44 +0800
Subject: [PATCH] first commit

---
 .gradle/5.4.1/fileChanges/last-build.bin      | Bin 1 -> 0 bytes
 .gradle/5.4.1/fileHashes/fileHashes.lock      | Bin 17 -> 0 bytes
 .gradle/5.4.1/gc.properties                   |   0
 .../executionHistory/executionHistory.bin     | Bin 4779063 -> 4779063 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/7.0.2/fileHashes/fileHashes.bin       | Bin 130183 -> 131983 bytes
 .gradle/7.0.2/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .../7.0.2/fileHashes/resourceHashesCache.bin  | Bin 19619 -> 20027 bytes
 .gradle/7.0.2/javaCompile/classAnalysis.bin   | Bin 3187607 -> 3218947 bytes
 .gradle/7.0.2/javaCompile/jarAnalysis.bin     | Bin 1705997 -> 2222785 bytes
 .gradle/7.0.2/javaCompile/javaCompile.lock    | Bin 17 -> 17 bytes
 .gradle/7.0.2/javaCompile/taskHistory.bin     | Bin 158401 -> 158401 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |  32 ++++--
 .../main/java/com/pxkj/jwzs/BaseActivity.java |   4 +-
 .../java/com/pxkj/jwzs/FirstActivity.java     | 103 +++++-------------
 .../main/java/com/pxkj/jwzs/MainActivity.java |   5 +-
 18 files changed, 59 insertions(+), 89 deletions(-)
 delete mode 100644 .gradle/5.4.1/fileChanges/last-build.bin
 delete mode 100644 .gradle/5.4.1/fileHashes/fileHashes.lock
 delete mode 100644 .gradle/5.4.1/gc.properties

diff --git a/.gradle/5.4.1/fileChanges/last-build.bin b/.gradle/5.4.1/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1
IcmZPo000310RR91

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
deleted file mode 100644
index 17827edcbdae19b9c1bf10d1a3da8b2590470469..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
TcmZQ}{@A=B|C6E}0~7!NHNONa

diff --git a/.gradle/5.4.1/gc.properties b/.gradle/5.4.1/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/7.0.2/executionHistory/executionHistory.bin b/.gradle/7.0.2/executionHistory/executionHistory.bin
index e59bd0851ac10e63fbf0a7c22c20f6a55446ad64..f2314f04805e0dcd52c6fabd276bec0be377c88d 100644
GIT binary patch
delta 7332
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
B-FW~2

delta 7740
zcmb`L2{=_-8^_PEH|G$x<2cSSTti5b5a$p@W@X4wR4PO1CK=K^NnMVVqLWtX7AhJg
zskV|SZZwI8dlgZ+xr$2jbm?1bEBE`3=T_hMUC;A>o}cxu^}g?3Yn}bBy~w703=-=2
zTZvv+WK^suMrb+5Dr|0SOw@eKC<{?+Sj0k69F6*;-y-Ac1c&Iw=QBwMj*6I_XEGu*
zN#)81#qE;}T^Mzeq6f>sv@%RyqWIed;?J^WdVXG$uH^sx_>Mx&%2N`eRSTqDXUR%f
zO&LT$aJ`YkF~2m|)dw#8m>IZJ5_?-)lHP=jDZq@WEX!dMi`gwT;+uL;ABro1PHcV|
z>~o5kvgy?A$lh~~FQb#!;$_K`DYr4Vpxdc;GKg+H_lI}Mht_G%WaF*hmpj8DTEP2P
z7F(jzyoE5*p3SSA6&C#@4s7eIzHyowyBSxOm9#f!5W7dJNAH;V`)l`!CyZz8KN3QX
z)v3lXKs2#%$>Ej^BDK<*{J1L}2vX7xG$vd)O?4U9;Kr70znu(5m6@}Nw{n@fx3+Tk
zn{~yT=;MZT7^9fzHl1f2^bGiKz9lNDzB<w$1(x)*ZsXh#R}XoeoZ@P`hBx7(wXG#R
zS5noiUVOYwj=}L-!EE#Bba)@EGylWsm2c0{_e-`s&;Z#v9G2wS{msOjnU!YwUXr-i
zo5ZS#6BFztX%CJQ9nPbhOfj9Secp}%HnZ$+7kjn8VJL5N`|VDmt9Q~&eXgjEXrey?
z&#z!pB**WlC=*Rr%yUKN>ue95whm6t$y``m-%-R!2o=s2iNeA}7D5Z_IX1%3aP!#~
z=HcPyW?^BL@Xsn-6b22W!)?N>=UCfVMub@lBP_y4hlbf$n?sXmmYHc}=t3GXZupee
zo|we0Qtq-(_Aa*<-OOy<-)m9b%cR%RzY-(i`+}JF2bmT<tl@3Pvy-|f)a16GSp4e2
zHWXx?=GS9<Ekwd!4`R_DW5Se<EL>G4`r};r_2uagTl!;MGyLCU{1sw!e~9x{Ppeib
z9bSI^VOoO2FW&6doz!HBo9X{V5X=4`t`V%%a@BxTN5yGlg;N(A7gI5A7BK!J#^nET
z)vfx2nA|Z>VRald@jWN7R<jE4YNCR)N*cPXSiex*fP?3qES_4YXH_BlV8iorZ|8b>
zlbRpSQ`Y?;@d!tt);dRjXSYiHANrL^ZJ9D<SF<T&4Jd*}eqGPhko8$*XNDv&yNe1p
zZLXn=ujE0(BNmT8?|z=~n_wS1ur51QBX_B98D+hq1c;*?K3_tNTrwokrQL~BzM@)2
zXY4-8`c4iw9OdxTPIiR6EwO(Q7Q4Qx)1`Q8#97L^A1pWu!z#sZr75`I^51M^nd+hP
zUXV)}8`xkEa(wi_>B`k3;s^t)X(lPHHa{Qu;<z3;9(%oGm%&f5^oCKYwkG7wv#0yV
z0%bEpHQpY(ACi~6J+feW#A03J$wjW^lu>g32~TZJt>Le)iqHDZH>r0&sCv}1nlhzG
z6rbwL)b@9?eyS&v(~luf1$@&;SNCzwn>rKct(_I$mG{1sGTq}!GM=hB<px&GTN|&L
zKb7lyf@kahp+Air0X@SjbYArM@I~{M%v-eFboQKOG{WC4V9Q!|3h#bnbJjZ}Kb<Pd
z(LrE#jKh<BdP>MuPz^T;IsoHk**wXpXB?SR{fW3e(+w!0uw)pMMyR`!D(|;@Uk)r4
z`Yf$K=>?nio6FV?>pS%uBda^F^!m}8ut{Lpc4^4n4?&><&(TqRk7Zy}v-^<DJIT%^
ztAkk4Pcwb2KwLK~Z+&QwIJAcj#UMj_nCb_=S-xoUAbk>76RbU^P%P2$P$XCE#17*`
zs%n$Y$>}HdN4{`yx+@eXN~&U1fk!sBZjc2uXJh$%>HhnkHNclm5+O<S=Z|nW7gJpQ
zYKhn5%Pe8%M^0THW$a_Xrzr4pIiYZ%L?Bbz@?g~MnYv_44t7fZ+gaxU<s)`5>jKP<
z^f{woPX`l@VJ`+Hhteinr)vr5gCc>{<JitYd0*`LEAP-B#|Bu=jg)a~%M&s>S1wq3
znKG_r!n~&@?J^CYP_m)ni4fnH9aMqQX*8^NG>s+-qS5pjG@4HFu5X<jXuCoB6lG1a
zp$H3M{zJ8eIjFY$#~bYLUtm9cy>0=eGuZO~KS!!GF$w9?^qo0sel16E|1`Gp|Id&r
zY)nGBuzhESU!O&be`pq|%E%=Ctuj)D@jG+;`YbA(`6p(PDyvLFx~zU@hF_mW%YSGV
zsjAE*q^t6G=BW3zy*P{V4a_}QfxzK1rc08g*fItoUDknpIaW$Y*K_Lpt?gte3rs7p
zorH8nr_ALQm@N2MfdP(mNvF=r8la*Q+e1hfbZY3QKUuQiRW+6_7>$Y<laMa#lm{&k
zcpm$ikgn^Xp&HW$2}e0N7*-9FldkN@UdoZK=$~^cslk5cNEh_aw!~ksERJ+Vr)Q&c
zKk0S>(_|3R#Ty>%wLp3ubSYiA={fL|Kod;6i0$A=S8C|er(J{8zJ$3l2bEAVj?LyV
zO?vLD+bZ$HtHxYeqZ=7kk&p_|!MWkG27K?6y*>d3zlDTO9M|A?sK~PlwB5j3O<wbh
z*0&d&$`{|R8Dq4vdQ9VXG-5|S9gf&{zGKn5^A?uA7mh6NHJxP#sv5C4rF-n3Y}W|i
zyy(j3gud8xog9B1JHh*Q*$V-MQS1s-r@@0q*csp$&2}K0A7h6ZO3$PG&R*;?%3B<4
zKGJ()3ow^+<bjY4cJ5%(b2kAYWj;!3JjKS2;m1!^2xcs^lGQJoV>tRkHaC+h%`b<8
zSR-6As5)-@T-AZba6CycN3HIo!$G0d($^LZcj*^?OsA|RFX`l&;rM3ux1Yvmp#Cjl
zkngQ<M_Kj1ubE`dVonep6pX|7$y8B=n4Dsd7hnc~Ro|?%vOVB=yugKwjxe}}kxy~1
z4;`dO8Egc+iMWKoYn$I1?#<ey-CJouMma~5l?x1l7$CvM-J4t$XJDy9S`_Q@=wSSH
z6;ny&O;?Fe;STa#l7T!O91p{{64Kw1plX3Z64@g*xI{-zW|1Q{8m!U=852Y+fl`@3
z8D!<NlD~MnLlzz}xP*}nDfn^*$KP>HO~BDDG&g3&qYk-9Gq{z}FJSRTT!qdNdp_d2
zc|SI-Skk=4G$nNf{OO>5etHwWgyT8CU_L&nJV)PSXuRNcS|%Kb_W9H_{1by%zu{s_
ztW!jCMrumZu#hucm<l%v+)T$W$UNDCb}Gopz}0!ucN1CZl&v8H*Ho9jnb=L)Qf1%)
zSC^^GQ>P8Om&m7joMwZ2XASs#=?jWOl=YqhAW99?)uk^ej#1VpEP5tL#Fe?4v_Y2?
zMg87YVSL{#4o^TEbWw4V>ahb{yTZ~?m%gGP2LecRT9JS03yM;zLzXJcfL?CSh5n^)
zD=MfS`5^QvON}pmV^K{R%Zxz!RhBBaCcz1r+ze_qA4+iec|w_i(l%U!Cw-yO-EX_M
z6BqEMFEe^5Td_J&&cY2@e^USL#zFQre3+b=@_#{zz7sSyx$!~gHk>1qMm28F#D@m#
zrf`!8zLM~Dfy(o8{5`Mchx`(-=!7P0;?B)Zxur4WLWhU_ClA~CV`0;>Rr&95y&H+b
zm$x@0+_#<po1||=fNr_LaIwQK97=|C*d;qY=bOKJ`c*K#o#Rb9v~woWsV@$nu`F*n
zLi(*sW;?MTVPLx_D@jHA{Yu|#3HLC29eLb~bz6>*dYO8ITpv~(`DXw-iZSSm06bsJ
zRwr|&v-tEuhj_AZ6dV4|TW7Ei6E(5IW0y1>RkmI!U-FB~E+>#+&Q2mCYF?GSi74JK
zYVyl&oZLPQR842=koMErTj*p<2x|ge_Iegt<}RQ;lYLP2T<Rf@RQ|BNU60;p?+Ru_
z-A0uJG+MFsxT_rB1crND48?w5kXsS?F}@Lw1DsjxVdLv54?O}n-!HBexB6QuPp8#w
zc`Qfk?uJd^*(cd0AkR0wFShRD*1a2GlUY@x7IT_k_ezJQs-3!tDIiA3Ud=x<V~xM*
zR*uc2kIg~9&ph&L73KEUF;F#|Wo-O8P4o%Y{<ieyWWkUbhZ|O9U=IT8(5H;ibMaz%
z3O-13!+7A{47M_87P6JeL$g_TboKxKHU0Tgw4HVd=vv_>Af!Nd6qu^WsRUjrEJd<G
z%t~;=YhS{zEZ`N*875Qz9DQ(!6ECx%*idp%@=!yd6rdELl%NPGWhf4m3YmDBD{uYH
zy@tWpJo>_Nurf5JlZBS}1UflRMs?v7nX?~JSn_nRs)Mo-hI4m?hc8~dRJ2rN6%lG_
z6%ii2WcK{<1+(YJTP)~*B32Wv1nA~s`ed1*iUM8i6Qc^ngHj`XV))0lkb78|1Bb)v
zlmv2YTZ@j+jJ+cF91fx12Sv()DZorwAWt4w7KAg21;L7aLFJvXV}ixXKio)q2dcEN
zNr0=3l?b#S`ls)m{i<{P#<cSvmpwb)lvNAUJaylIbmj>PxF$|pM;M8WwPq&{b($T$
zQC8vA4rDLgi7o^T=c(lCyR~)QGW%e()OX@SP;QACn&$07J!%bMhjQ77n@dloEHo?F
zkz_ckZ3S!^8($Uk(j~;tbI*uQFTF8)$+!^$PX<>_bkwq&+h+XOhf}Mm?ihUlIspqs
zn4yWG?{3gWk6xKs`yo8k&LU^scI5uyL2c-4w9AnWzYA|uPETj#y*YIv8q|m|6RZIC
z0Ix)t6JCM(f^+i}96uv7asVel#IB*Pgbn6{mB8l$;Wn5rh6aHW8_WrNiRcre_lR7_
zK<Y)5hNutGO-T4UfWrJ71%2<KupJ^+4iOx(g*|H#^&onJNMwgi#HtV_BU+2-7NR34
z2mP^-uA;VhNO&%qZ{QRIeWSs>AT>r|LVu1y<DkbsQP1oF>Oiy!`59>sX%C`Bi1r~W
zwTB-2-E545DV{`)<70K5uycrZIAAldUFfmiBcdi}+IUERpte#(RAQQrkV;YD)sC1S
zb_~%CN6ZU5fV}8C!EisJ5%UpkL39F9CgmB?PDBpQkO~or2dI94R9&EzT8dyqR4)4v
zp~(i15lIl4yMCc%15|+stpt#9`$ArBm>X6=J*695?mR?YZg9B|P`S86qMj|&9get&
z#<n1$+J<_-MMl&Mx>mqxyNk@Z%i**=K=clof2YiqD+ks|cGUoS|Am<d(VF#w7KCW2
zdcn}u3gbrDl_>7DNJ#tC*)rxgk82%kDU(I5F5KsRS2X|FuP7A8stot#2EVxnHmz1L
z`8>94HFQ%%xxv=J<SNmVUGjvv*C0~%g3nEDl3*{)5lco-yVnbDF=~G9uhyN2x52hv
zP?Z1&Kcbey8xDSps2&kD;i^6Z`~2=&7_fiK>nAFBV}&Tp8)(Ne&}@vI1c_Rjp9bhM
zA}S!q7n_VdL%!$xLXW7e7mQwy9)ZFY5HW<n!4Hlh5s48|zn6MM)RL(Bf1zMRk5RvU
z{+J7vjeK__+K0$00CT}nTQB&Or10g9;Fhf5f}<_f3o?=woIm3oi2WOF?_@Zt-yS7~
z_I9f4DTGfb>=VN@sadU=0)GpIun`ypLOOyd8Br%n=?_F5h}?s);QkQ@gWz6EL;ZRY
zZA9cZ74sz-lLW~xzgb~ecSv71y=&A#Ml5zwhteR$E}Hy8a(cb&VLQ^pTr1d+s2deG
zMR7~n9)GXSY3noAV<66)wT_s=uooIv+}$dFIXz|WoF*>lJ4y@%kwIE-{;OjPh$|#i
zLG3iH|L*?NXCh}L=n=9ceCZFE<aOu_v$33Po1x`HXKkbY{RqE^%-O1@v_VIs6Q58m
zEva*azl}i$q~|uQV*UmN|Cw&hR~i*mT|)Z8a<^vmdxYC+j)4wn8N*tpHoS9<Fr}o-
zdsV2<#JLZ9GK(muhs7^Lw4i=~(uUH3(uLB48VaQkWdLOeH4MrKYB-cJ)CedOsF6^n
zP@|yCpv<8xphiPkLRmoxp+r#DP&QCwplqS+pvFRtgR+NmfEo|w2;~Ij4CMml3gt$=
J3~_hf_%G}Aw=Mtx

diff --git a/.gradle/7.0.2/executionHistory/executionHistory.lock b/.gradle/7.0.2/executionHistory/executionHistory.lock
index 7e8b4cef73ac724c738c64530af02c24a15abd31..2872016fb8a3fce812c38b7714b09f92ea27297f 100644
GIT binary patch
literal 17
VcmZSPt@^i{>&lKj3}C?a5&$>y1%&_r

literal 17
VcmZSPt@^i{>&lKj3}C=A8vr+;1vLNw

diff --git a/.gradle/7.0.2/fileHashes/fileHashes.bin b/.gradle/7.0.2/fileHashes/fileHashes.bin
index c5a8115d44d4c7546d41bd178b1488bedbdb2e71..c2cfe72b2c1100c18b3cd31f0d4f82e8ad205619 100644
GIT binary patch
delta 4794
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
DMojJK

delta 2935
zcmZ{m3p`cX9>>o*$0H(g$f1X$FvxStE9peycpR0Z^bjf%;-gGb%Hg_oBobSnRcR7=
zG|}X=hiyz=!<42NibgN$mPS%hA-Q$$+K=vMt~0YfpS|}w`~Um?*MI%jf31D8rPHJn
z%9V?GK!DltM(|~NkHLBS*&N(&-VT7Z8}wlHd>c&3Fa$qn*vZDX8#w~J+W2=Ryu>1r
zgW1{S;Jr4HO6<84@b+$C3^n2b4+`QzBK(c)>3#$D;xP`(wfM5Wlz+PnaEiCzI2`fx
zd}|1c1>hY~&;=IN6y5MPuQP1^v;izo%ehxp&N3H8oxK=Js=Bg2?W9#KH@L<daIrJK
zTm|%Y9ftc>N=A12*WP$(TCyj|*3!@CVFiQ4(}+?gdRi?)H#2k@l9y)u2K69zqMfpl
zEZk(#wE}I5$a6S>jHqe9L$@hJhE5OvhfP<CquwrG@yK49$`E--8HuiGit<RfZtLXo
z3-)$<N5AfP1g`C1kmE>++P)fen=*(&zxa4j*!uz3qgg*sCcdeph@7_d6rd7Uh5Pue
z*7aVIyU^6Zd~R6kf)!!0N0rrS)va$R70CQa-tX>;n$*Og{gJGrOE(7|F<~=)OR)ZM
zUw>VPip4|PeddF!w64$5cZ+3=Wt2OXW`w*ulQrMMJ`kI9;`+yJTb6!(jwWs*x2P$1
zg+r++_zJ(c-AtEXUJ?=PeaH4r{cud&hTdf;v1m1O+HO)(uE}of-N6LNaRoY@oc1?x
zwkxp4E0a_8{9CPet(%cucUCMK*qD}+ra*JQoujyEM+4AvO78w<fzDF|S|2R!q_HCG
z%5x~eE}cx~|FzuF>wj{eQ<U7%2j6oFn?{n3u9$j}CE0VjjtS_VV>`C1NS~kQ`TPA;
z55GgfM%oUonmvFDH_ugx@;0MyI#ym}td2leRB2=bN!ZL#t|ZR>`(J0fadU6gC;YN9
ze+5kmu22%qVn_6xGRZUSD_NyhMIC#ew(WF@H0h$#a#utV?9p&};)uF9*z>`yPIaA?
zp`W)F<}#7ZBnf*KTPsN(F&jv>Pp_%-JFsPyPelJP+7xKb@&qyxVR0JF@sjgZfJ}o+
zEgn*0>i}%=oQE=iZ|uDcaKpzkWqj}tbZ|ty7{+%GhH|jMS3UUs*N*{qdw3YXKXOt5
z&lo$!VbA%FICK%rWy9JEz{8^^W3>3gPxPHNc-xwm+)6f#+S(wYNA}5}Mpo+YfaB`m
zhy;x+@~2+0Ks0(z$<ft}@4Pa2UlqN4F;S2o#6|}P8NSawnqY^?69?SJ0=IeH*rM<(
zrm!Ju5}g|)AzDKdZ^<?L(-`nSGk`8ReUTrWtpW7;KW<JITjgpwt)6_a{#kJOT?Tih
zaL2&4#99r|vkACBt7xzfHbetYV%|=W3J4+wbg+qnIMAwqJ$EQ0OcDU#5Q2RmT@mvW
z*bo{LP^pY3uWSX7NC%DBYtJ?8xi@5nLM>uRKKQHxYze0lFfg5Pl7SlvaF7iWiHp^M
zuS)!@5o`b`!!pAiT!^$Y;7}pZCL+4QLVYrHVIcwEAPHHM-q-1QaxP$n`?&@@S=!S}
zRi)B<ElW(3nwK!yV{#$pLF*CV&KJ8Sw**vVvphKsFP^JL*-)x1OAp%9`~Zj{mA};Y
zg|?^PpjAV{gJi4pjQxyiH?2|&MbAIwl{}Yyqc24(uC704<h3APZ#0W8y)4UZGy(FV
z*<0`v8MNms=G7wjBn)tM>k{Yti&oz%Ju`S;y(OuNj#{V>CGUVfFCeJhbouxGSsn+=
zuI)Gxc#5&kg(A|rN9AFQv}^wBerY4*$CcJGRuh_Cmsxc$>eE%Xcd>_46zdMJWvpgU
zhFJfh`NIB3M89K}JJH$wY@a)0wW5Plh>@S6sX^GR#*nSCuXe$_&&_wL8N!w(RIA}k
zcfgfc>c^f8el{xfxnjP#xIB~*Ev7}Blk#pe8Xbwr{NqqBJ*%u!a_x&-2b%b+K*m*1
z7<T7s7u&pyw=hyPVU8@JGfANMRZq(gGGrBLzWxmqAM19gX>PL=GhqqfqxWbV+>th`
zjUG<-a891(J?ZF-f+cs65S?md({_O~#{d_aj{+^K0zIMYD9WH{Kc~-YVEIH4Kl)>J
z()d+|Vm|jO<kp{3BjLe~Hl-qL*J!3xC)G!?lp*4%VOZ*muqP2*1NTKeRto&K&wg$J
zP9Xxc_o-M8&>A-Se2oI?co#~c${3&ybzv5C{?h#x#xPy)Utqx)s*(ZUrpqc9I!5aK
z+}o#Hw9KPDdjAYNkyX+gZggsh8~=w<<DtG2N_B0FwSXQ^0oBFSS+ovs2u(X(_oJGG
zGbFp5d5j@iXhQM5JQ4Y%#C$Ah)l&G6f{fXPd(n<0=j4s*l?4L~fG!Wyv`kP7T={f`
zR{j2FCB6$II1jBqpb7l&JaoK9@OEolTGPNvJa;=|t%WzokyRr;m!&T379TTRoZ-ct
z&||EH@DpjRD64KfxNw)IvE4?C^j@bkjJ1sNEOEL0Jm2`AaiGIm$Jv7Ds%5OG2Fa${
zfo@Zl@a)oghZDxjV>WHyV`#oshK>ztD)kh=QfQPXlCPWGeUI1rM_aTDFX&YGGDI^{
zlK;Fk(_z~OU@RaLat{4QjT3-wQ^vK5@(?a_&m2gNObLm9Su(+RA^$O<rW%TE*~Fa}
z*c6!(Kc{qq_L?iRoW&pie>Q5+wis}EV$Xo=6qWQ@PdXo*{$T3QXGBf#&3d2@%O(Jq
ata0xK*f2pCmv<E$`O>W+7JLL@?EeB4ZNzr~

diff --git a/.gradle/7.0.2/fileHashes/fileHashes.lock b/.gradle/7.0.2/fileHashes/fileHashes.lock
index 35e7b8bdba673ca2a9e1e25aa4791471f8f02a2e..c48502e31014c27f0c8da43717865a909ba8dd45 100644
GIT binary patch
literal 17
VcmZRM`Taw{*-~sB0~kms0RS)j1Kj`s

literal 17
VcmZRM`Taw{*-~sB0~iSJ0RS+J1abfX

diff --git a/.gradle/7.0.2/fileHashes/resourceHashesCache.bin b/.gradle/7.0.2/fileHashes/resourceHashesCache.bin
index 7266156095b742c48900a73f25cc41a7bf4aad7d..240e89fa84462ee089969e3a4c2903fd486b8448 100644
GIT binary patch
delta 699
zcmZ2HlX3SP#tkMCjJlIeB`P%L%5^?SWnd0x00W=r|Dj-ULA0Fem2Q5BxUcWzr4lm)
z&gOHR=sd80J5+G<WK+oifh+85<+uK2tb>|xbaJhvg~qdOPbcX=_78@t<b)afx~ue`
z?YkF`q2k(;*Geh~@Mwy*<aFC#gbIG2d{i<+K<ub%Sk2~pc2Hv%Pga#u5YTdIo8$I%
zYXwy0)ycL}76Jx*PVY|2NtHnb^C#y@H3)dtJF;)H$jpEWPMrKyDnq4uhf|WJ0Z#`+
z&`%QPDj3bcz~Z@4@rU?EgA2l&9X*m*<cxtzC4pEFgavN?NIky8Nrc(&-sMN4PbZg5
zUg#xU|Ig{#HTEC9eqT;K&9<tk0V+h(^?+YD`SRmEK?gppi<z~Rn*&ot<?_(oQd5@I
z8TQW+)XG_U9#h4J6FVN6{co$5ITTbdVY2mEgo=8Y<C@to@6sqcnPKvH1E;o^(H4Xf
zn2HXi=dT?TCoH)a?fAIqW3Lvb3i-Cz2j>}zZfV-H@oCkLhq0I{md;x%6Jg@rYoahq
zaEgV88AB$9e;L-R+ZgxG)!J#L+9R`#hZEC~cQ<0swsa(LKAl{uD=ixM98<-VXC0x=
S*M9vDe07}v70Xc*kO}~?Z`mmT

delta 77
zcmdlzhjH;t#tkMCjEa*@B`PN0m6$NORnlYfQ%Qr#u2K?{OQjMfzXj5=(gu@Lr7I?X
cl}_OK4+RVi%$ge&e~521_#m>`(Ibfk0KXL=y#N3J

diff --git a/.gradle/7.0.2/javaCompile/classAnalysis.bin b/.gradle/7.0.2/javaCompile/classAnalysis.bin
index 277c5b45d17fa97030bf15a8266e791588985c2a..99c40819ac26572d359c8edd822b945ab7b8905e 100644
GIT binary patch
delta 3014
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
R?iD}S#ugDgQ_lXX_!|~*KCu7*

delta 1024
zcmXZbdu&s66bJB~+xB+dZCTfr?%ob-@91^C_x9GZF)W$POfV`Fwbg|(4a`4O#=}f8
zN`}V0${j-;ljx5@q6U(MDVeKep1mwnNoXT;N-%*AOg3eSF5+f<!0`2xagxt}-<)4^
z&hNC2o(6K}bLd~mL;Pep-&=I@kFujih!XzYz?#-nL{CKkQxWEuy-<RErx>u{nKbjU
z1BOVKtnJh%CK<{=8F6CL)GtE_n@lViusfICZ9&<=PUpi@<Z3v0x6T){l$pw<EL0xy
z#oR_WtjC53m&wEETFz(0efM(?I{;auC<&5Pl-+uLoWuIK^^q2M2#2!P&kXq1ch)%;
z4_~pyO_(=pEzUQs$nmY~CTssxGQ@vPIgYhAtj}$P)tHIdx|ZS#TWt*tE^M>q0(y4X
zYK>4&PJOD>=q(L4Y6+E3*{K4`K{+WGwlpj?-+(>XvE4oI#e*GgVzmByt8#Ldca!zQ
z(f}zOk$8Q!(~Yy8g}WwTGj7?!f8)Ui8u>idG?gPA?HITu%Ya*(`G@a;Fya_LZ^f~3
z{%}5Yk-9N0f$7V9wHH)${lyP6IP(v0Hlv9ZVh#|9p)I(R47LS3(Ju(b4X^^`X9R)8
z+8si>3m2LMhB5W#@bVl<OsU<ttyS=p!o8Rn5G+pYNeiVMRFRL$)hl|>d4cj!Mbt9t
zHp)xgPWdR2D#o7k%Z=|r0zcg4-^Adum;AjvUVhWxY=M1Av7IBnF9Jq=<d`2vj!D0=
zP>+2dNKq#irld!0_}Z6J6)@tDNincwF`3FrdMbMdrm`h9gYX!-4hF89Q92UH7Q)4(
z7_lR5c%&3I;OOsxjGd(0_%M#M@*qdjZ}2=0IOIkK9!!d9`(nehl8k31rSAZ&!#$rU
zQ5zY4(H2J6Y2_z7Jf9TbFSwb*{WHqTW~fBNRVCxbMw86~__Im1urQSr!;Zy})2o))
zp#m#H>O~9b`&J0!lM%JfLEia6xIj)+t1<koQhC*Z)tl9+SLk51Np%xP6rBdYno;RF
zR3*i)3ve|TJmjNa?wlHI7I6E0!D$23C&lBpo|%3k7|YN*Dwni*7Au3=1(rPfJu`>i
zmD++8hLU33g;h1$xu>CwxJI-rvZLDdqMHM9qHk6!TLlt6E{0@|Tx#+hKuHUwjU<@x
zgt5FdbO^|ay&fL_E(=`)@_M^x498c6`i=N@MQ8|^qW>4?((9rj>Q1bShVP2~2RJ&9
Ad;kCd

diff --git a/.gradle/7.0.2/javaCompile/jarAnalysis.bin b/.gradle/7.0.2/javaCompile/jarAnalysis.bin
index 16bd9c29a6fffbddf2689ebae7c3867b1d027463..e49a64491605c6395f2152d3be1a2edf5c862e11 100644
GIT binary patch
delta 4339
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
PNV+La!6$Dq^A-OFx2y4y

delta 152
zcmWN=uMUDh0KnlLA_|D$AK;+jW+%u4T)W30@(Ki#f#k+^nT<z)WON3b)ps%a`?l}(
z?Zmxrri&Dzsbp!ceDj>uW?-D3EYZ%zFP+OVxhdT#EogB;n@c)eaZQ&VeQp?V%a9Rw
R-1ERAV<t=~A4+GR=O24IF9rYr

diff --git a/.gradle/7.0.2/javaCompile/javaCompile.lock b/.gradle/7.0.2/javaCompile/javaCompile.lock
index eb4ec9fbda8904c2cf137f37c063a0c87e6b3201..e9a7b0125076dd8a4cbc426e2edb07e702e276ae 100644
GIT binary patch
literal 17
UcmZQhj_tnPxLR3^0SvUH04|pU(*OVf

literal 17
UcmZQhj_tnPxLR3^0Sq*o0WSUoI{*Lx

diff --git a/.gradle/7.0.2/javaCompile/taskHistory.bin b/.gradle/7.0.2/javaCompile/taskHistory.bin
index 2d8fb5fc40eed872ea325625a4596eded006543a..d7a5bbaee2d945bb5dd152be6c6378884bd2a2b8 100644
GIT binary patch
delta 78
zcmV-U0I~nU)d|7X34pW#b-@BPs+XV`0d2SZg#j1?xBSEb<r@&tFl5`viTn?p;Mb!c
kL5C-oaijr?vmKc&6Sw+;0eb=hHMf_Gg8^x`j`smGbCt{^H2?qr

delta 83
zcmV-Z0IdJP)d|7X34pW#b-@BRx|g6B0d2SZg#j1?xBSEb<r@%`N7vecMoxuZBosHu
p5ZD2?z!(Bg0+-OM0bjR(90J`E0s5DL90Dzu5E}yIw~qG#Gjr(3B3l3e

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index fbb4337f36049a7977bba1461388d672246aa0fd..f429ad1b6fa3baeb656f545819ab77dabf4188fd 100644
GIT binary patch
literal 17
VcmZQxvQOkn*rA~R3}B$33jjKJ1q1*9

literal 17
VcmZQxvQOkn*rA~R3}7Iq1^_y31p5F0

diff --git a/app/build.gradle b/app/build.gradle
index 751b94c..d33c0b8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 
             manifestPlaceholders = [
-                    APPID  : "320924230000-2-1-32092423SJNB12202505211658160001",
+                    APPID  : "320924230000-2-1-32092423SJNB12202507111046530001",
 //                    APPID  : "320500220500-2-1-32050022SJ97122021091XXXXXXXXXX",
                     REGIONALISMCODE : "\\0320924230000",
 //                    REGIONALISMCODE : "\\03205002xxxxxx",
@@ -34,7 +34,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 
             manifestPlaceholders = [
-                    APPID  : "320924230000-2-1-32092423SJNB12202505211658160001",
+                    APPID  : "320924230000-2-1-32092423SJNB12202507111046530001",
                     REGIONALISMCODE : "\\0320924230000",
                     NETWORKAREACODE  : "\\02",
             ]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 10eb1ad..ed93d76 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,26 +13,42 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.jwzs"
-        tools:replace="android:allowBackup" >
+        tools:replace="android:allowBackup">
 
 
-        <meta-data android:name="appId" android:value="${APPID}"/><!-- 应用ID,当应用在平台注册后,由平台生成的平台内唯一标识 -->
-        <meta-data android:name="regionalismCode" android:value="${REGIONALISMCODE}" /><!--应用归属机构代码，如：320000260300；对于纯数字字符串，请在前面增加“\0”，否则将会取出null值字符串 -->
-        <meta-data android:name="networkAreaCode" android:value="${NETWORKAREACODE}" /><!--应用所属网络区域，也即应用类型（1-2-3），如：2；对于纯数字字符串，请在前面增加“\0”，否则将会取出null值字符串 -->
+        <meta-data
+            android:name="appId"
+            android:value="${APPID}" /><!-- 应用ID,当应用在平台注册后,由平台生成的平台内唯一标识 -->
+        <meta-data
+            android:name="regionalismCode"
+            android:value="${REGIONALISMCODE}" /><!--应用归属机构代码，如：320000260300；对于纯数字字符串，请在前面增加“\0”，否则将会取出null值字符串 -->
+        <meta-data
+            android:name="networkAreaCode"
+            android:value="${NETWORKAREACODE}" /><!--应用所属网络区域，也即应用类型（1-2-3），如：2；对于纯数字字符串，请在前面增加“\0”，否则将会取出null值字符串 -->
 
+        <!-- 添加硬件加速和屏幕方向配置 -->
         <activity
             android:name=".FirstActivity"
-            android:exported="true">
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="true"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <!-- 非必要可移除 MainActivity -->
         <activity
-            android:exported="false"
-            android:name=".MainActivity"/>
+            android:name=".MainActivity"
+            android:configChanges="orientation|screenSize"
+            android:exported="false" />
     </application>
 
+    <!-- 添加必要权限 -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/pxkj/jwzs/BaseActivity.java b/app/src/main/java/com/pxkj/jwzs/BaseActivity.java
index 075716d..be9fb2b 100644
--- a/app/src/main/java/com/pxkj/jwzs/BaseActivity.java
+++ b/app/src/main/java/com/pxkj/jwzs/BaseActivity.java
@@ -30,12 +30,12 @@ public abstract class BaseActivity extends AppCompatActivity {
     public static String ACTION_LOGIN = "com.ydjw.ua.ACTION_LOGIN";
     public static String ACTION_LOGOUT = "com.ydjw.ua.ACTION_LOGOUT";
 
-    protected static String appId = "320924230000-2-1-32092423SJNB12202505211658160001";
+    protected static String appId = "320924230000-2-1-32092423SJNB12202507111046530001";
 //    protected static String appId = "320500220500-2-1-32050022SJ97122021091XXXXXXXXXX";
     protected static String departId = "320924230000";
 //    protected static String departId = "3205002xxxxxx";
 
-    private final String my_service_id = "320924230000-3-0400-EB013F207C9842D890327B6421C66EB2";
+    private final String my_service_id = "320924230000-3-0800-5CDEC9969D674E1CBB7E2F86A697B0D7";
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/pxkj/jwzs/FirstActivity.java b/app/src/main/java/com/pxkj/jwzs/FirstActivity.java
index 7781045..7aa61be 100644
--- a/app/src/main/java/com/pxkj/jwzs/FirstActivity.java
+++ b/app/src/main/java/com/pxkj/jwzs/FirstActivity.java
@@ -3,6 +3,7 @@ package com.pxkj.jwzs;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
@@ -20,95 +21,49 @@ import androidx.annotation.Nullable;
 import java.io.IOException;
 
 public class FirstActivity extends BaseActivity {
-
-    private TextView tvApiResult;
-
+    private WebView webView;
 
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main); // 必须先加载布局，再初始化控件
+        setContentView(R.layout.activity_main);
 
-        // 初始化TextView（关键！绑定布局中的tv_api_result）
-//        tvApiResult = findViewById(R.id.tv_api_result);
-
-//        Button btnTestApi = findViewById(R.id.btn_test_api);
-//        btnTestApi.setOnClickListener(v -> {
-//            tvApiResult.setText("测试中..."); // 此时tvApiResult已初始化，不会空指针
-//            fetchData();
-//        });
-
-
-//        WebView webView = findViewById(R.id.webview);
-//        webView.getSettings().setJavaScriptEnabled(true); // 启用JS
-//        webView.setWebViewClient(new WebViewClient()); // 防止跳转浏览器
-////        webView.loadUrl("http://218.92.207.242:50022/"); // 加载H5地址
-//        webView.loadUrl("http://50.146.63.127:82/app/"); // 加载H5地址
-//        webView.getSettings().setDomStorageEnabled(true);
-//        webView.clearCache(true); // 清除缓存
-//        webView.getSettings().setUseWideViewPort(true);
-//        webView.getSettings().setLoadWithOverviewMode(true);
-
-
-        init(); // 调用父类方法
+        initWebView();
+        init(); // 触发认证流程
     }
 
 
-    private void fetchData() {
-        Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://50.146.63.127:82/app/api/")
-//                .baseUrl("http://218.92.207.242:50021/gwgl/")
-                .addConverterFactory(GsonConverterFactory.create())
-                .build();
-        ApiService service = retrofit.create(ApiService.class);
-        Call<ResponseBody> call = service.getData(); // 假设ApiService中定义的接口是正确的
+    private void initWebView() {
+        webView = findViewById(R.id.webview);
+        WebSettings settings = webView.getSettings();
+        settings.setJavaScriptEnabled(true);
+        settings.setDomStorageEnabled(true);
+        settings.setCacheMode(WebSettings.LOAD_DEFAULT);
 
-        call.enqueue(new Callback<ResponseBody>() {
+        webView.setWebViewClient(new WebViewClient() {
             @Override
-            public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response) {
-                // 确保tvApiResult不为null（双重保险）
-                if (tvApiResult == null) return;
-
-                if (response.isSuccessful()) {
-                    try {
-                        String result = response.body().string();
-                        tvApiResult.setText("请求成功:\n" + result);
-                    } catch (IOException e) {
-                        tvApiResult.setText("响应解析失败:\n" + e.getMessage());
-                    }
-                } else {
-                    tvApiResult.setText("HTTP错误:\n状态码=" + response.code());
-                }
+            public void onPageFinished(WebView view, String url) {
+                // 页面加载完成处理
             }
-
-            @Override
-            public void onFailure(Call<ResponseBody> call, Throwable t) {
-                // 确保tvApiResult不为null（双重保险）
-                if (tvApiResult == null) return;
-
-                // 显示具体错误原因（如网络不可达、超时等）
-                String errorMsg = "请求失败:\n";
-                if (t.getMessage() != null) {
-                    errorMsg += t.getMessage();
-                } else {
-                    errorMsg += "未知错误";
-                }
-                tvApiResult.setText(errorMsg);
+        });
+    }
+    @Override
+    protected void refresh() {
+        runOnUiThread(() -> {
+            String url = SpUtils.getString(this, "TARGET_URL", "");
+            if (!TextUtils.isEmpty(url)) {
+                webView.loadUrl(url);
             }
+            // 移除跳转到MainActivity的代码
         });
     }
 
     @Override
-    protected void refresh() {
-
-        String targetUrl = SpUtils.getString(this, "TARGET_URL", "");
-        if (!TextUtils.isEmpty(targetUrl)) {
-            WebView webView = findViewById(R.id.webview);
-            webView.loadUrl(targetUrl); // 加载绑定服务ID的网址
-        } else {
-            Toast.makeText(this, "未获取到有效网址", Toast.LENGTH_SHORT).show();
+    protected void onDestroy() {
+        if (webView != null) {
+            webView.destroy();
+            webView = null;
         }
-        // 寻址成功后，在这跳转下个页面
-        startActivity(new Intent(this, MainActivity.class));
+        super.onDestroy();
     }
 }
diff --git a/app/src/main/java/com/pxkj/jwzs/MainActivity.java b/app/src/main/java/com/pxkj/jwzs/MainActivity.java
index 4471706..8e153c7 100644
--- a/app/src/main/java/com/pxkj/jwzs/MainActivity.java
+++ b/app/src/main/java/com/pxkj/jwzs/MainActivity.java
@@ -7,9 +7,8 @@ public class MainActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        // 所有其它页面均继承BaseActivity
-
+        // 不自动跳转，仅作为备用入口
+        finish();
     }
 
     @Override