diff --git a/app/src/main/java/com/github/catvod/debug/MainActivity.java b/app/src/main/java/com/github/catvod/debug/MainActivity.java index ac48f5a6..0301cefe 100644 --- a/app/src/main/java/com/github/catvod/debug/MainActivity.java +++ b/app/src/main/java/com/github/catvod/debug/MainActivity.java @@ -7,6 +7,7 @@ import android.widget.Button; import com.github.catvod.R; import com.github.catvod.crawler.Spider; import com.github.catvod.spider.Init; +import com.github.catvod.spider.NG; import com.github.catvod.spider.PTT; import com.github.catvod.spider.Zxzj; import com.orhanobut.logger.AndroidLogAdapter; @@ -47,7 +48,7 @@ public class MainActivity extends Activity { private void initSpider() { try { Init.init(getApplicationContext()); - spider = new Zxzj(); + spider = new NG(); spider.init(this, ""); } catch (Throwable e) { e.printStackTrace(); @@ -75,7 +76,7 @@ public class MainActivity extends Activity { HashMap extend = new HashMap<>(); extend.put("c", "19"); extend.put("year", "2024"); - Logger.t("categoryContent").d(spider.categoryContent("/list/1.html", "2", true, extend)); + Logger.t("categoryContent").d(spider.categoryContent("1", "2", true, extend)); } catch (Throwable e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/github/catvod/spider/NG.java b/app/src/main/java/com/github/catvod/spider/NG.java index d0b8f845..81b44cb9 100644 --- a/app/src/main/java/com/github/catvod/spider/NG.java +++ b/app/src/main/java/com/github/catvod/spider/NG.java @@ -73,7 +73,25 @@ public class NG extends Spider { classList.add(clazz); } } - return Result.string(classList, filters); + Map params = new HashMap<>(getParams()); + /* for (String s : extend.keySet()) { + params.put(s, URLEncoder.encode(extend.get(s), "UTF-8")); + }*/ + params.put("page", "1"); + params.put("id", classList.get(0).getTypeId()); + String string = OkHttp.string(COMMON_URL + FIND_VIDEO_VOD_LIST, params, getHeaders()); + Type type = new TypeToken>() { + }.getType(); + Rst resp = Json.parseSafe(string, type); + List vodList = new ArrayList<>(); + if (resp != null && resp.isSuccess()) { + for (It it : resp.getList()) { + vodList.add(it.toVod()); + } + } else { + SpiderDebug.log("ng cate error: " + string); + } + return Result.string(classList, vodList, filters); } @Override diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 0af7b761..cba21d6c 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 75751332..e898f639 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -f75b8430b95b293a3c4bc8a624438d93 +2fd4e67c5d0b4025572442b8a5df401f diff --git a/json/index.json b/json/index.json index 6c9f006d..50909bac 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;f75b8430b95b293a3c4bc8a624438d93", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;2fd4e67c5d0b4025572442b8a5df401f", "lives": [ { "name": "直播ipv6", diff --git a/json/index1.json b/json/index1.json index 8bb9e62b..9c8d2c90 100644 --- a/json/index1.json +++ b/json/index1.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;f75b8430b95b293a3c4bc8a624438d93", + "spider": "https://androidcatvodspider.pages.dev/jar/custom_spider.jar;md5;2fd4e67c5d0b4025572442b8a5df401f", "lives": [ { "name": "直播ipv6",