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 33edc43b3..0b140e9b8 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
@@ -157,10 +157,14 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
return 0;
}
- private int getPlayerType() {
+ private int getPlayer() {
return mHistory != null && mHistory.getPlayer() != -1 ? mHistory.getPlayer() : getSite().getPlayerType() != -1 ? getSite().getPlayerType() : Prefers.getPlayer();
}
+ private int getScale() {
+ return mHistory != null && mHistory.getScale() != -1 ? mHistory.getScale() : Prefers.getScale();
+ }
+
private StyledPlayerView getExo() {
return Prefers.getRender() == 0 ? mBinding.surface : mBinding.texture;
}
@@ -292,8 +296,8 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
mViewModel = new ViewModelProvider(this).get(SiteViewModel.class);
mViewModel.search.observe(this, result -> setSearch(result.getList()));
mViewModel.player.observe(this, result -> {
- boolean useParse = result.getPlayUrl().isEmpty() && ApiConfig.get().getFlags().contains(result.getFlag()) || result.getJx() == 1;
- mBinding.control.parseLayout.setVisibility(mParseAdapter.size() > 0 && useParse ? View.VISIBLE : View.GONE);
+ boolean useParse = ApiConfig.hasParse() && ((result.getPlayUrl().isEmpty() && ApiConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1);
+ mBinding.control.parseLayout.setVisibility(useParse ? View.VISIBLE : View.GONE);
int timeout = getSite().isChangeable() ? Constant.TIMEOUT_PLAY : -1;
mPlayers.start(result, useParse, timeout);
resetFocus();
@@ -518,8 +522,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
}
private void onScale() {
- int index = mHistory.getScale();
- if (index == -1) index = Prefers.getScale();
+ int index = getScale();
String[] array = ResUtil.getStringArray(R.array.select_scale);
mHistory.setScale(index = index == array.length - 1 ? 0 : ++index);
setScale(index);
@@ -566,7 +569,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private boolean onOpeningReset() {
mHistory.setOpening(0);
- mBinding.control.opening.setText(mPlayers.stringToTime(mHistory.getOpening()));
+ mBinding.control.opening.setText(R.string.play_op);
return true;
}
@@ -580,7 +583,7 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
private boolean onEndingReset() {
mHistory.setEnding(0);
- mBinding.control.ending.setText(mPlayers.stringToTime(mHistory.getEnding()));
+ mBinding.control.ending.setText(R.string.play_ed);
return true;
}
@@ -695,11 +698,11 @@ public class DetailActivity extends BaseActivity implements CustomKeyDownVod.Lis
mHistory = mHistory == null ? createHistory(item) : mHistory;
setFlagActivated(mHistory.getFlag());
if (mHistory.isRevSort()) reverseEpisode();
- setScale(mHistory.getScale() == -1 ? Prefers.getScale() : mHistory.getScale());
- mBinding.control.opening.setText(mPlayers.stringToTime(mHistory.getOpening()));
- mBinding.control.ending.setText(mPlayers.stringToTime(mHistory.getEnding()));
+ mBinding.control.opening.setText(mHistory.getOpening() == 0 ? getString(R.string.play_op) : mPlayers.stringToTime(mHistory.getOpening()));
+ mBinding.control.ending.setText(mHistory.getEnding() == 0 ? getString(R.string.play_ed) : mPlayers.stringToTime(mHistory.getEnding()));
mBinding.control.speed.setText(mPlayers.setSpeed(mHistory.getSpeed()));
- mPlayers.setPlayer(getPlayerType());
+ mPlayers.setPlayer(getPlayer());
+ setScale(getScale());
setPlayerView();
setDecodeView();
}
diff --git a/app/src/leanback/res/layout/view_control_seek.xml b/app/src/leanback/res/layout/view_control_seek.xml
new file mode 100644
index 000000000..9c8698d53
--- /dev/null
+++ b/app/src/leanback/res/layout/view_control_seek.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/view_control_vod.xml b/app/src/leanback/res/layout/view_control_vod.xml
index 15218fc86..444e8c56c 100644
--- a/app/src/leanback/res/layout/view_control_vod.xml
+++ b/app/src/leanback/res/layout/view_control_vod.xml
@@ -172,14 +172,6 @@
android:visibility="gone"
tools:visibility="visible" />
-
-