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 404afc06..dee41f4c 100644 --- a/app/src/main/java/com/github/catvod/spider/Cloud.java +++ b/app/src/main/java/com/github/catvod/spider/Cloud.java @@ -36,6 +36,10 @@ public class Cloud extends Spider { return null; } + @Override + public String playerContent(String flag, String id, List vipFlags) throws Exception { + return flag.contains("quark") ? quark.playerContent(flag, id, vipFlags) : ali.playerContent(flag, id, vipFlags); + } protected String detailContentVodPlayFrom(List shareLinks) { List from = new ArrayList<>(); diff --git a/app/src/main/java/com/github/catvod/spider/Wogg.java b/app/src/main/java/com/github/catvod/spider/Wogg.java index fce7875c..a5dce61f 100644 --- a/app/src/main/java/com/github/catvod/spider/Wogg.java +++ b/app/src/main/java/com/github/catvod/spider/Wogg.java @@ -136,6 +136,8 @@ public class Wogg extends Cloud { return searchContent(key, pg); } + + private String searchContent(String key, String pg) { String searchURL = siteUrl + String.format("/index.php/vodsearch/%s----------%s---.html", URLEncoder.encode(key), pg); String html = OkHttp.string(searchURL, getHeader()); diff --git a/app/src/test/java/WoggTest.java b/app/src/test/java/WoggTest.java index 77728b21..bd970f8d 100644 --- a/app/src/test/java/WoggTest.java +++ b/app/src/test/java/WoggTest.java @@ -76,7 +76,7 @@ public class WoggTest { @org.junit.Test public void playerContent() throws Exception { - String content = spider.playerContent("轉存原畫", "sTpdhKkg18j+66a32d0a1d147f930c5e462db86e7eb629ee947e", new ArrayList<>()); + String content = spider.playerContent("quark4K", "dc59b0932afd40d0a22f36000677601e++6f9d159fdc95595863011d419b6e6ff9++564626ac1ea7++cBtIFnirbHfAa6y/su8FxbPHk8mzXfrmSWBnV56+LQo=", new ArrayList<>()); JsonObject map = Json.safeObject(content); Gson gson = new GsonBuilder().setPrettyPrinting().create(); System.out.println("playerContent--" + gson.toJson(map)); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 9e41a89a..71c50bf7 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 9008aeca..177dd471 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -cb5b012dd9492ea90f5ebc3542a4f0c6 +18916220184c13bb3ece0ae4aba0b182 diff --git a/json/index.json b/json/index.json index 224167c9..54ec07bd 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;cb5b012dd9492ea90f5ebc3542a4f0c6", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;18916220184c13bb3ece0ae4aba0b182", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index cd6f347b..241d5056 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;cb5b012dd9492ea90f5ebc3542a4f0c6", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;18916220184c13bb3ece0ae4aba0b182", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 7c2b318c..ee6b9e57 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;cb5b012dd9492ea90f5ebc3542a4f0c6", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;18916220184c13bb3ece0ae4aba0b182", "lives": [ { "name": "直播ipv6",