From e154ad1e26d8a9ff147ad0a51fecb1ac46bb776c Mon Sep 17 00:00:00 2001 From: jhengazuji Date: Fri, 7 Nov 2025 14:02:25 +0800 Subject: [PATCH] Clean code --- .../android/tv/ui/activity/LiveActivity.java | 4 +-- .../tv/ui/activity/SettingActivity.java | 4 +-- .../tv/ui/activity/SettingPlayerActivity.java | 10 ++++---- .../main/java/com/fongmi/android/tv/App.java | 8 ++++++ .../java/com/fongmi/android/tv/Startup.java | 3 ++- .../com/fongmi/android/tv/bean/Channel.java | 12 ++++----- .../android/tv/ui/activity/LiveActivity.java | 2 +- .../tv/ui/fragment/SettingPlayerFragment.java | 6 ++--- .../main/java/com/github/catvod/Startup.java | 25 ------------------- 9 files changed, 29 insertions(+), 45 deletions(-) delete mode 100644 catvod/src/main/java/com/github/catvod/Startup.java 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 caf84251d..ed558804a 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 @@ -884,14 +884,14 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick private void prevLine() { if (mChannel == null || mChannel.isOnly()) return; - mChannel.prevLine(); + mChannel.switchLine(false); showInfo(); fetch(); } private void nextLine(boolean show) { if (mChannel == null || mChannel.isOnly()) return; - mChannel.nextLine(); + mChannel.switchLine(true); if (show) showInfo(); else setInfo(); fetch(); 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 2f3c01a5c..f8e2a658b 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 @@ -269,9 +269,9 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit } private void setSize(View view) { - int index = Setting.getSize(); - Setting.putSize(index = index == size.length - 1 ? 0 : ++index); + int index = (Setting.getSize() + 1) % size.length; mBinding.sizeText.setText(size[index]); + Setting.putSize(index); RefreshEvent.size(); } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java index 235f3e3ad..5aca81fea 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java @@ -101,9 +101,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B } private void setScale(View view) { - int index = Setting.getScale(); - Setting.putScale(index = index == scale.length - 1 ? 0 : ++index); + int index = (Setting.getScale() + 1) % scale.length; mBinding.scaleText.setText(scale[index]); + Setting.putScale(index); } private void onSpeed(View view) { @@ -127,10 +127,10 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B } private void setRender(View view) { - int index = Setting.getRender(); - Setting.putRender(index = index == render.length - 1 ? 0 : ++index); + if (Setting.isTunnel() && Setting.getRender() == 0) setTunnel(view); + int index = (Setting.getRender() + 1) % render.length; mBinding.renderText.setText(render[index]); - if (Setting.isTunnel() && Setting.getRender() == 1) setTunnel(view); + Setting.putRender(index); } private void setTunnel(View view) { diff --git a/app/src/main/java/com/fongmi/android/tv/App.java b/app/src/main/java/com/fongmi/android/tv/App.java index 8808fb33f..70ddcd8b5 100644 --- a/app/src/main/java/com/fongmi/android/tv/App.java +++ b/app/src/main/java/com/fongmi/android/tv/App.java @@ -2,6 +2,7 @@ package com.fongmi.android.tv; import android.app.Activity; import android.app.Application; +import android.content.Context; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; @@ -14,6 +15,7 @@ import androidx.core.os.HandlerCompat; import com.fongmi.android.tv.utils.Notify; import com.fongmi.hook.Chromium; import com.fongmi.hook.Hook; +import com.github.catvod.Init; import com.google.gson.Gson; import java.util.concurrent.Callable; @@ -50,6 +52,12 @@ public class App extends Application implements Application.ActivityLifecycleCal this.hook = hook; } + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + Init.set(base); + } + @Override public void onCreate() { super.onCreate(); diff --git a/app/src/main/java/com/fongmi/android/tv/Startup.java b/app/src/main/java/com/fongmi/android/tv/Startup.java index 3995d72e8..5e1f30035 100644 --- a/app/src/main/java/com/fongmi/android/tv/Startup.java +++ b/app/src/main/java/com/fongmi/android/tv/Startup.java @@ -15,6 +15,7 @@ import com.orhanobut.logger.PrettyFormatStrategy; import org.greenrobot.eventbus.EventBus; +import java.util.Collections; import java.util.List; import cat.ereza.customactivityoncrash.config.CaocConfig; @@ -34,6 +35,6 @@ public class Startup implements Initializer { @NonNull @Override public List>> dependencies() { - return List.of(com.github.catvod.Startup.class); + return Collections.emptyList(); } } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java index a0d262fb1..e69f4a6f2 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java @@ -283,12 +283,12 @@ public class Channel { ImgUtil.load(getName(), getLogo(), view, false); } - public void nextLine() { - setLine(getLine() < getUrls().size() - 1 ? getLine() + 1 : 0); - } - - public void prevLine() { - setLine(getLine() > 0 ? getLine() - 1 : getUrls().size() - 1); + public void switchLine(boolean next) { + List urls = getUrls(); + if (urls.isEmpty()) return; + int size = urls.size(); + int step = next ? 1 : -1; + setLine((getLine() + step + size) % size); } public String getCurrent() { 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 a64bca124..2729f6093 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 @@ -922,7 +922,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener private void nextLine(boolean show) { if (mChannel == null || mChannel.isOnly()) return; - mChannel.nextLine(); + mChannel.switchLine(true); if (show) showInfo(); else setInfo(); fetch(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java index cd1c47a7a..3bef6af30 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java @@ -128,10 +128,10 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B } private void setRender(View view) { - int index = Setting.getRender(); - Setting.putRender(index = index == render.length - 1 ? 0 : ++index); + if (Setting.isTunnel() && Setting.getRender() == 0) setTunnel(view); + int index = (Setting.getRender() + 1) % render.length; mBinding.renderText.setText(render[index]); - if (Setting.isTunnel() && Setting.getRender() == 1) setTunnel(view); + Setting.putRender(index); } private void setTunnel(View view) { diff --git a/catvod/src/main/java/com/github/catvod/Startup.java b/catvod/src/main/java/com/github/catvod/Startup.java deleted file mode 100644 index 85fb1b52f..000000000 --- a/catvod/src/main/java/com/github/catvod/Startup.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.catvod; - -import android.content.Context; - -import androidx.annotation.NonNull; -import androidx.startup.Initializer; - -import java.util.Collections; -import java.util.List; - -public class Startup implements Initializer { - - @NonNull - @Override - public Void create(@NonNull Context context) { - Init.set(context); - return null; - } - - @NonNull - @Override - public List>> dependencies() { - return Collections.emptyList(); - } -}