diff --git a/app/src/main/java/com/github/catvod/spider/Cloud.java b/app/src/main/java/com/github/catvod/spider/Cloud.java index ab7ee00b..fa1677ee 100644 --- a/app/src/main/java/com/github/catvod/spider/Cloud.java +++ b/app/src/main/java/com/github/catvod/spider/Cloud.java @@ -54,29 +54,16 @@ public class Cloud extends Spider { protected String detailContentVodPlayFrom(List shareLinks) { List from = new ArrayList<>(); - List aliShare = new ArrayList<>(); - List quarkShare = new ArrayList<>(); - List ucShare = new ArrayList<>(); + for (String shareLink : shareLinks) { - if (shareLink.matches(Util.patternAli)) { - aliShare.add(shareLink); + if (shareLink.matches(Util.patternUC)) { + from.add(uc.detailContentVodPlayFrom(List.of(shareLink))); } else if (shareLink.matches(Util.patternQuark)) { - quarkShare.add(shareLink); - } else if (shareLink.matches(Util.patternUC)) { - ucShare.add(shareLink); + from.add(quark.detailContentVodPlayFrom(List.of(shareLink))); + } else if (shareLink.matches(Util.patternAli)) { + from.add(ali.detailContentVodPlayFrom(List.of(shareLink))); } } - if (!aliShare.isEmpty()) { - from.add(ali.detailContentVodPlayFrom(aliShare)); - } - if (!quarkShare.isEmpty()) { - from.add(quark.detailContentVodPlayFrom(quarkShare)); - } - if (!ucShare.isEmpty()) { - from.add(uc.detailContentVodPlayFrom(ucShare)); - } - - return TextUtils.join("$$$", from); } @@ -84,12 +71,12 @@ public class Cloud extends Spider { protected String detailContentVodPlayUrl(List shareLinks) throws Exception { List urls = new ArrayList<>(); for (String shareLink : shareLinks) { - if (shareLink.matches(Util.patternAli)) { - urls.add(ali.detailContentVodPlayUrl(List.of(shareLink))); + if (shareLink.matches(Util.patternUC)) { + urls.add(uc.detailContentVodPlayUrl(List.of(shareLink))); } else if (shareLink.matches(Util.patternQuark)) { urls.add(quark.detailContentVodPlayUrl(List.of(shareLink))); - } else if (shareLink.matches(Util.patternUC)) { - urls.add(uc.detailContentVodPlayUrl(List.of(shareLink))); + } else if (shareLink.matches(Util.patternAli)) { + urls.add(ali.detailContentVodPlayUrl(List.of(shareLink))); } } return TextUtils.join("$$$", urls); diff --git a/app/src/test/java/DdrkTest.java b/app/src/test/java/DdrkTest.java index 169eed2d..735480fa 100644 --- a/app/src/test/java/DdrkTest.java +++ b/app/src/test/java/DdrkTest.java @@ -66,7 +66,7 @@ public class DdrkTest { @org.junit.Test public void detailContent() throws Exception { // String content = spider.detailContent(Arrays.asList("https://ddys.pro/the-shadow-strays/")); - String content = spider.detailContent(Arrays.asList("the-shadow-strays")); + String content = spider.detailContent(Arrays.asList("lee")); JsonObject map = Json.safeObject(content); Gson gson = new GsonBuilder().setPrettyPrinting().create(); System.out.println("detailContent--" + content); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 286c73ca..7d8d6005 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 e310b6bb..93ac3476 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -a123d2842c9d069f49c0330afdec33e1 +c745db583bd062d2e9997dd02546f0ac diff --git a/json/index.json b/json/index.json index 422e9391..c852e2f3 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;c745db583bd062d2e9997dd02546f0ac", "lives": [ { "name": "直播", diff --git a/json/index1.json b/json/index1.json index e80546c6..96fe683a 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;c745db583bd062d2e9997dd02546f0ac", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 51ec1264..380ac844 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;c745db583bd062d2e9997dd02546f0ac", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index ff1810d5..52b5570a 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;c745db583bd062d2e9997dd02546f0ac", "lives": [ { "name": "直播",