diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index af7612431..c7ee667c6 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -363,7 +363,6 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.control.parse.setVisibility(isUseParse() ? View.VISIBLE : View.GONE); int timeout = getSite().isChangeable() ? Constant.TIMEOUT_PLAY : -1; mPlayers.start(result, isUseParse(), timeout); - Notify.show(result.getMsg()); }); mViewModel.result.observe(this, result -> { if (result.getList().isEmpty()) setEmpty(); 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 90d3b7060..ae2a2426d 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 @@ -61,8 +61,6 @@ public class Result { private List subs; @SerializedName("pagecount") private int pagecount; - @SerializedName("error") - private boolean error; @SerializedName("msg") private String msg; @@ -105,7 +103,6 @@ public class Result { public static Result error(String msg) { Result result = new Result(); - result.setError(true); result.setMsg(msg); return result; } @@ -222,22 +219,18 @@ public class Result { return pagecount; } - public boolean isError() { - return error; - } - - public void setError(boolean error) { - this.error = error; - } - public String getMsg() { - return msg; + return TextUtils.isEmpty(msg) ? "" : msg; } public void setMsg(String msg) { this.msg = msg; } + public boolean hasMsg() { + return !TextUtils.isEmpty(getMsg()); + } + public String getRealUrl() { return getPlayUrl() + getUrl(); } 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 2ee08d56c..1ce285471 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 @@ -301,7 +301,7 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic } public void start(Result result, boolean useParse, int timeout) { - if (result.isError()) { + if (result.hasMsg()) { ErrorEvent.extract(result.getMsg()); } else if (result.getUrl().isEmpty()) { ErrorEvent.url(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 2d33cf0d9..a95d37ce1 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -460,7 +460,6 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust int timeout = getSite().isChangeable() ? Constant.TIMEOUT_PLAY : -1; mPlayers.start(result, isUseParse(), timeout); mBinding.swipeLayout.setRefreshing(false); - Notify.show(result.getMsg()); } @Override