Merge pull request #61 from qlql765/main

修复看球、找资源

app/src/main/java/com/github/catvod/spider/Kanqiu.java

@@ -84,13 +84,17 @@ public class Kanqiu extends Spider {
 
     @Override
     public String detailContent(List<String> 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<String> 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";

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;