diff --git a/app/build.gradle b/app/build.gradle index 070baf2d4..a72576fb5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -89,18 +89,18 @@ dependencies { implementation project(':forcetech') implementation project(':ijkplayer') //pythonImplementation project(':pyramid') - implementation 'androidx.media3:media3-database:1.1.0' - implementation 'androidx.media3:media3-datasource:1.1.0' - implementation 'androidx.media3:media3-datasource-okhttp:1.1.0' - implementation 'androidx.media3:media3-datasource-rtmp:1.1.0' - implementation 'androidx.media3:media3-exoplayer:1.1.0' - implementation 'androidx.media3:media3-exoplayer-dash:1.1.0' - implementation 'androidx.media3:media3-exoplayer-hls:1.1.0' - implementation 'androidx.media3:media3-exoplayer-rtsp:1.1.0' - implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.1.0' - implementation 'androidx.media3:media3-extractor:1.1.0' - implementation 'androidx.media3:media3-session:1.1.0' - implementation 'androidx.media3:media3-ui:1.1.0' + implementation 'androidx.media3:media3-database:' + media3Version + implementation 'androidx.media3:media3-datasource:' + media3Version + implementation 'androidx.media3:media3-datasource-okhttp:' + media3Version + implementation 'androidx.media3:media3-datasource-rtmp:' + media3Version + implementation 'androidx.media3:media3-exoplayer:' + media3Version + implementation 'androidx.media3:media3-exoplayer-dash:' + media3Version + implementation 'androidx.media3:media3-exoplayer-hls:' + media3Version + implementation 'androidx.media3:media3-exoplayer-rtsp:' + media3Version + implementation 'androidx.media3:media3-exoplayer-smoothstreaming:' + media3Version + implementation 'androidx.media3:media3-extractor:' + media3Version + implementation 'androidx.media3:media3-session:' + media3Version + implementation 'androidx.media3:media3-ui:1.1.1' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.biometric:biometric:1.1.0' implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Biometric.java b/app/src/main/java/com/fongmi/android/tv/utils/Biometric.java index dcd7f2688..5e12b3158 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Biometric.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Biometric.java @@ -1,11 +1,16 @@ package com.fongmi.android.tv.utils; +import androidx.fragment.app.FragmentActivity; + public class Biometric { public static boolean enable() { return false; } + public static void show(FragmentActivity activity) { + } + public interface Callback { void onBiometricSuccess(); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index fdce8455d..ba57c645c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -127,7 +127,12 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt private void setNavigation() { mBinding.navigation.getMenu().findItem(R.id.vod).setVisible(true); mBinding.navigation.getMenu().findItem(R.id.setting).setVisible(true); - mBinding.navigation.getMenu().findItem(R.id.live).setVisible(false); + mBinding.navigation.getMenu().findItem(R.id.live).setVisible(LiveConfig.hasUrl()); + } + + private boolean openLive() { + LiveActivity.start(this); + return false; } private void setConfirm() { @@ -189,4 +194,4 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt Source.get().exit(); Server.get().stop(); } -} +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 96ade629c..0277d0a91 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ task clean(type: Delete) { project.ext { gsonVersion = '2.10.1' jsoupVersion = '1.15.3' + media3Version = '1.1.1' okhttpVersion = '4.11.0' annotationVersion = '1.3.0' } diff --git a/catvod/build.gradle b/catvod/build.gradle index 63357ebcc..77e61a909 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -12,7 +12,7 @@ android { } dependencies { - api 'androidx.media3:media3-common:1.1.0' + api 'androidx.media3:media3-common:' + media3Version api 'androidx.annotation:annotation:' + annotationVersion api 'androidx.preference:preference:1.2.1' api 'com.google.code.gson:gson:' + gsonVersion diff --git a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java index 090b7fa10..bb6e60982 100644 --- a/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java +++ b/quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java @@ -42,7 +42,7 @@ public class Spider extends com.github.catvod.crawler.Spider { private final String key; private final String api; - public Spider(String api, DexClassLoader dex) throws Exception { + public Spider(String key, String api, DexClassLoader dex) throws Exception { this.key = "__" + UUID.randomUUID().toString().replace("-", "") + "__"; this.executor = Executors.newSingleThreadExecutor(); this.api = api;