From c96fb3574d1c131aa617950d76ddba0fbed107b7 Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Wed, 10 Sep 2025 16:38:51 +0800 Subject: [PATCH] Update tvbus --- app/libs/tvbus-release.aar | Bin 16751 -> 17368 bytes .../java/com/fongmi/android/tv/bean/Core.java | 41 +++++++++++++++--- .../com/fongmi/android/tv/bean/Danmaku.java | 5 +-- .../com/fongmi/android/tv/bean/EpgData.java | 5 +-- .../java/com/fongmi/android/tv/bean/Page.java | 5 +-- .../java/com/fongmi/android/tv/bean/Rule.java | 5 +-- .../com/fongmi/android/tv/bean/Style.java | 5 +-- .../java/com/fongmi/android/tv/bean/Sub.java | 5 +-- .../android/tv/player/extractor/TVBus.java | 4 +- .../main/java/com/tvbus/engine/TVCore.java | 17 +++++++- 10 files changed, 65 insertions(+), 27 deletions(-) diff --git a/app/libs/tvbus-release.aar b/app/libs/tvbus-release.aar index d8731514a7253bb06d25ac2314f50295bc1233a9..e58c69089ca7f649ad208810549c0bacafe7cad1 100644 GIT binary patch delta 2677 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 delta 2062 zcmV+p2=VvWhXL<`0kEex1(NCJDwLC~H!OdtT@^|65QXm3WV9j8M4Tu+ex=pFe7p}& z51;fF8!j9&8EEAN1d_`>&}3jOV{?O{uXM5$M&u%Pow&2)mmIu-S1EI+6uTED%ktpT z<)rK!)q<=J26ZL&&DKRbp@ChIWqYnHk)}WhqOYsJqgO_5*hg`EyA%UM-0|XQR00;;G002P%TVj6{_yzy~LI?l=3jhEBV{Bn_b7gZbYGHDPm1k5F z<{riqB#MEs8dL(786YAdH3U$WtRNB-ED4BgArgcD0`x9t zdir?;2V15!f?JPEe)n?A`rKAad#m0+yYJi_$kcZ4h}$F#Im>iL8Z)j+aLs>{jwao2 zi{54MOD}&rTXb~L6=_RpgXS3+~!?>Vw8!Mcyg_XN==>z)yw)&^HL1et*kp_?X zSyfanb!Y97BWL46G*kqljvpP9mz!{6Blz=i1SZEpweRV}Nn4*q8yp#ZmM^+jEJkLZ zfTpN8kdR;C|HKmT{IK5v%p89vRc_UYKV2}PC1&#R#{Id&PL?15U`Gr9IQY4ZiT36J zLF9k$d-Db_=qoGe)&7y1t23+8+J3c;HL-{H2&;Oa<3@H%cS#@c`VoFu*4oq8&j;I^ z+5m8jorW(7ZHSV9cGje?6(zE|dCcqA8#+k>bls(ZwQYRZbN`j5o$Y@WiCFD7hvLpv%_j`!D$#N24FOPa8rivT;4jNMA~tct5s!57om$cueUP+uPoyU&BX4 zhH6w*Xp&c!6p`k`N$-Afa~6EdiL0_q8Oi>|=3)TC>EcuZCg3bKDl)V+R16~3rL$7R zgMk@-Q=P_f(Q~(p;{AVTQp6}-sMTRs4pKjXneMJ2-YpBsIITGy+E%md_qYI>8+d{% zDUL3@li)LJO~qjj!4+iI59CuQVGwO{5c9?hioX1*65Ue;Fg2yrex2pt;dis)E+vLY z$+qhJpt8~`{HXXa8=i+-FV|6i9f4tf!+^_X3o?Z+@)nET`VxQmd9`nG5isx8b+bT1 zQ`z(V_f}!8CA13Ss{K&VL^i8$FQWrgiLtvzYG_Thds3a9Id*;u3qp1YT;^hiki3#C zRxc-4^GK*8H#yb1p4WA;!&OI~r|{K*sz1D)fBkuxo+lv1`I2^iSYY?m-U^*}id*zL zSbLwjK+s1R?e~AuglDuv>~r{|Gzck6&rG>>ib`Y5o0ph<@9lU_Z2i1HLDPux?6{mJt4W zQmU{7rvHdMUbz`)CcbWZ-0DX8BJr?Wl(Lv((2wPrFZO>fARLah(b=aFWQg~e#B%W* z!<8{~&`u!EP^xlg!^Hh6u{-+LYHS?Wz$+^U=PDA6+E(bsa#Z4D$WkIFB1J3WwVe~u zkS3+#;U_33FT5~|w8XDHvd^}?62+

Q+gxiF$jVXl)Ii2mot3Le zLn3Xu5lj1Cuumi!A{dl9r{JzpyPG;~)cTF?v56wRRlU_`o}0~1Vh=qM)q3AN$Tn|j zQ3`oYU$D?)qdFHGl35lS&B8=qV9FzkMiG>oEI)sW8<$PlPMWxmkxy#GcetX#7U9og zx@Q^Ea+7ruROqw5-gtHVku(&t^JjO>voDWTWY+iezWr|Ao|5VDuR(6}GrD1Qg6FkP zb5(_+HI$E4s4A`0Pg$EvNW&;AsBGvro*qmHvvi$cMiogN#V;Wu37Mhit(KPdP0ReW z+e?32aV@>!SJrc-vhmBSR{(;e0g{2tt08goDYI>}?AQqyaGNjm#~Y$dHdGR8x0X}I z9Zdrxb-zVnK~sK&jL1u2VCG^emyZS0iKwp7m7>L=3_Cr^0qlPg*T7l*USzH%vC^31(G>deTUbKPM>Zc1$kj;)3n*)bY)~?+z z=SM>V^9NoI@-uity~QeA&<|a)LB2QXq8gWhGbK&fI+JGh1>KIOO$QOD+dHxicp7{82hX`4bg>xhM5e@8svz_@VxJIetiST*N=C^3!3T zdgs5xe1ZR9AzK^J?!QpbyJPwe=D&aa2~bM|1e0My8j}V>>jjeO<|>qv_Ch=xTVj6{ s_yzy~LI?l=3jhEB0000000000q=8We?OClLrVrlKmY&$0IB8j2><{9 diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Core.java b/app/src/main/java/com/fongmi/android/tv/bean/Core.java index 104684c20..d4eec0572 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Core.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Core.java @@ -2,14 +2,16 @@ package com.fongmi.android.tv.bean; import android.text.TextUtils; -import androidx.annotation.Nullable; - import com.fongmi.android.tv.server.Server; import com.fongmi.android.tv.utils.UrlUtil; import com.fongmi.hook.Hook; import com.github.catvod.net.OkHttp; +import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; +import java.util.Collections; +import java.util.List; + public class Core { @SerializedName("auth") @@ -30,6 +32,14 @@ public class Core { private String pkg; @SerializedName("so") private String so; + @SerializedName("key") + private String key; + @SerializedName("option") + private List