diff --git a/app/src/main/java/com/github/catvod/bean/bili/Resp.java b/app/src/main/java/com/github/catvod/bean/bili/Resp.java index 9020531a..f3ef36be 100644 --- a/app/src/main/java/com/github/catvod/bean/bili/Resp.java +++ b/app/src/main/java/com/github/catvod/bean/bili/Resp.java @@ -34,6 +34,8 @@ public class Resp { @SerializedName("bvid") private String bvid; + @SerializedName("aid") + private String aid; @SerializedName("title") private String title; @SerializedName("pic") @@ -50,6 +52,10 @@ public class Resp { return TextUtils.isEmpty(bvid) ? "" : bvid; } + public String getAid() { + return TextUtils.isEmpty(aid) ? "" : aid; + } + public String getTitle() { return TextUtils.isEmpty(title) ? "" : title; } @@ -64,7 +70,7 @@ public class Resp { public Vod getVod() { Vod vod = new Vod(); - vod.setVodId(getBvId()); + vod.setVodId(getBvId() + "@" + getAid()); vod.setVodName(Jsoup.parse(getTitle()).text()); vod.setVodRemarks(getDuration().split(":")[0] + "分鐘"); vod.setVodPic(getPic().startsWith("//") ? "https:" + getPic() : getPic()); diff --git a/app/src/main/java/com/github/catvod/spider/Bili.java b/app/src/main/java/com/github/catvod/spider/Bili.java index 88c48b2d..d7a849f1 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -148,17 +148,15 @@ public class Bili extends Spider { public String detailContent(List ids) throws Exception { if (!login) checkLogin(); - String id = ids.get(0); - String api = "https://api.bilibili.com/x/web-interface/archive/stat?bvid=" + id; - String json = OkHttp.string(api, getMember()); - Resp resp = Resp.objectFrom(json); - String aid = resp.getData().getAid(); + String[] split = ids.get(0).split("@"); + String id = split[0]; + String aid = split[1]; - api = "https://api.bilibili.com/x/web-interface/view?aid=" + aid; - json = OkHttp.string(api, getMember()); + String api = "https://api.bilibili.com/x/web-interface/view?aid=" + aid; + String json = OkHttp.string(api, getMember()); Data detail = Resp.objectFrom(json).getData(); Vod vod = new Vod(); - vod.setVodId(id); + vod.setVodId(ids.get(0)); vod.setVodPic(detail.getPic()); vod.setVodName(detail.getTitle()); vod.setTypeName(detail.getType()); @@ -344,4 +342,4 @@ public class Bili extends Spider { } catch (Exception ignored) { } } -} \ No newline at end of file +} diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index de756c91..8e4ef6da 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 933c7ab0..b1bd3d1c 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -52a0e12f50e6acdcc575ff0ba1df4dd4 +60e553db98f40a31024cbac397528fde diff --git a/json/adult.json b/json/adult.json index 05696e85..0fba9c20 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;52a0e12f50e6acdcc575ff0ba1df4dd4", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;60e553db98f40a31024cbac397528fde", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index 93780189..89d4fe4a 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;52a0e12f50e6acdcc575ff0ba1df4dd4", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;60e553db98f40a31024cbac397528fde", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {