diff --git a/app/src/main/java/com/github/catvod/bean/ali/Sorter.java b/app/src/main/java/com/github/catvod/bean/ali/Sorter.java index 17a1ca54..3ac7fe35 100644 --- a/app/src/main/java/com/github/catvod/bean/ali/Sorter.java +++ b/app/src/main/java/com/github/catvod/bean/ali/Sorter.java @@ -15,9 +15,13 @@ public class Sorter implements Comparator { @Override public int compare(Item o1, Item o2) { try { - return Integer.valueOf(Utils.removeExt(o1.getDisplayName())).compareTo(Integer.valueOf(Utils.removeExt(o2.getDisplayName()))); + return Integer.compare(getDigit(o1.getDisplayName()), getDigit(o2.getDisplayName())); } catch (NumberFormatException e) { return o1.getDisplayName().compareToIgnoreCase(o2.getDisplayName()); } } + + private int getDigit(String text) throws NumberFormatException { + return Integer.parseInt(Utils.removeExt(text).replaceAll("\\D+", "")); + } } 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 9fb4c890..157d3a34 100644 --- a/app/src/main/java/com/github/catvod/utils/Utils.java +++ b/app/src/main/java/com/github/catvod/utils/Utils.java @@ -10,7 +10,6 @@ import android.webkit.ValueCallback; import android.webkit.WebView; import android.webkit.WebViewClient; -import com.github.catvod.crawler.SpiderDebug; import com.github.catvod.spider.Init; import java.math.BigInteger; @@ -56,18 +55,15 @@ public class Utils { } public static String fixUrl(String base, String src) { - try { - if (src.startsWith("//")) { - Uri parse = Uri.parse(base); - src = parse.getScheme() + ":" + src; - } else if (!src.contains("://")) { - Uri parse = Uri.parse(base); - src = parse.getScheme() + "://" + parse.getHost() + src; - } - } catch (Exception e) { - SpiderDebug.log(e); + if (src.startsWith("//")) { + Uri parse = Uri.parse(base); + return parse.getScheme() + ":" + src; + } else if (!src.contains("://")) { + Uri parse = Uri.parse(base); + return parse.getScheme() + "://" + parse.getHost() + src; + } else { + return src; } - return src; } public static String removeExt(String text) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index aedc94e9..dbb979eb 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 ecd32556..6eb19eba 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -31931cd4ecb016c3263b041528b132ad +1da9b9d6b4241ada175c741d4b4b9cf9 diff --git a/json/adult.json b/json/adult.json index b5fadd57..23b4f784 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;31931cd4ecb016c3263b041528b132ad", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;1da9b9d6b4241ada175c741d4b4b9cf9", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index d049b325..bf99cd42 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;31931cd4ecb016c3263b041528b132ad", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;1da9b9d6b4241ada175c741d4b4b9cf9", "wallpaper": "http://饭太硬.ga/深色壁纸/api.php", "sites": [ {