From 1e23d40ffba0ac68551ed33e1a6a2072e2b2ae71 Mon Sep 17 00:00:00 2001 From: okjack Date: Thu, 7 Mar 2024 16:21:34 +0800 Subject: [PATCH] fix bug --- .../com/fongmi/android/tv/ui/activity/VideoActivity.java | 6 ++++++ .../java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java | 5 +++++ .../com/fongmi/android/tv/ui/presenter/ArrayPresenter.java | 3 +++ app/src/leanback/res/layout/dialog_site.xml | 2 +- 4 files changed, 15 insertions(+), 1 deletion(-) 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 c66c500f2..e3c08e1f5 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 @@ -794,6 +794,12 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List showDisplayInfo(); } + @Override + public boolean onArrayItemTouch() { + hasKeyEvent = true; + return false; + } + @Override public void onRevSort() { mHistory.setRevSort(!mHistory.isRevSort()); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java index 8d1547b37..4d23dd45d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java @@ -209,6 +209,11 @@ public class EpisodeDialog extends BaseDialog implements ArrayPresenter.OnClickL this.dismiss(); } + @Override + public boolean onArrayItemTouch() { + return false; + } + @Override public void onRevSort() { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ArrayPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ArrayPresenter.java index d56dab770..1896f29bc 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ArrayPresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/ArrayPresenter.java @@ -32,6 +32,8 @@ public class ArrayPresenter extends Presenter { void onRevSort(); void onRevPlay(TextView view); + + boolean onArrayItemTouch(); } public void setNextFocusDown(int nextFocusDown) { @@ -54,6 +56,7 @@ public class ArrayPresenter extends Presenter { holder.binding.text.setText(text); holder.binding.text.setNextFocusUpId(nextFocusUp); holder.binding.text.setNextFocusDownId(nextFocusDown); + holder.binding.text.setOnTouchListener((view, event) -> mListener.onArrayItemTouch()); if (text.equals(reverse)) setOnClickListener(holder, view -> mListener.onRevSort()); else if (text.equals(backward) || text.equals(forward)) setOnClickListener(holder, view -> mListener.onRevPlay(holder.binding.text)); else setOnClickListener(holder, null); diff --git a/app/src/leanback/res/layout/dialog_site.xml b/app/src/leanback/res/layout/dialog_site.xml index b0da28dee..14e9ebdb6 100644 --- a/app/src/leanback/res/layout/dialog_site.xml +++ b/app/src/leanback/res/layout/dialog_site.xml @@ -10,7 +10,7 @@