From d68aa75b3c7c47024d8611305945fe0ae1eb9052 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Sat, 19 Aug 2023 15:12:45 +0800
Subject: [PATCH] Fix bug

---
 .../com/fongmi/android/tv/ui/activity/LiveActivity.java   | 8 +++-----
 .../com/fongmi/android/tv/ui/activity/LiveActivity.java   | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

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 18f204301..a0eb2efe6 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
@@ -213,11 +213,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
 
     private void setViewModel() {
         mViewModel = new ViewModelProvider(this).get(LiveViewModel.class);
-        mViewModel.channel.observe(this, result -> {
-            mPlayers.setPlayer(getPlayerType(result.getPlayerType()));
-            mPlayers.start(result, getHome().getTimeout());
-            setPlayerView();
-        });
+        mViewModel.channel.observe(this, result -> mPlayers.start(result, getHome().getTimeout()));
         mViewModel.live.observe(this, live -> {
             hideProgress();
             setGroup(live);
@@ -471,8 +467,10 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
     }
 
     private void setChannel(Channel item) {
+        mPlayers.setPlayer(getPlayerType(item.getPlayerType()));
         App.post(mR3, 100);
         mChannel = item;
+        setPlayerView();
         showInfo();
     }
 
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 cf4e375ae..c189db27b 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
@@ -215,11 +215,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
 
     private void setViewModel() {
         mViewModel = new ViewModelProvider(this).get(LiveViewModel.class);
-        mViewModel.channel.observe(this, result -> {
-            mPlayers.setPlayer(getPlayerType(result.getPlayerType()));
-            mPlayers.start(result, getHome().getTimeout());
-            setPlayerView();
-        });
+        mViewModel.channel.observe(this, result -> mPlayers.start(result, getHome().getTimeout()));
         mViewModel.live.observe(this, live -> {
             hideProgress();
             setGroup(live);
@@ -462,7 +458,9 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List
     @Override
     public void onItemClick(Channel item) {
         mGroup.setPosition(mChannelAdapter.setSelected(item.group(mGroup)));
+        mPlayers.setPlayer(getPlayerType(item.getPlayerType()));
         mChannel = item;
+        setPlayerView();
         showInfo();
         hideUI();
         fetch();