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 fa1677ee..583b40f7 100644 --- a/app/src/main/java/com/github/catvod/spider/Cloud.java +++ b/app/src/main/java/com/github/catvod/spider/Cloud.java @@ -2,6 +2,7 @@ package com.github.catvod.spider; import android.content.Context; import android.text.TextUtils; + import com.github.catvod.crawler.Spider; import com.github.catvod.utils.Json; import com.github.catvod.utils.Util; @@ -54,31 +55,46 @@ public class Cloud extends Spider { protected String detailContentVodPlayFrom(List shareLinks) { List from = new ArrayList<>(); + List ucFrom = new ArrayList<>(); + List quarkFrom = new ArrayList<>(); + List aliFrom = new ArrayList<>(); for (String shareLink : shareLinks) { if (shareLink.matches(Util.patternUC)) { - from.add(uc.detailContentVodPlayFrom(List.of(shareLink))); + ucFrom.add(shareLink); } else if (shareLink.matches(Util.patternQuark)) { - from.add(quark.detailContentVodPlayFrom(List.of(shareLink))); + quarkFrom.add(shareLink); } else if (shareLink.matches(Util.patternAli)) { - from.add(ali.detailContentVodPlayFrom(List.of(shareLink))); + aliFrom.add(shareLink); } } + from.add(uc.detailContentVodPlayFrom(ucFrom)); + from.add(quark.detailContentVodPlayFrom(quarkFrom)); + from.add(ali.detailContentVodPlayFrom(aliFrom)); + + return TextUtils.join("$$$", from); } protected String detailContentVodPlayUrl(List shareLinks) throws Exception { List urls = new ArrayList<>(); + List ucUrl = new ArrayList<>(); + List quarkUrl = new ArrayList<>(); + List aliUrl = new ArrayList<>(); for (String shareLink : shareLinks) { if (shareLink.matches(Util.patternUC)) { - urls.add(uc.detailContentVodPlayUrl(List.of(shareLink))); + ucUrl.add(shareLink); } else if (shareLink.matches(Util.patternQuark)) { - urls.add(quark.detailContentVodPlayUrl(List.of(shareLink))); + quarkUrl.add(shareLink); } else if (shareLink.matches(Util.patternAli)) { - urls.add(ali.detailContentVodPlayUrl(List.of(shareLink))); + aliUrl.add(shareLink); } } + urls.add(uc.detailContentVodPlayUrl(ucUrl)); + urls.add(quark.detailContentVodPlayUrl(quarkUrl)); + urls.add(ali.detailContentVodPlayUrl(aliUrl)); + return TextUtils.join("$$$", urls); } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 7819e444..7f103031 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 2472f3ee..a7c4ae89 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -fc8f8fde90c2943674e0e38b00053bd5 +cdcfb3170b9643a4664d7641c1ca0df3 diff --git a/json/index.json b/json/index.json index 5a1dd317..1bab7132 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;fc8f8fde90c2943674e0e38b00053bd5", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;cdcfb3170b9643a4664d7641c1ca0df3", "lives": [ { "name": "直播", diff --git a/json/index1.json b/json/index1.json index b63671af..cc49a23c 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;fc8f8fde90c2943674e0e38b00053bd5", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;cdcfb3170b9643a4664d7641c1ca0df3", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index a7ff7779..fcca94dc 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;fc8f8fde90c2943674e0e38b00053bd5", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;cdcfb3170b9643a4664d7641c1ca0df3", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index 7e4f2f73..4f5e5583 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;fc8f8fde90c2943674e0e38b00053bd5", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;cdcfb3170b9643a4664d7641c1ca0df3", "lives": [ { "name": "直播",