diff --git a/app/build.gradle b/app/build.gradle index 720c35c2..e0b60279 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.github.catvod.demo" - minSdk 16 + minSdk 17 targetSdk 28 ndk { abiFilters "armeabi-v7a" } buildConfigField("String", "CLIENT_ID", "\"${clientId}\"") diff --git a/app/src/main/java/com/github/catvod/ali/API.java b/app/src/main/java/com/github/catvod/ali/API.java index 0575b5ad..5319b9a9 100644 --- a/app/src/main/java/com/github/catvod/ali/API.java +++ b/app/src/main/java/com/github/catvod/ali/API.java @@ -118,9 +118,9 @@ public class API { private HashMap getHeaderAuth() { HashMap headers = getHeader(); - headers.put("authorization", user.getAuthorization()); headers.put("x-share-token", shareToken); headers.put("X-Canary", "client=Android,app=adrive,version=v4.3.1"); + if (user.isAuthed()) headers.put("authorization", user.getAuthorization()); return headers; } @@ -134,7 +134,7 @@ public class API { //https://api-cf.nn.ci/alist/ali_open/ //https://api.xhofe.top/alist/ali_open/ //https://sni_api_nn_ci.cooluc.com/alist/ali_open/ - String api = "https://api.xhofe.top/alist/ali_open/" + url; + String api = "https://aliapi.ewwe.gq/alist/ali_open/" + url; OkResult result = OkHttp.postJson(api, body.toString(), getHeader()); SpiderDebug.log(result.getCode() + "," + api + "," + result.getBody()); if (isManyRequest(result.getBody())) return false; @@ -535,9 +535,7 @@ public class API { FrameLayout frame = new FrameLayout(Init.context()); params.gravity = Gravity.CENTER; frame.addView(image, params); - dialog = new AlertDialog.Builder(Init.getActivity()).setView(frame).create(); - dialog.setOnDismissListener(this::dismiss); - dialog.show(); + dialog = new AlertDialog.Builder(Init.getActivity()).setView(frame).setOnDismissListener(this::dismiss).show(); dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); Init.show("請使用阿里雲盤 App 掃描二維碼"); } catch (Exception ignored) { diff --git a/app/src/main/java/com/github/catvod/bean/ali/User.java b/app/src/main/java/com/github/catvod/bean/ali/User.java index 596f4187..9b66f3f5 100644 --- a/app/src/main/java/com/github/catvod/bean/ali/User.java +++ b/app/src/main/java/com/github/catvod/bean/ali/User.java @@ -53,6 +53,10 @@ public class User { return getTokenType() + " " + getAccessToken(); } + public boolean isAuthed() { + return getTokenType().length() > 0 && getAccessToken().length() > 0; + } + public User clean() { this.refreshToken = ""; this.accessToken = ""; diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 80fd9f8a..dd5c88f3 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 d189b0e9..93bbfd46 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -16f80f13f3bd4b6fedfb3af5f5b3d3d0 +493c8d428897bd6133ffd22eb1cb0495 diff --git a/json/adult.json b/json/adult.json index 9d3cf0f7..23ff3e72 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;16f80f13f3bd4b6fedfb3af5f5b3d3d0", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;493c8d428897bd6133ffd22eb1cb0495", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index c6e4352e..9d93f747 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;16f80f13f3bd4b6fedfb3af5f5b3d3d0", + "spider": "https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;493c8d428897bd6133ffd22eb1cb0495", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {