diff --git a/app/src/main/java/com/github/catvod/api/AliYun.java b/app/src/main/java/com/github/catvod/api/AliYun.java index 4060d44..0523a55 100644 --- a/app/src/main/java/com/github/catvod/api/AliYun.java +++ b/app/src/main/java/com/github/catvod/api/AliYun.java @@ -400,18 +400,18 @@ public class AliYun { private String getPreviewContent(String[] ids) { Preview.Info info = getVideoPreviewPlayInfo(ids[0], ids[1]); - List url = getPreviewUrl(info, ids[0], ids[1]); + List url = getPreviewUrl(info, ids[0], ids[1], true); List subs = getSubs(ids); subs.addAll(getSubs(info)); return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string(); } - private List getPreviewUrl(Preview.Info info, String shareId, String fileId) { + private List getPreviewUrl(Preview.Info info, String shareId, String fileId, boolean proxy) { List tasks = info.getLiveTranscodingTaskList(); List url = new ArrayList<>(); for (int i = tasks.size() - 1; i >= 0; i--) { url.add(tasks.get(i).getTemplateId()); - url.add(proxyVideoUrl("preview", shareId, fileId, tasks.get(i).getTemplateId())); + url.add(proxy ? proxyVideoUrl("preview", shareId, fileId, tasks.get(i).getTemplateId()) : tasks.get(i).getUrl()); } return url; } @@ -525,7 +525,7 @@ public class AliYun { private String getM3u8Url(String shareId, String fileId, String templateId) { Preview.Info info = getVideoPreviewPlayInfo(shareId, fileId); - List url = getPreviewUrl(info, shareId, fileId); + List url = getPreviewUrl(info, shareId, fileId, false); Map previewMap = new HashMap<>(); for (int i = 0; i < url.size(); i = i + 2) { previewMap.put(url.get(i), url.get(i + 1)); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 07b6012..679c845 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 cbe95b3..0ee9603 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -cac76b1a53488ed7492d586ac2a9408b +8b94f251e1af6b67e1ee86cb151cda70