diff --git a/app/src/main/java/com/github/catvod/spider/Dovx.java b/app/src/main/java/com/github/catvod/spider/Dovx.java deleted file mode 100644 index b64d3d83..00000000 --- a/app/src/main/java/com/github/catvod/spider/Dovx.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.catvod.spider; - -import com.github.catvod.bean.Result; -import com.github.catvod.bean.Vod; -import com.github.catvod.net.OkHttp; - -import java.net.URLEncoder; - -public class Dovx extends Ali { - - @Override - public String searchContent(String key, boolean quick) { - Result result = Result.objectFrom(OkHttp.string("https://api.dovx.tk/ali/search?wd=" + URLEncoder.encode(key))); - for (Vod vod : result.getList()) vod.setVodId(vod.getVodContent()); - return result.string(); - } -} diff --git a/app/src/main/java/com/github/catvod/spider/Duanju.java b/app/src/main/java/com/github/catvod/spider/Duanju.java index ffdafb5e..6127c63a 100644 --- a/app/src/main/java/com/github/catvod/spider/Duanju.java +++ b/app/src/main/java/com/github/catvod/spider/Duanju.java @@ -1,7 +1,6 @@ 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; diff --git a/app/src/main/java/com/github/catvod/spider/Eighteen.java b/app/src/main/java/com/github/catvod/spider/Eighteen.java index 0662bfc9..2b469c57 100644 --- a/app/src/main/java/com/github/catvod/spider/Eighteen.java +++ b/app/src/main/java/com/github/catvod/spider/Eighteen.java @@ -1,15 +1,10 @@ package com.github.catvod.spider; -import android.os.SystemClock; -import android.webkit.WebView; -import android.webkit.WebViewClient; - 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.Util; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -88,10 +83,7 @@ public class Eighteen extends Spider { @Override public String playerContent(String flag, String id, List vipFlags) throws Exception { - HashMap result = new HashMap<>(); - Util.loadWebView(url + id, getClient(result)); - while (result.isEmpty()) SystemClock.sleep(10); - return Result.get().url(result.get("url")).string(); + return Result.get().parse().url(url + id).string(); } private String searchContent(String key, String pg) { @@ -110,16 +102,4 @@ public class Eighteen extends Spider { } return Result.string(list); } - - private WebViewClient getClient(HashMap result) { - return new WebViewClient() { - @Override - public void onLoadResource(WebView view, String url) { - if (url.endsWith(".m3u8")) { - result.put("url", url); - view.destroy(); - } - } - }; - } } diff --git a/app/src/main/java/com/github/catvod/spider/Ying.java b/app/src/main/java/com/github/catvod/spider/Ying.java index 0c692e2d..3055bbfb 100644 --- a/app/src/main/java/com/github/catvod/spider/Ying.java +++ b/app/src/main/java/com/github/catvod/spider/Ying.java @@ -24,7 +24,7 @@ import java.util.Map; public class Ying extends Spider { - private static final String siteUrl = "https://www.yhdmz.org"; + private static final String siteUrl = "https://www.iyhdmm.com"; private static final String listUrl = siteUrl + "/list/"; private static final String showUrl = siteUrl + "/showp/"; private static final String filterUrl = siteUrl + "/tpsf/js/catalog.js"; diff --git a/app/src/main/java/com/github/catvod/spider/Ysj.java b/app/src/main/java/com/github/catvod/spider/Ysj.java index 55e49694..98b51994 100644 --- a/app/src/main/java/com/github/catvod/spider/Ysj.java +++ b/app/src/main/java/com/github/catvod/spider/Ysj.java @@ -23,11 +23,11 @@ import java.util.Map; public class Ysj extends Spider { - private static final String siteUrl = "https://ysjdm.net"; - private static final String cateUrl = "https://ysjdm.net/index.php/vod/show"; - private static final String homeUrl = "https://ysjdm.net/index.php/vod/show/id/20.html"; - private static final String detailUrl = "https://ysjdm.net/index.php/vod/detail/id/"; - private static final String searchUrl = "https://ysjdm.net/index.php/vod/search.html"; + private static final String siteUrl = "https://www.lldm.net"; + private static final String cateUrl = "https://www.lldm.net/index.php/vod/show"; + private static final String homeUrl = "https://www.lldm.net/index.php/vod/show/id/20.html"; + private static final String detailUrl = "https://www.lldm.net/index.php/vod/detail/id/"; + private static final String searchUrl = "https://www.lldm.net/index.php/vod/search.html"; private static final String playUrl = "/index.php/vod/play/id/"; private HashMap getHeaders() { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 6d9cf1de..42ec9d3c 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 dca15749..c70adf5f 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -2f42b42b34c08da62657fc4ab2d78c90 +60d5e47e1bbfa645ee6fb5aa561eee28