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 df8e86a57..552bd1d3a 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 @@ -216,7 +216,6 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void getLive() { mPlayers.setPlayer(getPlayerType()); mViewModel.getLive(getHome()); - TVBus.get().quit(); setPlayerView(); setDecodeView(); showProgress(); @@ -784,7 +783,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick mPlayers.release(); Force.get().stop(); ZLive.get().stop(); - TVBus.get().quit(); + TVBus.get().stop(); App.removeCallbacks(mR1, mR2, mR3, mR4); } } diff --git a/app/src/main/java/com/fongmi/android/tv/player/source/TVBus.java b/app/src/main/java/com/fongmi/android/tv/player/source/TVBus.java index 441b67ed4..541780174 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/source/TVBus.java +++ b/app/src/main/java/com/fongmi/android/tv/player/source/TVBus.java @@ -48,16 +48,8 @@ public class TVBus implements Listener { } public void stop() { - if (hls == null) return; - tvcore.stop(); - hls = null; - } - - public void quit() { - if (tvcore == null) return; - tvcore.stop(); - tvcore = null; - hls = null; + if (tvcore != null) tvcore.stop(); + if (hls != null) hls = null; } @Override 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 94a9919da..626be4e61 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 @@ -222,7 +222,6 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List private void getLive() { mPlayers.setPlayer(getPlayerType()); mViewModel.getLive(getHome()); - TVBus.get().quit(); setPlayerView(); setDecodeView(); showProgress(); @@ -883,7 +882,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List mPlayers.release(); Force.get().stop(); ZLive.get().stop(); - TVBus.get().quit(); + TVBus.get().stop(); App.removeCallbacks(mR1, mR2, mR3); } }