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 f464ccfb..38fd1862 100644 --- a/app/src/main/java/com/github/catvod/api/AliYun.java +++ b/app/src/main/java/com/github/catvod/api/AliYun.java @@ -93,7 +93,6 @@ public class AliYun { m3u8MediaMap = new HashMap<>(); shareDownloadMap = new HashMap<>(); cache = Cache.objectFrom(Path.read(getCache())); - OkHttp.string("http://127.0.0.1:" + Proxy.getPort() + "/go"); } public void setRefreshToken(String token) { 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 34c5a023..b4ff4d9a 100644 --- a/app/src/main/java/com/github/catvod/utils/ProxyVideo.java +++ b/app/src/main/java/com/github/catvod/utils/ProxyVideo.java @@ -3,7 +3,10 @@ package com.github.catvod.utils; import static fi.iki.elonen.NanoHTTPD.Response.Status; import static fi.iki.elonen.NanoHTTPD.newFixedLengthResponse; +import android.os.SystemClock; + import com.github.catvod.net.OkHttp; +import com.github.catvod.spider.Proxy; import java.net.URLEncoder; import java.util.Locale; @@ -14,8 +17,12 @@ import okhttp3.Response; public class ProxyVideo { + private static final String GO_SERVER = "http://127.0.0.1:7777/"; + public static NanoHTTPD.Response multi(String url, Map headers, int thread) throws Exception { - return proxy(String.format(Locale.getDefault(), "http://127.0.0.1:7777/?url=%s&thread=%d", URLEncoder.encode(url), thread), headers); + if (OkHttp.string(GO_SERVER).isEmpty()) OkHttp.string("http://127.0.0.1:" + Proxy.getPort() + "/go"); + while (OkHttp.string(GO_SERVER).isEmpty()) SystemClock.sleep(250); + return proxy(String.format(Locale.getDefault(), "%s?url=%s&thread=%d", GO_SERVER, URLEncoder.encode(url), thread), headers); } public static NanoHTTPD.Response proxy(String url, Map headers) throws Exception { diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 31d94df8..2a300e4e 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 a966c567..940f9a05 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -5b3460279d173de4e0288eb56fac596f +22534319dabee7086d31f194a1e19e6a