From 8ddac062a329ab8030774fd4d3d7cd92d13cf55b Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 18 Jan 2023 00:58:23 +0800 Subject: [PATCH] Update dev --- .../fongmi/android/tv/ui/activity/DetailActivity.java | 2 +- .../java/com/fongmi/android/tv/event/ErrorEvent.java | 10 +++++++--- .../java/com/fongmi/android/tv/player/Players.java | 4 +++- 3 files changed, 11 insertions(+), 5 deletions(-) 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 4dcd82b83..2a1c67a34 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 @@ -818,7 +818,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void checkError(ErrorEvent event) { if (event.isParse() && mParseAdapter.size() > 0) checkParse(); - else if (event.isUrl()) onNext(); + else if (event.isAds()) onNext(); else checkFlag(); } diff --git a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java index b1e7c19dd..7a8a2830d 100644 --- a/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java +++ b/app/src/main/java/com/fongmi/android/tv/event/ErrorEvent.java @@ -14,6 +14,10 @@ public class ErrorEvent { EventBus.getDefault().post(new ErrorEvent(Type.URL, false)); } + public static void ads() { + EventBus.getDefault().post(new ErrorEvent(Type.ADS, false)); + } + public static void parse() { EventBus.getDefault().post(new ErrorEvent(Type.PARSE, false)); } @@ -47,8 +51,8 @@ public class ErrorEvent { return retry; } - public boolean isUrl() { - return getType() == Type.URL; + public boolean isAds() { + return getType() == Type.ADS; } public boolean isParse() { @@ -60,6 +64,6 @@ public class ErrorEvent { } public enum Type { - URL, PARSE, FORMAT, TIMEOUT + ADS, URL, PARSE, FORMAT, TIMEOUT } } 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 78b3320cc..b3e50e715 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 @@ -268,8 +268,10 @@ public class Players implements Player.Listener, IMediaPlayer.OnInfoListener, IM } public void start(Result result, boolean useParse) { - if (result.getUrl().isEmpty() || isAds(result.getUrl())) { + if (result.getUrl().isEmpty()) { ErrorEvent.url(); + } else if (isAds(result.getUrl())) { + ErrorEvent.ads(); } else if (result.getParse(1) == 1 || result.getJx() == 1) { stopParse(); parseTask = ParseTask.create(this).run(result, useParse);