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 0) { + for(int j=0; j