Merge branch 'FongMi:main' into main
This commit is contained in:
commit
5595f83876
|
|
@ -34,6 +34,8 @@ public class Resp {
|
||||||
|
|
||||||
@SerializedName("bvid")
|
@SerializedName("bvid")
|
||||||
private String bvid;
|
private String bvid;
|
||||||
|
@SerializedName("aid")
|
||||||
|
private String aid;
|
||||||
@SerializedName("title")
|
@SerializedName("title")
|
||||||
private String title;
|
private String title;
|
||||||
@SerializedName("pic")
|
@SerializedName("pic")
|
||||||
|
|
@ -50,6 +52,10 @@ public class Resp {
|
||||||
return TextUtils.isEmpty(bvid) ? "" : bvid;
|
return TextUtils.isEmpty(bvid) ? "" : bvid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getAid() {
|
||||||
|
return TextUtils.isEmpty(aid) ? "" : aid;
|
||||||
|
}
|
||||||
|
|
||||||
public String getTitle() {
|
public String getTitle() {
|
||||||
return TextUtils.isEmpty(title) ? "" : title;
|
return TextUtils.isEmpty(title) ? "" : title;
|
||||||
}
|
}
|
||||||
|
|
@ -64,7 +70,7 @@ public class Resp {
|
||||||
|
|
||||||
public Vod getVod() {
|
public Vod getVod() {
|
||||||
Vod vod = new Vod();
|
Vod vod = new Vod();
|
||||||
vod.setVodId(getBvId());
|
vod.setVodId(getBvId() + "@" + getAid());
|
||||||
vod.setVodName(Jsoup.parse(getTitle()).text());
|
vod.setVodName(Jsoup.parse(getTitle()).text());
|
||||||
vod.setVodRemarks(getDuration().split(":")[0] + "分鐘");
|
vod.setVodRemarks(getDuration().split(":")[0] + "分鐘");
|
||||||
vod.setVodPic(getPic().startsWith("//") ? "https:" + getPic() : getPic());
|
vod.setVodPic(getPic().startsWith("//") ? "https:" + getPic() : getPic());
|
||||||
|
|
|
||||||
|
|
@ -148,17 +148,18 @@ public class Bili extends Spider {
|
||||||
public String detailContent(List<String> ids) throws Exception {
|
public String detailContent(List<String> ids) throws Exception {
|
||||||
if (!login) checkLogin();
|
if (!login) checkLogin();
|
||||||
|
|
||||||
String id = ids.get(0);
|
String[] split = ids.get(0).split("@");
|
||||||
String api = "https://api.bilibili.com/x/web-interface/archive/stat?bvid=" + id;
|
// String api = "https://api.bilibili.com/x/web-interface/archive/stat?bvid=" + id;
|
||||||
String json = OkHttp.string(api, getMember());
|
// String json = OkHttp.string(api, getMember());
|
||||||
Resp resp = Resp.objectFrom(json);
|
// Resp resp = Resp.objectFrom(json);
|
||||||
String aid = resp.getData().getAid();
|
String id = split[0];
|
||||||
|
String aid = split[1];
|
||||||
|
|
||||||
api = "https://api.bilibili.com/x/web-interface/view?aid=" + aid;
|
api = "https://api.bilibili.com/x/web-interface/view?aid=" + aid;
|
||||||
json = OkHttp.string(api, getMember());
|
json = OkHttp.string(api, getMember());
|
||||||
Data detail = Resp.objectFrom(json).getData();
|
Data detail = Resp.objectFrom(json).getData();
|
||||||
Vod vod = new Vod();
|
Vod vod = new Vod();
|
||||||
vod.setVodId(id);
|
vod.setVodId(ids.get(0));
|
||||||
vod.setVodPic(detail.getPic());
|
vod.setVodPic(detail.getPic());
|
||||||
vod.setVodName(detail.getTitle());
|
vod.setVodName(detail.getTitle());
|
||||||
vod.setTypeName(detail.getType());
|
vod.setTypeName(detail.getType());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue