From 9c577ac6ae6c0d0ad48cea8b3e3435044116cb48 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 18 May 2023 00:05:00 +0800 Subject: [PATCH] [mobile] support back when load config --- .../android/tv/ui/activity/MainActivity.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index d30b4bcef..fb2d4a319 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -100,6 +100,12 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt }; } + private void setNavigation() { + mBinding.navigation.getMenu().findItem(R.id.vod).setVisible(true); + mBinding.navigation.getMenu().findItem(R.id.setting).setVisible(true); + mBinding.navigation.getMenu().findItem(R.id.live).setVisible(LiveConfig.hasUrl()); + } + private boolean openLive() { LiveActivity.start(this); return false; @@ -114,10 +120,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt @Override public void onRefreshEvent(RefreshEvent event) { super.onRefreshEvent(event); - if (!event.getType().equals(RefreshEvent.Type.CONFIG)) return; - mBinding.navigation.getMenu().findItem(R.id.vod).setVisible(true); - mBinding.navigation.getMenu().findItem(R.id.setting).setVisible(true); - mBinding.navigation.getMenu().findItem(R.id.live).setVisible(LiveConfig.hasUrl()); + if (event.getType().equals(RefreshEvent.Type.CONFIG)) setNavigation(); } @Override @@ -137,7 +140,9 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt @Override public void onBackPressed() { - if (mManager.isVisible(1)) { + if (!mBinding.navigation.getMenu().findItem(R.id.vod).isVisible()) { + setNavigation(); + } else if (mManager.isVisible(1)) { mBinding.navigation.setSelectedItemId(R.id.vod); } else if (mManager.canBack(0)) { if (!confirm) setConfirm();