diff --git a/app/build.gradle b/app/build.gradle index 80db5895..c8687413 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,9 +38,9 @@ dependencies { debugImplementation 'org.chromium.net:cronet-embedded:101.4951.41' implementation('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } implementation 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' - implementation('com.squareup.okhttp3:okhttp:3.12.13') { force = true } implementation 'wang.harlon.quickjs:wrapper-android:0.21.1' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' + implementation 'com.squareup.okhttp3:okhttp:3.12.13' implementation 'com.google.code.gson:gson:2.8.6' implementation 'cn.wanghaomiao:JsoupXpath:2.5.1' implementation 'com.google.zxing:core:3.3.0' 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 afb995c6..45d49c1d 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -58,6 +58,7 @@ public class Bili extends Spider { private JsonObject extend; private String cookie; private boolean login; + private static boolean AskOnlyOnce = false; private Map getHeader(String cookie) { Map headers = new HashMap<>(); @@ -145,7 +146,7 @@ public class Bili extends Spider { @Override public String detailContent(List ids) throws Exception { - if (!login) checkLogin(); + if (!login && !AskOnlyOnce) checkLogin(); String[] split = ids.get(0).split("@"); String id = split[0]; @@ -262,7 +263,8 @@ public class Bili extends Spider { } private void getQRCode() { - if (login || getUserCache().exists() && COOKIE.equals(cookie)) return; + if (login) return; + AskOnlyOnce = true; String json = OkHttp.string("https://passport.bilibili.com/x/passport-login/web/qrcode/generate?source=main-mini"); Data data = Resp.objectFrom(json).getData(); Init.run(() -> openApp(data)); diff --git a/app/src/main/java/com/github/catvod/utils/Image.java b/app/src/main/java/com/github/catvod/utils/Image.java index 072e998c..30fbf22e 100644 --- a/app/src/main/java/com/github/catvod/utils/Image.java +++ b/app/src/main/java/com/github/catvod/utils/Image.java @@ -2,8 +2,8 @@ package com.github.catvod.utils; public class Image { - public static final String FOLDER = "https://s1.ax1x.com/2023/05/04/p9tgI81.png"; - public static final String VIDEO = "https://s1.ax1x.com/2023/05/04/p9tgogx.png"; + public static final String FOLDER = "https://x.imgs.ovh/x/2023/09/05/64f680bb030b4.png"; + public static final String VIDEO = "https://x.imgs.ovh/x/2023/09/05/64f67fe2e7720.png"; public static String getIcon(boolean folder) { return folder ? FOLDER : VIDEO; 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 29f00c36..a1d6310d 100644 --- a/app/src/main/java/com/github/catvod/utils/Utils.java +++ b/app/src/main/java/com/github/catvod/utils/Utils.java @@ -61,7 +61,7 @@ public class Utils { } public static boolean isSub(String ext) { - return ext.equals("srt") || ext.equals("ass") || ext.equals("ssa"); + return ext.equals("srt") || ext.equals("ass") || ext.equals("ssa") || ext.equals("vtt"); } public static String getExt(String name) { @@ -196,6 +196,8 @@ public class Utils { try { Matcher matcher = Pattern.compile(".*(1080|720|2160|4k|4K).*").matcher(text); if (matcher.find()) text = matcher.group(1) + " " + text; + matcher = Pattern.compile("^([0-9]+)").matcher(text); + if (matcher.find()) text = matcher.group(1) + " " + text; return text.replaceAll("\\D+", ""); } catch (Exception e) { return ""; diff --git a/build.gradle b/build.gradle index f647df4e..0fd13f1f 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,6 @@ plugins { id 'com.android.library' version '7.2.2' apply false } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 9b4207a8..60c0b8a9 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 a8d54c92..898a4231 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -0cd8dd32e89511058fd8e6bceb586a28 +bb25b79fe383dfe57c8d984824e700e2 diff --git a/json/adult.json b/json/adult.json index 858c97b6..832b9f61 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;0cd8dd32e89511058fd8e6bceb586a28", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bb25b79fe383dfe57c8d984824e700e2", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/alist.json b/json/alist.json index 62bee9ca..cf3b5fa0 100644 --- a/json/alist.json +++ b/json/alist.json @@ -1,5 +1,5 @@ { - "vodPic": "https://s1.ax1x.com/2023/05/04/p9tgI81.png", + "vodPic": "https://x.imgs.ovh/x/2023/09/05/64f680bb030b4.png", "drives": [ { "name": "小雅", diff --git a/json/config.json b/json/config.json index 8cee7a44..3b019c20 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;0cd8dd32e89511058fd8e6bceb586a28", + "spider": "https://fongmi.cachefly.net/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;bb25b79fe383dfe57c8d984824e700e2", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {