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 7557d158..abd17aa9 100644 --- a/app/src/main/java/com/github/catvod/api/AliYun.java +++ b/app/src/main/java/com/github/catvod/api/AliYun.java @@ -243,7 +243,7 @@ public class AliYun { List subs = new ArrayList<>(); listFiles(shareId, new Item(getParentFileId(fileId, share)), files, subs); Collections.sort(files); - List playFrom = Arrays.asList("原畫", "普畫", "極速"); + List playFrom = Arrays.asList("原畫", "普畫"); List episode = new ArrayList<>(); List playUrl = new ArrayList<>(); for (Item file : files) episode.add(file.getDisplayName() + "$" + shareId + "+" + file.getFileId() + findSubs(file.getName(), subs)); @@ -401,12 +401,6 @@ public class AliYun { private String getPreviewContent(String[] ids) { Preview.Info info = getVideoPreviewPlayInfo(ids[0], ids[1]); List url = getPreviewUrl(info); - List proxyUrl = new ArrayList<>(); - for (int i = 0; i < url.size(); i++) { - String item = url.get(i); - if (item.startsWith("http")) item = proxyVideoUrl("preview", ids[0], ids[1], url.get(i - 1)); - proxyUrl.add(item); - } List subs = getSubs(ids); subs.addAll(getSubs(info)); return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string(); @@ -457,10 +451,6 @@ public class AliYun { return String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s", cate, shareId, fileId); } - private String proxyVideoUrl(String cate, String shareId, String fileId, String templateId) { - return String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s&templateId=%s", cate, shareId, fileId, templateId); - } - private String proxyVideoUrl(String cate, String shareId, String fileId, String templateId, String mediaId) { return String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s&templateId=%s&mediaId=%s", cate, shareId, fileId, templateId, mediaId); } diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index 1a36dd74..0d71bc3e 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -54,11 +54,10 @@ public class Ali extends Spider { */ public String detailContentVodPlayFrom(List ids) { List playFrom = new ArrayList<>(); - if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("原畫", "普畫", "極速")); + if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("原畫", "普畫")); for (int i = 1; i <= ids.size(); i++) { playFrom.add(String.format(Locale.getDefault(), "原畫#%02d", i)); playFrom.add(String.format(Locale.getDefault(), "普畫#%02d", i)); - playFrom.add(String.format(Locale.getDefault(), "極速#%02d", i)); } return TextUtils.join("$$$", playFrom); }