diff --git a/app/src/main/java/com/github/catvod/spider/Kanqiu.java b/app/src/main/java/com/github/catvod/spider/Kanqiu.java index ff3e82cf..a41dcfa7 100644 --- a/app/src/main/java/com/github/catvod/spider/Kanqiu.java +++ b/app/src/main/java/com/github/catvod/spider/Kanqiu.java @@ -84,13 +84,17 @@ public class Kanqiu extends Spider { @Override public String detailContent(List ids) throws Exception { - Document doc = Jsoup.parse(OkHttp.string(ids.get(0) + "-url", getHeader())); - JSONArray jsonArray = new JSONArray(doc.text()); + if (ids.get(0).equals(siteUrl)) { + Notify.show("比赛尚未开始"); + return Result.string(new Vod()); + } + String content = OkHttp.string(ids.get(0) + "-url", getHeader()); + JSONArray linksArray = new JSONObject(content).getJSONArray("links"); List vodItems = new ArrayList<>(); - for (int i = 0; i < jsonArray.length(); i++) { - JSONObject dataObject = jsonArray.getJSONObject(i); - String text = dataObject.optString("name"); - String href = dataObject.optString("url"); + for (int i = 0; i < linksArray.length(); i++) { + JSONObject linkObject = linksArray.getJSONObject(i); + String text = linkObject.optString("name"); + String href = linkObject.optString("url"); vodItems.add(text + "$" + href); } String vod_play_from = "Qile"; diff --git a/app/src/main/java/com/github/catvod/spider/Zhaozy.java b/app/src/main/java/com/github/catvod/spider/Zhaozy.java index 46c1d350..6a78b553 100644 --- a/app/src/main/java/com/github/catvod/spider/Zhaozy.java +++ b/app/src/main/java/com/github/catvod/spider/Zhaozy.java @@ -24,7 +24,7 @@ public class Zhaozy extends Ali { private final Pattern regexAli = Pattern.compile("(https://www.aliyundrive.com/s/[^\"]+)"); private final Pattern regexVid = Pattern.compile("(\\S+)"); - private final String siteUrl = "https://zhaoziyuan.me/"; + private final String siteUrl = "https://zhaoziyuan.pw/"; private String username; private String password;