From 9436be641d52d8dc1777083835331be3a04b19f9 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 9 Jun 2023 01:31:33 +0800
Subject: [PATCH] Support MediaPlayer - part 4

---
 .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java  | 1 +
 .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java    | 1 +
 app/src/main/java/com/fongmi/android/tv/player/Players.java     | 2 --
 .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java  | 1 +
 .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java    | 1 +
 5 files changed, 4 insertions(+), 2 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 6fb566e79..64ca27860 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
@@ -287,6 +287,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
 
     private void setPlayerView() {
         mBinding.control.player.setText(mPlayers.getPlayerText());
+        if (mPlayers.isIjk()) getIjk().setPlayer(mPlayers.getPlayer());
         getExo().setVisibility(mPlayers.isExo() ? View.VISIBLE : View.GONE);
         getIjk().setVisibility(mPlayers.isIjk() ? View.VISIBLE : View.GONE);
         mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Prefers.getReset()]);
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 d6b6100dc..0511bf5fc 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
@@ -179,6 +179,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
 
     private void setPlayerView() {
         mBinding.control.player.setText(mPlayers.getPlayerText());
+        if (mPlayers.isIjk()) getIjk().setPlayer(mPlayers.getPlayer());
         getExo().setVisibility(mPlayers.isExo() ? View.VISIBLE : View.GONE);
         getIjk().setVisibility(mPlayers.isIjk() ? View.VISIBLE : View.GONE);
     }
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 16f9ab58b..d271daf92 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
@@ -81,7 +81,6 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
     private void setupIjk(IjkVideoView view) {
         ijkPlayer = view.render(Prefers.getRender()).decode(decode);
         ijkPlayer.addListener(this);
-        ijkPlayer.setPlayer(player);
     }
 
     public ExoPlayer exo() {
@@ -190,7 +189,6 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
     public void togglePlayer() {
         stop();
         setPlayer(player == 2 ? 0 : ++player);
-        if (isIjk()) ijkPlayer.setPlayer(player);
     }
 
     public void toggleDecode() {
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 9a8561cff..9816b6e5e 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
@@ -281,6 +281,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust
     }
 
     private void setPlayerView() {
+        if (mPlayers.isIjk()) getIjk().setPlayer(mPlayers.getPlayer());
         mBinding.control.action.player.setText(mPlayers.getPlayerText());
         getExo().setVisibility(mPlayers.isExo() ? View.VISIBLE : View.GONE);
         getIjk().setVisibility(mPlayers.isIjk() ? View.VISIBLE : View.GONE);
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 9d541663b..cc25cf655 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
@@ -179,6 +179,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
     }
 
     private void setPlayerView() {
+        if (mPlayers.isIjk()) getIjk().setPlayer(mPlayers.getPlayer());
         mBinding.control.action.player.setText(mPlayers.getPlayerText());
         getExo().setVisibility(mPlayers.isExo() ? View.VISIBLE : View.GONE);
         getIjk().setVisibility(mPlayers.isIjk() ? View.VISIBLE : View.GONE);