diff --git a/app/src/main/java/com/github/catvod/ali/API.java b/app/src/main/java/com/github/catvod/ali/API.java index 59b463fb..26b49021 100644 --- a/app/src/main/java/com/github/catvod/ali/API.java +++ b/app/src/main/java/com/github/catvod/ali/API.java @@ -392,7 +392,7 @@ public class API { } public String playerContent(String[] ids) { - return Result.get().url(getDownloadUrl(ids[0])).subs(getSubs(ids)).header(getHeader()).string(); + return Result.get().url(getDownloadUrl(ids[0])).octet().subs(getSubs(ids)).header(getHeader()).string(); } public String playerContent(String[] ids, String flag) { @@ -401,7 +401,7 @@ public class API { String url = getPreviewUrl(playInfo, flag); List subs = getSubs(ids); subs.addAll(getSubs(playInfo)); - return Result.get().url(url).subs(subs).header(getHeader()).string(); + return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string(); } catch (Exception e) { e.printStackTrace(); return Result.get().url("").string(); diff --git a/app/src/main/java/com/github/catvod/bean/Result.java b/app/src/main/java/com/github/catvod/bean/Result.java index cbdff6af..796c36ed 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -23,6 +23,8 @@ public class Result { private LinkedHashMap> filters; @SerializedName("header") private String header; + @SerializedName("format") + private String format; @SerializedName("url") private String url; @SerializedName("subs") @@ -129,11 +131,36 @@ public class Result { return this; } + public Result format(String format) { + this.format = format; + return this; + } + public Result subs(List subs) { this.subs = subs; return this; } + public Result dash() { + this.format = "application/dash+xml"; + return this; + } + + public Result m3u8() { + this.format = "application/x-mpegURL"; + return this; + } + + public Result rtsp() { + this.format = "application/x-rtsp"; + return this; + } + + public Result octet() { + this.format = "application/octet-stream"; + return this; + } + public Result page() { return page(1, 1, 0, 1); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index ae30c07e..d3d96f27 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 f12c1463..334fff94 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -5293550a292d61fd7318571385c4fc11 +f7dbc2384bc488cf422fb91bbb2e56ec diff --git a/json/adult.json b/json/adult.json index 02c289a9..59c574c4 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5293550a292d61fd7318571385c4fc11", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;f7dbc2384bc488cf422fb91bbb2e56ec", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index 2a5c21f8..864053cf 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;5293550a292d61fd7318571385c4fc11", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;f7dbc2384bc488cf422fb91bbb2e56ec", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {