From 3f9db645178e0ce0badc1f74ca41abaf545b39a7 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 19 Mar 2023 20:34:27 +0800 Subject: [PATCH] [mobile] update dev --- app/build.gradle | 2 +- .../android/tv/ui/activity/DetailActivity.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 683c58fb2..c4ea3ce6e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { mobile { dimension "mode" versionCode 7 - versionName "1.0.7" + versionName "20230319#1" } java { dimension = "api" diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 2b8bc6fa1..1c2ea6128 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -77,6 +77,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private ActivityDetailBinding mBinding; private EpisodeAdapter mEpisodeAdapter; private SearchAdapter mSearchAdapter; + private EpisodeDialog mEpisodeDialog; private ParseAdapter mParseAdapter; private CustomKeyDownVod mKeyDown; private ExecutorService mExecutor; @@ -282,6 +283,10 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis if (result.getList().isEmpty()) setEmpty(); else setDetail(result.getList().get(0)); }); + mViewModel.episode.observe(this, episode -> { + onItemClick(episode); + hideEpisode(); + }); } private void getDetail() { @@ -399,6 +404,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis initSearch(name, false); } + private void onMore() { + for (Fragment fragment : getSupportFragmentManager().getFragments()) if (fragment instanceof BottomSheetDialogFragment) return; + mEpisodeDialog = EpisodeDialog.create().reverse(mHistory.isRevSort()).episodes(mEpisodeAdapter.getItems()); + mEpisodeDialog.show(getSupportFragmentManager(), null); + } + private void onContent() { boolean more = mBinding.content.getMaxLines() == 2; mBinding.content.setMaxLines(more ? Integer.MAX_VALUE : 2); @@ -478,6 +489,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis } private void onTrack(View view) { + for (Fragment fragment : getSupportFragmentManager().getFragments()) if (fragment instanceof BottomSheetDialogFragment) return; mTrackDialog = TrackDialog.create().player(mPlayers).type(Integer.parseInt(view.getTag().toString())).listener(this); mTrackDialog.show(getSupportFragmentManager(), null); hideControl(); @@ -655,6 +667,11 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mTrackDialog = null; } + private void hideEpisode() { + if (mEpisodeDialog != null) mEpisodeDialog.dismissAllowingStateLoss(); + mEpisodeDialog = null; + } + private void setTraffic() { Traffic.setSpeed(mBinding.widget.traffic); App.post(mR2, Constant.INTERVAL_TRAFFIC); @@ -1073,6 +1090,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis if (isInPictureInPictureMode) { enterFullscreen(); hideControl(); + hideEpisode(); hideTrack(); } else { exitFullscreen();