From e6252bbcc9ab9d99c2dafb7a803f9a1265f936d3 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 4 Jan 2026 23:44:35 +0800 Subject: [PATCH] Fix error event bug --- .../java/com/fongmi/android/tv/ui/activity/CastActivity.java | 5 ----- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 5 ----- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 ----- app/src/main/java/com/fongmi/android/tv/Constant.java | 1 - .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 5 ----- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 ----- 6 files changed, 26 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 f54239f42..e4dcce326 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 @@ -347,11 +347,6 @@ public class CastActivity extends BaseActivity implements CustomKeyDownVod.Liste @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { if (!event.getTag().equals(tag)) return; - if (mPlayers.retried()) onError(event); - else onReset(); - } - - private void onError(ErrorEvent event) { showError(event.getMsg()); mPlayers.resetTrack(); onStopped(); 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 391d8dfc6..c2f93ef8c 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 @@ -823,11 +823,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { if (!event.getTag().equals(tag)) return; - if (mPlayers.retried()) onError(event); - else fetch(); - } - - private void onError(ErrorEvent event) { Track.delete(mPlayers.getUrl()); showError(event.getMsg()); mPlayers.resetTrack(); 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 c613a9b3a..599f994d9 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 @@ -1122,11 +1122,6 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { if (!event.getTag().equals(tag)) return; - if (mPlayers.retried()) onError(event); - else onRefresh(); - } - - private void onError(ErrorEvent event) { Track.delete(mPlayers.getUrl()); showError(event.getMsg()); mClock.setCallback(null); diff --git a/app/src/main/java/com/fongmi/android/tv/Constant.java b/app/src/main/java/com/fongmi/android/tv/Constant.java index 525720d33..052388a8b 100644 --- a/app/src/main/java/com/fongmi/android/tv/Constant.java +++ b/app/src/main/java/com/fongmi/android/tv/Constant.java @@ -12,7 +12,6 @@ public class Constant { public static final long TIMEOUT_XML = TimeUnit.SECONDS.toMillis(15); public static final long TIMEOUT_PLAY = TimeUnit.SECONDS.toMillis(15); public static final long TIMEOUT_SYNC = TimeUnit.SECONDS.toMillis(2); - public static final long TIMEOUT_DANMAKU = TimeUnit.SECONDS.toMillis(30); public static final long TIMEOUT_PARSE_DEF = TimeUnit.SECONDS.toMillis(15); public static final long TIMEOUT_PARSE_WEB = TimeUnit.SECONDS.toMillis(15); public static final long TIMEOUT_PARSE_LIVE = TimeUnit.SECONDS.toMillis(10); 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 ce2eed70d..9c563d6b5 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 @@ -861,11 +861,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { if (!event.getTag().equals(tag)) return; - if (mPlayers.retried()) onError(event); - else fetch(); - } - - private void onError(ErrorEvent event) { Track.delete(mPlayers.getUrl()); showError(event.getMsg()); mPlayers.resetTrack(); 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 154e3cbe9..f0a514d9d 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 @@ -1259,11 +1259,6 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo @Subscribe(threadMode = ThreadMode.MAIN) public void onErrorEvent(ErrorEvent event) { if (!event.getTag().equals(tag)) return; - if (mPlayers.retried()) onError(event); - else onRefresh(); - } - - private void onError(ErrorEvent event) { mBinding.swipeLayout.setEnabled(true); Track.delete(mPlayers.getUrl()); showError(event.getMsg());