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 33772393..07aa9df6 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -135,6 +135,7 @@ public class Bili extends Spider { public String categoryContent(String tid, String pg, boolean filter, HashMap extend) throws Exception { String order = extend.containsKey("order") ? extend.get("order") : "totalrank"; String duration = extend.containsKey("duration") ? extend.get("duration") : "0"; + tid = extend.containsKey("tid") ? extend.get("tid") : tid; String api = "https://api.bilibili.com/x/web-interface/search/type?search_type=video&keyword=" + URLEncoder.encode(tid) + "&order=" + order + "&duration=" + duration + "&page=" + pg; String json = OkHttp.string(api, getGuest()); Resp resp = Resp.objectFrom(json); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 54e481b1..a9a29e28 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 128a5b64..63df732f 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -edae7af0ef2089cfc135c90ce085aacd +6634431a04b488e0984e752918316382 diff --git a/json/adult.json b/json/adult.json index 2d347872..00919e8c 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;edae7af0ef2089cfc135c90ce085aacd", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;6634431a04b488e0984e752918316382", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/bili.json b/json/bili.json index 47503d9c..7b4e3ab1 100644 --- a/json/bili.json +++ b/json/bili.json @@ -38,5 +38,149 @@ } ], "filters": { + "帕梅拉": [ + { + "key": "order", + "name": "排序", + "value": [ + { + "n": "综合排序", + "v": "0" + }, + { + "n": "最多点击", + "v": "click" + }, + { + "n": "最新发布", + "v": "pubdate" + }, + { + "n": "最多弹幕", + "v": "dm" + }, + { + "n": "最多收藏", + "v": "stow" + } + ] + }, + { + "key": "duration", + "name": "时长", + "value": [ + { + "n": "全部", + "v": "0" + }, + { + "n": "60分钟以上", + "v": "4" + }, + { + "n": "30~60分钟", + "v": "3" + }, + { + "n": "10~30分钟", + "v": "2" + }, + { + "n": "10分钟以下", + "v": "1" + } + ] + }, + { + "key": "tid", + "name": "分类", + "value": [ + { + "n": "全部", + "v": "帕梅拉" + }, + { + "n": "帕梅拉合集", + "v": "帕梅拉合集" + }, + { + "n": "Pamela Reif", + "v": "Pamela Reif" + } + ] + } + ], + "太极拳": [ + { + "key": "order", + "name": "排序", + "value": [ + { + "n": "综合排序", + "v": "0" + }, + { + "n": "最多点击", + "v": "click" + }, + { + "n": "最新发布", + "v": "pubdate" + }, + { + "n": "最多弹幕", + "v": "dm" + }, + { + "n": "最多收藏", + "v": "stow" + } + ] + }, + { + "key": "duration", + "name": "时长", + "value": [ + { + "n": "全部", + "v": "0" + }, + { + "n": "60分钟以上", + "v": "4" + }, + { + "n": "30~60分钟", + "v": "3" + }, + { + "n": "10~30分钟", + "v": "2" + }, + { + "n": "10分钟以下", + "v": "1" + } + ] + }, + { + "key": "tid", + "name": "分类", + "value": [ + { + "n": "全部", + "v": "太极拳" + }, + { + "n": "太极拳合集", + "v": "太极拳合集" + }, + { + "n": "太极拳五连鞭", + "v": "太极拳五连鞭" + } + ] + } + ] } } \ No newline at end of file diff --git a/json/config.json b/json/config.json index fc6f5604..72ec134c 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;edae7af0ef2089cfc135c90ce085aacd", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;6634431a04b488e0984e752918316382", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {