diff --git a/app/src/main/java/com/github/catvod/api/BaiDuYunHandler.kt b/app/src/main/java/com/github/catvod/api/BaiDuYunHandler.kt index 75bbd6fe..a64fdfa5 100644 --- a/app/src/main/java/com/github/catvod/api/BaiDuYunHandler.kt +++ b/app/src/main/java/com/github/catvod/api/BaiDuYunHandler.kt @@ -164,10 +164,16 @@ class BaiDuYunHandler private constructor() { SpiderDebug.log("百度登录成功,设置cookie:${bduss}") cookies = "BDUSS=$bduss" cookies = generateCooike(loginResponse.resp["set-cookie"]) - cache.setUser(User.objectFrom(this.cookies)) - //停止检验线程,关闭弹窗 - stopService() + if (cookies.isNotEmpty()) { + cache.setUser(User.objectFrom(this.cookies)) + //停止检验线程,关闭弹窗 + stopService() + Notify.show("百度登录成功") + + } + + mapOf("success" to true, "bduss" to bduss) } else { mapOf("error" to "登录失败: $cleanLoginResponse") diff --git a/app/src/main/java/com/github/catvod/api/BaiduDrive.kt b/app/src/main/java/com/github/catvod/api/BaiduDrive.kt index caf63595..66b00129 100644 --- a/app/src/main/java/com/github/catvod/api/BaiduDrive.kt +++ b/app/src/main/java/com/github/catvod/api/BaiduDrive.kt @@ -10,6 +10,7 @@ import com.github.catvod.utils.Util import com.github.catvod.utils.Util.MEDIA import com.google.gson.JsonObject import java.util.* +import java.util.concurrent.atomic.AtomicInteger object BaiduDrive { private val cache = mutableMapOf(); @@ -38,10 +39,14 @@ object BaiduDrive { } fun processShareLinks(urls: List): Pair, List> { + val retry = AtomicInteger(3) //首先确保cookie不为空 - if (cookies.isEmpty()) { + if (cookies.isEmpty() && retry.get() > 0) { BaiDuYunHandler.get().startScan() cookies = BaiDuYunHandler.get().token + Thread.sleep(10000) + retry.decrementAndGet() + processShareLinks(urls) } if (urls.isEmpty()) return emptyList() to emptyList() diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 1e781494..ea80c592 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 484115d6..48b8e3ed 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -61a0fb4612a2a5b5a0586e89e9f1c0d0 +11bbc41a3dab2b417fb77d70c031dabf diff --git a/json/index.json b/json/index.json index 150a49e0..93c69a59 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;61a0fb4612a2a5b5a0586e89e9f1c0d0", + "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;11bbc41a3dab2b417fb77d70c031dabf", "lives": [ { "name": "电视直播",