diff --git a/app/src/main/java/com/github/catvod/api/QuarkApi.java b/app/src/main/java/com/github/catvod/api/QuarkApi.java index 914a62f8..705e5f73 100644 --- a/app/src/main/java/com/github/catvod/api/QuarkApi.java +++ b/app/src/main/java/com/github/catvod/api/QuarkApi.java @@ -163,6 +163,8 @@ public class QuarkApi { List> listData = listFile(1, shareData, files, subs, shareData.getShareId(), shareData.getFolderId(), 1); List playFrom = QuarkApi.get().getPlayFormatList(); + playFrom = new ArrayList<>(playFrom); + playFrom.add("原画"); List playUrl = new ArrayList<>(); @@ -197,7 +199,7 @@ public class QuarkApi { String fileId = split[0], fileToken = split[1], shareId = split[2], stoken = split[3]; String playUrl = ""; - if (flag.contains("原画")) { + if (flag.contains("quark原画")) { playUrl = this.getDownload(shareId, stoken, fileId, fileToken, true); } else { playUrl = this.getLiveTranscoding(shareId, stoken, fileId, fileToken, flag); @@ -550,9 +552,9 @@ public class QuarkApi { if (saveFileId == null) return null; this.saveFileIdCaches.put(fileId, saveFileId); } - Map down = Json.parseSafe(api("file/download?" + this.pr + "&uc_param_str=", Collections.emptyMap(), Map.of("fids", this.saveFileIdCaches.get(fileId)), 0, "POST"), Map.class); + Map down = Json.parseSafe(api("file/download?" + this.pr + "&uc_param_str=", Collections.emptyMap(), Map.of("fids", List.of(this.saveFileIdCaches.get(fileId))), 0, "POST"), Map.class); if (down.get("data") != null) { - return ((List) down.get("data")).get(0); + return ((List>) down.get("data")).get(0).get("download_url").toString(); } return null; } diff --git a/app/src/main/java/com/github/catvod/spider/Quark.java b/app/src/main/java/com/github/catvod/spider/Quark.java index 019c6aed..f3b4be60 100644 --- a/app/src/main/java/com/github/catvod/spider/Quark.java +++ b/app/src/main/java/com/github/catvod/spider/Quark.java @@ -49,12 +49,14 @@ public class Quark extends Spider { /* if (ids.size() < 2){ return TextUtils.join("$$$", QuarkApi.get().getPlayFormatList()); }*/ + for (int i = 1; i <= ids.size(); i++) { + for (String s : QuarkApi.get().getPlayFormatList()) { playFrom.add(String.format(Locale.getDefault(), "quark" + s + "#%02d", i)); } - + playFrom.add("quark原画"); } return TextUtils.join("$$$", playFrom); } diff --git a/app/src/test/java/WoggTest.java b/app/src/test/java/WoggTest.java index dbb37263..c74a85cb 100644 --- a/app/src/test/java/WoggTest.java +++ b/app/src/test/java/WoggTest.java @@ -77,7 +77,7 @@ public class WoggTest { @org.junit.Test public void playerContent() throws Exception { - String content = spider.playerContent("quark4K", "81c9aa49887d4b07aba861d7dd76d0ac++0ec2d75805f83bd045434f0d22f71489++4be1d75e17aa++wGlrbmw95nBbzO2rbCcEicZ8f4a+z5aKiuyoLQLA5SQ=", new ArrayList<>()); + String content = spider.playerContent("quark原画", "81c9aa49887d4b07aba861d7dd76d0ac++b2a83edeb7211b3fe316b5ec1be6f19f++4be1d75e17aa++EBR0p92y9GDjeAk2mgUu959KWjj3KIx1w5UgMpVaubg=", new ArrayList<>()); System.out.println("playerContent--" + content); JsonObject map = Json.safeObject(content); Gson gson = new GsonBuilder().setPrettyPrinting().create(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index a82a431b..6cb2eb10 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 37661e0b..109a7dfc 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -55832fefa407b9cfa0c0fb18b24b652d +046039ed47e1967e85fbc358683fb76a diff --git a/json/index.json b/json/index.json index c7482dfb..59f779bb 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;55832fefa407b9cfa0c0fb18b24b652d", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;046039ed47e1967e85fbc358683fb76a", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index 9b01e1b0..d09b9946 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;55832fefa407b9cfa0c0fb18b24b652d", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;046039ed47e1967e85fbc358683fb76a", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 0aeac5cc..fbf4acec 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;55832fefa407b9cfa0c0fb18b24b652d", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;046039ed47e1967e85fbc358683fb76a", "lives": [ { "name": "直播ipv6",