From 334d1b2ed602c7c23b5f302aabd8f09079ed0712 Mon Sep 17 00:00:00 2001 From: okjack Date: Sun, 4 Feb 2024 11:37:51 +0800 Subject: [PATCH 1/2] update --- .../java/com/fongmi/android/tv/ui/activity/HomeActivity.java | 4 +++- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 5 +++-- 2 files changed, 6 insertions(+), 3 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 288ec4ffd..0e2487377 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 @@ -20,6 +20,7 @@ import com.android.cast.dlna.dmr.DLNARendererService; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Product; import com.fongmi.android.tv.R; +import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.Updater; import com.fongmi.android.tv.api.config.LiveConfig; import com.fongmi.android.tv.api.config.VodConfig; @@ -320,7 +321,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void onItemClick(Vod item) { - VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic()); + if (Setting.isAggregatedSearch()) CollectActivity.start(this, item.getVodName()); + else VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic()); } @Override diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 9962365c5..9336921ff 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -348,7 +348,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List mBinding.control.danmu.setOnClickListener(view -> onDanmu()); mBinding.control.next.setOnClickListener(view -> checkNext()); mBinding.control.prev.setOnClickListener(view -> checkPrev()); - mBinding.control.episodes.setOnClickListener(view -> showEpisodes()); + mBinding.control.episodes.setOnClickListener(view -> onEpisodes()); mBinding.control.scale.setOnClickListener(view -> onScale()); mBinding.control.speed.setOnClickListener(view -> onSpeed()); mBinding.control.reset.setOnClickListener(view -> onReset()); @@ -843,8 +843,9 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List else mBinding.danmaku.hide(); } - private void showEpisodes() { + private void onEpisodes() { EpisodeDialog.create().episodes(getFlag().getEpisodes()).show(this); + hideControl(); } private void checkNext() { From eca98d2f333cd32226a790322db682e813290c1a Mon Sep 17 00:00:00 2001 From: okjack Date: Sun, 4 Feb 2024 11:38:39 +0800 Subject: [PATCH 2/2] build.gradle --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 93445a60c..6bf5a4ae2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.fongmi.android.tv" minSdk 21 targetSdk 28 - versionCode 224 - versionName "0203" + versionCode 225 + versionName "2.2.5" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]