From 84e7f84c185fb906fc1cb3e8e0451594335af7cf Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 16 Jun 2023 12:12:49 +0800 Subject: [PATCH] Adjust toggle player rule --- .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/DetailActivity.java | 2 +- .../java/com/fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- 4 files changed, 4 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 4aa68a06c..983b07715 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 @@ -896,7 +896,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void checkError(ErrorEvent event) { - if (event.isFormat() && getToggleCount() < 3) { + if (getSite().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) { toggleCount++; onPlayer(); } else { 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 0f410882e..42989f6d7 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 @@ -578,7 +578,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void checkError(ErrorEvent event) { - if (event.isFormat() && getToggleCount() < 3) { + if (getHome().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) { toggleCount++; onPlayer(); } else { 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 903b8e094..b7298f59d 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 @@ -923,7 +923,7 @@ public class DetailActivity extends BaseActivity implements Clock.Callback, Cust } private void checkError(ErrorEvent event) { - if (event.isFormat() && getToggleCount() < 3) { + if (getSite().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) { toggleCount++; onPlayer(); } else { 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 26ee22f56..b5732cb60 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 @@ -613,7 +613,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDownLive.List } private void checkError(ErrorEvent event) { - if (event.isFormat() && getToggleCount() < 3) { + if (getHome().getPlayerType() == -1 && event.isFormat() && getToggleCount() < 3) { toggleCount++; onPlayer(); } else {