From 03834a6a65486807cc98ed7a94213000262867f4 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 19 Jul 2024 11:30:41 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/ui/activity/CastActivity.java | 4 ++-- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 4 ++-- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 4 ++-- .../main/java/com/fongmi/android/tv/event/ErrorEvent.java | 4 ---- app/src/main/java/com/fongmi/android/tv/player/Players.java | 6 ------ .../main/java/com/fongmi/android/tv/player/exo/ExoUtil.java | 5 ++++- .../com/fongmi/android/tv/ui/activity/LiveActivity.java | 4 ++-- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 4 ++-- 8 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java index 88d201467..eca9d99ab 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java @@ -338,8 +338,8 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { - if (event.isDecode() && mPlayers.canToggle()) onDecode(); - else if (mPlayers.retried()) onError(event); + if (mPlayers.retried()) onError(event); + else if (event.isDecode()) onDecode(); else onReset(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 702fd81de..29c49793a 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -726,8 +726,8 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { - if (event.isDecode() && mPlayers.canToggle()) onDecode(); - else if (mPlayers.retried()) onError(event); + if (mPlayers.retried()) onError(event); + else if (event.isDecode()) onDecode(); else fetch(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 4ec1229ed..5ca882c44 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1134,8 +1134,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { if (isBackground()) return; - if (event.isDecode() && mPlayers.canToggle()) onDecode(); - else if (mPlayers.retried()) onError(event); + if (mPlayers.retried()) onError(event); + else if (event.isDecode()) onDecode(); else onRefresh(); } 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 d2b9bfe0e..4029c7ee5 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 @@ -49,10 +49,6 @@ public class ErrorEvent { return type; } - public int getCode() { - return code; - } - public boolean isDecode() { return code / 1000 == 4; } 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 05d0addaf..1c035e9eb 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 @@ -74,7 +74,6 @@ public class Players implements Player.Listener, ParseCallback { private long position; private int decode; - private int count; private int error; private int retry; @@ -146,15 +145,10 @@ public class Players implements Player.Listener, ParseCallback { this.position = position; } - public boolean canToggle() { - return ++count <= 2; - } - public void reset() { position = C.TIME_UNSET; removeTimeoutCheck(); stopParse(); - count = 0; error = 0; retry = 0; } diff --git a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java index 9e7fce973..1077238b9 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/player/exo/ExoUtil.java @@ -97,7 +97,10 @@ public class ExoUtil { } public static int getRetry(int errorCode) { - return errorCode >= PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED && errorCode <= PlaybackException.ERROR_CODE_PARSING_MANIFEST_UNSUPPORTED || errorCode == PlaybackException.ERROR_CODE_IO_UNSPECIFIED ? 2 : errorCode > 999 ? 1 : 0; + if (errorCode == PlaybackException.ERROR_CODE_IO_UNSPECIFIED) return 2; + if (errorCode >= PlaybackException.ERROR_CODE_DECODER_INIT_FAILED && errorCode <= PlaybackException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED) return 2; + if (errorCode >= PlaybackException.ERROR_CODE_PARSING_CONTAINER_MALFORMED && errorCode <= PlaybackException.ERROR_CODE_PARSING_MANIFEST_UNSUPPORTED) return 2; + return 1; } public static MediaItem getMediaItem(Map headers, Uri uri, String mimeType, Drm drm, List subs, int decode) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index a44fc398a..3c50b49ab 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -785,8 +785,8 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { - if (event.isDecode() && mPlayers.canToggle()) onDecode(); - else if (mPlayers.retried()) onError(event); + if (mPlayers.retried()) onError(event); + else if (event.isDecode()) onDecode(); else fetch(); } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index a8e77bc88..6cea84672 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -1153,8 +1153,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { if (isRedirect()) return; - if (event.isDecode() && mPlayers.canToggle()) onDecode(); - else if (mPlayers.retried()) onError(event); + if (mPlayers.retried()) onError(event); + else if (event.isDecode()) onDecode(); else onRefresh(); }