From 2ce9b3636a7cf2faa7edfd5fe92d10d7b31f502f Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 3 Apr 2025 13:02:00 +0800 Subject: [PATCH] Clean code --- app/build.gradle | 12 +++--------- .../java/com/fongmi/android/tv/Updater.java | 2 +- .../fongmi/android/tv/api/loader/PyLoader.java | 18 ++++-------------- .../android/tv/player/extractor/TVBus.java | 11 ++++++----- .../java/com/fongmi/android/tv/Updater.java | 2 +- 5 files changed, 15 insertions(+), 30 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 760cbcde7..b7d9b7a4f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { namespace 'com.fongmi.android.tv' compileSdk 35 - flavorDimensions = ["mode", "api", "abi"] + flavorDimensions = ["mode", "abi"] defaultConfig { applicationId "com.fongmi.android.tv" @@ -29,12 +29,6 @@ android { mobile { dimension "mode" } - java { - dimension "api" - } - python { - dimension "api" - } arm64_v8a { dimension "abi" ndk { abiFilters "arm64-v8a" } @@ -67,7 +61,7 @@ android { android.applicationVariants.configureEach { variant -> variant.outputs.configureEach { output -> - outputFileName = "${variant.productFlavors[0].name}-${variant.productFlavors[1].name}-${variant.productFlavors[2].name}.apk" + outputFileName = "${variant.productFlavors[0].name}-${variant.productFlavors[1].name}.apk" } } @@ -92,7 +86,7 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.aar"]) implementation project(':catvod') implementation project(':quickjs') - pythonImplementation project(':chaquo') + implementation project(':chaquo') implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.media:media:1.7.0' implementation 'androidx.room:room-runtime:2.6.1' diff --git a/app/src/leanback/java/com/fongmi/android/tv/Updater.java b/app/src/leanback/java/com/fongmi/android/tv/Updater.java index 549a1de5a..57354f643 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Updater.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Updater.java @@ -37,7 +37,7 @@ public class Updater implements Download.Callback { } private String getApk() { - return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + "-" + BuildConfig.FLAVOR_abi); + return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_abi); } public static Updater create() { diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java index 0bb692ded..9c9807e9d 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java +++ b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java @@ -1,24 +1,22 @@ package com.fongmi.android.tv.api.loader; -import android.content.Context; - import com.fongmi.android.tv.App; +import com.fongmi.chaquo.Loader; import com.github.catvod.crawler.Spider; import com.github.catvod.crawler.SpiderNull; -import java.lang.reflect.Method; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class PyLoader { private final ConcurrentHashMap spiders; - private Object loader; + private final Loader loader; private String recent; public PyLoader() { spiders = new ConcurrentHashMap<>(); - init(); + loader = new Loader(); } public void clear() { @@ -30,18 +28,10 @@ public class PyLoader { this.recent = recent; } - private void init() { - try { - loader = Class.forName("com.fongmi.chaquo.Loader").newInstance(); - } catch (Throwable ignored) { - } - } - public Spider getSpider(String key, String api, String ext) { try { if (spiders.containsKey(key)) return spiders.get(key); - Method method = loader.getClass().getMethod("spider", Context.class, String.class); - Spider spider = (Spider) method.invoke(loader, App.get(), api); + Spider spider = loader.spider(App.get(), api); spider.init(App.get(), ext); spiders.put(key, spider); return spider; diff --git a/app/src/main/java/com/fongmi/android/tv/player/extractor/TVBus.java b/app/src/main/java/com/fongmi/android/tv/player/extractor/TVBus.java index 893dd4b20..5f0fb72e7 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/extractor/TVBus.java +++ b/app/src/main/java/com/fongmi/android/tv/player/extractor/TVBus.java @@ -20,8 +20,8 @@ import java.io.File; public class TVBus implements Source.Extractor, Listener { + private volatile String hls; private TVCore tvcore; - private String hls; private Core core; @Override @@ -50,8 +50,9 @@ public class TVBus implements Source.Extractor, Listener { @Override public String fetch(String url) throws Exception { - if (core != null && !core.equals(LiveConfig.get().getHome().getCore())) change(); - if (tvcore == null) init(core = LiveConfig.get().getHome().getCore()); + Core c = LiveConfig.get().getHome().getCore(); + if (core != null && !core.equals(c)) change(); + if (tvcore == null) init(core = c); App.get().setHook(null); tvcore.start(url); onWait(); @@ -63,7 +64,7 @@ public class TVBus implements Source.Extractor, Listener { if (hls.startsWith("-")) throw new ExtractException(ResUtil.getString(R.string.error_play_code, hls)); } - private void onWait() throws InterruptedException { + private void onWait() throws Exception { synchronized (this) { wait(); } @@ -83,7 +84,7 @@ public class TVBus implements Source.Extractor, Listener { @Override public void stop() { if (tvcore != null) tvcore.stop(); - if (hls != null) hls = null; + hls = null; } @Override diff --git a/app/src/mobile/java/com/fongmi/android/tv/Updater.java b/app/src/mobile/java/com/fongmi/android/tv/Updater.java index bdbc58b49..4f80248d0 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/Updater.java +++ b/app/src/mobile/java/com/fongmi/android/tv/Updater.java @@ -38,7 +38,7 @@ public class Updater implements Download.Callback { } private String getApk() { - return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_api + "-" + BuildConfig.FLAVOR_abi); + return Github.getApk(dev, BuildConfig.FLAVOR_mode + "-" + BuildConfig.FLAVOR_abi); } public static Updater create() {