diff --git a/app/src/main/java/com/github/catvod/utils/ProxyVideo.java b/app/src/main/java/com/github/catvod/utils/ProxyVideo.java index 81266562..9da08cce 100644 --- a/app/src/main/java/com/github/catvod/utils/ProxyVideo.java +++ b/app/src/main/java/com/github/catvod/utils/ProxyVideo.java @@ -1,5 +1,6 @@ package com.github.catvod.utils; +import android.os.Debug; import android.os.SystemClock; import android.text.TextUtils; @@ -31,7 +32,7 @@ public class ProxyVideo { private static final String GO_SERVER = "http://127.0.0.1:7777/"; //线程数4 - private static final int THREAD_NUM = 8; + private static final int THREAD_NUM = Runtime.getRuntime().availableProcessors() * 2; private static Map infos = new HashMap<>(); @@ -98,6 +99,7 @@ public class ProxyVideo { public static Object[] proxyMultiThread(String url, Map headers) { ExecutorService service = Executors.newFixedThreadPool(THREAD_NUM); + SpiderDebug.log("--proxyMultiThread: THREAD_NUM "+THREAD_NUM); SequenceInputStream in = null; try { @@ -122,6 +124,10 @@ public class ProxyVideo { String total = StringUtils.split(contentRange, "/")[1]; SpiderDebug.log("--文件总大小:" + total); + //如果文件太小,也不走代理 + if (Long.parseLong(total) < 1024 * 1024 * 100) { + return proxy(url, headers); + } String range = StringUtils.isAllBlank(headers.get("range")) ? headers.get("Range") : headers.get("range"); SpiderDebug.log("---proxyMultiThread,Range:" + range); Map rangeObj = parseRange(range); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 35ebff45..81699438 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 86ea46a2..fcdfec9f 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -2f2f43db60e7493b3af54c85a8172218 +9e16172dad5f5417f9948084af40df03 diff --git a/json/index.json b/json/index.json index eedb0632..aabedc17 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://androidcatvodspider.netlify.app/jar/custom_spider.jar;md5;4a9814b359e0f39cf4613cd801871c06", + "spider": "https://gh-proxy.com/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThread/jar/custom_spider.jar;md5;9e16172dad5f5417f9948084af40df03", "lives": [ { "name": "电视直播",