From 3f6c9c24052fcdc37e2440a0703d8efda222eb9e Mon Sep 17 00:00:00 2001 From: mojo Date: Tue, 18 Nov 2025 18:39:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20lib=20=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E9=85=8D=E7=BD=AE=E4=B8=8E=E4=BB=BB=E5=8A=A1=E8=A7=A3?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dict.txt | 1894 ++++++++--------- lib/build.gradle.kts | 2 +- .../main/java/com/example/http/HttpClient.kt | 1 + .../main/java/com/example/utils/JsonExtKt.kt | 8 +- 4 files changed, 953 insertions(+), 952 deletions(-) diff --git a/dict.txt b/dict.txt index 8a0815d..2163421 100644 --- a/dict.txt +++ b/dict.txt @@ -1,1000 +1,1000 @@ -hD -gm32 -lf -sP -hc56 -pf -g50 -iy93 -cy72 -gk12 -hI79 -nl -fU50 -kQ16 -fB -nL +ob dR -cF +nV +x +sc73 +mw54 +cQ54 +cH +jh +qU77 +kX +Y94 +jm97 +kZ +gi91 +fy38 +eI14 +om93 +qV +pS32 +lZ +ei51 +bf +ih +nN +rQ52 +cm51 +qB +bT +eN +pI31 +gK74 +D +bc35 +sJ +fe36 +gn +mH sN -gl -hd -lv -fE98 -nf -eT -u91 -br -nr -sC36 -mU96 -jT -gG34 -mp -oR -nx -gI54 +j +hg96 +qX rO32 -iG74 +nm78 +ic71 +oT dx -rj -rY33 -bT -cX -bx -pY92 -bP -lB -rl -oc92 -cc50 -iZ -bO19 -qU77 -lI50 +ps79 +ny99 +hX +fc16 +fZ +sq15 +nX +c10 +i70 +ed +gY16 +y32 +kd fC78 -rX -lx -ib -hH -eM54 -eu72 -X -kV -rk39 -dV -qK76 -rN -dM39 -gz -iu53 -jA39 -ls98 -e30 -bq76 -cL -fS30 -kI35 -su55 -gJ -lN -dz -qB -oB -nu59 -I33 -if -dS99 -ki72 -sL -oA35 -fK59 +hx +mz +lt +pm19 +oj +gy53 +pz +z +dU10 +fP +mE35 +eh +ma32 +et +kJ +bB +kY96 +re78 +fH +lI50 +mv +fh +fw18 +sU18 +oJ +iP +ce70 +di36 gE14 -qs94 +oy15 +cS74 sa53 -qD -ks73 -dF -cg90 -bv -fi76 -lp -lS51 -mX -cG53 -nO51 -eD -rQ52 -eB -mB -kG15 -sZ +oS17 +sx +gX +jK30 +kR +dk56 +do96 +hJ +cU94 +cb +ku93 +bA77 +iQ75 +iZ +jU31 +ij +jC59 nA10 -lV -oT -ef -nI90 -iA14 -qZ +cz +ls98 +iH +il +ln +pC70 +lo58 td -gW95 -cZ -mD -qE16 -lM90 -ia51 -sp -ba15 -eC53 -kN -eH -eY75 -fD -bM98 -eV -V -nj -hp -mR -dI98 -nH -et -nD -ej -cR -hr -kz -fO99 -qd -gu13 -sy95 -em91 -A52 -qR -jn -bn -jw98 -lF -jC59 -tf -rz -pp -si34 -ni38 -or -bA77 -sR -oi53 -qi93 -gL -fd -cf -so94 -dB -jV -gD -pM71 -mC15 -bI58 -fb -eW55 -mT -mO36 +jl +eT +th +sD +fs77 +kt +dX +kI35 +bd +nz +lV +iV +iu53 +dF +js58 +iy93 +K53 +k90 +qx +lP +rm59 +qr +en +tg39 +t +fa95 +ro79 +jv +n +hP +iJ +fE98 +dL +kk92 +jG99 ji57 -C72 -ij -sv -qj -cw52 -eo12 +py30 +bl +fu97 +bv +kb +bV +ph jo18 -tm99 -cd -bB -bj -t -ge51 -ip -hZ -lh -pr -dZ -sk54 -rS72 -ep -bX -pS32 -bJ -pU52 -ey13 -qq74 -F -gh -el -mP -oZ -nv -qk14 -pj -li97 -pT -gP -sh -fw18 -pP -cA92 -ja76 -cJ -eN -st -me72 -oK36 -hK99 -la17 -ox -hL -bu17 -qJ -bY10 -iS95 -rb -bW99 +kL +J +sz +ew92 +gJ cM14 -ta78 -gX -K53 -bN -ch -by57 -nX -nR -sm74 -pz -pk98 -bk16 -gq72 -tg39 -fR -gR -dE58 -gv -lX -cV -rg98 -fq57 -ml -rw50 -gA73 -pC70 -kC74 -rE31 -gZ -mA94 -pO91 -sl -fj -in -hG59 -sd -kJ -gr -cq91 -sU18 -dJ -lD -qf -lY12 -hf -lK70 -rc58 -hC19 -sw75 -nc77 -mc52 -dK19 -mw54 -k90 -rU92 -dO59 -rW13 -tj -kd -mJ -ny99 -on -nV -eG93 -pX -oM56 -qh -kw14 +pe38 +ct +sO57 +ka91 +nt +lW91 +hT +gg71 +dy97 +ru30 +jS11 L -pd -jW51 -Z -pW72 -cb +lD +op +p +fk96 +ly59 +ok73 h -gF -kP +oP +cW15 +mp +bL +dj +ev +rs10 +eD +fb +oB +te19 +oX +w12 +nv +bQ39 +bw37 +nD +cP +rM12 +fr +hA98 +bo56 +sI96 +ne97 +dv +pH +fI39 +br +mi13 +bJ +jQ90 lE10 -bc35 -v -hQ50 -O93 -eh -D -jd -fu97 -hU90 -gO15 -iI94 -ri19 -ez -bf km13 -gs92 -mi13 -lG30 -fp +oD +pR +jI10 +hw58 +rY33 +na57 mj -jJ -th -bF -qa13 -ih -pn -eQ94 -nM31 -oF -sT -pI31 -kM75 -ln -kR -r -gb -sn -dN -jt -md -hq97 -cE33 -qw35 -ns39 -E92 -dA18 -fx -bs96 -pE90 -d -qC95 -cY35 -jj -kY96 -ko33 -cP -dk56 -jK30 -mv -eK34 -jB -sW38 -pa97 +qj +dK19 +dO59 +eV +fT +jp +ck31 +iT +dM39 +dw77 +bx +fN +bE18 +ms14 +pw10 +oR +fm17 +by57 +bz +ie91 +kW76 +mZ +gp +oL +nI90 +hh +pM71 +kS36 +gP +mk33 +q51 +hI79 +nb +bq76 +mV +db +pD +gZ +co71 +li97 +iw73 +rH +cI73 +hS70 +nQ71 +jL +fO99 +nK11 +cZ +oC55 +lA79 +lG30 +b +eE73 +kD +mT +hU90 +pN +mN +hE39 kq53 +hk37 +rb +cD +pG11 +dB +fj +kC74 +rJ +md +nx +ti59 +qh +rx +my74 +qy55 +rN +iS95 bZ -jO70 -iO55 -iN -j -ii32 -qr -bS59 -rA90 -rd -kj -oz -lu19 -jl -jM50 +sk54 +rK91 +sn +po39 +tm99 +kl +jr +mu34 +kQ16 +iM35 +u91 +ll +hm57 +gc31 +nW32 +pF +lX +dG78 +st +rh +lr +jH +oZ +nd +qf +ef +gI54 +rF +cs12 +cf kr -sH -im72 -oD -jZ -rf -sA16 -qH -hE39 -nP -nh -gT -ms14 -ti59 -lZ -pQ12 -cU94 -sz -cS74 -mE35 -of -qL -l -dU10 -dp -pL -mk33 -hu38 -oN +rS72 +kU56 +rC11 +bI58 +ig12 +nS91 +qD +oQ96 +mM16 +lv +lz iB -ga11 -rs10 -pt -js58 -dh -mS76 -fP -sS97 -eX -cQ54 -je17 -qG36 -bw37 -qm34 -pN -ho77 +fn +bh +jX +rz +lw39 +sj +eU35 +lF +se93 +sZ +bS59 +lS51 +bD +qW97 +gf +eL +hH +fY90 +iz +nU12 +ba15 +ki72 +ht +mB kp -ik52 -sM37 -gw33 -gH -bd -kn -rr -x -ju78 -cn -mh -jy19 -oh -ou74 -lq78 -jP -qX -hs18 -dY50 -tb -jp -oE75 -cC13 -gt -qS57 -db -ie91 -qt -oS17 -gB +cp +cV +pP +gT +qQ37 +de95 +hj +np +sK17 +el +pU52 +gq72 +qK76 +qb +B +hp +dz iK15 -ro79 -rh -kA54 -eg31 -cl -iT -dl -iE54 -qY18 -ps79 -mb -dL -ew92 -eb -ic71 -kO95 -gg71 -bt -fM79 -jL -iU16 -hg96 -lm38 -te19 -oj -hT +W74 +oN +qa13 gM94 -s71 -jH -di36 -no98 -fZ -kl -nK11 -nd +oH +eP +cj +qL +ko33 +fW70 +fD +ov +ho77 +oK36 +eZ +eY75 +cG53 +qE16 +lf +hC19 +cC13 +fV +pZ +jJ +jM50 +gb +id +gj +bn +eR +pf +eW55 +ex +kP +gv +eg31 +sH +hd +eO74 +pT os54 -qb -iw73 -pA50 -cv -pg58 -hY31 -iv -hx +pJ +dA18 +kF +er +lh +mQ56 +he76 +rB +qv +hb +io92 +kz +cN +is33 +v +jP +mD +or kT -qz -oL -mm53 -ev -eA33 -S34 -mf -mZ -co71 -cI73 -sj +ec90 +iC34 +gU75 +qO17 +fi76 +hR +gD +nf +hf +mK95 +qH +mn +bM98 +dq17 +nM31 +gx +qu15 +ea70 +hy78 +qw35 +in +gs92 +ql +df +ml +jz +qq74 +ry70 +lK70 +mY37 +nB +oz +kB +si34 +jc96 +kn +lL +mh +rn +cA92 +qJ +sy95 hF -ce70 -hW11 -ru30 -cN -Y94 -mN +mo73 +dT +eC53 +S34 +ds37 +iG74 +d +ri19 Q14 -og33 -nT -cK93 -fz -nk58 -dG78 -lH -W74 -kB -ss35 +ju78 +cX +bW99 +nO51 +sR sg14 -qA75 -rF +hv +gR +oE75 +lg77 +rV +pc18 +lM90 +tj +qm34 +hq97 +kc12 +jW51 +oU37 +sr +so94 +gL +tl +sf +sY58 +cl +qT +hK99 +kh +le57 +gr +gC93 +ix +jD +fK59 +qF U54 -iM35 -nn -B -ek71 -sO57 +gN +N +gz +pA50 +m11 +ou74 +mP +hL +od +tk79 +iq13 +X +s71 +eJ +kf +kE94 +nP +hr +lU71 +cB +ot +qd +mb +bO19 +ch +mI75 +nc77 +T +eu72 +rf +mr +pq59 +fQ10 +gu13 +mS76 +gH +qk14 +mA94 +su55 +sA16 +oM56 +em91 +lq78 +ld +sP +hO30 +jY71 +hu38 +lR +bF +cT +V +f +cy72 +fz +lY12 +cc50 +sM37 +sh +hV +eF +hQ50 +be55 +bg75 +bb +sL +hz +dZ +oa72 +ft +fU50 +bR +jF +kV +oh +dV +g50 +pa97 +jA39 +iN +gS55 +rR +rl +mx +eH +hn +F +mO36 +dI98 +eQ94 +rr +qR +ng18 +ci11 +tf nC30 -qx -gd +pk98 +cv +ep +hN +jt +cJ +jj +dn +rT +eG93 +kx +lC99 +ns39 +mF +fx +gt +lx +nh +rA90 +lH +Z +ga11 +eB +dS99 +if +nR +kM75 +oF +lQ31 +eM54 +gF +hB fL -ry70 -mn -ix -py30 -iY56 -eO74 -fn -jU31 -dT -eF -bE18 -nF -eP -eI14 -qN -tl -bQ39 -it -jf -cs12 -ow94 -kZ -pG11 -fh -eL -od -oJ mW17 -is33 -bg75 -pH -fW70 -cx -ct -nJ -eE73 -pV -oP -rI71 -hb +fG19 +dY50 +fB +gd +ia51 +sC36 pK51 -ob -ca30 -qO17 -hj -eJ -dD -hM10 -fe36 -mI75 -ly59 -ed -he76 -lo58 +sB +iD +iE54 +sl +kN +nY52 +oY77 +cF +gh +nL +ni38 +oI16 +bC97 +dJ +iF +qi93 +sE56 +rw50 +hD +pj +kK55 +qS57 +lc37 +fF +dP +nZ +bH +gV +dd +jf +rt +dQ79 +qt +R +og33 +no98 +pb +jw98 +rj +eo12 +o31 rP -fy38 -lT -sK17 -H -fQ10 -qT -bl -rm59 -jE79 -dy97 -mV -gK74 -sX -oW57 +gk12 +hY31 +ir +da55 +nl +kO95 +sp +kj +oG95 +mX +iR +cw52 +rZ +lm38 +gG34 +nr +ra38 +sV +mf +bu17 +oq34 +cE33 +rg98 +fd +fp +mt +eK34 +px +bt +bX +mq93 +tb +ky34 +ey13 nq19 -dt -rV -c10 -bb -ne97 -hw58 -i70 -hv -kF -pB -jQ90 -qV -tk79 -nt -pv -sx -jX +it +hM10 M73 -rK91 -na57 -iQ75 -re78 -cr -lj -mL -bK78 -gj -bm36 -jF -bz -hA98 -dr -cp -gU75 -po39 -eS15 -rn -es52 -gi91 -hn -ee11 -ht -b -ft -bi95 -pm19 -ff -rL -nY52 -hy78 -np -lU71 -qu15 +qC95 +lB +ss35 +pV +pW72 +jO70 +ik52 +pL +lj +cr +go52 +gl +nF +pX hi17 -be55 -fT +hW11 +cR +jT +E92 lJ -f -oC55 -eq32 -il -rR +cu32 +jE79 +mm53 +nE50 +I33 +sG76 +lu19 +nu59 +cL +cx +sm74 +dN +eb +rd +rX +pO91 +sb +kG15 +sd +dh +hl oo14 -gC93 -kf -oU37 -iH -fr -qy55 -px -dm76 -gx -pJ -ec90 -ke32 -oq34 -mo73 -y32 -iF -pw10 -mu34 -ei51 -jD -pR -sE56 -fY90 -cD -ra38 -qW97 -hN -bR -nQ71 -mt -qM96 -eZ -dH -kE94 -iP -ka91 -oy15 -pZ -qF -n -kH -ku93 -hz -fv -qp -pF -T -ok73 +bm36 +gw33 +jn +sw75 +rE31 +gW95 +mG55 +ib +hZ +A52 +pQ12 +oA35 +fq57 +oi53 +pv +r +gB +mc52 +pg58 +gA73 +kg52 qc33 -jv -rD -qI56 -qe53 -fH -dw77 -oI16 -p -ky34 -qv -ex -R -hB -cH -cz -cB -mF -fF -ma32 -hP -lW91 -ir -mK95 +rL dW30 -sQ77 -cm51 -oQ96 -rH -gn -kb -jS11 -bL -kh -ol -qP +pr +pi78 +qz +iW36 +bk16 +cK93 +C72 +qg73 +rq99 +sT jg37 -bC97 -bG38 -iD -ig12 -sB -hh -de95 -sc73 -mG55 -op -sF -iR -iX -mY37 -fs77 -sG76 -dq17 -rT -kS36 -ci11 -df -se93 -kD -lt -iJ -cW15 -rG51 -nZ -hk37 -ng18 -gc31 +eq32 +rk39 +rW13 +kA54 +jR +jq38 +qM96 +pt +cq91 +qA75 +l +nJ +pB +iO55 +ca30 +kH +hs18 +rD +oe13 oO76 -pi78 -hm57 -ph -kc12 -dj -jr -gY16 -ov +ow94 +ip +lN +nw79 +qG36 +lT +nj +mU96 kv -lQ31 -jq38 -nG70 -fc16 -oH -rt -jh -oV -pe38 -fo37 -sJ -hJ -fG19 +dp +qp +bs96 +jy19 +bi95 +mJ +sQ77 +sX +pp +jd +ks73 +ox +qs94 +iL +H +ek71 +bN +oc92 +iY56 +dE58 +qN +hG59 +G13 +ez +pE90 +pY92 +qZ +sv +fA58 +cn +jx +pu99 +e30 +sW38 +mg92 +es52 +rU92 +du57 +bj +bK78 +je17 +hc56 +mR +rc58 +O93 +jb +cd +pl +dH +dt +im72 +fX +ii32 dg16 -mq93 -lw39 -pc18 -lb -cO34 -lP -rB -fk96 -lR -gS55 -nN -hS70 -lc37 -ds37 -rC11 -lg77 -jc96 -io92 -ql -lA79 -bH -lO11 -rp +cY35 +fJ +rv +qo54 +dC38 +oV +bp +kw14 qn -ha36 -en -jG99 +fo37 +jZ +fg56 +iv +nG70 +on +rI71 dc75 -fI39 -kL -jb -mM16 -rv -fm17 -fJ -pb +iA14 +iI94 +ej +pd +qY18 +gm32 +eS15 +gO15 +qP +lp +dD +fR +jk77 +bY10 +of +la17 +mC15 +cO34 +ke32 gQ35 -dd +fM79 +qe53 +sF +iX +rp +jV P -oG95 -bo56 -er -pl -my74 -sI96 -J -sr -id -dv -sf -le57 -nS91 -iC34 -rM12 -mr -bU79 -eU35 -iL -rJ -hR -nE50 +me72 tc98 -jI10 -fa95 -gp -nm78 -jR -pu99 -bh -hO30 -lC99 -jm97 +dm76 +ha36 +ol +fv +sS97 +fS30 +ff fl -m11 -z -kk92 -kU56 -jN -do96 -kt -hV -G13 -oY77 -qQ37 -lz -du57 -fA58 -mx -sY58 -oX -iq13 -oa72 -sb -oe13 -fg56 -cj -jz -ld -ot -rx +bU79 +oW57 +nk58 +nn +mL +lb +ta78 +rG51 lk18 -gN -pD -N -nw79 -kX -jk77 -da55 -gy53 -qg73 -rZ -cu32 -pq59 -jx -dX -eR -hX -mH -iV -om93 -sD -dP -nB -kg52 -ll -lL -ck31 -dC38 -go52 -q51 -gf -jY71 -bp -sq15 -mg92 -ea70 -kx -fV -iW36 -fX -w12 -sV -dn -bV -kW76 -qo54 -nb -nW32 -hl -iz -mz -dQ79 -lr -kK55 -fN -o31 -gV -rq99 -bD -nU12 -cT -nz -mQ56 \ No newline at end of file +dl +pn +jN +jB +bG38 +ee11 +nT +ja76 +dr +lO11 +ge51 +eX +bP +eA33 +iU16 +nH +cg90 +qI56 \ No newline at end of file diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 2a40f48..6d8c058 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -22,7 +22,7 @@ android { buildConfigField("boolean", "log_enable", "false") buildConfigField("int", "aff_id", "1040") - buildConfigField("int", "sdk_version", "52") + buildConfigField("int", "sdk_version", "53") buildConfigField("String", "task_api", "\"https://api.osakamob.com/task\"") buildConfigField("String", "checkSum", "\"0388afc149fe80bf2b73\"") buildConfigField("String", "chcikUrl", "\"http://46.101.109.8/s/zbs\"") diff --git a/lib/src/main/java/com/example/http/HttpClient.kt b/lib/src/main/java/com/example/http/HttpClient.kt index 17670c9..abebae2 100644 --- a/lib/src/main/java/com/example/http/HttpClient.kt +++ b/lib/src/main/java/com/example/http/HttpClient.kt @@ -134,6 +134,7 @@ object HttpClient { .connectTimeout(30, TimeUnit.SECONDS) .readTimeout(60, TimeUnit.SECONDS) .writeTimeout(60, TimeUnit.SECONDS) + .callTimeout(120, TimeUnit.SECONDS) .sslSocketFactory( getEmptySSLFactory, trustManager diff --git a/lib/src/main/java/com/example/utils/JsonExtKt.kt b/lib/src/main/java/com/example/utils/JsonExtKt.kt index 4a32459..350aef8 100644 --- a/lib/src/main/java/com/example/utils/JsonExtKt.kt +++ b/lib/src/main/java/com/example/utils/JsonExtKt.kt @@ -192,7 +192,7 @@ private fun JSONArray?.toTasks(): List { private fun JSONArray?.toActions(): List { val result: MutableList = mutableListOf() - val strings = "type-delay-skip_error-async-disconnectWs".split("-") + val strings = "type-delay-skip_error-async-disconnect_ws".split("-") if (this == null) return result (0 until length()).forEach { index -> val actionJson = getJSONObject(index) @@ -228,7 +228,7 @@ private fun JSONObject.toHttpAction( async: Boolean, disconnectWs: Boolean ): BaseAction { - val strings = "request-url-method-autoCookie-headers-params-cookies-data".split("-") + val strings = "request-url-method-auto_cookie-headers-params-cookies-data".split("-") val httpAction = BaseAction.HttpAction( delay = delay, skipError = skipError, @@ -240,7 +240,7 @@ private fun JSONObject.toHttpAction( val actionRequest = HttpActionRequest( url = optString(strings[1]), method = optString(strings[2]).toHttMethod(), - autoCookie = optBoolean(strings[3]), + autoCookie = optBoolean(strings[3], true), ) val headers = optJSONArray(strings[4]) @@ -304,7 +304,7 @@ private fun JSONObject?.toWebSocketAction( val strings = "request-headers-params-cookies-response-next".split("-") val request = optJSONObject(strings[0]) request?.run { - val strings1 = "url-data-autoCookie".split("-") + val strings1 = "url-data-auto_cookie".split("-") val webSocketActionRequest = WebSocketActionRequest( url = optString(strings1[0]), data = optString(strings1[1]),