diff --git a/app/src/main/java/com/github/catvod/bean/ali/Item.java b/app/src/main/java/com/github/catvod/bean/ali/Item.java index 9ff85e4a..5556ad7e 100644 --- a/app/src/main/java/com/github/catvod/bean/ali/Item.java +++ b/app/src/main/java/com/github/catvod/bean/ali/Item.java @@ -87,11 +87,11 @@ public class Item implements Comparable { } public String getSortName() { - return TextUtils.join(" ", Arrays.asList(getParent(), getName())).trim(); + return TextUtils.join(" ", Arrays.asList(getParent(), Utils.getDigit(getName()))).trim(); } @Override public int compareTo(Item item) { - return Integer.compare(Utils.getDigit(getSortName()), Utils.getDigit(item.getSortName())); + return getSortName().compareTo(item.getSortName()); } } diff --git a/app/src/main/java/com/github/catvod/utils/Utils.java b/app/src/main/java/com/github/catvod/utils/Utils.java index bca0f9ce..29f00c36 100644 --- a/app/src/main/java/com/github/catvod/utils/Utils.java +++ b/app/src/main/java/com/github/catvod/utils/Utils.java @@ -192,13 +192,13 @@ public class Utils { }); } - public static int getDigit(String text) { + public static String getDigit(String text) { try { Matcher matcher = Pattern.compile(".*(1080|720|2160|4k|4K).*").matcher(text); - if (matcher.find()) text = matcher.group(1) + text; - return Integer.parseInt(text.replaceAll("\\D+", "")); + if (matcher.find()) text = matcher.group(1) + " " + text; + return text.replaceAll("\\D+", ""); } catch (Exception e) { - return -1; + return ""; } } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 6439734b..88d2ec7a 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 6fcb3f44..1b63a092 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -e202ef069c4742cadfd707f4b144ed2a +50095fdf21e5b6f4c21d64bd8e163063 diff --git a/json/adult.json b/json/adult.json index 5a083fd8..852031f3 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;e202ef069c4742cadfd707f4b144ed2a", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;50095fdf21e5b6f4c21d64bd8e163063", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index c99d0be8..9e74d78f 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;e202ef069c4742cadfd707f4b144ed2a", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;50095fdf21e5b6f4c21d64bd8e163063", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {