From 681906e10fde8d4d82c3fa1928effd4f44459b6f Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 15 Mar 2024 13:40:04 +0800 Subject: [PATCH 1/2] fix home --- .../com/fongmi/android/tv/ui/activity/HomeActivity.java | 9 +++++---- .../com/fongmi/android/tv/ui/fragment/HomeFragment.java | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 45a652f18..88c67f73e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -319,7 +319,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void error(String msg) { if (TextUtils.isEmpty(msg) && AppDatabase.getBackup().exists()) onRestore(); - getHomeFragment().mBinding.progressLayout.showContent(); + else if (getHomeFragment().init) getHomeFragment().mBinding.progressLayout.showContent(); + else App.post(() -> getHomeFragment().mBinding.progressLayout.showContent(), 1000); mResult = Result.empty(); Notify.show(msg); } @@ -511,11 +512,11 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override protected void onBackPress() { - if (mBinding.recycler.getSelectedPosition() != 0) { + if (mBinding.recycler.getVisibility() != View.GONE && mBinding.recycler.getSelectedPosition() != 0) { mBinding.recycler.scrollToPosition(0); - } else if (mPageAdapter != null && getHomeFragment().mBinding.progressLayout.isProgress()) { + } else if (mPageAdapter != null && getHomeFragment().init && getHomeFragment().mBinding.progressLayout.isProgress()) { getHomeFragment().mBinding.progressLayout.showContent(); - } else if (mPageAdapter != null && getHomeFragment().mPresenter != null && getHomeFragment().mPresenter.isDelete()) { + } else if (mPageAdapter != null && getHomeFragment().init && getHomeFragment().mPresenter != null && getHomeFragment().mPresenter.isDelete()) { getHomeFragment().setHistoryDelete(false); } else if (getHomeFragment().canBack()) { getHomeFragment().goBack(); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java index 2dcdbbfad..325c0e6fc 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/HomeFragment.java @@ -57,6 +57,7 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi private ArrayObjectAdapter mHistoryAdapter; public HistoryPresenter mPresenter; private ArrayObjectAdapter mAdapter; + public boolean init; private int homeUI; private String button; @@ -75,6 +76,7 @@ public class HomeFragment extends BaseFragment implements VodPresenter.OnClickLi setRecyclerView(); setAdapter(); initEvent(); + init = true; } @Override From a00a71da9baf96c257c63aa6fe487b1b875e6872 Mon Sep 17 00:00:00 2001 From: okjack Date: Fri, 15 Mar 2024 13:44:51 +0800 Subject: [PATCH 2/2] update --- .../java/com/fongmi/android/tv/ui/activity/HomeActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 88c67f73e..cebcb89cc 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -512,7 +512,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override protected void onBackPress() { - if (mBinding.recycler.getVisibility() != View.GONE && mBinding.recycler.getSelectedPosition() != 0) { + if (isVisible(mBinding.recycler) && mBinding.recycler.getSelectedPosition() != 0) { mBinding.recycler.scrollToPosition(0); } else if (mPageAdapter != null && getHomeFragment().init && getHomeFragment().mBinding.progressLayout.isProgress()) { getHomeFragment().mBinding.progressLayout.showContent();