diff --git a/app/src/main/java/com/github/catvod/spider/Ys23.java b/app/src/main/java/com/github/catvod/spider/Ys23.java index 7512f50f..5b27c1d1 100644 --- a/app/src/main/java/com/github/catvod/spider/Ys23.java +++ b/app/src/main/java/com/github/catvod/spider/Ys23.java @@ -1,6 +1,7 @@ package com.github.catvod.spider; import android.content.Context; + import com.github.catvod.crawler.Spider; import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Util; @@ -21,18 +22,18 @@ import java.util.regex.Pattern; public class Ys23 extends Spider { - private String siteURL = "http://tv.ersanyun.cn"; + private String siteUrl = "http://tv.ersanyun.cn"; private Map getHeader() { Map header = new HashMap<>(); header.put("User-Agent", Util.CHROME); - header.put("Referer", siteURL + "/"); + header.put("Referer", siteUrl + "/"); return header; } @Override public void init(Context context, String extend) throws Exception { - if (!extend.isEmpty()) siteURL = extend; + if (!extend.isEmpty()) siteUrl = extend; } @Override @@ -40,39 +41,33 @@ public class Ys23 extends Spider { List classes = new ArrayList<>(); List typeIds = Arrays.asList("1", "2", "3", "4", "48", "49"); List typeNames = Arrays.asList("电影", "电视剧", "综艺", "动漫", "热门短剧", "体育赛事"); - for (int i = 0; i < typeIds.size(); i++) { - classes.add(new Class(typeIds.get(i), typeNames.get(i))); - } - String f = "{\"1\": [{\"key\": \"class\", \"name\": \"剧情\", \"value\": [{\"n\": \"全部\", \"v\": \"\"}, {\"n\": \"动作片\", \"v\": \"cate_id=9&\"}, {\"n\": \"喜剧片\", \"v\": \"cate_id=10&\"}, {\"n\": \"爱情片\", \"v\": \"cate_id=11&\"}, {\"n\": \"恐怖片\", \"v\": \"cate_id=12&\"}, {\"n\": \"剧情片\", \"v\": \"cate_id=13&\"}, {\"n\": \"科幻片\", \"v\": \"cate_id=14&\"}, {\"n\": \"动画片\", \"v\": \"cate_id=17&\"}]}], \"2\": [{\"key\": \"class\", \"name\": \"剧情\", \"value\": [{\"n\": \"全部\", \"v\": \"\"}, {\"n\": \"国产剧\", \"v\": \"cate_id=22&\"}, {\"n\": \"香港剧\", \"v\": \"cate_id=23&\"}, {\"n\": \"台湾剧\", \"v\": \"cate_id=24&\"}, {\"n\": \"欧美剧\", \"v\": \"cate_id=25&\"}, {\"n\": \"日本剧\", \"v\": \"cate_id=26&\"}, {\"n\": \"韩国剧\", \"v\": \"cate_id=27&\"}, {\"n\": \"海外剧\", \"v\": \"cate_id=29&\"}]}]}"; JSONObject filterConfig = new JSONObject(f); - Document doc = Jsoup.parse(OkHttp.string(siteURL, getHeader())); + for (int i = 0; i < typeIds.size(); i++) classes.add(new Class(typeIds.get(i), typeNames.get(i))); + String f = "{\"1\": [{\"key\": \"class\", \"name\": \"剧情\", \"value\": [{\"n\": \"全部\", \"v\": \"\"}, {\"n\": \"动作片\", \"v\": \"cate_id=9&\"}, {\"n\": \"喜剧片\", \"v\": \"cate_id=10&\"}, {\"n\": \"爱情片\", \"v\": \"cate_id=11&\"}, {\"n\": \"恐怖片\", \"v\": \"cate_id=12&\"}, {\"n\": \"剧情片\", \"v\": \"cate_id=13&\"}, {\"n\": \"科幻片\", \"v\": \"cate_id=14&\"}, {\"n\": \"动画片\", \"v\": \"cate_id=17&\"}]}], \"2\": [{\"key\": \"class\", \"name\": \"剧情\", \"value\": [{\"n\": \"全部\", \"v\": \"\"}, {\"n\": \"国产剧\", \"v\": \"cate_id=22&\"}, {\"n\": \"香港剧\", \"v\": \"cate_id=23&\"}, {\"n\": \"台湾剧\", \"v\": \"cate_id=24&\"}, {\"n\": \"欧美剧\", \"v\": \"cate_id=25&\"}, {\"n\": \"日本剧\", \"v\": \"cate_id=26&\"}, {\"n\": \"韩国剧\", \"v\": \"cate_id=27&\"}, {\"n\": \"海外剧\", \"v\": \"cate_id=29&\"}]}]}"; + JSONObject filterConfig = new JSONObject(f); + Document doc = Jsoup.parse(OkHttp.string(siteUrl, getHeader())); ArrayList list = new ArrayList(); for (Element li : doc.select(".video-card-wrap")) { - String vid = siteURL + li.select("a").attr("href"); + String vid = siteUrl + li.select("a").attr("href"); String name = li.select("a").attr("title"); String pic = li.select("a img").attr("data-src"); - if (!pic.startsWith("http")) - pic = siteURL + pic; + if (!pic.startsWith("http")) pic = siteUrl + pic; list.add(new Vod(vid, name, pic)); } return Result.string(classes, list, filterConfig); } - @Override public String categoryContent(String tid, String pg, boolean filter, HashMap extend) throws Exception { String classType = extend.get("class") == null ? "" : extend.get("class"); String cateId = extend.get("cateId") == null ? tid : extend.get("cateId"); - String cateURL = siteURL - + String.format("/vod/index.html?%spage=%s&type_id=%s", classType, pg, cateId); - System.out.println(cateURL); - Document doc = Jsoup.parse(OkHttp.string(cateURL, getHeader())); + String cateUrl = String.format(siteUrl + "/vod/index.html?%spage=%s&type_id=%s", classType, pg, cateId); + Document doc = Jsoup.parse(OkHttp.string(cateUrl, getHeader())); List list = new ArrayList<>(); for (Element li : doc.select(".card.vertical")) { - String vid = siteURL + li.attr("href"); + String vid = siteUrl + li.attr("href"); String name = li.attr("title"); String pic = li.select("img").attr("data-src"); - if (!pic.startsWith("http")) - pic = siteURL + pic; + if (!pic.startsWith("http")) pic = siteUrl + pic; list.add(new Vod(vid, name, pic)); } return Result.string(list); @@ -91,7 +86,7 @@ public class Ys23 extends Spider { Elements aElementArray = sources.get(i).select(".playlist-rect__col a"); for (int j = 0; j < aElementArray.size(); j++) { Element a = aElementArray.get(j); - String href = siteURL + a.attr("href"); + String href = siteUrl + a.attr("href"); String text = a.text(); vod_play_url.append(text).append("$").append(href); boolean notLastEpisode = j < aElementArray.size() - 1; @@ -111,15 +106,14 @@ public class Ys23 extends Spider { @Override public String searchContent(String key, boolean quick) throws Exception { - String searchURL = siteURL + "/search/index.html?keyword=" + URLEncoder.encode(key);; - Document doc = Jsoup.parse(OkHttp.string(searchURL, getHeader())); + String searchUrl = siteUrl + "/search/index.html?keyword=" + URLEncoder.encode(key); + Document doc = Jsoup.parse(OkHttp.string(searchUrl, getHeader())); List list = new ArrayList<>(); for (Element li : doc.select(".list_item")) { - String vid = siteURL + li.select("strong a").attr("href"); + String vid = siteUrl + li.select("strong a").attr("href"); String name = li.select("strong a").attr("title"); String pic = li.select(".figure_pic.lazy1").attr("src"); - if (!pic.startsWith("http")) - pic = siteURL + pic; + if (!pic.startsWith("http")) pic = siteUrl + pic; String remark = li.select(".figure_info").text(); list.add(new Vod(vid, name, pic, remark)); }