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 2fcf6905..ad399e91 100644 --- a/app/src/main/java/com/github/catvod/api/QuarkApi.java +++ b/app/src/main/java/com/github/catvod/api/QuarkApi.java @@ -168,6 +168,7 @@ public class QuarkApi { } catch (Exception e) { SpiderDebug.log("资源已取消:" + e.getMessage()); Notify.show("资源已取消"); + throw new RuntimeException(e); } List playFrom = QuarkApi.get().getPlayFormatList(); diff --git a/app/src/main/java/com/github/catvod/spider/Quark.java b/app/src/main/java/com/github/catvod/spider/Quark.java index 89c61b07..d583ddc4 100644 --- a/app/src/main/java/com/github/catvod/spider/Quark.java +++ b/app/src/main/java/com/github/catvod/spider/Quark.java @@ -2,10 +2,13 @@ package com.github.catvod.spider; import android.content.Context; import android.text.TextUtils; + import com.github.catvod.api.QuarkApi; import com.github.catvod.bean.Result; import com.github.catvod.bean.quark.ShareData; import com.github.catvod.crawler.Spider; +import com.github.catvod.crawler.SpiderDebug; +import com.github.catvod.utils.Notify; import java.util.ArrayList; import java.util.List; @@ -54,10 +57,10 @@ public class Quark extends Spider { for (int i = 1; i <= ids.size(); i++) { for (String s : QuarkApi.get().getPlayFormatList()) { - playFrom.add(String.format(Locale.getDefault(), "quark" + s + "#%02d%02d", i,index)); + playFrom.add(String.format(Locale.getDefault(), "quark" + s + "#%02d%02d", i, index)); } - playFrom.add("quark原画" + i+index); + playFrom.add("quark原画" + i + index); } return TextUtils.join("$$$", playFrom); } @@ -72,7 +75,11 @@ public class Quark extends Spider { List playUrl = new ArrayList<>(); for (String id : ids) { ShareData shareData = QuarkApi.get().getShareData(id); - playUrl.add(QuarkApi.get().getVod(shareData).getVodPlayUrl()); + try { + playUrl.add(QuarkApi.get().getVod(shareData).getVodPlayUrl()); + } catch (Exception e) { + SpiderDebug.log("获取播放地址出错:" + e.getMessage()); + } } return TextUtils.join("$$$", playUrl); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index d4544bee..54e5051a 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 0fbbe424..13660e7e 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -6777330057a51172b51f6a400482b047 +f9c6ffc30c6a09b30ee403675a8851af diff --git a/json/index.json b/json/index.json index f9bbccb6..c6a59bf5 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;6777330057a51172b51f6a400482b047", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", "lives": [ { "name": "直播", diff --git a/json/index1.json b/json/index1.json index 906ca221..a3567327 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;6777330057a51172b51f6a400482b047", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index ce46eb70..4db5269f 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;6777330057a51172b51f6a400482b047", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index d68f4eaa..29ebea66 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;6777330057a51172b51f6a400482b047", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;f9c6ffc30c6a09b30ee403675a8851af", "lives": [ { "name": "直播",