diff --git a/app/src/main/java/com/github/catvod/spider/Kugou.java b/app/src/main/java/com/github/catvod/spider/Kugou.java index 27acf65..2c1f5a1 100644 --- a/app/src/main/java/com/github/catvod/spider/Kugou.java +++ b/app/src/main/java/com/github/catvod/spider/Kugou.java @@ -1,7 +1,13 @@ package com.github.catvod.spider; import android.text.TextUtils; + +import com.github.catvod.bean.Class; +import com.github.catvod.bean.Result; +import com.github.catvod.bean.Vod; import com.github.catvod.crawler.Spider; +import com.github.catvod.net.OkHttp; +import com.github.catvod.utils.Utils; import org.json.JSONArray; import org.json.JSONObject; @@ -9,20 +15,12 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import com.github.catvod.net.OkHttp; -import com.github.catvod.utils.Utils; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import com.github.catvod.bean.Result; -import com.github.catvod.bean.Vod; -import com.github.catvod.bean.Class; /** * @author Qile @@ -41,14 +39,12 @@ public class Kugou extends Spider { List list = new ArrayList<>(); List typeIds = Arrays.asList("6666|0", "33162|1", "4681|2"); List typeNames = Arrays.asList("热门榜单", "特色音乐榜", "全球榜"); - for (int i = 0; i < typeIds.size(); i++) - classes.add(new Class(typeIds.get(i), typeNames.get(i))); + for (int i = 0; i < typeIds.size(); i++) classes.add(new Class(typeIds.get(i), typeNames.get(i))); return Result.string(classes, list); } @Override - public String categoryContent(String tid, String pg, boolean filter, HashMap extend) - throws Exception { + public String categoryContent(String tid, String pg, boolean filter, HashMap extend) throws Exception { HashMap ext = new HashMap<>(); if (extend != null && extend.size() > 0) ext.putAll(extend); String[] item = tid.split("\\|"); @@ -63,15 +59,10 @@ public class Kugou extends Spider { for (Element li : lis) { String vid = li.attr("href"); String name = li.attr("title"); - JSONObject vod = new JSONObject() - .put("vod_id", vid) - .put("vod_name", name); + JSONObject vod = new JSONObject().put("vod_id", vid).put("vod_name", name); videos.put(vod); } - JSONObject result = new JSONObject() - .put("total", lis.size()) - .put("pagecount", 1) - .put("list", videos); + JSONObject result = new JSONObject().put("total", lis.size()).put("pagecount", 1).put("list", videos); return result.toString(); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index d131275..8a73c3a 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 6a3b026..2455be1 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -aa238f375f2bb1161db6d60835f44692 +d0ae5fa6fb705a6c020f930a73f44714