diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java index f8a187ea5..91c8ba48c 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java @@ -262,12 +262,8 @@ public class Result implements Parcelable { return pagecount == null ? 0 : pagecount; } - public Integer getParse(Integer def) { - return parse == null ? def : parse; - } - public Integer getParse() { - return getParse(0); + return parse == null ? 0 : parse; } public void setParse(Integer parse) { diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index e09816df7..9cc20a716 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -400,12 +400,12 @@ public class Players implements Player.Listener, ParseCallback { } public void start(Channel channel, int timeout) { - if (channel.hasMsg()) { + if (channel.getParse() == 1) { + startParse(channel.result(), false); + } else if (channel.hasMsg()) { ErrorEvent.extract(tag, channel.getMsg()); } else if (isIllegal(channel.getUrl())) { ErrorEvent.url(tag); - } else if (channel.getParse() == 1) { - startParse(channel.result(), false); } else if (channel.getDrm() != null && !FrameworkMediaDrm.isCryptoSchemeSupported(channel.getDrm().getUUID())) { ErrorEvent.drm(tag); } else { @@ -414,12 +414,12 @@ public class Players implements Player.Listener, ParseCallback { } public void start(Result result, boolean useParse, int timeout) { - if (result.hasMsg()) { + if (result.getParse() == 1 || result.getJx() == 1) { + startParse(result, useParse); + } else if (result.hasMsg()) { ErrorEvent.extract(tag, result.getMsg()); } else if (isIllegal(result.getRealUrl())) { ErrorEvent.url(tag); - } else if (result.getParse(1) == 1 || result.getJx() == 1) { - startParse(result, useParse); } else if (result.getDrm() != null && !FrameworkMediaDrm.isCryptoSchemeSupported(result.getDrm().getUUID())) { ErrorEvent.drm(tag); } else {