From a7a4b5e7147656ae273862b47c6cae7e307ea7ee Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Fri, 24 Oct 2025 14:34:06 +0800 Subject: [PATCH] Clean code --- .../android/tv/ui/activity/HomeActivity.java | 2 -- .../android/tv/ui/activity/LiveActivity.java | 1 + .../tv/ui/fragment/SettingFragment.java | 29 ++++++++++++++++--- 3 files changed, 26 insertions(+), 6 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 3e066d103..9d47b5b27 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 @@ -110,7 +110,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen mBinding.progressLayout.showProgress(); PermissionUtil.requestNotify(this); Updater.create().start(this); - mResult = Result.empty(); Server.get().start(); setRecyclerView(); setViewModel(); @@ -199,7 +198,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void error(String msg) { mBinding.progressLayout.showContent(); - mResult = Result.empty(); Notify.show(msg); setFocus(); setFunc(); 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 7649799d7..754349347 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 @@ -721,6 +721,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener public void success() { Notify.dismiss(); setLive(getHome()); + RefreshEvent.config(); } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java index d03934095..31f2aa56c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java @@ -2,6 +2,7 @@ package com.fongmi.android.tv.ui.fragment; import android.app.Activity; import android.content.Intent; +import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -47,6 +48,10 @@ import com.github.catvod.net.OkHttp; import com.github.catvod.utils.Path; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + import java.util.ArrayList; import java.util.List; @@ -83,6 +88,12 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit return mBinding = FragmentSettingBinding.inflate(inflater, container, false); } + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + EventBus.getDefault().register(this); + } + @Override protected void initView() { mBinding.vodUrl.setText(VodConfig.getDesc()); @@ -190,15 +201,11 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit Notify.dismiss(); RefreshEvent.video(); RefreshEvent.config(); - mBinding.vodUrl.setText(VodConfig.getDesc()); - mBinding.liveUrl.setText(LiveConfig.getDesc()); - mBinding.wallUrl.setText(WallConfig.getDesc()); break; case 1: setCacheText(); Notify.dismiss(); RefreshEvent.config(); - mBinding.liveUrl.setText(LiveConfig.getDesc()); break; case 2: setCacheText(); @@ -362,6 +369,14 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit VodConfig.get().init().load(getCallback(0)); } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onRefreshEvent(RefreshEvent event) { + if (event.getType() != RefreshEvent.Type.CONFIG) return; + mBinding.vodUrl.setText(VodConfig.getDesc()); + mBinding.liveUrl.setText(LiveConfig.getDesc()); + mBinding.wallUrl.setText(WallConfig.getDesc()); + } + @Override public void onHiddenChanged(boolean hidden) { if (hidden) return; @@ -371,6 +386,12 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit setCacheText(); } + @Override + public void onDestroyView() { + super.onDestroyView(); + EventBus.getDefault().unregister(this); + } + private final ActivityResultLauncher launcher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> { if (result.getResultCode() != Activity.RESULT_OK || result.getData() == null || result.getData().getData() == null) return; setConfig(Config.find("file:/" + FileChooser.getPathFromUri(result.getData().getData()).replace(Path.rootPath(), ""), type));