From a361a2c11cb27aabc912527309c6fe5e228cc527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E9=87=91=E5=8D=8E?= <1533761530@qq.com>
Date: Thu, 21 Mar 2024 17:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=AF=E8=A7=A3=E7=A0=81?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executionHistory/executionHistory.bin     | Bin 8540799 -> 8820100 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/5.6.4/fileHashes/fileHashes.bin       | Bin 537291 -> 537491 bytes
 .gradle/5.6.4/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .../5.6.4/fileHashes/resourceHashesCache.bin  | Bin 64671 -> 65419 bytes
 .gradle/5.6.4/javaCompile/classAnalysis.bin   | Bin 666115 -> 709856 bytes
 .gradle/5.6.4/javaCompile/jarAnalysis.bin     | Bin 666509 -> 747525 bytes
 .gradle/5.6.4/javaCompile/javaCompile.lock    | Bin 17 -> 17 bytes
 .gradle/5.6.4/javaCompile/taskHistory.bin     | Bin 143602 -> 143602 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 app/build.gradle                              |   4 +-
 .../trans88/taxiappkotlin/Configurations.java |   8 ++++
 .../java/cn/trans88/taxiappkotlin/TaxiApp.kt  |   4 ++
 .../logic/model/AdvertiseProcess.java         |  17 +++++++++
 .../logic/network/JoeyDownloadManager.java    |  14 ++++---
 .../logic/network/ProcessingCommands.kt       |  35 +++++++++++++++++-
 .../taxiappkotlin/logic/network/WsManager.kt  |  18 ++++++++-
 .../taxiappkotlin/ui/play/PlayerRule.kt       |  10 ++---
 local.properties                              |   2 +-
 release/output.json                           |   2 +-
 20 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin
index dc60665ff9c613b7dbf384f5619338a2bcd023e8..976805dd4d47c178450da7c1dde1dcc40deb1183 100644
GIT binary patch
delta 9446
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

delta 16374
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

diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock
index a373e32706bd638f6e928a8b6ce47c6f55375541..24f4de8b752bf8cc67c481679e4a1d20979d4d0a 100644
GIT binary patch
literal 17
UcmZS95bwRu%IMn300xZD0Uy}|YXATM

literal 17
UcmZS95bwRu%IMn300xYU03VbCCIA2c

diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin
index af39b31eb3ed9f4496f68aff181e57d72f9465d0..7c7ecc710b0c08e31103fce8b48b31948df152b9 100644
GIT binary patch
delta 10963
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
bf;Edi?vQG|;0VXarAMhzGji!?ExG(3HhK`z

delta 10063
zcmZ`<30Rd?x8^V%j1&=4JVb}%l%|5HIU$ochKPVeg^1*U6A});BOxFTsSJ_6<`5nO
zB@GeHPJf0+#1te$)XV`mpdwBPWNQ72+_k^8<GHtc?|B~JU3;zduC>?R-`@M%hm1Pc
z(puLe1D#YykG<=3&H7k(?QNY^p_wYAJKFhL=`hCEs$bG*zYU}PRP<v`KNg13ewM}>
z)iHy0SF42XhRm^6Ar`9Z`MM!$L^xZuGq{FY>1MdvCw82j8RqwF@X|j&i>c5rGc!}A
zc%B@6)=c@R&K(;(?sHX}<z{C6UMJN)!>eztHaQwHORSD|Q2FKSF4`z$STx?k(a@*X
zYK_YE+=%av#?Ncn)H!(3&Yf%SyE9|JT4pr6hUs-yBMq<DSshhddY%kjmk~V4&CvMR
z>cA9LjA6$pYn6o|f2{Rltzq9!)(6_+dJZw4U1r_bGk#Scll7~p<f;~<zpnp=p|;FC
zc_%YF6w+U}0raaE{piF``@%~Tb0?ZDtG)hU^tU4}HT@tx_LGu6syO=f509y%n%f&3
zx^E2F>+ZL>ce_>6V>ek+Ps|+Z{<q7YN6&P-Y#vZs-z%nfuVZ~XOP3s!k5p+~|DU9H
z5D$GE3Q_2)cIf23`{Eq`Q@u)RtV;)2^!mGJdo%XDuL;@zi)!uQ6ORoUzxDj-{O0&Y
zl79~~jE$kc|L8>0U8^qj!)i9Iz3T7Zb9uiC>9LPJRQ_lhZ0Ue8d#xR41SV$~rth^L
zt#Wld{?Q*Ez8zQY+qovMv-bm@3M)H4VXx3+{5D+G!|*_FeSd(V+*dWp*6?<X^^|r*
z5k3M54c40Afu9~WZ3*=6P-^kT+nPh^$2e|yh>ZJxl>3`;{pXoYv7I=&WY+#4td5X{
zn0{f-ipM(^&^KE-Zf{ib44;Tjjn;0jliEp9TRg6X>Xo^}vEc^>TOlsavYp}3>#BCv
zSXoX}ru2oijkk7->G5ZkK}%NpcAV2MdaCZE;GdYduODYr50%>50anA*#ja<gX2%Zb
z5$-YX<gt}WtABc>Sgw7ri!E=&L2tBh*zT$JFnDLHel&OWIAK%SuKl|^cHJ%C(7fA7
zW|aA=uij+)Ub8dO7djYRz14*(JpNiW%P`7UeN{!ZN_x4?!(4-*Bh-$Hgy0csH-Ub{
zYCB5>okOlf#V|=!0{ix?EkS@kdz?g^M9s*P=oM-tdI(#4_ILy@iE0qjiu4lY;O0o?
zJBWNgl?K`lmP%@0!)FvL4k1>e!`Rh<Nxwm)BN;c0;(p|z{27Uz9oY8>JRI2WC>D%n
zmSfl>(YGj*=r~kkSX++Xj^r_MUGJU<7l=x78BNth`n4mIUO}N${E8RS?JD|?WrAyn
zXhrD~oxq7VnCeH=OLQK(w=8J@Ix^``2=2%xKcRkyg$8@1;w%crG4ok8NYn(~d))SK
zoZ4ZnLG*jv{qGUiiCKQg@CeqRq!Y8BM2&1W!a0Clvk@rKe#A>ufP9Hg;ii+NMmx*(
z%Kp;-1ZCCtdTV$_);3x$#DkG^il>(|(sNY~a39anOX1U*qn9F9q9Pm`&+*QnQlcW*
z1#;W(@RO(!3pDKeJM6DfmyCf-`ULs`RQ&rI?#UCVoZ0RvJSQ;AABdLd88RjM3*{0$
z#|!E49DUzp-@g#iiqa*zh0-AAyNzav?!bK_x78w2qQ`K{rza<OBIox21ujf_4-FET
z#MmlRrwUu&pzNdHqU>o-y_1oitwE-csETDU1~dCbG)a^WXDv+&uMlSc3_&((4PvC&
z6@EKN)c-AJc+J(IRLgYUco@QTK5z+T<SV9?2J=Fh&KC(%F#?BNNpV3cMxa(I{9&gf
zg~ufJ@P}<Jbs$W~F}h>*Bxdf8T!}JZYDM;wS^GIWyAVtGWM<ihmJ^hBsuUL^Q)mlG
zq;)iDG0&#{23+rA*+W!jiFj@`=stzrm%wWZ^Ug+$M022Llvs}%7aEXyGA6df$INCK
zr7V?jovIewOJWn;yAfsZRE09}cRc)*#MRxDekDG~uBl3d#6NL?QIZNR5}Cu}eb&B2
zSa))Zd!JceVjC-xEMXLi8d8WZS#c8WzQAAIxl1<a{Q>u(4Z<a|MXE%vqfnxDc-Vu8
z+J2~Zv?Zc;Ow=AtD`<=Gp;l3!_6T~LjAC2GCTlA1uD5xRI^e{I9LfRp5=}sG7?}(W
zV**7~mN}|HPfLwc>Z`u@zH=BndEbfalOFvrpuMv1tn2NJ<6%q{3=`QwHH`^E;Bt%R
zMekl5G8E};XbfgcZ7AZVvD+l%wW1n{CSz+Vt#EzAxmHu;fNh3{orMEtgsUAy&%?Oc
zANf!@XlF0kGkN_vyI<|=K8&v4Qv9u4h@{bnu-DT<bmAS(CLA}z)fy+wuhR~uI1Td7
zTkPY#vHD7b^qG#f(>XaUd?a#3tVBBO>P`JDn9lv|f?uU#6k3Er7r|MN;`G!;4DG`s
zJOmzfRFY&e5Mwk%>@FJQ_2Ha`qAY@=4uxt4qhW|mBa^@x?BR))C$#d#OL4e(ST)Ee
zQPjhW1DYc;jb_5lzD&CkFC^J2^o?X%Cq%TObcvjC!i}=8jO0+xcq$b=pmisO-$&f7
z9vnrr4*H+f4p``JDW0CBx3T#nChv&?Mv1j(kmxRSGZk&(Jp}Y4w&<A(TjG6Yv+_ga
zD@uCrOyyZj>W2IzvMMJlFCy>8Ru;kZ_a8?{3&;MS%$#=PPOsqsgNIFjeTW>wzU&cz
z{LR)5uF?0+-%i{8Vnv&dQ+I6qLFX%t+}J4WcLaLy2#rSkEbhf<<V!RLh3S+_^DHjR
z81xpR`)n5b!>2!qk*(s&*-S79hgwl)ZyNT7{yZQ9VK;|O-i4n;aab^bShmjL8h^rx
z*#Ww7bO1gzhpVz2Wx}dSTCHF!>tM7Q$mz#J)r}%ej^f<nd83RU$br{F6;JN}mf8fA
zM{yoWcrlO^E^~Pvtz+IXsIj0S38Gdp!0Qn4E*T||DAuoJHd5u{i+4GA3QFhFGj;LQ
zio_QV!+H+>C1uSgPg3QXJ}DK=b2-|2xX=3=MM|^*n+Fkj?mW(5Ba_=IPc}@{Dl*uN
z24Q4BpEKCPMnNOcYcOZ973rR|#w;TPVZRkVS`sq{bN8cQoX>Hi&?M1ZI1eF8uLT@;
zE>oKGS{g&Gf@dD$g^^y0^Wh_&$<iTAyATf-Fl{tk7BX6jAc>YCL82HO8cHk|7IOCD
zZHPXvje=iSmBaRE9^skrv8I$gqB)<LY}5vYbyhSIeN@UB!5MqhWVCe{ClG+#Xbw9b
zrdDLXh}!~@-;<_9yp6f&OWI>ZdnyNyGy^gvx{Pv(D$%!%xj2@j(E)NIWg9eHiIH|o
ztlmOVS_gfM!d!X}rNb4f()(zZs1EL4+;$g{j84~M*T;%S(REyqr~xe!HNhj6wT%e#
zR(y;8Kx_a7&x=*+fBH`tSy9@6CW-z)rq+rE&PU0w_$I;^D=fwLkSb9f3MHB?&L6a6
zE>ZZ3XTil+33T!)^cpJ8JYR*y*Z~QwFxun95{1v$1N9Pp2<=jC>yKcGW?{9TLS>9W
zu0)A2Nt6ov5v<KXz%usz5^;>qyoEf0Ca&{JMolZS^{1Zq{TF3QijD9RVnnMLBgAwm
zu7KX3=*ez5n%mQicq$eDLfhrcybO`{r1)St^Q9qHD$=lPBvBPeMG{(s*zi9^-3oR~
zgvTh-hDtF7P2ohEEX7UGcOucyDmHZ>@xBx{L$#7~Q4sBAE1C3DgpVfDcqyhLRfzem
zVxbUkOK}5UNS5^oawPgOtC)oz`BgNuEC0Kwlw=D|j3I(bsYpP*5baj8+gfPHlISPJ
zcmxY^i4>Euc{S&}4h0gWph2Q#(5)e@=gG5X2pFe~?^$!iNo0$>R#YRA9h~E6Wo#FJ
z*7msfq`@uaL#EW-@SnuH(796x6xz}Yx(#7I+4_Npr<N5D_W4|D3zh0RT|XFF+#H`g
z_i*Nbz?7aDgQWH}^2yhA?hCU&emUGB5Rq5xV_u<+)QXpV`do3x?e~-wve*@E1C)%5
zyTV7JF5+nu{VCSr&?i*Pf&hM~x**2Nh9-p+b+C&kt!})f*Z_*POzswfCNFabeA3xm
zoC8jquwcBxcKROnNK}V1iS9xb$l9uHu~hNEKqb`aN<^<!YD!+2jEb63F3~2uV6UQ7
z^qrvi7hOVxMCC}A=rT$Z6qcfkXqKoP?umc5MM`uPn}ZaV5?2&3GG?JcqOZi#C+cB*
zh_EEi>Mv|<MTHugf7g>}B6*%XnT;k^oNVGp$ZH)d8W9-GJ$;V&U^+i1G@c*((mi{4
z`1+EaZaDNOk5N$+@`cv)%O@+!=Q|wLJN3J?Rp&!TIq@1@G+Sh<aZ1ZA_nvSo<y8CU
zv+LHU&yX+KMYEI*&Z+omRYj@YqbCk8n||F~`#ar%D!y|NOWU7z`Xu+C^PR^GyjHR_
zvBcjbZ{>>Q*75=Lcj$z%D_P0<j3okVXpApNu?;FixZJU@3uTl9KZzD&^?Ic|CB7(g
zrJ@)^mC-Emfk`U7VZVV*-h}5Qg`i{vq9vM$Oo@U}K8dEolMPB5=XJ2%sJNZ)f`~4}
zJar>0x*%PMo21wkdTFPDX$cY3ONBF<CzGh%#BOiGeF}-eQtXCEAtp(&D+;<2>2WE#
zph1XrQq-bl6X)_KJU(UQ3YQnOZ^V7d^jd74N_=@z)WImk8Yy-~lMo#?vvFti-pnlB
z#a#rwy1%bft+WWKQsIU|iJ~~uwp-YDHo9+7i<`ysv-#=s9D_|CD35k&0?I-t?F%0;
zTM|x?DNWJRMAS=^4DD8K+kjw+)+6^rWn4<vLwQFm+p5GWO@@6KE7l>pCozYIG4ncp
zCrOoJ0^(BsCiU>4{*<IB1jW&)VMXzBculi(v!F!-i>6t+Q&Ppb&{GqklGoAPi`eU@
z@!YY+%~XZ1_<OWXV`LB~E@g!pBw|Yxw3(_Z?@hcim3xzhG$r(zj_{anDe81aUUS-{
zV9#{R9*9a;&!P>}JBu#!X^%=*S5OKSL3k3OBvUaFtADfBgq-wnF{`cFYy9rk;<Y1(
zE%=h3sA@@OE{gw;*N}xn-1cdvZCKgW<GQuYfzyrbQSlWIQ@<OC%211oi;9a#&ro_$
zaSaK5l`~bPJ+zTZ{K_{F%&2N6JR8L&U!+o&sz^-#hGtxu6z8DebA_eS0u2)NhHe|T
z^@F`TGmk~yN6Z|E8bVZ(%4wXF#U^-kp;M*XOyvcxat55Yv-=7JO0)*?5~U+wqV3T4
zWAYsM%wlr7ca`V_zLLm@LtwsNQ7KUc>~?V5BXLh92C}jd9{riG1!c1pzAAI5<}lJC
zT3iGL&fzk2hvyfHTh#>dj;z6kFO(6l3PGk+(AOCf<)d(b!d!J65m5?X#eJj`qB2y`
zcP!##Nm~-#&7&$xDMOVJPuaAp2>Hbnq0=soa1QRfICKdjB`QVmyBy&H8s>5>oS>V>
zxtAeSqKgRI&AylMu_e91AK1;LS7DTjYiN?_CTa#TsR{OXXwYN!uyGCY=W~ofxXq~Q
zHXiO_=6i7YlF<VMF{%tff<&_rJA_H=GinxT(DEg7Ho$KobFRe_iFRUjCNnjO^fWk^
z$;MA%VnyW<*zaYN=THq};+M#bW~$RDm#797i?|rIu+_82D|j)ge1aI+W(~bWE#e(c
zObnBXFV(gCl;9>yM8+soCR@BcoK5VoYo9`DvPYo{m8wn}JD^1>-hjtfY~l=^7rVU)
z<Ht<(7Mdi|qH8R-x#Ge(dh%jol__WHg77RR=!#TERh}r6$Q$|I+<jjJE#|IHK>{JV
zkuk}83v=j$>E7zXVrJ|G)k~TKEmG`*`fMulPd>^UnkfL4KAdJCg7=f6moF=V;OEPV
ziDI);Y7`3lr5s9Lc$lFuo9?;7mvX3Z1RUVxKSG>DbC4&|eAGy^2<3jvor0KU%>5bk
z5~ac9LB*|K#-!VEGlxlcqwUv>_QOY_!-$pW2;BXd^m{}~^b=bCrO;PTgU5142e9Cv
z!cq<Fk!T^x7@5vNb%<k>p|FAK5qO9v#3eM1Wcn(kuHc++qfnwdC=izgZC7&6chUD7
zX88jVjH=C$F56lVG+Lpmwm<?S({IqOV$z!kW>l@l=3LIy76lT$fd+{>L3fz79YMEh
zv^gDCGOg|m`>{;#jJ(y{=|iZIC>PFo?A8T=5_LtqM067-QFpQI&^=ThlMaG@9Fq=(
zPaKmDN329%FgekX6~rmsul5&Tx6n~uiX&l{&ml*{uNAetr|?zGghv3QxhVTYVXjyp
z?vBKit5^unqwE_XR#kd~i{}`D$dn2?%}Er3)bZvTgUd1XkLFJ09V-^LEwQu<xVYhH
zieD^!+e+tD<AFA4I!^B}#Vfwt8oFWqEhj^Au+yZw^lh%9wdQ5|og;?c->DbAhSaSh
znlW327mtX!<dk}&1IFo<#{Dl4sTWxq_tRzmT`E?tRM4IM6%tKSe1H}q+V5kxpA8<r
zsz<AwqB~^0bH7M6^83%{$BqfTUCk-v%s}c@dO`d1*uzW5ch@@qa?8Hy();BTq}CCI
zLOW!4@Wyu<GWO|p!*5u<ETE%;NIxeQ55Kb1xR%>qs_%NE-q$Ok!^ZT+csf8RT08Ds
zb|3L2EQVx>Ey$STkDx527YCjofl<yfv=!Hk7qXO$5B$mB4YshDGYZ;k)E|#*MVk|Y
z^k_O#&6MH_tj@M{Gvr@Wr_mR?#;iR^6*rg>H^f9TW^EH27M-aND9%}F&>v8uXD!Cf
z8)Br5S!)n`llZkcY!VNjo2;O-phW8tTt_hrZZhc#T*zUTOsFc!xAWJWTM9hBRutK1
zu%JR=*{?-o6=jgeCfTP@R-t}oOK~@GebgvVp_|CY8yp^ZQOV(>(YH!H-f4#Y(FcdK
zGIy0+&GL?ki>j2>twDMfjf`_e-1wxzte~U$`S0iFU5%1jdTpd4Ic+_-y?$k~Vefc-
z++({g;zn2*nOi8&wA6&Sy_Yg*=^K+*gz8;qw;8a#Tx$Q~ysXpc?>`QLQ6s!oZa?X8
z*5=Az`_F#$-jCAb0eg&b#G(puUN>fa2EW@>muwRk>|+#|xKm5fAkh}+s<~~Ic-Uz{
zsTP-q#_Y??W_5+nE_<uR?V&OIG%~~Kp|7g6r0)Za*%fT%2){3AOK4wZ>1gOwqn<A2
zK=uoi6;bqzTk6py=KO-aw`l~P-%^sv`2+cH((PKW+bm{_RK-Ndxx-h;Tcx59Ypco4
zD8*uaQD`EO;^#c#_-feSrdQ0acbM!YJnt~sWkgH#1=fB`-TSvR`5xs`@dK)AD1b{X
z`=+D)EfRyISb(_e)QJQVMZEJI&khMS6z`Zcx{K0Uj&~N#5`8092c<*L5lKjRKW6Xc
z2)<9=xpz6@e?(yv{WI3PqWlOQ7a!eLYMdi${2FQ=ke7cQdu1Z5j``DgNDfHFHW;M>
zXp-nO`qe5=L{1JS-{WNDd&6t+xJ$H$YdP3qPQezc3>wgCY87L$6A#Htpc8Pp&*&h6
zBszlxiN3_CyBwzpwX$uu*s?V6uCsK+s0Zrpg5{*a^g#Wgm?b$!3|^1aTNL;N7wXk#
zMB_ulw#Vv5rEvldxmYQoH=&Y{;eMmKkI?Mzf=KaY>SV2z$Z>x+L~E_wu=00xu@KFm
z($RQFJW<NE-&|Q>am>}q(UAQ_{k}QbWS2noOese8&)jVrG?^?N41v$oSwplIpWpQV
zPq*>UM%HZ33+Wh7Us=%q%dBgmyAS##U*!d(tGkW3Ms0C{r@M{D>1*o&1MFvRd-^Ze
z$RE(>bcEuQtR0tea|*pkxZCu1O0VzOal-m{;^x~QoM1b|{t#QJLQpRJS6{xhbluwD
zcdq)<YfZ%Uc6#YQ5*Gbz=*}@&I}+(f>9GmwXLFEt%JXy3EEEcI_fU|@8j%vU5&ua+
cJCujb3hHjok77P(;NPE8CNTwJ{cS$}FA^|KWdHyG

diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock
index a682a41bc6667fd4d9ba10423eb9a11f47fa166a..223baa8a686f4e19dab6d3a84bc51ab6b3327403 100644
GIT binary patch
literal 17
UcmZP;<M|PlJv-i<0SpXn048b!fdBvi

literal 17
UcmZP;<M|PlJv-i<0SvT^0VY!eaR2}S

diff --git a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin
index eb300c59f92333bb7dd38937ad4a81f746020e52..cdea640a7f145fcaf16f1513b6eda554c4540dd2 100644
GIT binary patch
delta 568
zcmbRLlezmp^9B<MM$gTr5+@i1T0(lC7R=T3VE}{ws*}G;D)Mv0NHkZzNQR1KPUe-G
z$v@BK;M0XyGN5Aao99XivhXK#BxNmBybKZiw}10exs%NN%-`%Pc3+Qy2>xZ=oT?Pb
z$glsr*ZRYEeyGa1lea2c@&_FAHw{&v4-xzGc=J=`LPq{8(>kB-ZQ+LMUccE_bten|
zEYo*hs=KE`1wU{8tI5d3&!eDft?UvD)qZgES8WAmfjd9%%<$Y7BnuJ!_i!_>KG2<a
zOzwTDiphrxR&N$H20G~gvqhgr?nH>-f9B1pCRL0~axW+A9&Oz`&-_sfqub`jJ&sKL
zkMydhi>bbcYL48zb05$}DyqDv(z>2P1pi*#oO!r|kzamih3g{GGzqBE$#2Y*CUYIF
z;P3nq*S}7{0xE32x$@{r4*rZw#-7??jZhOjC)?UtZVoy(ftlYqD7Ec;cP>;SdvdO0
z;AX8$8yNZJyh3uGzmtJVsBgY_8R(F;2`@TM9I1i|_D*iR5g<_hvnR9f^|cKU!9Vji
zpS%I`+QN;B1%jJ<-v|jzu5IR<y!3O2K-&8~>r39O_#8a1BJbwv6DubljGZ-E^M}&p
S{@62<8C#Vm$47Ml`62)nfy{vb

delta 184
zcmV;p07w6e{{x@-1F$q00X(xc7{~#W6&e|nMjDW_?ivULvko7?1GDBLPyv%pBrvm<
zBxnJ%7ACL+v)(HB0kiHb7Xz~$FbM>+J~U7Pv!*q10RkPdlf}bTlQP7plk&tDlR3p1
zlWN6avu-yMg#kUYfxJNiv)aC}1hb;Ue*u#@#gUV4H!!mj#&8I;n$ExjlXgK!v%1o-
m0h9JZkh2oiAOw@nMlX|j*%-5_*>V8_9m%mFND{M+>=F=(08K&w

diff --git a/.gradle/5.6.4/javaCompile/classAnalysis.bin b/.gradle/5.6.4/javaCompile/classAnalysis.bin
index 10a254f139690a176993575a7f0efc6dd18f6015..8a5ed167cea85f9f1f6ab6eedec9f8c047b6c1d1 100644
GIT binary patch
delta 2348
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

delta 593
zcmWlVUr1AN6vzFYdp$olO)&_6tH^1i7Nty>wZT9uMSTn+@}+z*XrK>*4?f6EvRZ>g
z=g)ZxOz1(TFVeWhdFW-34_O!qN<vnX{-6e9Mp8&dcMqS#mvav111CFodU(bEG^j+M
z-Kf$+|MMuj{%{}Id^867N_EDr_l8W{^1V0gUVqfoxih17vd(MTOAV*ME)Rx;eXTKL
z=(FK~w!%u!hn4*)TmiZ`(ynhrYO!{%NchH*e`J&rLRQh5knI!#>7gh%X%S?ADh(&~
z8Bz^TMq-l@!IKeajfs1_{u06_*S&(PK#yO;T59AC7(DY9Hi2fALGkJ`<c-wFRY2PP
z0A19(4plt0Uf3`D3_Elv3n^a7f=lr31`G)v`2v2RrEk#2E#Dz6_`oJK0Q#O3;jwbE
z$1zGljqNm{QPG0N>oh!p9rSg=>9r)WEjG9f4u*rtgWJW^T3B?%!UpQLFhh}BnCF%u
zTr)U$2fc!O?&2nJ&wV^6_(dFdkQT;pfG;Ns!w2I|Em%?o%N#p`CZMSw;Gt)Pv)um>
zXAN4)L4dobuu{VDjdV?*j8D#E^96C6Z|3olV9!tV19$#HWpMmA#(?~L&atgM%nI80
zi(S;YkBZ~_SZz{9$OJo|A2L};=@r^)QhcdImI!^KSy9|2XQ{(22lRBahux(zXXxh_
l75gjX7HF%ri{l67q5;11>6&+?v3{>~C~<Iczt=tL`VTpZ;LiX6

diff --git a/.gradle/5.6.4/javaCompile/jarAnalysis.bin b/.gradle/5.6.4/javaCompile/jarAnalysis.bin
index 00f2d0c67c5221a6e991748022d5ba06e3ab4fb9..0efbd77d48774d84ab304dc69f413f37aa3b65b5 100644
GIT binary patch
delta 16152
zcmeHNX;f6#vOcx@oI~%1hHgP-Xh0BfK-v}uoWKE%b2|`?hM=O6s0fN^iz3bg4vi=!
ziV6-W1{Ivp!~rsSH8F}Y#!QMP-k5l!n8d^+MqlkF=H~u-zutQ9t%Ym#p`}mnvv<{3
zUwu`@+D{^uU2a?1!5f+v#CTsf{JMVY(wf_ME=l5_uJzgi#i!Dcb|meUX(!(8()i2s
z=L-(_yu=u<3V!TW6>acb65oGCe1D)9qnCzWGQAXfsq}K9m$o{-KOgi}h((gNi&ty$
zGI)<n-#mKm3s+xQetxUI^`Y6c{2|Q$S=$+do@kxjL(PU$cc=c6ATRsy$;Ob6f6mN5
zhrwEyfkS&L<8b>A+B*iP5AF~8rr!tpeW`cOuTQy>kJdP)C*HI3QHBQtil6MSpXPOC
zf$xZf>bPrIH%sY(>+*S`Vbzl6H3PFgy%!}-X}EIZ;1x92@Ro(nz^h&M$``@#!-W^p
zI~TtBY|7b~<*7a<8I3{Qw@?qwu*VJMYs3A^?~i1~=~1^Mv*hcuZx6xX3p^5|A8P{*
zZ#+6P^NsOSOp~LkOB%knMPThYJ^=SU){Zo^zOXu_-?;|d5q8h3X3@dZX#EEd$E14Y
zZFECE!thzfD%THYPq~mj;NI#J|CqN9g9E`A?E@57%r$^BuB(uT;^)6<YYZ!_)0Veu
z8{zb=R3Cor$FC=0=|~8~=$o=DHf*MoA9}j-r!SAV#_Wu&dv?=l`b><Urvz0e9h5m3
zej9%Lr&yPxX6qq;>qeil*RU#zx5t_-e6OJ_qqljUDfNP>BF$^yS1!qzTq(b6a0!ba
zcJfTkh}im`>HSLwyoe76DzVkmpJ^|E;ic*GUYj@g#PmxiV(v*jOr3-wI^#m%Ziet3
ziA%RuY|40i(e;$%bt?;lFY#FX?1((hP&oab*R>M&iT_*|aePGVtG^@Ml>;!@8@w_5
zs65ut{EZa{_w25p{#8y@XUijf9M<)R?il0)DTcTwU-W%Dvu*Qs^UX~E<l}6N?*<mU
za7^|xxTH;f`u5j7>%;Gde^@%%+7=%klUJin=JyS;)jxXucGv#R>Z&2bOgFB^I^2nN
zKWJv)gZm!YK0M8P{Ms8wyjL!J1v7>#a}0~6F{S&5$9<GCZ~mTyh9i*}zgUSk8h(hd
ze|~!3{+;#v?@gaqKcqKS`Kz7q{`bm5yttbu8SZ-j9J%aP;Wx(y%rdrnWDF7>v|#Q7
zWu)=;-1SSoKlCkIIP9w_=Z{|XynyBcr7s#fbEUdngYpL$y3D@XvCY)w-QVyS(A>ME
zhg@xR=Ka7Bedi0S+t|scLhhV6yZe*tkE<7z^Fhp@Z~uM#lT+?p+Fw7{^Y<;IZeso@
z0!w|3>}i<lmoqYZZ^FcZ!)N@6kLNYV@$(=QYwpX=nDnz!YzX@)Bj7vF(Wa3h!9U#p
zbig>gRV!~Ybltjtd||6y&7g~4_o#oYn}Br>WIFO0YZ3pk@?XcFRjgZlV7~h+2#=Ni
zhW967$kndBdd>c9*YbqWM_aJ!7j0Lp906JpvvF#8YPSnF8k$=dynTKAw^sx_+f-K?
zc@Tpen17N}fL@c0ru3OJUY$8<)~rFPvoh&xpBx$a&xh%EJ@;kKtgYI))QE6dHW#*n
ziMalEWt`zor_pJ8&tD8>@2%hS?i8<$0#HHN;KBV2FPHs#_w0l8-0gSYiA?`>>1G@s
zp?0fIKg{i5xb?~KKhC~*sVH#FYpt(!NY<lqB=}Wdo~TTP>IL4s7!1XoE*y4RGqlCr
z(_b9!6Vo#jAy5v)<Z5m;Y<*;VZPfh7+q=K)dC7P}T7tFJ{7b_t?T4Kjwg2Y!%@N1n
zd;9#yw{cN{5{_ps%A>H=Nq)p|%c>1?FMG7r|L%uRe?0gz$A{wchL<Tu{VvG^4K;p~
zuN;+)U%LKOK7VuE>b(NQkysxD20V00HX6T<>+`|nh~wFdUBX6bqFVWtVC_C~ZuI-I
zf(@7CJy`K3?``mJe(%WRk59$q_C9kj{YkpM+Ni2O1AY<2M;caJeNSKa|9*Y;kLR8S
z{qm`AbzCrC#th}k@HNLbEPMCF){g%w-_$V-Yq{DI<C<}`+P9WFgE4Vv<~v8szrKI#
zMeUlnH;!c=LenSm-Ri)%`A*-zyUy^Ru9LE!`^p_8tW{+{47$O?*xU<f{Y~yKhngi@
zqq{2oR9_~|6AtPQ*|_L1AHt;hSbvyLW6}c57!5-q2Wv+|A6V${6xOd-+Ok|g>v@@O
zU4-?$c|0t}`Y~XJC0J)y;@DCU4B?BFeRwD=!`gA+hYfwWD=f#FpXE?kfu;FM8(4|f
zzC0FIVfr|TDf~e8)kv%1FJ}j8q&&b<P=lGYhEOiIg|(QG$V1Scz=L6(_|`C3FIJBP
zJJy=jj#yuyxIsReUxt2c1EBpRMW$3B{vRRSZGw$xNP@0x6a3x9@5u&PDulmzRU;v7
z<g(m{Nt>~DlM)9-m@xx_3%#HjleUO$_!q`NOD1i7{yt1&mWm6Lp)=b?r#JC-OxiAX
z9gNW(!C52i0AX-n%sov}C(*OaYF{W7Km2i6B#&UyP7L0xw1Qn||3fyzZiGR+HSB4;
zBgoF1qv@&a0cB{O0CBJv%|%KS?8DLt&=JZh%c_2O*$q6Hv>)Sl61<})f-}4>Zu7(R
zbcOa^A^sEYfR{!(0BDSbUQ9ZO!9#cq94d@aC+e?jfI%o@V38`JpzcU(cP874z*-J6
zgA|291xQt!YL!;)?2r%TU@3q+c(DXVJ26PmijO&iBG8F<&f=X5V>YXF7;w=V#TOg4
zDz3W5Z<c^`1non4h;s$R8yKtr>8Qg*K^Rx1xZ%Hsa=mJE*$&b%tO43~@*K{a4VyV*
zA`uj02{sSMcaDn>yJ&KxYT=-844MqCI-3vE3@U=I(g|ERj7P&stQ^L>Ioq~FmOq2#
zAiaTx``oKp5j}NCDQtoerYVB%ZKO9b$jYOY3NT5h(5O+O+-xhv;Vra}O^_v>MssJ?
z-8n&6s0gGpa1hP?R3AKV<(_gLNM{}9CS9VS{{!yk-Do;XU{*MDN=*nYf-;CK2dM_D
zG)hb}TPv|jYsRLVq8J%ds-<MdJGR;bR_QHRGj&GhwA8eyQE91}%x!QH46$kx^T2H_
zOdXRC7O|bTv2HkT2k#(^;9Z^RVdaoQXO!N><Obf(xC<<u#1lF*4ZV$#-ougxZh~`I
z)4&7$Y^CIV*1sGQm~(Gizn6-@i}vQ!BS-oN){o$wwYL6_O`R8T3dR~O$ha;QTsb`_
z#X^3$fM;XX=B}?b3+>`r1d{_xAw+r~7mnm@*av{Oo@j$Gx~uB0_Yh{Lor&*U#9>`k
zZx=E~5wt7@YY*u|G>qc@a0%^Q)o6`Px{S%Ac$iGqt;76M(uegwa1}@pc2nCICUVvF
zBUmxPmN{wc%M8M$tC;Mhc<Y5}CzrxY1VZU!v0sZ)L=e6vg0qj4Etx@v^ocmOCkAR2
zEj{Ks#&uW2WM3EQQye-CB2;p6rt}%+YL#yE@#lC}s|5O4rZDL8ny}$iaY<*;pRkvl
zA$<X8ex_-qGH4-v2?fCy+7jgRU=D*=>4tDe7{={ZJT)oOO|*{YX2oW;NcC9qh+8_(
zwS`5rYMryN?P7wWWhJbJ9(mBSZ$ke8<m4@|6^2=d?|?lpb}w0NKLyeOI0#A7E$psS
z!gbk8DMAS=w*em}%3cKxH<W^gL}wTA%VmupeTAhu#jjN#n^ml^0W5j6$aZo9(~IR-
z(Gz*1a|sxxdWaa7zQ#X#s-em&hd{c6Zq7=mlfZ3H>7RmC%mP;qRDA<S1=>UKP@L+n
z(Mfkj#KkB!>02O1%mW`M#*nQ39h&0RP&Jw?D%~r5%zfmwApHyL%9IEvinmQ5eUI_!
z5YR)><^hYCsP>rb;@T&*Swh+dnCV*p8zGRu-6GWHz<hS(b{L&gO1m!uaU9F*beJUR
zJ`|KzM)Go4PiMAB53tTf333unjFK7(f937`C>$Sx{m&p8IXivYq*((qg%_nC&^(TZ
zk;kPUp$d)H6?d%crJ9W8wDJa8&bE;*^!1;xzL(lhD`-P{M1*W!OM+o=Z`CQ5SfP;+
zeun(<X(=;jq^3m8m=)D)cIvbg2F1h`jLj9!6dbkHaotAOB<UAi*IP9?rxITOq#iUT
zQK?e$GB-rn4$-R2b1oTt3s_ePC%H^bu)|UyKZy{s2*XIf;=|u4ZT^N2U6oGUX5CFI
zTczL8?56k`E1+lmUiw8j?4#?e(i5!dqqbB9HAsI5TJXc<{fePo7nMLa*_EtrhqQc{
zSs+-DY%XXfoA~@si_<fOwVz`BEb!xhhMDwCMCPBAu)eSALz@r`nI+|-*++>8OPxMx
zMEdwNqJ9@?5wkzHP}-!-s8KUh9Z6&{!>4^I0DDSH7}jP&>wt35GdX*KYc9BopZZ*I
zBhR{vvn^#fJwf$zDi)_$#_(Zx*|(r_l};~cJKW;!2nf;^393gkp0JyIY$YnwRzN98
zD;VB-i*#wpYzWZX=sbDg;>$plR${w;YDbw8+A6$gRQxpY(rQe8%G>JZdWbMt4N@MO
zvcTIZFqpwY(jf88lrT9pM_P+F={8azw=&3_m094fx?3%7(t3=4##_j=N4t1ua*t+w
zDjAn-S`LX7WML^EZyiwDD1zZP2wOSSffMGqE8IDcyx-0N&;ndP2RxOP5GifM1MW(o
z;*%q7Vxqbsf$gsNXl;%5E<~e;(q6XuO1SBiE`SrJ^2B2{<8%+Di#)(06=CUg9)QCZ
za2G9Osf7M5WRMYLkaW=bz*ej~q*z>Rl;ctwmn=rB4MK!jw&4TN1-dMV6XuN<QMMgR
zZO~jBwhvz23DOR%ZLY+rA{0o^%xAimq-UZ$6|=k#NX(3Xi%v(W+~`OcB9ZUHg{sb1
zC#nlaeC<YqLMb~*qjM6^+k+41K{ti+l2nHIlX)l2UbY9#8z7YAK{*UzY(fzXWsoE7
zBTf}^=T+6<G9zsklWpYHEU6ra%DSi)#gHhhIL3jB{cPQz6fkJ~Jewc@deZAyBI`Oh
zgvb^OED}cX@6cv*mw*$ln-9&=Ptm#f5Ca@w&$IBb@u@Q%zB$MaVEi#~#~a>+nV!@h
z$xw7=k^C!#L(SSE@NvzNsu+%^WQ+EBoOfq3r8}!SiLr9n0h1Xkf<WmoD|j9lL>({m
zN=-|dG?OXY1n;{phBU`ckFaX2Lg+}!D@8gg>=&fcqmHpsTy#ze(lU+ZAYt=3UQ~5{
zDjltwl_5kDg^zX|{{)uiKy*kk%w>cN8#55`46#P?9?qrEdxgjin_xEa{z<Glri2qE
z(h_f=X(5=L7R+a4(>L+7lP*lZi*gG|g&iQBVn-a0MmMd_Lr)K1;$R!;G$TpcQT4)0
z3&AMdc?Q?Z;M=QB7d1stO;6XgAUM8%I&qCjkj)$i+mHyz-r?Yz#UP&Y7tdEXvff!%
z)hMw}Or=CZN3X$nf5k#6x)vXfB@m={0T)akuKLoi-l9~_L-;{hM|;X4d6cd|h*pjz
zEufd)K|_GjGGtC{e&dGUW%e0UQ)fi=A~7){b7pGVs|<Qb@39^D5OnVNY#P_g3-r=C
ztO_J-q<2yk+_4DUdI<R{P_vyd##(mj(zQD=^<-z)buguO>T6S*dHQS+TpBvaHe_fq
zWG9vYacP@&V~Kh?lC-KFq58^YAe|S1*~XpFlC#6Hp;F2jq)16t2@b{RlL{w?nxywx
zK}K$%!CX!WkR;E3y3k!8h;79v8%R<ywEv(9rsQiQ^L&Uk&bsIzy5kbt@Hc$*nw^$1
zjR1&(LNC*g@8uu?cvmtT39ThyBDy3wW0kJp&>6hB(@JsUM}%UN983~@Efqe3POoC6
zi!KH}#)~s}D*?r8Y!}Y(P(sj@&K39s^Me$#Dq{FL!{8v<L+_NZ(m}_T9@3`_>&{Sk
zT~1WBl=}l2OeV=ypQw5$q#sChy_wF#g_FO)XL?<*b_wl)ko2XnNI33T20D+Wf=w;l
zIgG(hs=tIOZZxuieG=$|=;F<ohSt~)5lkbJCKVbt3qvSY%ApM-iCT}RGPtQRBi<4e
zZid@ph3JT$(IRHd;$mUV5twbTRqZza#nJI@QQpx5$O8osm?eEBz7&p^N2^XGe!dpC
z7sBAwOs;2l7@DtBl^6Yk%<=wADtZ5jf6U~8^tfzS=^G55#r^$kEz3wFq!Z^_dI(__
z*qby*U#h!EQq``2md*~9)K7@nZ?WnO5j?r#J3Kp!2WsvSB^vX<AD_(PI^r5il&&PM
zTr;_s?zss6p1gLIs;!!4WRbI>il<*0c!$#(_y3|ZL52>3c_4T?9AD4m&SH;J13}|M
z^5%_9&UqdTbg;-nY{=wYT?k)EBblau`UsLx!<vzU@?l6KrJElyc{Xn&9QPC2XLFOB
zt(P8&@Ql~YlYT~nyRIwzf*IpfM{<0OFJ*C)Li_oZ;Ua2A$i*Q2hG*S%W&x<*+0I5y
z){w;wjg0gJXXHVcD~U^r(S0zTL2D8-wDI;Kuh<5!BoJ6t!qa4z7fCC|lb<XkBP$@#
zBt3n;Sjn8{i#@|j9y*_}Mx{eXBq8id5o%0L5NL5QViHk3;VxH$<|H*nwn>ZVop5XA
z8qhl*gn5F<CrOJn1-Cx;D!BZfQ7<Tc17tJMOG`9Zm!w9C^DWh2^jc`6CD|d=(K7sf
zE)QVKHI1zoM@7}c#=QfmLSCWSFk|YJ%*=F4)QgiQjF>TT>ZDAna(j?WseDCkNvB&N
z7GFgfn0Itt$k;&$&Lt|)ORH(Qk(AFJ*~@tzcczHW!=Pj}Or<2fMzaqWB~jC4p_h(R
z1EnsFI5Y03;)*57s){@2aVHWoHD0<<B|8^L!qmR21gVs+B)bMnv#E)5Ia23N#6Xml
zkMZ6*F9F64IL=$wLa=-RW{g)OWlI(*6>}$QHP}zdKJKD88@0;8RIBMqDRvVY?GUWp
zM^P&kYBoAJmXexYLNuOJLR^Z8VHhhGvU@Y;+QCczH;qgxCSyMLqcWq$4w253^6a!K
z?PDv}&L`l}K8o?-eBRo-oZ2>|R5m+4E~XXpXkBTW1`WOBcCrvaSm&$r$6{Zd&bX1D
zR^qsGCtbrx(A4FFBgvHD!?sEbg*2#Ciog5neArI1Mj3eE!fY^NS3jMO{2N7z#+<{=
z?t-OWrzP^>5M6E3Zq0VIPU9YEPf?u}+Ae9Ek`y&m$2!c`I2sUTc+*c8AgbKGh5oug
zBPG#+1Y42wOi|K4O%VonSG<i(l%<pe;-fqrR9BAX3rehUoELFJfUp2HaLEk&F@KU8
zrjYGk*I?CcVs<LLjri1Grx!4+&@^h1b^$t5rz~5`?8x~!xv&_PP`Wi+I(3Qd)+4?*
zm7g16Gf>S%8F>d${g|@G3RKiv(g7@urYyK7m&d)3HOH2{fEHLr<?9MqNvB>**cWvh
zwbdvVx6lgP2=F_|xTWOpU9g*~*}W9F|1M`qavanYSWo)mFdb-dXdq#X9&<>u9~Y^V
zeb*syoVth`bQRFvamGrGsCUD$Vi9+ts;z1h__<X;7p9p~1RY};%#jWY0FsJ3tmv@*
zRaNhl+D+uMBN))0`T?T4J&MMQN&wnTI_GYGRzITV+ys9wHi--Vra_WkU|M&ZRrp~$
zxD600_!yBv4G-9;IN_J=6&DwZO>)s-QBxeps*6h7Fo6dvbAM$sbP+|Y+RZIt4-hsj
z9f*`dvPMuFf%;YP2yI;RU=$<#x|rgn6Pg2m9o|o&bWEzOE=czxP`7F+4|L96kPBlS
zws;fG9f<pu0@au)lng~JDxK0iFLnn{${e3EK65-fgz=Y@FWe3iEGZzZNsRm=dRQHl
zFkDvz)L*lbEI)&#MGz!gqNsgUw~Tin{;0v=7CMtmz^z5o7TTs^!e2$vTN+Au8z=*9
zX`yowWbiiTFXvv=g(~T&MC<b)mC5S}219eG5B02t&QpZvdxa}_7wSBbhdS$sdL4}_
zQbXxm!C!oS9_?EpKq2&#{>iwav`yOvNf|6^LKj7}E6Bt;7ene)QLR!f>`4-mO5qUd
zayJ&sL$;E{NF??bmFq4lm|t>~%e3(On!i*~R_dfVQHgY6&P!mxpV8K{wP|5Isi}-G
zT}ypA%%<?oVr;&JI#nfM6rr@lhgch?^WxhG!lcWkOL&X!h09p_k<!w+404!e9i$E=
z6;(ytstllSToE+e&M84y_ajFV2}k=jht|4^rQ4t@rIe2~nDJQC0u8Hq(5N}Ku$JN3
z5s|H0FUV<|3sH@sWr?BKTq(LkYoO;^=tC`{jTB*y5FKXS2E#>+HOAMN#^4&)*erTE
zNxG)lMHED3N@cjtNC%@nlLI=RX!bOM>~yT+P9^X4Ml|?G=-f1)Y7n0-15Y33vJ2)c
zgV_G!%;gl|I~*tfOjD3PrX%G7BAU<9e2u*Q@AhaGi8ew{tHMZ~ju1qetpf$4y${8)
zp#-#4qLENDbyG}^0`Dfql|Xc0pE<=aY#$7d*-0EyNE|}(RR~O@Sq}ar)bhJ2orPAu
zg%2Zj;W9ODZ=-)JGX7U+>aMhO6>+wUZl~kLP#0@hDfqjH-|eAwtkN9~8pq0B80R8;
zQIoYr9vy{w4%`ej5~PCp;{*lTVa!re^xn~9&3hprFo?Qdb)^vcA1C_;Yp*N8A%DwA
z6~LU9K-xgXqSYM`oPUsVP4GgT)>>x@-QM{>hw8cQ-g-QxcyWtww)EC%4`>schU!g2
z_5XpPdSTv#(HRY$_BH!1uzu%;E8Cie>i-vq>dJ%Vf4H~1Gi&t4m!5bW-_Yjyp!UBX
zsu!$%|4!69<HsitIy$g2&8PMM@=*O?{-os}9Y6WmyDxv|b*C<m+9v;BhUzOG#k~>r
zp;R?`aM{BLUsVP*4b_{5>gJ}Qdecz7X{b(RV$)E)X{g>bRBsxpJK6<JL-nSidecz7
zX{g>bRBsxpHx1RBhU!g2^`@bE(@?!>sNOVGZyKsQ{_4GHs7`+Y(KJ;5A0Mi-?VbM%
DZyxFm

delta 75
zcmZp@pxb+0V}pqVqwr)?i5rtuC09&-DjCGYcypuT5Alr#4r0xY9_@}Ej6lo;#LPg<
V0>rF9%m&2lK+Lh-(Sy_HF#rUa8BYKJ

diff --git a/.gradle/5.6.4/javaCompile/javaCompile.lock b/.gradle/5.6.4/javaCompile/javaCompile.lock
index 11fb4bb169cfec89951ef82a301587e9930d0a71..abeb0433a76cca7344d01aeb579d9aebce6b0ab5 100644
GIT binary patch
literal 17
VcmZS1TlD&yyQHrj0~oN)1^_fT1c3km

literal 17
VcmZS1TlD&yyQHrj0~oN`0su4G1S0?d

diff --git a/.gradle/5.6.4/javaCompile/taskHistory.bin b/.gradle/5.6.4/javaCompile/taskHistory.bin
index 94e7268510d3c5edc03b1ec07b99cefc42ee24a6..a9f3ef6194416726e179e2fe88707e2869160bd3 100644
GIT binary patch
delta 41
zcmV+^0M`HV;Ry2K2!MnEv;spg5r8kk_-LGhBj=h!3J9$TR`8e6F9KYburLBbi^dU&

delta 41
zcmV+^0M`HV;Ry2K2!MnEv;spg5yi0y#eN#wL&`mg4s$Gc{_vO4F9KYburLBblK&Dz

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 4d49910c7c8c891dff4f6a666c7a11f5f81e17ce..d297c0b29deafc76e5d7743329be02936a934c15 100644
GIT binary patch
literal 17
VcmZR6$@fd*U7gb|1~6dr0{}Rb1jzsZ

literal 17
VcmZR6$@fd*U7gb|1~6d#0suKU1#SQU

diff --git a/app/build.gradle b/app/build.gradle
index efe13df..c135b6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "net.sysolution.taxiapp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 249
-        versionName "3.3.3-beta26.4.0.8-debug"
+        versionCode 251
+        versionName "3.3.3-beta26.4.0.9-release"
 
         //alphaxx - 预览版本,不会对外发布，由测试人员测试，会有很多bug
         //Betaxx - 公开测试版本，会发给其他工作人员，会有较多版本
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java b/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java
index 76aa19f..8343e7d 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/Configurations.java
@@ -454,6 +454,14 @@ public class Configurations {
         context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putInt("logInterval", logInterval).apply();
     }
 
+    public String progressList(){
+        return context.getSharedPreferences("config", Context.MODE_PRIVATE).getString("progressList", "");
+    }
+
+    public void progressListSave(String s){
+        context.getSharedPreferences("config", Context.MODE_PRIVATE).edit().putString("progressList", s).apply();
+    }
+
 }
 
 
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt b/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt
index c97f8ef..5809d10 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/TaxiApp.kt
@@ -15,6 +15,7 @@ import cn.trans88.taxiappkotlin.logic.dao.DaoSession
 import cn.trans88.taxiappkotlin.logic.dao.HelperDaoDB
 import cn.trans88.taxiappkotlin.logic.exception.CrashHandler
 import cn.trans88.taxiappkotlin.logic.model.Advertise
+import cn.trans88.taxiappkotlin.logic.model.AdvertiseProcess
 import cn.trans88.taxiappkotlin.logic.model.BackgroundType
 import cn.trans88.taxiappkotlin.logic.model.Regions
 import cn.trans88.taxiappkotlin.logic.network.JoeyDownloadManager
@@ -39,6 +40,7 @@ import java.util.*
 import java.util.concurrent.CopyOnWriteArrayList
 import kotlin.collections.ArrayList
 import kotlin.collections.HashMap
+import kotlin.collections.HashSet
 
 class TaxiApp:Application() {
 
@@ -67,6 +69,8 @@ class TaxiApp:Application() {
     val timerTaskMap = HashMap<String,kotlin.collections.ArrayList<TimerTask>>()
     //存储定时广告的列表
     var timedAds:ArrayList<Advertise> = ArrayList()
+    //存储未上传成功的下载进度
+    var processList:HashSet<AdvertiseProcess> = HashSet()
     var activity:PlayActivity? = null
 
     //gps日志定时器
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/AdvertiseProcess.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/AdvertiseProcess.java
index 14b3972..eec0b93 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/AdvertiseProcess.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/model/AdvertiseProcess.java
@@ -1,5 +1,7 @@
 package cn.trans88.taxiappkotlin.logic.model;
 
+import java.util.Objects;
+
 public class AdvertiseProcess {
     private String type = "notify_download_ad_progress";
     private String ad_id;
@@ -20,4 +22,19 @@ public class AdvertiseProcess {
     public void setProgress(String progress) {
         this.progress = progress;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AdvertiseProcess that = (AdvertiseProcess) o;
+        return Objects.equals(type, that.type) &&
+                Objects.equals(ad_id, that.ad_id) &&
+                Objects.equals(progress, that.progress);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(type, ad_id, progress);
+    }
 }
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
index 0a995b8..576d408 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/JoeyDownloadManager.java
@@ -192,6 +192,7 @@ public class JoeyDownloadManager {
                 downloadListener = new JoeyDownloadListener() {
                     @Override
                     protected void completed(BaseDownloadTask task) {
+                        YoungUtil.YoungLog("下载完成 --》 completed");
                         YoungUtil.YoungLog("Download "
                                 + task.getUrl()
                                 + " successful, [Size/Speed ==> "
@@ -226,7 +227,7 @@ public class JoeyDownloadManager {
                         advertiseProcess.setProgress(String.valueOf(100));
                         String progressJson = new Gson().toJson(advertiseProcess);
                         YoungUtil.YoungLog("广告:"+task.getTag()+",下载完成进度100");
-                        WsManager.INSTANCE.send(progressJson);
+//                        WsManager.INSTANCE.send(progressJson);
 
                         try {
                             RefreshPlayer.refresh();
@@ -313,11 +314,12 @@ public class JoeyDownloadManager {
                             advertiseProcess.setProgress(String.valueOf(100));
                             String progressJson = new Gson().toJson(advertiseProcess);
                             YoungUtil.YoungLog("广告:"+task.getTag().toString()+",下载完成进度100");
-                            WsManager.INSTANCE.send(progressJson);
-                            try{
-                                Thread.sleep(500);
-                            }catch (Exception e){}
-                            WsManager.INSTANCE.send(progressJson);
+//                            WsManager.INSTANCE.send(progressJson);
+
+//                            try{
+//                                Thread.sleep(500);
+//                            }catch (Exception e){}
+//                            WsManager.INSTANCE.send(progressJson);
                         }
 //                        if (progress%5==0){
 //                            AdvertiseProcess advertiseProcess =new AdvertiseProcess();
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
index 7ef182e..65f63cb 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/ProcessingCommands.kt
@@ -22,6 +22,7 @@ import cn.trans88.taxiappkotlin.ui.play.isOverdue
 import cn.trans88.taxiappkotlin.util.YoungUtil
 import com.google.gson.Gson
 import com.google.gson.JsonParser
+import com.google.gson.reflect.TypeToken
 import com.trs88.kurolibrary.execute.KuroExecutor
 import com.trs88.kurolibrary.file.KuroFileUtil
 import java.io.*
@@ -298,6 +299,7 @@ object ProcessingCommands {
         //edit by ljh @2024/3/14
         Configurations.config(TaxiApp.instance()).isSoftDecodeSave(loggerSwitch.isSoftDeCode)
         taxiApp.isSoftDecode = loggerSwitch.isSoftDeCode
+        "是否软解码：${taxiApp.isSoftDecode}".logd()
 
         baseResponse.type = type
         val response = gson.toJson(baseResponse)
@@ -356,6 +358,7 @@ object ProcessingCommands {
             beatTimer!!.cancel()
             beatTimer!!.purge()
             beatTimer = null
+
         }
 
         beatTimer = Timer()
@@ -395,9 +398,25 @@ object ProcessingCommands {
     }
 
     /**
-     *发送所有广告信息
+     * 发送所有广告信息
      */
     private fun sendAllAdvertiseInfo(task: String, type: String) {
+        //提交未上传成功的下载进度
+        try {
+            val progressListJson = Configurations.config(taxiApp).progressList()
+            if (!progressListJson.isNullOrEmpty()){
+                "progressListJson:$progressListJson".logd()
+                val progressList = gson.fromJson<AdvertiseProcess>(progressListJson,object : TypeToken<Set<AdvertiseProcess>>(){}.type) as HashSet<AdvertiseProcess>
+                for (advertiseProcess in progressList) {
+                   send(gson.toJson(advertiseProcess))
+                }
+                Configurations.config(taxiApp).progressListSave("")
+                taxiApp.processList.clear()
+            }
+        } catch (e: Exception) {
+            "exception:${e?.message}".loge()
+        }
+
         val baseResponse = gson.fromJson<BaseResponse>(task)
 
         val positionAdvertises = DaoUtil.getPositionAdvertise().loadAll()
@@ -593,7 +612,7 @@ object ProcessingCommands {
 
         val sanleResponse = SanleResponse()
         sanleResponse.task_id = taskId
-        sanleResponse.id =id
+        sanleResponse.id = id
         sanleResponse.type = type
         val response = gson.toJson(sanleResponse)
         send(response)
@@ -826,6 +845,12 @@ object ProcessingCommands {
         sanleResponse.type = type
         val response = gson.toJson(sanleResponse)
         send(response)
+
+        val advertiseProcess = AdvertiseProcess()
+        advertiseProcess.ad_id = positionAdvertise.task_id
+        advertiseProcess.progress = 100.toString()
+        val progressJson = Gson().toJson(advertiseProcess)
+        send(progressJson)
     }
 
     /**
@@ -1042,6 +1067,12 @@ object ProcessingCommands {
         sanleResponse.type = type
         val response = gson.toJson(sanleResponse)
         send(response)
+
+        val advertiseProcess = AdvertiseProcess()
+        advertiseProcess.ad_id = sanleAdvertise.task_id
+        advertiseProcess.progress = 100.toString()
+        val progressJson = Gson().toJson(advertiseProcess)
+        send(progressJson)
 //        send("服务器日志 ${Xixun.getCardId()} 添加广告 id =${sanleAdvertise.id}")
     }
 
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
index 1aeb211..2ce8365 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/logic/network/WsManager.kt
@@ -14,6 +14,7 @@ import cn.trans88.taxiappkotlin.ext.logd
 import cn.trans88.taxiappkotlin.ext.loge
 import cn.trans88.taxiappkotlin.logic.Repository
 import cn.trans88.taxiappkotlin.logic.dao.DaoUtil
+import cn.trans88.taxiappkotlin.logic.model.AdvertiseProcess
 import cn.trans88.taxiappkotlin.logic.model.CurrentPlayAdvertises
 import cn.trans88.taxiappkotlin.util.KuroTimer
 import cn.trans88.taxiappkotlin.util.KuroTimerTask
@@ -357,7 +358,22 @@ object WsManager {
 //        if(!(heartbeatContext.equals(msg))){
 //            Repository.taxiApp.saveLog("回复服务器 $msg")
 //        }
-
+        if (msg.contains("notify_download_ad_progress")) {
+            "notify_download_ad_progress ----> $msg".logd()
+            if (mWebSocket == null) {
+                try {
+                    val process = Repository.taxiApp.gson.fromJson<AdvertiseProcess>(
+                        msg,
+                        AdvertiseProcess::class.java
+                    )
+                    Repository.taxiApp.processList.add(process)
+                    val json = Repository.taxiApp.gson.toJson(Repository.taxiApp.processList)
+                    Configurations.config(Repository.taxiApp).progressListSave(json)
+                } catch (e:Exception){
+                    "exception：${e?.message}".loge()
+                }
+            }
+        }
         mWebSocket?.send(msg)
 //        mWebSocket?.send(msg) ?: throw IllegalArgumentException("mWebSocket is null not send!")
     }
diff --git a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
index 58e444a..b498f0b 100644
--- a/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
+++ b/app/src/main/java/cn/trans88/taxiappkotlin/ui/play/PlayerRule.kt
@@ -35,11 +35,11 @@ fun Advertise.isReady(): Boolean {
 
             if(media_type != MaterialType.Text.ordinal){
                 /* 这里exist判断不准，文件存在被判定为不存在 略作改动
-                if (!File(this.pathName).exists()) {
-                    YoungUtil.YoungLog("${this.pathName}的广告本地不存在，重新下载 ready返回false")
-                    downloadFile()
-                    ready = false
-                }
+                    if (!File(this.pathName).exists()) {
+                        YoungUtil.YoungLog("${this.pathName}的广告本地不存在，重新下载 ready返回false")
+                        downloadFile()
+                        ready = false
+                    }
                 */
                 //edit by yzd @20211222
                 val file = File(this.pathName)
diff --git a/local.properties b/local.properties
index d70b3ff..d288f8f 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Mar 18 15:40:17 GMT+08:00 2024
+#Thu Mar 21 16:48:54 GMT+08:00 2024
 sdk.dir=D\:\\Android\\sdk
diff --git a/release/output.json b/release/output.json
index fcc39a0..a4ccdcf 100644
--- a/release/output.json
+++ b/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":249,"versionName":"3.3.3-beta26.4.0.8-debug","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.4.0.8-debug{249}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.4.0.8-debug{249}.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":251,"versionName":"3.3.3-beta26.4.0.9-release","enabled":true,"outputFile":"TaxiApp_v3.3.3-beta26.4.0.9-release{251}.apk","fullName":"release","baseName":"release","dirName":""},"path":"TaxiApp_v3.3.3-beta26.4.0.9-release{251}.apk","properties":{}}]
\ No newline at end of file