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..5155693d 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,18 @@ 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 api = "https://api.bilibili.com/x/web-interface/archive/stat?bvid=" + id; + // String json = OkHttp.string(api, getMember()); + // Resp resp = Resp.objectFrom(json); + String id = split[0]; + String aid = split[1]; api = "https://api.bilibili.com/x/web-interface/view?aid=" + aid; 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 +345,4 @@ public class Bili extends Spider { } catch (Exception ignored) { } } -} \ No newline at end of file +}