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 89e43641..f6c638a1 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 fac245f2..33772393 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)); @@ -127,17 +122,13 @@ public class Bili extends Spider { } @Override - public String homeVideoContent() throws Exception { - if (extend.has("json")) { - String api = "https://api.bilibili.com/x/web-interface/popular?ps=20"; - String json = OkHttp.string(api, getGuest()); - Resp resp = Resp.objectFrom(json); - List list = new ArrayList<>(); - for (Resp.Result item : Resp.Result.arrayFrom(resp.getData().getList())) list.add(item.getVod()); - return Result.string(list); - } - String[] types = extend.get("type").getAsString().split("#"); - return categoryContent(types[0], "1", true, new HashMap<>()); + public String homeVideoContent() { + String api = "https://api.bilibili.com/x/web-interface/popular?ps=20"; + String json = OkHttp.string(api, getGuest()); + Resp resp = Resp.objectFrom(json); + List list = new ArrayList<>(); + for (Resp.Result item : Resp.Result.arrayFrom(resp.getData().getList())) list.add(item.getVod()); + return Result.string(list); } @Override @@ -187,7 +178,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 +249,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 11c6a904..54e481b1 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 998bfde9..128a5b64 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -1de1a94d0429f343a35986ef5e9145d6 +edae7af0ef2089cfc135c90ce085aacd diff --git a/json/adult.json b/json/adult.json index 99c8f1c1..2d347872 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;1de1a94d0429f343a35986ef5e9145d6", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;edae7af0ef2089cfc135c90ce085aacd", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { @@ -67,7 +67,7 @@ "searchable": 1, "style": { "type": "rect", - "ratio": 1.486 + "ratio": 1.485 } }, { @@ -78,7 +78,7 @@ "searchable": 1, "style": { "type": "rect", - "ratio": 1.309 + "ratio": 1.77 } }, { diff --git a/json/bili.json b/json/bili.json index 403cc937..47503d9c 100644 --- a/json/bili.json +++ b/json/bili.json @@ -1,5 +1,5 @@ { - "classes": [ + "class": [ { "type_name": "帕梅拉", "type_id": "帕梅拉" @@ -37,6 +37,6 @@ "type_id": "动物世界" } ], - "filter": { + "filters": { } } \ No newline at end of file diff --git a/json/config.json b/json/config.json index aebd6a8f..fc6f5604 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;1de1a94d0429f343a35986ef5e9145d6", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;edae7af0ef2089cfc135c90ce085aacd", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {