diff --git a/app/src/main/java/com/github/catvod/MainActivity.java b/app/src/main/java/com/github/catvod/MainActivity.java index 2924320a..a0a60184 100644 --- a/app/src/main/java/com/github/catvod/MainActivity.java +++ b/app/src/main/java/com/github/catvod/MainActivity.java @@ -7,7 +7,6 @@ import com.github.catvod.crawler.Spider; import com.github.catvod.databinding.ActivityMainBinding; import com.github.catvod.spider.Init; import com.github.catvod.spider.PTT; -import com.github.catvod.spider.Proxy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParser; @@ -134,7 +133,7 @@ public class MainActivity extends Activity { public void proxy() { try { Map params = new HashMap<>(); - Logger.t("liveContent").d(Proxy.proxy(params)); + Logger.t("liveContent").d(spider.proxy(params)); } catch (Throwable e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/github/catvod/crawler/Spider.java b/app/src/main/java/com/github/catvod/crawler/Spider.java index f397ee99..dba5122c 100644 --- a/app/src/main/java/com/github/catvod/crawler/Spider.java +++ b/app/src/main/java/com/github/catvod/crawler/Spider.java @@ -60,7 +60,7 @@ public abstract class Spider { return false; } - public Object[] proxyLocal(Map params) throws Exception { + public Object[] proxy(Map params) throws Exception { return null; } diff --git a/app/src/main/java/com/github/catvod/spider/Bili.java b/app/src/main/java/com/github/catvod/spider/Bili.java index dab37b86..12aa89b8 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -204,7 +204,7 @@ public class Bili extends Spider { } @Override - public Object[] proxyLocal(Map params) { + public Object[] proxy(Map params) { String aid = params.get("aid"); String cid = params.get("cid"); String qn = params.get("qn"); diff --git a/app/src/main/java/com/github/catvod/spider/Local.java b/app/src/main/java/com/github/catvod/spider/Local.java index 9c3391f7..2b5132ab 100644 --- a/app/src/main/java/com/github/catvod/spider/Local.java +++ b/app/src/main/java/com/github/catvod/spider/Local.java @@ -87,7 +87,7 @@ public class Local extends Spider { } @Override - public Object[] proxyLocal(Map params) { + public Object[] proxy(Map params) { String path = new String(Base64.decode(params.get("path"), Base64.DEFAULT | Base64.URL_SAFE)); Object[] result = new Object[3]; result[0] = 200; diff --git a/app/src/main/java/com/github/catvod/spider/MQiTV.java b/app/src/main/java/com/github/catvod/spider/MQiTV.java index 8010621e..b062f3fc 100644 --- a/app/src/main/java/com/github/catvod/spider/MQiTV.java +++ b/app/src/main/java/com/github/catvod/spider/MQiTV.java @@ -42,7 +42,7 @@ public class MQiTV extends Spider { } @Override - public Object[] proxyLocal(Map params) { + public Object[] proxy(Map params) { String ip = params.get("ip"); String port = params.get("port"); String playing = params.get("playing"); @@ -55,7 +55,7 @@ public class MQiTV extends Spider { String id = params.get("id"); String auth = config.getAuth(id, token); if (!"OK".equals(auth)) config.clear(); - if (!"OK".equals(auth)) return proxyLocal(params); + if (!"OK".equals(auth)) return proxy(params); String m3u8 = config.getM3U8(id, token, port); return m3u8.isEmpty() ? get302(config.getPlayUrl(port, playing)) : get200(m3u8); } diff --git a/app/src/main/java/com/github/catvod/spider/WebDAV.java b/app/src/main/java/com/github/catvod/spider/WebDAV.java index 313f6a96..dd8afc98 100644 --- a/app/src/main/java/com/github/catvod/spider/WebDAV.java +++ b/app/src/main/java/com/github/catvod/spider/WebDAV.java @@ -130,7 +130,7 @@ public class WebDAV extends Spider { } @Override - public Object[] proxyLocal(Map params) throws IOException { + public Object[] proxy(Map params) throws IOException { String url = params.get("url"); String key = url.contains("/") ? url.substring(0, url.indexOf("/")) : url; url = url.substring(key.length()); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 3da6d911..25c3a391 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 e906751d..ffbf9d2b 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -a0eb7f9582a738589ec05589299052c9 +a747194acf234c9e3f8e102fdc902970