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 b1ead7e29..39b085614 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 @@ -237,17 +237,13 @@ public class HomeActivity extends BaseActivity implements VodPresenter.OnClickLi } } - @Override - protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) getVideo(); - } - @Override public void onBackPressed() { if (mHistoryPresenter.isDelete()) { mHistoryPresenter.setDelete(false); mHistoryAdapter.notifyArrayItemRangeChanged(0, mHistoryAdapter.size()); + } else if (mBinding.recycler.getSelectedPosition() != 1) { + mBinding.recycler.smoothScrollToPosition(1); } else if (!mConfirmExit) { mConfirmExit = true; Notify.show(R.string.app_exit); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java index f7f188f33..f24403608 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java @@ -38,7 +38,7 @@ public class SettingActivity extends BaseActivity implements ConfigDialog.Callba private ActivitySettingBinding mBinding; public static void start(Activity activity) { - activity.startActivityForResult(new Intent(activity, SettingActivity.class), 1000); + activity.startActivity(new Intent(activity, SettingActivity.class)); } private final ActivityResultLauncher launcherString = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> loadConfig()); @@ -121,7 +121,7 @@ public class SettingActivity extends BaseActivity implements ConfigDialog.Callba mBinding.home.setText(item.getName()); for (int i = 0; i < adapter.size(); i++) ((Site) adapter.get(i)).setHome(item); adapter.notifyArrayItemRangeChanged(0, adapter.size()); - setResult(RESULT_OK); + EventBus.getDefault().post(RefreshEvent.video()); Notify.dismiss(); }