From 85d32acda24b68ae306bed013624a22ee2191cf7 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 9 Jan 2023 16:26:33 +0800 Subject: [PATCH] Support reset --- .../android/tv/ui/activity/DetailActivity.java | 12 ++++++------ .../android/tv/ui/custom/CustomKeyDownVod.java | 14 +++++++++----- app/src/leanback/res/layout/activity_detail.xml | 1 + app/src/leanback/res/layout/view_control_vod.xml | 4 ++-- app/src/main/res/values-zh-rCN/strings.xml | 3 +-- app/src/main/res/values-zh-rTW/strings.xml | 3 +-- app/src/main/res/values/strings.xml | 1 - 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java index 309c23661..667b6389e 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/DetailActivity.java @@ -191,13 +191,13 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.control.prev.setOnClickListener(view -> checkPrev()); mBinding.control.scale.setOnClickListener(view -> onScale()); mBinding.control.speed.setOnClickListener(view -> onSpeed()); - mBinding.control.replay.setOnClickListener(view -> onReplay()); + mBinding.control.reset.setOnClickListener(view -> onReset()); mBinding.control.player.setOnClickListener(view -> onPlayer()); mBinding.control.decode.setOnClickListener(view -> onDecode()); mBinding.control.ending.setOnClickListener(view -> onEnding()); mBinding.control.opening.setOnClickListener(view -> onOpening()); mBinding.control.speed.setOnLongClickListener(view -> onSpeedLong()); - mBinding.control.replay.setOnLongClickListener(view -> onReplayLong()); + mBinding.control.reset.setOnLongClickListener(view -> onResetLong()); mBinding.control.ending.setOnLongClickListener(view -> onEndingReset()); mBinding.control.opening.setOnLongClickListener(view -> onOpeningReset()); mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event)); @@ -540,12 +540,12 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis return true; } - private void onReplay() { - getPlayer(true); + private void onReset() { + getPlayer(false); } - private boolean onReplayLong() { - getPlayer(false); + private boolean onResetLong() { + getPlayer(true); return true; } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java index ae9deb977..55350e19c 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/CustomKeyDownVod.java @@ -28,7 +28,16 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { return detector.onTouchEvent(e); } + public boolean hasEvent(KeyEvent event) { + return Utils.isEnterKey(event) || Utils.isUpKey(event) || Utils.isDownKey(event) || Utils.isLeftKey(event) || Utils.isRightKey(event); + } + public boolean onKeyDown(KeyEvent event) { + check(event); + return true; + } + + private void check(KeyEvent event) { if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isLeftKey(event)) { listener.onSeeking(subTime()); } else if (event.getAction() == KeyEvent.ACTION_DOWN && Utils.isRightKey(event)) { @@ -42,7 +51,6 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { } else if (event.getAction() == KeyEvent.ACTION_UP && Utils.isEnterKey(event)) { listener.onKeyCenter(); } - return true; } @Override @@ -57,10 +65,6 @@ public class CustomKeyDownVod extends GestureDetector.SimpleOnGestureListener { return true; } - public boolean hasEvent(KeyEvent event) { - return Utils.isEnterKey(event) || Utils.isUpKey(event) || Utils.isDownKey(event) || Utils.isLeftKey(event) || Utils.isRightKey(event); - } - private int addTime() { return holdTime = holdTime + 10000; } diff --git a/app/src/leanback/res/layout/activity_detail.xml b/app/src/leanback/res/layout/activity_detail.xml index 0b5dcf38f..874540560 100644 --- a/app/src/leanback/res/layout/activity_detail.xml +++ b/app/src/leanback/res/layout/activity_detail.xml @@ -15,6 +15,7 @@ android:layout_marginTop="24dp" android:background="@color/black" android:focusable="true" + android:focusableInTouchMode="true" android:foreground="@drawable/selector_video" android:nextFocusDown="@id/flag"> diff --git a/app/src/leanback/res/layout/view_control_vod.xml b/app/src/leanback/res/layout/view_control_vod.xml index 79f808038..3980ba709 100644 --- a/app/src/leanback/res/layout/view_control_vod.xml +++ b/app/src/leanback/res/layout/view_control_vod.xml @@ -60,7 +60,7 @@ android:textSize="14sp" /> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index bb90230ad..6237f5d2e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -41,8 +41,7 @@ 下一集 上一集 准备播放：%s - 重播 - 重置 + 刷新 轨道 字幕 音轨 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index b258013ec..46ebc77dd 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -41,8 +41,7 @@ 下一集 上一集 準備播放：%s - 重播 - 重置 + 刷新 軌道 字幕 音軌 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c294db694..5206253ad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,7 +41,6 @@ Next Prev Ready to play: %s - Replay Reset Tracks Text