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 facdc7bc2..fd1657c5f 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 @@ -158,6 +158,10 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis return view.getVisibility() == View.GONE; } + private boolean isReplay() { + return Prefers.getReset() == 1; + } + @Override protected ViewBinding getBinding() { return mBinding = ActivityDetailBinding.inflate(getLayoutInflater()); @@ -197,7 +201,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.control.ending.setOnClickListener(view -> onEnding()); mBinding.control.opening.setOnClickListener(view -> onOpening()); mBinding.control.speed.setOnLongClickListener(view -> onSpeedLong()); - mBinding.control.reset.setOnLongClickListener(view -> onResetLong()); + mBinding.control.reset.setOnLongClickListener(view -> onResetToggle()); mBinding.control.ending.setOnLongClickListener(view -> onEndingReset()); mBinding.control.opening.setOnLongClickListener(view -> onOpeningReset()); mBinding.video.setOnTouchListener((view, event) -> mKeyDown.onTouchEvent(event)); @@ -241,6 +245,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis mBinding.control.player.setText(mPlayers.getPlayerText()); getExo().setVisibility(mPlayers.isExo() ? View.VISIBLE : View.GONE); getIjk().setVisibility(mPlayers.isIjk() ? View.VISIBLE : View.GONE); + mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Prefers.getReset()]); } private void setDecodeView() { @@ -540,13 +545,15 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis return true; } - private void onReset() { - getPlayer(false); + private boolean onReset() { + getPlayer(isReplay()); + return true; } - private boolean onResetLong() { - getPlayer(true); - return true; + private boolean onResetToggle() { + Prefers.putReset(Math.abs(Prefers.getReset() - 1)); + mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Prefers.getReset()]); + return onReset(); } private void onOpening() { diff --git a/app/src/leanback/res/layout/view_control_vod.xml b/app/src/leanback/res/layout/view_control_vod.xml index 3980ba709..4d3f4d8f8 100644 --- a/app/src/leanback/res/layout/view_control_vod.xml +++ b/app/src/leanback/res/layout/view_control_vod.xml @@ -68,9 +68,9 @@ android:focusable="true" android:focusableInTouchMode="true" android:nextFocusDown="@id/parse" - android:text="@string/play_reset" android:textColor="@color/white" - android:textSize="14sp" /> + android:textSize="14sp" + tools:text="刷新" /> 下一集 上一集 准备播放:%s - 刷新 - 轨道 字幕 音轨 反转 @@ -134,4 +132,9 @@ 裁剪 + + 刷新 + 重播 + + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 46ebc77dd..85a9afae3 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -41,8 +41,6 @@ 下一集 上一集 準備播放:%s - 刷新 - 軌道 字幕 音軌 反轉 @@ -134,4 +132,9 @@ 裁剪 + + 刷新 + 重播 + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5206253ad..70cc37b4a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,8 +41,6 @@ Next Prev Ready to play: %s - Reset - Tracks Text Audio Invert @@ -139,4 +137,9 @@ Zoom + + Reset + Replay + + \ No newline at end of file