diff --git a/app/src/main/java/com/github/catvod/spider/PanTa.java b/app/src/main/java/com/github/catvod/spider/PanTa.java index 76b47742..f77dcad6 100644 --- a/app/src/main/java/com/github/catvod/spider/PanTa.java +++ b/app/src/main/java/com/github/catvod/spider/PanTa.java @@ -16,6 +16,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -58,8 +59,8 @@ public class PanTa extends Cloud { List list = new ArrayList<>(); Elements elements = doc.select(".topicList > .topicItem"); for (Element e : elements) { - String pic = e.selectFirst("a.avatarLink img").attr("src"); - pic = StringUtils.isAllBlank(pic) ? e.selectFirst(".tm-m-photos-thumb li").attr("data-src") : pic; + String pic = Objects.isNull(e.selectFirst(".tm-m-photos-thumb li")) ? "" : e.selectFirst(".tm-m-photos-thumb li").attr("data-src"); + pic = StringUtils.isAllBlank(pic) ? e.selectFirst("a.avatarLink img").attr("src") : pic; Element content = e.selectFirst(".content > h2 > a"); String vodId = content.attr("href"); String vodPic = HOST + pic; diff --git a/app/src/test/java/PanTaTest.java b/app/src/test/java/PanTaTest.java index 34bf22bf..4d4d4459 100644 --- a/app/src/test/java/PanTaTest.java +++ b/app/src/test/java/PanTaTest.java @@ -56,7 +56,7 @@ public class PanTaTest { @org.junit.Test public void categoryContent() throws Exception { - String content = spider.categoryContent("?tagId=39765285016165", "2", true, null); + String content = spider.categoryContent("?tagId=39955372461067", "2", true, null); JsonObject map = Json.safeObject(content); Gson gson = new GsonBuilder().setPrettyPrinting().create(); System.out.println("categoryContent--" + gson.toJson(map)); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 3c56334c..c6698c42 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 e2cdca2d..a5b828ae 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -5d9042b0b2af294ab9659fdd9c04faad +36608b16ea95ec345af695415b76803c diff --git a/json/index.json b/json/index.json index 8db0420c..7c5e1048 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;5d9042b0b2af294ab9659fdd9c04faad", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;36608b16ea95ec345af695415b76803c", "lives": [ { "name": "电视直播", diff --git a/json/index1.json b/json/index1.json index eecafd56..1d2e99d3 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;5d9042b0b2af294ab9659fdd9c04faad", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;36608b16ea95ec345af695415b76803c", "lives": [ { "name": "直播ipv6", diff --git a/json/index2.json b/json/index2.json index f518f852..83b2ac6c 100644 --- a/json/index2.json +++ b/json/index2.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;5d9042b0b2af294ab9659fdd9c04faad", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;36608b16ea95ec345af695415b76803c", "lives": [ { "name": "直播ipv6", diff --git a/json/test.json b/json/test.json index 59b83276..2ebf99bc 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;5d9042b0b2af294ab9659fdd9c04faad", + "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;36608b16ea95ec345af695415b76803c", "lives": [ { "name": "直播",