diff --git a/app/src/main/java/com/github/catvod/api/TianyiApi.java b/app/src/main/java/com/github/catvod/api/TianyiApi.java index 83889172..5ab1bac4 100644 --- a/app/src/main/java/com/github/catvod/api/TianyiApi.java +++ b/app/src/main/java/com/github/catvod/api/TianyiApi.java @@ -53,6 +53,7 @@ public class TianyiApi { //初始化CookieJar if (Objects.nonNull(obj)) { tianYiHandler.setCookie(obj); + tianYiHandler.loginWithPassword(obj.get("username").getAsString(), obj.get("password").getAsString()); } } if (!isCookieValid()) { diff --git a/app/src/main/java/com/github/catvod/spider/LeiJing.java b/app/src/main/java/com/github/catvod/spider/LeiJing.java index dac2c20d..e0cfdbe1 100644 --- a/app/src/main/java/com/github/catvod/spider/LeiJing.java +++ b/app/src/main/java/com/github/catvod/spider/LeiJing.java @@ -107,10 +107,10 @@ public class LeiJing extends Cloud { @Override public String categoryContent(String tid, String pg, boolean filter, HashMap extend) { - Document doc = Jsoup.parse(OkHttp.string(String.format("%s?tagId=%s&page=%s", siteUrl, tid, pg), getHeader())); + Document doc = Jsoup.parse(OkHttp.string(String.format("%s%s&page=%s", siteUrl, tid, pg), getHeader())); List list = parseVodListFromDoc(doc); - int total = (Integer.parseInt(pg) + 1) * 19; - return Result.get().vod(list).page(Integer.parseInt(pg), Integer.parseInt(pg) + 1, 19, total).string(); + int total = (Integer.parseInt(pg) + 1) * 30; + return Result.get().vod(list).page(Integer.parseInt(pg), Integer.parseInt(pg) + 1, 30, total).string(); } diff --git a/app/src/main/java/com/github/catvod/spider/TianYi.java b/app/src/main/java/com/github/catvod/spider/TianYi.java index c231aad8..778c5612 100644 --- a/app/src/main/java/com/github/catvod/spider/TianYi.java +++ b/app/src/main/java/com/github/catvod/spider/TianYi.java @@ -58,7 +58,7 @@ public class TianYi extends Spider { playFrom.add(String.format(Locale.getDefault(), "天意" + s + "#%02d%02d", i, index)); } - playFrom.add("天意" + i + index); + // playFrom.add("天意" + i + index); } return TextUtils.join("$$$", playFrom); } diff --git a/app/src/test/java/LeiJingTest.java b/app/src/test/java/LeiJingTest.java index 1469bf3f..f85367b7 100644 --- a/app/src/test/java/LeiJingTest.java +++ b/app/src/test/java/LeiJingTest.java @@ -29,7 +29,9 @@ public class LeiJingTest { Init.init(mockContext); spider = new LeiJing(); //Server.get().start(); - spider.init(mockContext,""); + spider.init(mockContext,"{\n" + + "\t\"username\":\"18896781601\" ,\"password\":\"Lushunming@0526\"\n" + + "}"); // spider.init(mockContext, "{\"cookie\":\"b-user-id=89ede34e-0efc-e1dd-c997-f16aaa792d0c; _UP_A4A_11_=wb9661c6dfb642f88f73d8e0c7edd398; b-user-id=89ede34e-0efc-e1dd-c997-f16aaa792d0c; ctoken=wla6p3EUOLyn1FSB8IKp1SEW; grey-id=5583e32b-39df-4bf0-f39f-1adf83f604a2; grey-id.sig=p8ReBIMG2BeZu1sYvsuOAZxYbx-MVrsfKEiCv87MsTM; isQuark=true; isQuark.sig=hUgqObykqFom5Y09bll94T1sS9abT1X-4Df_lzgl8nM; _UP_F7E_8D_=ZkyvVHnrBLp1A1NFJIjWi0PwKLOVbxJPcg0RzQPI6KmBtV6ZMgPh38l93pgubgHDQqhaZ2Sfc0qv%2BRantbfg1mWGAUpRMP4RqXP78Wvu%2FCfvkWWGc5NhCTV71tGOIGgDBR3%2Bu6%2Fjj44KlE5biSNDOWW7Bigcz27lvOTidzNw8s%2FWtKAIxWbnCzZn4%2FJMBUub1SIMcW89g57k4mfPmDlCgpZKzxwl6beSfdtZ4RUWXmZOn5v5NkxVKhU4wR0Pq7NklczEGdRq2nIAcu7v22Uw2o%2FxMY0xBdeC9Korm5%2FNHnxl6K%2Bd6FXSoT9a3XIMQO359auZPiZWzrNlZe%2BqnOahXcx7KAhQIRqSOapSmL4ygJor4r5isJhRuDoXy7vJAVuH%2FRDtEJJ8rZTq0BdC23Bz%2B0MrsdgbK%2BiW; _UP_D_=pc; __wpkreporterwid_=3d3f74a7-99b7-4916-3f78-911fc2eb9d87; tfstk=fIoZNxjnbhKwPOu0TWZ4LsaRqirTcudSSmNbnxD0C5VgClMm8xMyB-GsnSu4tjpOflAOmSD-9PNiGl120XrgkVNb1SrqHbJBN3tSBAEYoQOWVUUg9qZ8n1bGGkD3CqGYINKSBABhjnXgp3_Vywz6gSc0Syj3BWf0mr2DLW24eZfiiovEKWefj1q0swq3E82iNEMinMy7SLrcpA4Fh3z_ZAViCfih3PbtdW5N_DuU77AaTijmYRkL2Wq54ENoy5a7ZXxCbok33XzS7QSZgxD-oyoVsdGotql0p2dVu7umC4nLStbiLmParc4FELHrI-c0u2dPVRrs8zoZWKCnIbNZrlHfUCMUz2z8KyXVSlgSFmUojh58OzeqTzgwaGll4YCYKwctDV5coP2LL79eKHxpNTXHmre1kZU32JPWCR_AkP2LL79eLZQY-WeUNdw1.; __pus=2051c82285199d8be553be41dd5a2100AAQ+mmv35G4FDDZ5x+3Mhe2OMbNgweQ1ODbW8zDt9YuP1LQVqHUuAAz9KWLsPjpNtim0AVGHusN4MCosTmbq/khM; __kp=e6604120-6051-11ef-bfe4-c31b6cdd0766; __kps=AATcZArVgS76EPn0FMaV4HEj; __ktd=sii/iz4ePzEaoVirXul7QQ==; __uid=AATcZArVgS76EPn0FMaV4HEj; __itrace_wid=5829b95d-dac1-48d3-bfd5-f60cd9462786; __puus=7da0b96cb710fa1b376934485f977e05AATp/q8/QupT7IiBR1GWqZhxlIRT677smMvoHlLxQA0Lk6CkP0YJBOTl+p9DZgzlMz6w4hPXPgWsokukk8PW7ZfhFfPmv8tKMgLpCGLW+tk57luhNghmSdTeVPkAF59STtyCPBEtiNzNAd/zZJ6qILJDi5ywEBAAAg+gOyWHoLHNUR+QxeHRuQa8g5WWA95J8jebIlrr8rCvI1vjTbtiYktT\",\"token\":\"26fc6787afff43e78b78992e782502f1\"}"); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 743fbee3..91f0bd7b 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 12503b65..5ca0ace7 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -eda488df43e7c0a7586f8418c1e5659a +d68b53069d28d51471d29c10c52a1ba3 diff --git a/json/index.json b/json/index.json index 275aaf1d..57fdba03 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;eda488df43e7c0a7586f8418c1e5659a", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;d68b53069d28d51471d29c10c52a1ba3", "lives": [ { "name": "电视直播",