嗅探调整

pull/69/head
21561 4 years ago
parent 3ac5bde5d5
commit c85f0a8360
  1. 11
      app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
  2. 10
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  3. 9
      app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.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

@ -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

@ -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;
}

Loading…
Cancel
Save