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 90e11054..b887df26 100644 --- a/app/src/main/java/com/github/catvod/api/QuarkApi.java +++ b/app/src/main/java/com/github/catvod/api/QuarkApi.java @@ -418,13 +418,13 @@ public class QuarkApi { getShareToken(new ShareData(shareId, null)); if (!this.shareTokenCache.containsKey(shareId)) return null; } - Type type = new TypeToken>>() { + 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); if (saveResult.getData() != null && (saveResult.getData()).get("task_id") != null) { int retry = 0; while (true) { - Type type2 = new TypeToken>>() { + 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); 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) { @@ -444,7 +444,7 @@ public class QuarkApi { if (saveFileId == null) return null; this.saveFileIdCaches.put(fileId, saveFileId); } - Type type2 = new TypeToken>>() { + 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); if (transcoding.getData() != null && (transcoding.getData()).get("video_list") != null) { diff --git a/gradle.properties b/gradle.properties index 4e59a36c..20e047e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,4 +19,5 @@ android.enableJetifier=true # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.enableR8.fullMode=false \ No newline at end of file diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 014987b6..3a35857a 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 6e647bd6..65ad30dc 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -4537aa56277df82697b60bf7f0c0ed1c +7fe0986610b192cfb6454b8d079d3ea9 diff --git a/json/index.json b/json/index.json index 9ab04df5..bcdcb890 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;4537aa56277df82697b60bf7f0c0ed1c", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;7fe0986610b192cfb6454b8d079d3ea9", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index a4eea042..6115a759 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;4537aa56277df82697b60bf7f0c0ed1c", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;7fe0986610b192cfb6454b8d079d3ea9", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 2bc11fc7..4c4e8b1e 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;4537aa56277df82697b60bf7f0c0ed1c", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;7fe0986610b192cfb6454b8d079d3ea9", "lives": [ { "name": "直播ipv6",