diff --git a/app/src/main/java/com/github/catvod/spider/AList.java b/app/src/main/java/com/github/catvod/spider/AList.java index ef223d88..ac50f1d6 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -34,8 +34,8 @@ public class AList extends Spider { private List getFilter() { List items = new ArrayList<>(); - items.add(new Filter("type", "排序類型", Arrays.asList(new Filter.Value("名稱", "name"), new Filter.Value("大小", "size"), new Filter.Value("修改時間", "date")))); - items.add(new Filter("order", "排序方式", Arrays.asList(new Filter.Value("⬆", "asc"), new Filter.Value("⬇", "desc")))); + items.add(new Filter("type", "排序類型", Arrays.asList(new Filter.Value("預設", ""), new Filter.Value("名稱", "name"), new Filter.Value("大小", "size"), new Filter.Value("修改時間", "date")))); + items.add(new Filter("order", "排序方式", Arrays.asList(new Filter.Value("預設", ""), new Filter.Value("⬆", "asc"), new Filter.Value("⬇", "desc")))); return items; } @@ -71,8 +71,8 @@ public class AList extends Spider { @Override public String categoryContent(String tid, String pg, boolean filter, HashMap extend) throws Exception { fetchRule(); - String type = extend.containsKey("type") ? extend.get("type") : "name"; - String order = extend.containsKey("order") ? extend.get("order") : "asc"; + String type = extend.containsKey("type") ? extend.get("type") : ""; + String order = extend.containsKey("order") ? extend.get("order") : ""; List folders = new ArrayList<>(); List files = new ArrayList<>(); List list = new ArrayList<>(); @@ -80,8 +80,10 @@ public class AList extends Spider { if (item.isFolder()) folders.add(item); else files.add(item); } - Sorter.sort(type, order, folders); - Sorter.sort(type, order, files); + if (!TextUtils.isEmpty(type) && !TextUtils.isEmpty(order)) { + Sorter.sort(type, order, folders); + Sorter.sort(type, order, files); + } for (Item item : folders) list.add(item.getVod(tid)); for (Item item : files) list.add(item.getVod(tid)); return Result.get().vod(list).page().string(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 5542eda9..38ffc9f7 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 28784742..b58a57f9 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -7ea557373acdfaecb8095ad3b1bf5529 +279424aa7be0e38dbd884daf8913c1d4 diff --git a/json/adult.json b/json/adult.json index 816085a9..31abd986 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7ea557373acdfaecb8095ad3b1bf5529", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;279424aa7be0e38dbd884daf8913c1d4", "wallpaper": "https://gao.chuqiuyu.tk", "lives": [ { diff --git a/json/config.json b/json/config.json index 9ce9e17f..bda870f3 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;7ea557373acdfaecb8095ad3b1bf5529", + "spider": "https://ghproxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;279424aa7be0e38dbd884daf8913c1d4", "wallpaper": "http://www.kf666888.cn/api/tvbox/img", "lives": [ {