Merge branch 'main' of https://github.com/FongMi/CatVodSpider

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

@@ -3,15 +3,18 @@ package com.github.catvod.spider;
 import android.content.Context;
 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;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import com.github.catvod.net.OkHttp;
-import com.github.catvod.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,10 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.github.catvod.bean.Result;
-import com.github.catvod.bean.Vod;
-import com.github.catvod.bean.Class;
-
 /**
  * @author Qile
  */
@@ -57,13 +56,8 @@ public class Kanqiu extends Spider {
     }
 
     @Override
-    public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend)
+    public String categoryContent(String tid, String pg, boolean filter, HashMap<String, String> extend) throws Exception {
-            throws Exception {
+        String cateId = extend.get("cateId") == null ? tid : extend.get("cateId");
-        HashMap<String, String> ext = new HashMap<>();
-        if (extend != null && extend.size() > 0) {
-            ext.putAll(extend);
-        }
-        String cateId = ext.get("cateId") == null ? tid : ext.get("cateId");
         String cateUrl;
         if (cateId == null || cateId.isEmpty()) {
             cateUrl = siteUrl + String.format("%s", tid);
@@ -90,9 +84,8 @@ public class Kanqiu extends Spider {
 
     @Override
     public String detailContent(List<String> ids) throws Exception {
-        Document doc = Jsoup.parse(OkHttp.string(ids.get(0), getHeader()));
+        Document doc = Jsoup.parse(OkHttp.string(ids.get(0) + "-url", getHeader()));
-        Document doc1 = Jsoup.parse(OkHttp.string(ids.get(0) + "-url", getHeader()));
+        JSONArray jsonArray = new JSONArray(doc.text());
-        JSONArray jsonArray = new JSONArray(doc1.text());
         List<String> vodItems = new ArrayList<>();
         for (int i = 0; i < jsonArray.length(); i++) {
             JSONObject dataObject = jsonArray.getJSONObject(i);
@@ -100,15 +93,10 @@ public class Kanqiu extends Spider {
             String href = dataObject.optString("url");
             vodItems.add(text + "$" + href);
         }
-
         String vod_play_from = "Qile";
         String vod_play_url = TextUtils.join("#", vodItems);
-        String title = doc.select(".game-info-container").text();
-        String pic = doc.select(".col-md-4.text-center img").attr("src");
         Vod vod = new Vod();
         vod.setVodId(ids.get(0));
-        vod.setVodPic(pic);
-        vod.setVodName(title);
         vod.setVodPlayFrom(vod_play_from.toString());
         vod.setVodPlayUrl(vod_play_url.toString());
         return Result.string(vod);
@@ -118,5 +106,4 @@ public class Kanqiu extends Spider {
     public String playerContent(String flag, String id, List<String> vipFlags) throws Exception {
         return Result.get().url(id).parse().header(getHeader()).string();
     }
-
 }

jar/custom_spider.jar.md5

@@ -1 +1 @@
-2ea1762a8c802608c2222c7051709afc
+18d6103e01c3865caeb7a23e627adb3c

json/adult.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;2ea1762a8c802608c2222c7051709afc",
+  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;18d6103e01c3865caeb7a23e627adb3c",
   "wallpaper": "https://gao.chuqiuyu.tk",
   "sites": [
     {

json/config.json

@@ -1,5 +1,5 @@
 {
-  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;2ea1762a8c802608c2222c7051709afc",
+  "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/FongMi/CatVodSpider/main/jar/custom_spider.jar;md5;18d6103e01c3865caeb7a23e627adb3c",
   "wallpaper": "http://饭太硬.top/深色壁纸/api.php",
   "sites": [
     {
@@ -116,8 +116,8 @@
       "changeable": 0
     },
     {
-      "key": "88kanqiu",
+      "key": "看球",
-      "name": "88看球",
+      "name": "看球",
       "type": 3,
       "api": "csp_Kanqiu",
       "searchable": 1,