From 29fd7803345d1f6289da2476749315036818a518 Mon Sep 17 00:00:00 2001
From: okjackcaptain <378702538@qq.com>
Date: Tue, 25 Oct 2022 11:24:22 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=AD=97=E5=B9=95=E9=BB=91=E8=BE=B9bug=20(?=
 =?UTF-8?q?by=20okjack)=20-=20=E5=97=85=E6=8E=A2=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=94=AF=E6=8C=81=E6=AD=A3=E5=88=99=20(by=20?=
 =?UTF-8?q?okjack)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../osc/subtitle/widget/SimpleSubtitleView.java   |  6 ++++++
 .../com/github/tvbox/osc/util/DefaultConfig.java  |  3 ++-
 .../github/tvbox/osc/util/VideoParseRuler.java    | 15 +++++++++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/subtitle/widget/SimpleSubtitleView.java b/app/src/main/java/com/github/tvbox/osc/subtitle/widget/SimpleSubtitleView.java
index 58aaabdc..23e26338 100644
--- a/app/src/main/java/com/github/tvbox/osc/subtitle/widget/SimpleSubtitleView.java
+++ b/app/src/main/java/com/github/tvbox/osc/subtitle/widget/SimpleSubtitleView.java
@@ -208,6 +208,12 @@ public class SimpleSubtitleView extends TextView
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
 
+    @Override
+    public void setTextSize(float size) {
+        super.setTextSize(size);
+        backGroundText.setTextSize(size);
+    }
+
     @Override
     protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
         if (backGroundText != null) {
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 83c1ef1c..995c4d0e 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
@@ -132,8 +132,9 @@ public class DefaultConfig {
 //    }
 
     private static final Pattern snifferMatch = Pattern.compile(
-                    "http((?!http).){20,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg)\\?.*|" +
+            "http((?!http).){20,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg)\\?.*|" +
                     "http((?!http).){20,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg)|" +
+                    "http((?!http).)*?video/tos*|" +
                     "http((?!http).){20,}?/m3u8\\?pt=m3u8.*|" +
                     "http((?!http).)*?default\\.ixigua\\.com/.*|" +
                     "http((?!http).)*?dycdn-tos\\.pstatp[^\\?]*|" +
diff --git a/app/src/main/java/com/github/tvbox/osc/util/VideoParseRuler.java b/app/src/main/java/com/github/tvbox/osc/util/VideoParseRuler.java
index 0e8784a3..ba066c37 100644
--- a/app/src/main/java/com/github/tvbox/osc/util/VideoParseRuler.java
+++ b/app/src/main/java/com/github/tvbox/osc/util/VideoParseRuler.java
@@ -3,6 +3,7 @@ package com.github.tvbox.osc.util;
 import android.net.Uri;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.regex.Pattern;
 
 public class VideoParseRuler {
 
@@ -49,11 +50,17 @@ public class VideoParseRuler {
             boolean isVideoRuleCheck = false;
             for(int i=0; i<hostRules.size(); i++) {
                 boolean checkIsVideo = true;
-                for(int j=0; j<hostRules.get(i).size(); j++) {
-                    if (!url.contains(hostRules.get(i).get(j))) {
-                        checkIsVideo = false;
-                        break;
+                if (hostRules.get(i) != null && hostRules.get(i).size() > 0) {
+                    for(int j=0; j<hostRules.get(i).size(); j++) {
+                        Pattern onePattern = Pattern.compile("" + hostRules.get(i).get(j));
+                        if (!onePattern.matcher(url).find()) {
+                            checkIsVideo = false;
+                            break;
+                        }
+                        LOG.i("RULE:" + hostRules.get(i).get(j));
                     }
+                } else {
+                    checkIsVideo = false;
                 }
                 if (checkIsVideo) {
                     isVideoRuleCheck = true;