diff --git a/app/src/main/java/com/github/catvod/spider/Jianpian.java b/app/src/main/java/com/github/catvod/spider/Jianpian.java index c09ff3c..460ee35 100644 --- a/app/src/main/java/com/github/catvod/spider/Jianpian.java +++ b/app/src/main/java/com/github/catvod/spider/Jianpian.java @@ -12,6 +12,8 @@ import com.github.catvod.bean.jianpian.Search; import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -19,6 +21,7 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -50,7 +53,7 @@ public class Jianpian extends Spider { String json = OkHttp.string(siteUrl + "/api/v2/settings/resourceDomainConfig"); if (!json.isEmpty()) { JsonObject root = new Gson().fromJson(json, JsonObject.class); - imgDomain = root.getAsJsonObject("data").get("imgDomain").getAsString(); + imgDomain = root.getAsJsonObject("data").get("imgDomain").getAsString().split(",")[0]; break; } } @@ -59,9 +62,9 @@ public class Jianpian extends Spider { @Override public String homeContent(boolean filter) { List classes = new ArrayList<>(); - List typeIds = Arrays.asList("1", "2", "3", "4", "50", "99"); - List typeNames = Arrays.asList("電影", "電視劇", "動漫", "綜藝", "紀錄片", "Netflix"); - for (int i = 0; i < typeIds.size(); i++) classes.add(new Class(typeIds.get(i), typeNames.get(i))); + JsonObject homeCategory = new Gson().fromJson(OkHttp.string(siteUrl + "/api/v2/settings/homeCategory"), JsonObject.class); + JsonArray dataArray = homeCategory.getAsJsonArray("data"); + for (JsonElement element : dataArray) classes.add(new Class(element.getAsJsonObject().get("id").getAsString(), element.getAsJsonObject().get("name").getAsString())); return Result.string(classes, JsonParser.parseString(OkHttp.string(extend))); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 7e5a85a..2b3c280 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 0fc4a55..b4f9c92 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -e14c0d52e603bd33540fb576ba5dd5b9 +3af519c4c97caf55ef54ba342dcaac98 diff --git a/json/jianpian.json b/json/jianpian.json index b2c5201..84fb96c 100644 --- a/json/jianpian.json +++ b/json/jianpian.json @@ -43,6 +43,10 @@ "n": "全部", "v": "0" }, + { + "n": "2026", + "v": "162" + }, { "n": "2025", "v": "107" @@ -149,6 +153,10 @@ "n": "全部", "v": "0" }, + { + "n": "2026", + "v": "162" + }, { "n": "2025", "v": "107" @@ -255,6 +263,10 @@ "n": "全部", "v": "0" }, + { + "n": "2026", + "v": "162" + }, { "n": "2025", "v": "107" @@ -361,6 +373,10 @@ "n": "全部", "v": "0" }, + { + "n": "2026", + "v": "162" + }, { "n": "2025", "v": "107"