diff --git a/app/src/main/java/com/github/catvod/spider/DuoDuo.java b/app/src/main/java/com/github/catvod/spider/DuoDuo.java index 0e4117bb..e08851d4 100644 --- a/app/src/main/java/com/github/catvod/spider/DuoDuo.java +++ b/app/src/main/java/com/github/catvod/spider/DuoDuo.java @@ -40,17 +40,7 @@ public class DuoDuo extends Cloud { @Override public void init(Context context, String extend) throws Exception { - JsonObject ext = Json.safeObject(extend); - JsonArray siteList = ext.get("site").getAsJsonArray(); - if (!siteList.isEmpty()) { - for (JsonElement jsonElement : siteList) { - String html = OkHttp.string(jsonElement.getAsString()); - if (html.contains("电影")) { - siteUrl = jsonElement.getAsString(); - break; - } - } - } + // JsonObject ext = Json.safeObject(extend); super.init(context, extend); } @@ -76,7 +66,7 @@ public class DuoDuo extends Cloud { urlParams[Integer.parseInt(key)] = extend.get(key); } } - Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vodshow/%s.html", siteUrl, String.join("-", urlParams)), getHeader())); + Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vod/show/id/%s/page/%s.html", siteUrl, tid, pg), getHeader())); int page = Integer.parseInt(pg), limit = 72, total = 0; Matcher matcher = regexPageTotal.matcher(doc.html()); if (matcher.find()) total = Integer.parseInt(matcher.group(1)); @@ -148,7 +138,7 @@ public class DuoDuo extends Cloud { private String searchContent(String key, String pg) { - String searchURL = siteUrl + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); + String searchURL = siteUrl + String.format("/index.php/vod/search/page/%s/wd/%s.html", pg,URLEncoder.encode(key)); String html = OkHttp.string(searchURL, getHeader()); Elements items = Jsoup.parse(html).select(".module-search-item"); List list = new ArrayList<>(); diff --git a/app/src/main/java/com/github/catvod/spider/NaBi.java b/app/src/main/java/com/github/catvod/spider/NaBi.java index 96ec9942..069a9d7c 100644 --- a/app/src/main/java/com/github/catvod/spider/NaBi.java +++ b/app/src/main/java/com/github/catvod/spider/NaBi.java @@ -40,17 +40,7 @@ public class NaBi extends Cloud { @Override public void init(Context context, String extend) throws Exception { - JsonObject ext = Json.safeObject(extend); - JsonArray siteList = ext.get("site").getAsJsonArray(); - if (!siteList.isEmpty()) { - for (JsonElement jsonElement : siteList) { - String html = OkHttp.string(jsonElement.getAsString()); - if (html.contains("电影")) { - siteUrl = jsonElement.getAsString(); - break; - } - } - } + // JsonObject ext = Json.safeObject(extend); super.init(context, extend); } @@ -76,7 +66,7 @@ public class NaBi extends Cloud { urlParams[Integer.parseInt(key)] = extend.get(key); } } - Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vodshow/%s.html", siteUrl, String.join("-", urlParams)), getHeader())); + Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vod/show/id/%s/page/%s.html", siteUrl, tid, pg), getHeader())); int page = Integer.parseInt(pg), limit = 72, total = 0; Matcher matcher = regexPageTotal.matcher(doc.html()); if (matcher.find()) total = Integer.parseInt(matcher.group(1)); @@ -148,7 +138,7 @@ public class NaBi extends Cloud { private String searchContent(String key, String pg) { - String searchURL = siteUrl + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); + String searchURL = siteUrl + String.format("/index.php/vod/search/page/%s/wd/%s.html", pg,URLEncoder.encode(key)); String html = OkHttp.string(searchURL, getHeader()); Elements items = Jsoup.parse(html).select(".module-search-item"); List list = new ArrayList<>(); diff --git a/app/src/main/java/com/github/catvod/spider/ShanDian.java b/app/src/main/java/com/github/catvod/spider/ShanDian.java index c3561f71..b6316710 100644 --- a/app/src/main/java/com/github/catvod/spider/ShanDian.java +++ b/app/src/main/java/com/github/catvod/spider/ShanDian.java @@ -40,17 +40,7 @@ public class ShanDian extends Cloud { @Override public void init(Context context, String extend) throws Exception { - JsonObject ext = Json.safeObject(extend); - JsonArray siteList = ext.get("site").getAsJsonArray(); - if (!siteList.isEmpty()) { - for (JsonElement jsonElement : siteList) { - String html = OkHttp.string(jsonElement.getAsString()); - if (html.contains("电影")) { - siteUrl = jsonElement.getAsString(); - break; - } - } - } + // JsonObject ext = Json.safeObject(extend); super.init(context, extend); } @@ -76,7 +66,7 @@ public class ShanDian extends Cloud { urlParams[Integer.parseInt(key)] = extend.get(key); } } - Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vodshow/%s.html", siteUrl, String.join("-", urlParams)), getHeader())); + Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vod/show/id/%s/page/%s.html", siteUrl, tid, pg), getHeader())); int page = Integer.parseInt(pg), limit = 72, total = 0; Matcher matcher = regexPageTotal.matcher(doc.html()); if (matcher.find()) total = Integer.parseInt(matcher.group(1)); @@ -148,7 +138,7 @@ public class ShanDian extends Cloud { private String searchContent(String key, String pg) { - String searchURL = siteUrl + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); + String searchURL = siteUrl + String.format("/index.php/vod/search/page/%s/wd/%s.html", pg,URLEncoder.encode(key)); String html = OkHttp.string(searchURL, getHeader()); Elements items = Jsoup.parse(html).select(".module-search-item"); List list = new ArrayList<>(); diff --git a/app/src/main/java/com/github/catvod/spider/TeXiaFan.java b/app/src/main/java/com/github/catvod/spider/TeXiaFan.java index 34a897fc..ec125b4b 100644 --- a/app/src/main/java/com/github/catvod/spider/TeXiaFan.java +++ b/app/src/main/java/com/github/catvod/spider/TeXiaFan.java @@ -40,17 +40,7 @@ public class TeXiaFan extends Cloud { @Override public void init(Context context, String extend) throws Exception { - JsonObject ext = Json.safeObject(extend); - JsonArray siteList = ext.get("site").getAsJsonArray(); - if (!siteList.isEmpty()) { - for (JsonElement jsonElement : siteList) { - String html = OkHttp.string(jsonElement.getAsString()); - if (html.contains("电影")) { - siteUrl = jsonElement.getAsString(); - break; - } - } - } + // JsonObject ext = Json.safeObject(extend); super.init(context, extend); } @@ -76,7 +66,7 @@ public class TeXiaFan extends Cloud { urlParams[Integer.parseInt(key)] = extend.get(key); } } - Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vodshow/%s.html", siteUrl, String.join("-", urlParams)), getHeader())); + Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vod/show/id/%s/page/%s.html", siteUrl, tid, pg), getHeader())); int page = Integer.parseInt(pg), limit = 72, total = 0; Matcher matcher = regexPageTotal.matcher(doc.html()); if (matcher.find()) total = Integer.parseInt(matcher.group(1)); @@ -148,7 +138,7 @@ public class TeXiaFan extends Cloud { private String searchContent(String key, String pg) { - String searchURL = siteUrl + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); + String searchURL = siteUrl + String.format("/index.php/vod/search/page/%s/wd/%s.html", pg,URLEncoder.encode(key)); String html = OkHttp.string(searchURL, getHeader()); Elements items = Jsoup.parse(html).select(".module-search-item"); List list = new ArrayList<>(); diff --git a/app/src/main/java/com/github/catvod/spider/XiaoMi.java b/app/src/main/java/com/github/catvod/spider/XiaoMi.java index 5fe79d33..6e7712b1 100644 --- a/app/src/main/java/com/github/catvod/spider/XiaoMi.java +++ b/app/src/main/java/com/github/catvod/spider/XiaoMi.java @@ -40,17 +40,7 @@ public class XiaoMi extends Cloud { @Override public void init(Context context, String extend) throws Exception { - JsonObject ext = Json.safeObject(extend); - JsonArray siteList = ext.get("site").getAsJsonArray(); - if (!siteList.isEmpty()) { - for (JsonElement jsonElement : siteList) { - String html = OkHttp.string(jsonElement.getAsString()); - if (html.contains("电影")) { - siteUrl = jsonElement.getAsString(); - break; - } - } - } + // JsonObject ext = Json.safeObject(extend); super.init(context, extend); } @@ -76,7 +66,7 @@ public class XiaoMi extends Cloud { urlParams[Integer.parseInt(key)] = extend.get(key); } } - Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vodshow/%s.html", siteUrl, String.join("-", urlParams)), getHeader())); + Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vod/show/id/%s/page/%s.html", siteUrl, tid, pg), getHeader())); int page = Integer.parseInt(pg), limit = 72, total = 0; Matcher matcher = regexPageTotal.matcher(doc.html()); if (matcher.find()) total = Integer.parseInt(matcher.group(1)); @@ -148,7 +138,7 @@ public class XiaoMi extends Cloud { private String searchContent(String key, String pg) { - String searchURL = siteUrl + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); + String searchURL = siteUrl + String.format("/index.php/vod/search/page/%s/wd/%s.html", pg,URLEncoder.encode(key)); String html = OkHttp.string(searchURL, getHeader()); Elements items = Jsoup.parse(html).select(".module-search-item"); List list = new ArrayList<>(); diff --git a/app/src/main/java/com/github/catvod/spider/ZhiZhen.java b/app/src/main/java/com/github/catvod/spider/ZhiZhen.java index 241e6eb0..163e3c77 100644 --- a/app/src/main/java/com/github/catvod/spider/ZhiZhen.java +++ b/app/src/main/java/com/github/catvod/spider/ZhiZhen.java @@ -40,17 +40,7 @@ public class ZhiZhen extends Cloud { @Override public void init(Context context, String extend) throws Exception { - JsonObject ext = Json.safeObject(extend); - JsonArray siteList = ext.get("site").getAsJsonArray(); - if (!siteList.isEmpty()) { - for (JsonElement jsonElement : siteList) { - String html = OkHttp.string(jsonElement.getAsString()); - if (html.contains("电影")) { - siteUrl = jsonElement.getAsString(); - break; - } - } - } + // JsonObject ext = Json.safeObject(extend); super.init(context, extend); } @@ -76,7 +66,7 @@ public class ZhiZhen extends Cloud { urlParams[Integer.parseInt(key)] = extend.get(key); } } - Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vodshow/%s.html", siteUrl, String.join("-", urlParams)), getHeader())); + Document doc = Jsoup.parse(OkHttp.string(String.format("%s/index.php/vod/show/id/%s/page/%s.html", siteUrl, tid, pg), getHeader())); int page = Integer.parseInt(pg), limit = 72, total = 0; Matcher matcher = regexPageTotal.matcher(doc.html()); if (matcher.find()) total = Integer.parseInt(matcher.group(1)); @@ -148,7 +138,7 @@ public class ZhiZhen extends Cloud { private String searchContent(String key, String pg) { - String searchURL = siteUrl + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); + String searchURL = siteUrl + String.format("/index.php/vod/search/page/%s/wd/%s.html", pg,URLEncoder.encode(key)); String html = OkHttp.string(searchURL, getHeader()); Elements items = Jsoup.parse(html).select(".module-search-item"); List list = new ArrayList<>(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 089c1928..673f6cf3 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 3ae6abb1..ee2270ea 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -c3be25374d8d674c8ca3b57c395d0fad +8cfebc2822aa9b34bccab340ac7071ca diff --git a/json/index.json b/json/index.json index f75a6f22..595add67 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;8cfebc2822aa9b34bccab340ac7071ca", "lives": [ { "name": "直播", diff --git a/json/index1.json b/json/index1.json index a3567327..da64f5a1 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;8cfebc2822aa9b34bccab340ac7071ca", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index e14a4a5e..19db0601 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;8cfebc2822aa9b34bccab340ac7071ca", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index 29ebea66..af1558c6 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;8cfebc2822aa9b34bccab340ac7071ca", "lives": [ { "name": "直播",