|
|
|
@ -401,9 +401,15 @@ public class AliYun { |
|
|
|
private String getPreviewContent(String[] ids) { |
|
|
|
private String getPreviewContent(String[] ids) { |
|
|
|
Preview.Info info = getVideoPreviewPlayInfo(ids[0], ids[1]); |
|
|
|
Preview.Info info = getVideoPreviewPlayInfo(ids[0], ids[1]); |
|
|
|
List<String> url = getPreviewUrl(info); |
|
|
|
List<String> url = getPreviewUrl(info); |
|
|
|
|
|
|
|
List<String> 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<Sub> subs = getSubs(ids); |
|
|
|
List<Sub> subs = getSubs(ids); |
|
|
|
subs.addAll(getSubs(info)); |
|
|
|
subs.addAll(getSubs(info)); |
|
|
|
return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string(); |
|
|
|
return Result.get().url(proxyUrl).m3u8().subs(subs).header(getHeader()).string(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private List<String> getPreviewUrl(Preview.Info info) { |
|
|
|
private List<String> getPreviewUrl(Preview.Info info) { |
|
|
|
@ -451,6 +457,10 @@ public class AliYun { |
|
|
|
return String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s", cate, shareId, fileId); |
|
|
|
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) { |
|
|
|
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); |
|
|
|
return String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s&templateId=%s&mediaId=%s", cate, shareId, fileId, templateId, mediaId); |
|
|
|
} |
|
|
|
} |
|
|
|
|