From 2d0ad541fc484c1df1872fdf8ad27b95f1716285 Mon Sep 17 00:00:00 2001
From: lushunming <1357197829@qq.com>
Date: Mon, 1 Dec 2025 09:57:30 +0800
Subject: [PATCH] =?UTF-8?q?uc=E5=92=8Cquark=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/catvod/api/QuarkApi.java   | 15 +++++++++------
 .../main/java/com/github/catvod/api/UCApi.java | 18 +++++++-----------
 2 files changed, 16 insertions(+), 17 deletions(-)

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<String, String> 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<String, String> 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<String, String> 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) {