diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9a37d8d8..555127c3 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -41,6 +41,3 @@ public static ** valueOf(java.lang.String); } --keepclassmembers class com.github.catvod.bean.quark.** { - (); -} \ No newline at end of file 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 b887df26..c84e9c31 100644 --- a/app/src/main/java/com/github/catvod/api/QuarkApi.java +++ b/app/src/main/java/com/github/catvod/api/QuarkApi.java @@ -420,13 +420,13 @@ public class QuarkApi { } Type type = new TypeToken>>() { }.getType(); - ApiResponse> saveResult = Json.parseSafe(api("share/sharepage/save?" + this.pr, null, Map.of("fid_list", List.of(fileId), "fid_token_list", List.of(fileToken), "to_pdir_fid", this.saveDirId, "pwd_id", shareId, "stoken", stoken != null ? stoken : (String) this.shareTokenCache.get(shareId).get("stoken"), "pdir_fid", "0", "scene", "link"), 0, "POST"), type); + ApiResponse> saveResult = Json.parseSafe(api("share/sharepage/save?" + this.pr, null, Map.of("fid_list", List.of(fileId), "fid_token_list", List.of(fileToken), "to_pdir_fid", this.saveDirId, "pwd_id", shareId, "stoken", stoken != null ? stoken : (String) this.shareTokenCache.get(shareId).get("stoken"), "pdir_fid", "0", "scene", "link"), 0, "POST"), type); if (saveResult.getData() != null && (saveResult.getData()).get("task_id") != null) { int retry = 0; while (true) { Type type2 = new TypeToken>>() { }.getType(); - ApiResponse> taskResult = Json.parseSafe(api("task?" + this.pr + "&task_id=" + (saveResult.getData()).get("task_id") + "&retry_index=" + retry, Collections.emptyMap(), Collections.emptyMap(), 0, "GET"), type2); + ApiResponse> taskResult = Json.parseSafe(api("task?" + this.pr + "&task_id=" + (saveResult.getData()).get("task_id") + "&retry_index=" + retry, Collections.emptyMap(), Collections.emptyMap(), 0, "GET"), type2); if (taskResult.getData() != null && taskResult.getData().get("save_as") != null && ((Map) taskResult.getData().get("save_as")).get("save_as_top_fids") != null && ((List) ((Map) ((Map) taskResult.getData()).get("save_as")).get("save_as_top_fids")).size() > 0) { return ((List) ((Map) (taskResult.getData()).get("save_as")).get("save_as_top_fids")).get(0); } @@ -446,7 +446,7 @@ public class QuarkApi { } Type type2 = new TypeToken>>() { }.getType(); - ApiResponse> transcoding = Json.parseSafe(api("file/v2/play?" + this.pr, Collections.emptyMap(), Map.of("fid", this.saveFileIdCaches.get(fileId), "resolutions", "normal,low,high,super,2k,4k", "supports", "fmp4"), 0, "POST"), type2); + ApiResponse> transcoding = Json.parseSafe(api("file/v2/play?" + this.pr, Collections.emptyMap(), Map.of("fid", this.saveFileIdCaches.get(fileId), "resolutions", "normal,low,high,super,2k,4k", "supports", "fmp4"), 0, "POST"), type2); if (transcoding.getData() != null && (transcoding.getData()).get("video_list") != null) { String flagId = flag.split("-")[flag.split("-").length - 1]; int index = Util.findAllIndexes(getPlayFormatList(), flagId); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index f41326d9..5a393098 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 4d7b342b..8c8e1e5d 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -6435dcbc53a962c3b1b795b8141e9668 +674ee11b16c388f01c57a5dcbdf96ed7 diff --git a/json/index.json b/json/index.json index 004d4196..d8959132 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;6435dcbc53a962c3b1b795b8141e9668", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;674ee11b16c388f01c57a5dcbdf96ed7", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index 824a9bb8..7de6147b 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;6435dcbc53a962c3b1b795b8141e9668", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;674ee11b16c388f01c57a5dcbdf96ed7", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index bb498275..0dc00842 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;6435dcbc53a962c3b1b795b8141e9668", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;674ee11b16c388f01c57a5dcbdf96ed7", "lives": [ { "name": "直播ipv6",