diff --git a/app/build.gradle b/app/build.gradle index d8a32b856..7e9fd351c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -79,17 +79,17 @@ dependencies { implementation project(':forcetech') implementation project(':ijkplayer') pythonImplementation project(':pyramid') - implementation 'androidx.media3:media3-database:1.0.1' - implementation 'androidx.media3:media3-datasource:1.0.1' - implementation 'androidx.media3:media3-datasource-rtmp:1.0.1' - implementation 'androidx.media3:media3-exoplayer:1.0.1' - implementation 'androidx.media3:media3-exoplayer-dash:1.0.1' - implementation 'androidx.media3:media3-exoplayer-hls:1.0.1' - implementation 'androidx.media3:media3-exoplayer-rtsp:1.0.1' - implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.0.1' - implementation 'androidx.media3:media3-extractor:1.0.1' - implementation 'androidx.media3:media3-session:1.0.1' - implementation 'androidx.media3:media3-ui:1.0.1' + implementation 'androidx.media3:media3-database:1.0.2' + implementation 'androidx.media3:media3-datasource:1.0.2' + implementation 'androidx.media3:media3-datasource-rtmp:1.0.2' + implementation 'androidx.media3:media3-exoplayer:1.0.2' + implementation 'androidx.media3:media3-exoplayer-dash:1.0.2' + implementation 'androidx.media3:media3-exoplayer-hls:1.0.2' + implementation 'androidx.media3:media3-exoplayer-rtsp:1.0.2' + implementation 'androidx.media3:media3-exoplayer-smoothstreaming:1.0.2' + implementation 'androidx.media3:media3-extractor:1.0.2' + implementation 'androidx.media3:media3-session:1.0.2' + implementation 'androidx.media3:media3-ui:1.0.2' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.lifecycle:lifecycle-viewmodel:2.5.1' implementation 'androidx.preference:preference:1.2.0' diff --git a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java index 59d9495fe..14508b578 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java @@ -97,7 +97,7 @@ public class ExoUtil { MediaItem.Builder builder = new MediaItem.Builder().setUri(uri); if (errorCode == PlaybackException.ERROR_CODE_PARSING_CONTAINER_UNSUPPORTED) builder.setMimeType(MimeTypes.APPLICATION_M3U8); if (subs.size() > 0) builder.setSubtitleConfigurations(getSubtitles(subs)); - return builder.setAds(getAdsRegex(uri)).build(); + return builder.build(); } private static List getAdsRegex(Uri uri) { 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 fb2d4a319..c88fd1268 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 @@ -103,12 +103,7 @@ 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(LiveConfig.hasUrl()); - } - - private boolean openLive() { - LiveActivity.start(this); - return false; + mBinding.navigation.getMenu().findItem(R.id.live).setVisible(false); } private void setConfirm() { @@ -128,7 +123,6 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt if (mBinding.navigation.getSelectedItemId() == item.getItemId()) return false; if (item.getItemId() == R.id.vod) return mManager.change(0); if (item.getItemId() == R.id.setting) return mManager.change(1); - if (item.getItemId() == R.id.live) return openLive(); return false; } diff --git a/release/leanback-dev.json b/release/leanback-dev.json new file mode 100644 index 000000000..587963dfb --- /dev/null +++ b/release/leanback-dev.json @@ -0,0 +1,5 @@ +{ + "code": 77, + "name": "1.7.7", + "desc": "* [直播]\n* 修正閃退問題\n* [點播]\n* 優化換源邏輯\n* 支持同步觀看紀錄\n* 支持同步收藏紀錄\n* 配置載入過久可返回\n* 配置支持 rules,不再內置嗅探規則" +} \ No newline at end of file diff --git a/release/leanback-release.json b/release/leanback-release.json new file mode 100644 index 000000000..587963dfb --- /dev/null +++ b/release/leanback-release.json @@ -0,0 +1,5 @@ +{ + "code": 77, + "name": "1.7.7", + "desc": "* [直播]\n* 修正閃退問題\n* [點播]\n* 優化換源邏輯\n* 支持同步觀看紀錄\n* 支持同步收藏紀錄\n* 配置載入過久可返回\n* 配置支持 rules,不再內置嗅探規則" +} \ No newline at end of file diff --git a/release/mobile-dev.json b/release/mobile-dev.json new file mode 100644 index 000000000..881e78a1f --- /dev/null +++ b/release/mobile-dev.json @@ -0,0 +1,5 @@ +{ + "code": 15, + "name": "1.1.5", + "desc": "* [直播]\n* 修正閃退問題\n* [點播]\n* 優化換源邏輯\n* 支持同步觀看紀錄\n* 支持同步收藏紀錄\n* 配置載入過久可返回\n* 配置支持 rules,不再內置嗅探規則" +} \ No newline at end of file diff --git a/release/mobile-release.json b/release/mobile-release.json new file mode 100644 index 000000000..881e78a1f --- /dev/null +++ b/release/mobile-release.json @@ -0,0 +1,5 @@ +{ + "code": 15, + "name": "1.1.5", + "desc": "* [直播]\n* 修正閃退問題\n* [點播]\n* 優化換源邏輯\n* 支持同步觀看紀錄\n* 支持同步收藏紀錄\n* 配置載入過久可返回\n* 配置支持 rules,不再內置嗅探規則" +} \ No newline at end of file diff --git a/release/run.bat b/release/run.bat new file mode 100644 index 000000000..f55e357d9 --- /dev/null +++ b/release/run.bat @@ -0,0 +1,8 @@ +move .\leanbackJava\release\*.apk .\ +move .\leanbackPython\release\*.apk .\ +move .\mobileJava\release\*.apk .\ +move .\mobilePython\release\*.apk .\ +rmdir /s /q .\leanbackJava +rmdir /s /q .\leanbackPython +rmdir /s /q .\mobileJava +rmdir /s /q .\mobilePython \ No newline at end of file