diff --git a/app/src/main/java/com/github/catvod/bean/bili/Data.java b/app/src/main/java/com/github/catvod/bean/bili/Data.java index 89e4364..f6c638a 100644 --- a/app/src/main/java/com/github/catvod/bean/bili/Data.java +++ b/app/src/main/java/com/github/catvod/bean/bili/Data.java @@ -48,6 +48,7 @@ public class Data { public JsonElement getResult() { return result; } + public JsonElement getList() { return list; } 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 fac245f..d1eca67 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -29,6 +29,7 @@ import com.github.catvod.utils.QRCode; import com.github.catvod.utils.Utils; import com.google.gson.JsonObject; import com.google.gson.JsonParser; + import org.json.JSONArray; import org.json.JSONObject; @@ -109,15 +110,9 @@ public class Bili extends Spider { @Override public String homeContent(boolean filter) throws Exception { + if (extend.has("json")) return OkHttp.string(extend.get("json").getAsString()); List classes = new ArrayList<>(); LinkedHashMap> filters = new LinkedHashMap<>(); - JSONObject jSONObject = new JSONObject(); - if (extend.has("json")) { - JSONObject json = new JSONObject(OkHttp.string(extend.get("json").getAsString())); - jSONObject.put("class", json.getJSONArray("classes")); - jSONObject.put("filters", json.getJSONObject("filter")); - return jSONObject.toString(); - } String[] types = extend.get("type").getAsString().split("#"); for (String type : types) { classes.add(new Class(type)); @@ -187,7 +182,6 @@ public class Bili extends Spider { } vod_play.put("相关推荐", TextUtils.join("#", playList)); - vod.setVodPlayFrom(TextUtils.join("$$$", vod_play.keySet())); vod.setVodPlayUrl(TextUtils.join("$$$", vod_play.values())); return Result.string(vod); @@ -259,35 +253,11 @@ public class Bili extends Spider { String id = media.getId() + "_" + media.getCodecId(); String type = media.getMimeType().split("/")[0]; String baseUrl = media.getBaseUrl().replace("&", "&"); - return String.format(Locale.getDefault(), - "\n" + - "\n" + - "\n" + - "%s\n" + - "\n" + - "\n" + - "\n" + - "\n" + - "", - type, - id, media.getBandWidth(), media.getCodecs(), media.getMimeType(), params, media.getStartWithSap(), - baseUrl, - media.getSegmentBase().getIndexRange(), - media.getSegmentBase().getInitialization()); + return String.format(Locale.getDefault(), "\n" + "\n" + "\n" + "%s\n" + "\n" + "\n" + "\n" + "\n" + "", type, id, media.getBandWidth(), media.getCodecs(), media.getMimeType(), params, media.getStartWithSap(), baseUrl, media.getSegmentBase().getIndexRange(), media.getSegmentBase().getInitialization()); } private String getMpd(Dash dash, String videoList, String audioList) { - return String.format(Locale.getDefault(), - "\n" + - "\n" + - "%s\n" + - "%s\n" + - "\n" + - "", - dash.getDuration(), dash.getMinBufferTime(), - dash.getDuration(), - videoList, - audioList); + return String.format(Locale.getDefault(), "\n" + "\n" + "%s\n" + "%s\n" + "\n" + "", dash.getDuration(), dash.getMinBufferTime(), dash.getDuration(), videoList, audioList); } private void checkLogin() { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 11c6a90..0adea74 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 998bfde..b99328c 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -1de1a94d0429f343a35986ef5e9145d6 +1763b7d2459b598d1ccb6a10b0e81b73