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 b56df4ac..262dd172 100644 --- a/app/src/main/java/com/github/catvod/api/AliYun.java +++ b/app/src/main/java/com/github/catvod/api/AliYun.java @@ -449,15 +449,11 @@ public class AliYun { } private String proxyVideoUrl(String cate, String shareId, String fileId) { - String aliUrl = String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s", cate, shareId, fileId); int thread = 1; - if ("open".equals(cate)) { - thread = 10; - } else if ("share".equals(cate)) { - thread = 10; - } - if (thread == 1) return aliUrl; - return ProxyVideo.url(aliUrl, thread); + String url = String.format(Proxy.getUrl() + "?do=ali&type=video&cate=%s&shareId=%s&fileId=%s", cate, shareId, fileId); + if ("open".equals(cate)) thread = 10; + if ("share".equals(cate)) thread = 10; + return thread == 1 ? url : ProxyVideo.url(url, thread); } private String proxyVideoUrl(String cate, String shareId, String fileId, String templateId) { 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 716a2074..29928cbc 100644 --- a/app/src/main/java/com/github/catvod/utils/ProxyVideo.java +++ b/app/src/main/java/com/github/catvod/utils/ProxyVideo.java @@ -19,10 +19,9 @@ public class ProxyVideo { private static final String GO_SERVER = "http://127.0.0.1:7777/"; - public static boolean go() { + public static void go() { if (OkHttp.string(GO_SERVER).isEmpty()) OkHttp.string("http://127.0.0.1:" + Proxy.getPort() + "/go"); while (OkHttp.string(GO_SERVER).isEmpty()) SystemClock.sleep(20); - return true; } public static String url(String url, int thread) { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 21f0f03c..52cbe0e6 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 8baf7cf9..487a3a16 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -430c09fd9d279d1b5d1fdebbae7e1d67 +5d1ab45ff233a49e9bc9b9a1554b38a9