From fe64663a5cc75636ba4abe99d17df01652ebbdb4 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 16 Jun 2023 14:49:54 +0800
Subject: [PATCH] Fix auto player bug

---
 .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 8 +++++++-
 .../com/fongmi/android/tv/ui/activity/LiveActivity.java   | 8 +++++++-
 .../com/fongmi/android/tv/ui/activity/DetailActivity.java | 8 +++++++-
 .../com/fongmi/android/tv/ui/activity/LiveActivity.java   | 8 +++++++-
 4 files changed, 28 insertions(+), 4 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 983b07715..a63674a9e 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
@@ -898,13 +898,19 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
     private void checkError(ErrorEvent event) {
         if (getSite().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) {
             toggleCount++;
-            onPlayer();
+            nextPlayer();
         } else {
             resetToggle();
             onError(event);
         }
     }
 
+    private void nextPlayer() {
+        mPlayers.togglePlayer();
+        setPlayerView();
+        onRefresh();
+    }
+
     private void onError(ErrorEvent event) {
         Clock.get().setCallback(null);
         showError(event.getMsg());
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 42989f6d7..158a0937d 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
@@ -580,13 +580,19 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
     private void checkError(ErrorEvent event) {
         if (getHome().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) {
             toggleCount++;
-            onPlayer();
+            nextPlayer();
         } else {
             resetToggle();
             onError(event);
         }
     }
 
+    private void nextPlayer() {
+        mPlayers.togglePlayer();
+        setPlayerView();
+        fetch();
+    }
+
     private void onError(ErrorEvent event) {
         mPlayers.stop();
         startFlow(event);
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 b7298f59d..f7b89ed78 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
@@ -925,13 +925,19 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     private void checkError(ErrorEvent event) {
         if (getSite().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) {
             toggleCount++;
-            onPlayer();
+            nextPlayer();
         } else {
             resetToggle();
             onError(event);
         }
     }
 
+    private void nextPlayer() {
+        mPlayers.togglePlayer();
+        setPlayerView();
+        onRefresh();
+    }
+
     private void onError(ErrorEvent event) {
         mBinding.swipeLayout.setEnabled(true);
         Clock.get().setCallback(null);
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 b5732cb60..369ecfb6b 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
@@ -615,13 +615,19 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
     private void checkError(ErrorEvent event) {
         if (getHome().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) {
             toggleCount++;
-            onPlayer();
+            nextPlayer();
         } else {
             resetToggle();
             onError(event);
         }
     }
 
+    private void nextPlayer() {
+        mPlayers.togglePlayer();
+        setPlayerView();
+        fetch();
+    }
+
     private void onError(ErrorEvent event) {
         mPlayers.stop();
         startFlow(event);