main
于俊 12 months ago
parent 11e76688d2
commit 2b90734195
  1. 1
      app/src/main/java/com/github/tvbox/osc/api/ApiConfig.java
  2. 4
      app/src/main/java/com/github/tvbox/osc/ui/activity/PlayActivity.java
  3. 4
      app/src/main/java/com/github/tvbox/osc/ui/fragment/PlayFragment.java
  4. 15
      app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java
  5. 2
      gradle.properties

@ -326,6 +326,7 @@ public class ApiConfig {
}
}else {
if (Boolean.parseBoolean(jarCache) && cache.exists() && !FileUtils.isWeekAgo(cache)) {
LOG.i("echo-load jar jarCache:"+jarUrl);
if (jarLoader.load(cache.getAbsolutePath())) {
callback.success();
return;

@ -516,6 +516,10 @@ public class PlayActivity extends BaseActivity {
goPlayUrl(url,headers);
return;
}
if(DefaultConfig.noAd(mVodInfo.playFlag)){
goPlayUrl(url,headers);
return;
}
LOG.i("echo-playM3u8:" + url);
mController.playM3u8(url,headers);
}

@ -532,6 +532,10 @@ public class PlayFragment extends BaseLazyFragment {
goPlayUrl(url,headers);
return;
}
if(DefaultConfig.noAd(mVodInfo.playFlag)){
goPlayUrl(url,headers);
return;
}
LOG.i("echo-playM3u8:" + url);
mController.playM3u8(url,headers);
}

@ -14,6 +14,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
@ -178,4 +179,18 @@ public class DefaultConfig {
return urlOri.replace("proxy://", ControlManager.get().getAddress(true) + "proxy?");
return urlOri;
}
private static final List<String> NO_AD_KEYWORDS = Arrays.asList(
"tx", "youku", "qq", "iqiyi", "qiyi", "letv", "sohu", "mgtv", "bilibili", "优酷", "芒果", "腾讯", "爱奇艺", "奇艺"
);
public static boolean noAd(String flag) {
if (flag == null || flag.isEmpty()) return false;
for (String keyword : NO_AD_KEYWORDS) {
if (flag.equals(keyword) || flag.contains(keyword)) {
return true;
}
}
return false;
}
}

@ -18,4 +18,4 @@ android.useAndroidX=true
android.enableJetifier=true
IsDebug=true
#build on off
org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED
#org.gradle.jvmargs=-Xmx2048m --add-opens java.base/java.io=ALL-UNNAMED
Loading…
Cancel
Save