diff --git a/app/src/main/java/com/github/catvod/api/QuarkApi.java b/app/src/main/java/com/github/catvod/api/QuarkApi.java index 6eb8cd93..be1e552a 100644 --- a/app/src/main/java/com/github/catvod/api/QuarkApi.java +++ b/app/src/main/java/com/github/catvod/api/QuarkApi.java @@ -227,15 +227,18 @@ public class QuarkApi { String fileId = split[0], fileToken = split[1], shareId = split[2], stoken = split[3]; String playUrl = ""; - if (flag.contains("quark原画")) { - playUrl = this.getDownload(shareId, stoken, fileId, fileToken, true); - } else { - playUrl = this.getLiveTranscoding(shareId, stoken, fileId, fileToken, flag); - } Map header = getHeaders(); header.remove("Host"); header.remove("Content-Type"); - return Result.get().url(ProxyServer.INSTANCE.buildProxyUrl(playUrl, header)).octet().header(header).string(); + if (flag.contains("quark原画")) { + playUrl = this.getDownload(shareId, stoken, fileId, fileToken, true); + return Result.get().url(ProxyServer.INSTANCE.buildProxyUrl(playUrl, header)).octet().header(header).string(); + } else { + playUrl = this.getLiveTranscoding(shareId, stoken, fileId, fileToken, flag); + return Result.get().url(proxyVideoUrl(playUrl, header)).octet().header(header).string(); + } + + } private String proxyVideoUrl(String url, Map header) { diff --git a/app/src/main/java/com/github/catvod/api/UCApi.java b/app/src/main/java/com/github/catvod/api/UCApi.java index 2584af82..affa4e03 100644 --- a/app/src/main/java/com/github/catvod/api/UCApi.java +++ b/app/src/main/java/com/github/catvod/api/UCApi.java @@ -217,23 +217,19 @@ public class UCApi { SpiderDebug.log("flag:" + flag); String fileId = split[0], fileToken = split[1], shareId = split[2], stoken = split[3]; String playUrl = ""; - if (flag.contains("uc原画")) { - playUrl = this.getDownload(shareId, stoken, fileId, fileToken, true); - } else { - playUrl = this.getLiveTranscoding(shareId, stoken, fileId, fileToken, flag); - } SpiderDebug.log("origin playUrl:" + playUrl); Map header = getHeaders(); header.remove("Host"); header.remove("Content-Type"); - - //UCTV 可以直接播放,不需要代理 - if (testVideo(playUrl)) { - SpiderDebug.log("UCTV 可以直接播放,不需要代理" ); - + if (flag.contains("uc原画")) { + playUrl = this.getDownload(shareId, stoken, fileId, fileToken, true); return Result.get().url(playUrl).string(); + } else { + playUrl = this.getLiveTranscoding(shareId, stoken, fileId, fileToken, flag); + return Result.get().url(proxyVideoUrl(playUrl, new HashMap<>())).string(); } - return Result.get().url(ProxyServer.INSTANCE.buildProxyUrl(playUrl, new HashMap<>())).string(); + + } private boolean testVideo(String url) {