From 91849986a80c1ae3cc6ff7553852afaf121a4eaa Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 20 Feb 2023 19:04:18 +0800 Subject: [PATCH] [mobile] support track --- .../android/tv/ui/adapter/TrackAdapter.java | 0 .../tv/ui/custom/dialog/TrackDialog.java | 0 .../tv/ui/activity/DetailActivity.java | 11 +++- app/src/mobile/res/layout/adapter_track.xml | 14 +++++ app/src/mobile/res/layout/dialog_track.xml | 51 ++----------------- 5 files changed, 28 insertions(+), 48 deletions(-) rename app/src/{leanback => main}/java/com/fongmi/android/tv/ui/adapter/TrackAdapter.java (100%) rename app/src/{leanback => main}/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java (100%) create mode 100644 app/src/mobile/res/layout/adapter_track.xml diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/adapter/TrackAdapter.java b/app/src/main/java/com/fongmi/android/tv/ui/adapter/TrackAdapter.java similarity index 100% rename from app/src/leanback/java/com/fongmi/android/tv/ui/adapter/TrackAdapter.java rename to app/src/main/java/com/fongmi/android/tv/ui/adapter/TrackAdapter.java diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java similarity index 100% rename from app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java rename to app/src/main/java/com/fongmi/android/tv/ui/custom/dialog/TrackDialog.java 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 7f762ecfa..abb02eacc 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 @@ -40,6 +40,7 @@ import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.model.SiteViewModel; import com.fongmi.android.tv.player.ExoUtil; import com.fongmi.android.tv.player.Players; +import com.fongmi.android.tv.ui.custom.dialog.TrackDialog; import com.fongmi.android.tv.ui.adapter.EpisodeAdapter; import com.fongmi.android.tv.ui.adapter.FlagAdapter; import com.fongmi.android.tv.ui.adapter.ParseAdapter; @@ -63,7 +64,7 @@ import java.util.concurrent.ExecutorService; import tv.danmaku.ijk.media.player.ui.IjkVideoView; -public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Listener, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, ParseAdapter.OnClickListener, Clock.Callback { +public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Listener, TrackDialog.Listener, Clock.Callback, FlagAdapter.OnClickListener, EpisodeAdapter.OnClickListener, ParseAdapter.OnClickListener { private ViewGroup.LayoutParams mFrameParams; private ActivityDetailBinding mBinding; @@ -395,7 +396,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis private void onTrack(View view) { int type = Integer.parseInt(view.getTag().toString()); - //TrackDialog.create(this).player(mPlayers).type(type).listener(this).show(); + TrackDialog.create(this).player(mPlayers).type(type).listener(this).show(); setR1Callback(); hideControl(); } @@ -672,6 +673,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis keep.save(); } + @Override + public void onTrackClick(Track item) { + item.setKey(getHistoryKey()); + item.save(); + } + @Override public void onTimeChanged() { long current = mPlayers.getPosition(); diff --git a/app/src/mobile/res/layout/adapter_track.xml b/app/src/mobile/res/layout/adapter_track.xml new file mode 100644 index 000000000..7aa079eff --- /dev/null +++ b/app/src/mobile/res/layout/adapter_track.xml @@ -0,0 +1,14 @@ + + \ No newline at end of file diff --git a/app/src/mobile/res/layout/dialog_track.xml b/app/src/mobile/res/layout/dialog_track.xml index ddbe3893a..d5b105654 100644 --- a/app/src/mobile/res/layout/dialog_track.xml +++ b/app/src/mobile/res/layout/dialog_track.xml @@ -1,50 +1,9 @@ - - - - - - - - - - - - - - - - \ No newline at end of file + android:padding="16dp" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + app:maxHeight="228dp" /> \ No newline at end of file