From c85f0a8360fa89732c04703025d373ee26117741 Mon Sep 17 00:00:00 2001
From: 21561 <215613905@qq.com>
Date: Mon, 7 Nov 2022 20:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=97=85=E6=8E=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/tvbox/osc/ui/activity/PlayActivity.java    | 11 +++++------
 .../github/tvbox/osc/ui/fragment/PlayFragment.java    | 10 +++++-----
 .../java/com/github/tvbox/osc/util/DefaultConfig.java |  9 +++------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
index 23a0524a..006c044f 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
@@ -1276,10 +1276,10 @@ public class PlayActivity extends BaseActivity {
     }
 
     boolean checkVideoFormat(String url) {
+        if (url.contains("url=http") || url.contains(".html")) {
+            return false;
+        }
         if (sourceBean.getType() == 3) {
-            if (url.contains("=http") || url.contains(".html")) {
-                return false;
-            }
             Spider sp = ApiConfig.get().getCSP(sourceBean);
             if (sp != null && sp.manualVideoCheck())
                 return sp.isVideoFormat(url);
@@ -1485,7 +1485,7 @@ public class PlayActivity extends BaseActivity {
         @Nullable
         @Override
         public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
-            return checkIsVideo(url, new HashMap<>());
+            return null;
         }
 
         @Nullable
@@ -1505,8 +1505,7 @@ public class PlayActivity extends BaseActivity {
                     }
                 }
             }
-            WebResourceResponse response = checkIsVideo(url, webHeaders);
-            return response;
+            return checkIsVideo(url, webHeaders);
         }
 
         @Override
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
index 7cabae8c..6de179c6 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
@@ -1289,10 +1289,10 @@ public class PlayFragment extends BaseLazyFragment {
 
     boolean checkVideoFormat(String url) {
         try{
+            if (url.contains("url=http") || url.contains(".html")) {
+                return false;
+            }
             if (sourceBean.getType() == 3) {
-                if (url.contains("=http") || url.contains(".html")) {
-                    return false;
-                }
                 Spider sp = ApiConfig.get().getCSP(sourceBean);
                 if (sp != null && sp.manualVideoCheck()){
                     return sp.isVideoFormat(url);
@@ -1504,8 +1504,8 @@ public class PlayFragment extends BaseLazyFragment {
         @Nullable
         @Override
         public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
-            WebResourceResponse response = checkIsVideo(url, new HashMap<>());
-            return response;
+//            WebResourceResponse response = checkIsVideo(url, new HashMap<>());
+            return null;
         }
 
         @Nullable
diff --git a/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java b/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java
index 467781c4..e8ee2fae 100644
--- a/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java
+++ b/app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java
@@ -123,17 +123,14 @@ public class DefaultConfig {
                     "http((?!http).)*?netease\\.com/file/.*"
     );
     public static boolean isVideoFormat(String url) {
-        if (url.contains("=http") || url.contains(".html")) {
-            return false;
-        }
         Uri uri = Uri.parse(url);
         String path = uri.getPath();
         if (TextUtils.isEmpty(path)) {
             return false;
         }
-        if (path.endsWith(".js") || path.endsWith(".css") || path.endsWith(".html")) {
-            return false;
-        }
+//        if (path.endsWith(".js") || path.endsWith(".css") || path.endsWith(".html")) {
+//            return false;
+//        }
         if (snifferMatch.matcher(url).find()) return true;
         return false;
     }