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 f29a7a3d..ab7ee00b 100644 --- a/app/src/main/java/com/github/catvod/spider/Cloud.java +++ b/app/src/main/java/com/github/catvod/spider/Cloud.java @@ -66,17 +66,18 @@ public class Cloud extends Spider { ucShare.add(shareLink); } } - - if (!ucShare.isEmpty()) { - from.add(uc.detailContentVodPlayFrom(ucShare)); + if (!aliShare.isEmpty()) { + from.add(ali.detailContentVodPlayFrom(aliShare)); } if (!quarkShare.isEmpty()) { from.add(quark.detailContentVodPlayFrom(quarkShare)); } - if (!aliShare.isEmpty()) { - from.add(ali.detailContentVodPlayFrom(aliShare)); + if (!ucShare.isEmpty()) { + from.add(uc.detailContentVodPlayFrom(ucShare)); } + + return TextUtils.join("$$$", from); } diff --git a/app/src/test/java/DdrkTest.java b/app/src/test/java/DdrkTest.java index 7a9f7bac..169eed2d 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("dahmer-monster")); + String content = spider.detailContent(Arrays.asList("the-shadow-strays")); 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 8df1a9b6..286c73ca 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 ef3cc2b4..e310b6bb 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -22dc36b8c8afa1f2cc6b2f4ee72f6e62 +a123d2842c9d069f49c0330afdec33e1 diff --git a/json/index.json b/json/index.json index 17f754fd..422e9391 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;22dc36b8c8afa1f2cc6b2f4ee72f6e62", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", "lives": [ { "name": "直播", diff --git a/json/index1.json b/json/index1.json index 537ebd19..e80546c6 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;22dc36b8c8afa1f2cc6b2f4ee72f6e62", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 6ce4d597..51ec1264 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;22dc36b8c8afa1f2cc6b2f4ee72f6e62", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index f64162b7..ff1810d5 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;22dc36b8c8afa1f2cc6b2f4ee72f6e62", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;a123d2842c9d069f49c0330afdec33e1", "lives": [ { "name": "直播",