diff --git a/app/src/main/java/com/github/catvod/utils/DownloadMT.kt b/app/src/main/java/com/github/catvod/utils/DownloadMT.kt index 4366b551..48192b7c 100644 --- a/app/src/main/java/com/github/catvod/utils/DownloadMT.kt +++ b/app/src/main/java/com/github/catvod/utils/DownloadMT.kt @@ -18,7 +18,7 @@ import java.util.Vector import kotlin.math.min object DownloadMT { - private var THREAD_NUM: Int = Runtime.getRuntime().availableProcessors() * 2 + private val THREAD_NUM: Int = Runtime.getRuntime().availableProcessors() * 2 private val infos = mutableMapOf>(); @@ -75,9 +75,9 @@ object DownloadMT { SpiderDebug.log("--文件总大小:$total") //如果文件太小,也不走代理 - if (total.toLong() < 1024 * 1024 * 64) { - return ProxyVideo.proxy(url, headers) - } + /* if (total.toLong() < 1024 * 1024 * 100) { + return proxy(url, headers) + }*/ var range = if (StringUtils.isAllBlank(headers["range"])) headers["Range"] else headers["range"] if (StringUtils.isAllBlank(range)) range = "bytes=0-"; @@ -155,11 +155,10 @@ object DownloadMT { fun generatePart(rangeObj: Map, total: String): List { val totalSize = total.toLong() - //超过10GB,分块是80MB,不然是16MB + //超过10GB,分块是80Mb,不然是16MB val partSize = - if (totalSize > 1024L * 1024L * 1024L * 10L) 1024 * 1024 * 8 * 10L else 1024 * 1024 * 8 * 2L - THREAD_NUM = if (totalSize > 1024L * 1024L * 1024L * 10L) 64 else Runtime.getRuntime() - .availableProcessors() * 2 + if (totalSize > 8L * 1024L * 1024L * 1024L * 10L) 1024 * 1024 * 8 * 10L else 1024 * 1024 * 8 * 2L + var start = rangeObj["start"]!!.toLong() var end = if (StringUtils.isAllBlank(rangeObj["end"])) start + partSize else rangeObj["end"]!!.toLong() diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 7651abfc..d287a942 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 ced1541d..d6b67f2e 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -ca49e8939240a5851b24f58461c82ef9 +848c7528f18727d12cc591e6de830caa diff --git a/json/index.json b/json/index.json index f63f5c35..46fc2134 100644 --- a/json/index.json +++ b/json/index.json @@ -1,5 +1,5 @@ { - "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;ca49e8939240a5851b24f58461c82ef9", + "spider": "https://andoridspidermt.netlify.app/jar/custom_spider.jar;md5;848c7528f18727d12cc591e6de830caa", "lives": [ { "name": "电视直播", diff --git a/json/test.json b/json/test.json index 072e0e78..35f8f9b1 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadkt/jar/custom_spider.jar;md5;ca49e8939240a5851b24f58461c82ef9", + "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadkt/jar/custom_spider.jar;md5;848c7528f18727d12cc591e6de830caa", "lives": [ { "name": "电视直播",