diff --git a/app/src/main/java/com/github/catvod/api/AliYun.java b/app/src/main/java/com/github/catvod/api/AliYun.java index 7557d158..0f4a1f25 100644 --- a/app/src/main/java/com/github/catvod/api/AliYun.java +++ b/app/src/main/java/com/github/catvod/api/AliYun.java @@ -243,7 +243,7 @@ public class AliYun { List subs = new ArrayList<>(); listFiles(shareId, new Item(getParentFileId(fileId, share)), files, subs); Collections.sort(files); - List playFrom = Arrays.asList("原畫", "普畫", "極速"); + List playFrom = Arrays.asList("原畫", "普畫"); List episode = new ArrayList<>(); List playUrl = new ArrayList<>(); for (Item file : files) episode.add(file.getDisplayName() + "$" + shareId + "+" + file.getFileId() + findSubs(file.getName(), subs)); @@ -409,7 +409,7 @@ public class AliYun { } List subs = getSubs(ids); subs.addAll(getSubs(info)); - return Result.get().url(url).m3u8().subs(subs).header(getHeader()).string(); + return Result.get().url(proxyUrl).m3u8().subs(subs).header(getHeader()).string(); } private List getPreviewUrl(Preview.Info info) { @@ -489,11 +489,11 @@ public class AliYun { } if ("open".equals(cate)) { + thread = 10; downloadUrl = getDownloadUrl(shareId, fileId); - thread = 30; } else if ("share".equals(cate)) { + thread = 10; downloadUrl = getShareDownloadUrl(shareId, fileId); - thread = 30; } else if ("m3u8".equals(cate)) { lock.lock(); String mediaUrl = m3u8MediaMap.get(fileId).get(mediaId); diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index 1a36dd74..0d71bc3e 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -54,11 +54,10 @@ public class Ali extends Spider { */ public String detailContentVodPlayFrom(List ids) { List playFrom = new ArrayList<>(); - if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("原畫", "普畫", "極速")); + if (ids.size() < 2) return TextUtils.join("$$$", Arrays.asList("原畫", "普畫")); for (int i = 1; i <= ids.size(); i++) { playFrom.add(String.format(Locale.getDefault(), "原畫#%02d", i)); playFrom.add(String.format(Locale.getDefault(), "普畫#%02d", i)); - playFrom.add(String.format(Locale.getDefault(), "極速#%02d", i)); } return TextUtils.join("$$$", playFrom); } diff --git a/app/src/main/java/com/github/catvod/utils/MultiThread.java b/app/src/main/java/com/github/catvod/utils/MultiThread.java index 08d2bf5d..ea2b4953 100644 --- a/app/src/main/java/com/github/catvod/utils/MultiThread.java +++ b/app/src/main/java/com/github/catvod/utils/MultiThread.java @@ -1,8 +1,5 @@ package com.github.catvod.utils; -import com.github.catvod.spider.Proxy; - -import java.net.URLEncoder; import java.util.Map; import java.util.TreeMap; @@ -10,10 +7,6 @@ import fi.iki.elonen.NanoHTTPD; public class MultiThread { - public static String url(String url, int thread) { - return String.format(Proxy.getUrl() + "?do=multi&url=%s&thread=%d", URLEncoder.encode(url), thread); - } - public static Object[] proxy(Map params) throws Exception { String url = params.get("url"); int thread = Integer.parseInt(params.get("thread")); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 776ffd1a..de90e4ca 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 4b1dbd7d..a1e420c9 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -fba567f6ab0f55d841d2b464f91e6555 +d21813e2dfdd1685610b2748e96e6c3a diff --git a/json/adult.json b/json/adult.json index 4b52fc93..33aabf81 100644 --- a/json/adult.json +++ b/json/adult.json @@ -1,5 +1,5 @@ { - "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;fba567f6ab0f55d841d2b464f91e6555", + "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;d21813e2dfdd1685610b2748e96e6c3a", "wallpaper": "https://gao.chuqiuyu.tk", "sites": [ { diff --git a/json/config.json b/json/config.json index b39b46fc..d18c8e5b 100644 --- a/json/config.json +++ b/json/config.json @@ -1,5 +1,5 @@ { - "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;fba567f6ab0f55d841d2b464f91e6555", + "spider": "https://fm.t4tv.hz.cz/jar/custom_spider.jar;md5;d21813e2dfdd1685610b2748e96e6c3a", "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "sites": [ {