diff --git a/app/src/main/java/com/github/catvod/api/QuarkApi.java b/app/src/main/java/com/github/catvod/api/QuarkApi.java index 7e7f5827..c3107ce3 100644 --- a/app/src/main/java/com/github/catvod/api/QuarkApi.java +++ b/app/src/main/java/com/github/catvod/api/QuarkApi.java @@ -262,14 +262,16 @@ public class QuarkApi { if (StringUtils.isAllBlank(cookie)) { cookie = cache.getUser().getCookie(); } + if (StringUtils.isNoneBlank(cookie)) { + initQuark(this.cookie); + cache.setUser(User.objectFrom(this.cookie)); + return; + } if (StringUtils.isAllBlank(cookie) && StringUtils.isAllBlank(serviceTicket)) { SpiderDebug.log("cookie为空"); throw new RuntimeException("cookie为空"); } - if (StringUtils.isNoneBlank(cookie)) { - initQuark(this.cookie); - return; - } + String token = serviceTicket; OkResult result = OkHttp.get("https://pan.quark.cn/account/info?st=" + token + "&lw=scan", new HashMap<>(), getWebHeaders()); Map json = Json.parseSafe(result.getBody(), Map.class); @@ -292,7 +294,7 @@ public class QuarkApi { stopService(); startFlow(); } finally { - // while (cache.getUser().getCookie().isEmpty()) SystemClock.sleep(250); + while (cache.getUser().getCookie().isEmpty()) SystemClock.sleep(250); } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 45fb5acf..53fa9561 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 762872cc..eb057782 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -672f859b8caf636064f3aad14b481021 +75f65a3e65e2e5d418c5852bbdc2e285 diff --git a/json/index.json b/json/index.json index b3ca75aa..1a543a9f 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;672f859b8caf636064f3aad14b481021", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;75f65a3e65e2e5d418c5852bbdc2e285", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index 273b3bd1..6df8678c 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;672f859b8caf636064f3aad14b481021", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;75f65a3e65e2e5d418c5852bbdc2e285", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index 046c0288..232f4f95 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;672f859b8caf636064f3aad14b481021", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;75f65a3e65e2e5d418c5852bbdc2e285", "lives": [ { "name": "直播ipv6",