diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java index 88c9fb6b3..61eb3af39 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java @@ -18,6 +18,7 @@ public class SettingCustomActivity extends BaseActivity { private ActivitySettingCustomBinding mBinding; private String[] quality; private String[] size; + private String[] episode; @Override protected ViewBinding getBinding() { @@ -32,12 +33,15 @@ public class SettingCustomActivity extends BaseActivity { protected void initView() { mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]); mBinding.qualityText.setText((quality = ResUtil.getStringArray(R.array.select_quality))[Setting.getQuality()]); + mBinding.episodeText.setText((episode = ResUtil.getStringArray(R.array.select_episode))[Setting.getEpisode()]); + } @Override protected void initEvent() { mBinding.quality.setOnClickListener(this::setQuality); mBinding.size.setOnClickListener(this::setSize); + mBinding.episode.setOnClickListener(this::setEpisode); } private void setQuality(View view) { @@ -54,4 +58,10 @@ public class SettingCustomActivity extends BaseActivity { RefreshEvent.size(); } + private void setEpisode(View view) { + int index = Setting.getEpisode(); + Setting.putEpisode(index = index == episode.length - 1 ? 0 : ++index); + mBinding.episodeText.setText(episode[index]); + } + } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java index 8edea2a2b..a40e81c93 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java @@ -25,7 +25,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B private ActivitySettingPlayerBinding mBinding; private String[] caption; - private String[] episode; private String[] player; private String[] render; private String[] scale; @@ -58,7 +57,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]); mBinding.playerText.setText((player = ResUtil.getStringArray(R.array.select_player))[Setting.getPlayer()]); mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]); - mBinding.episodeText.setText((episode = ResUtil.getStringArray(R.array.select_episode))[Setting.getEpisode()]); mBinding.captionText.setText((caption = ResUtil.getStringArray(R.array.select_caption))[Setting.isCaption() ? 1 : 0]); } @@ -72,7 +70,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.player.setOnClickListener(this::setPlayer); mBinding.render.setOnClickListener(this::setRender); mBinding.tunnel.setOnClickListener(this::setTunnel); - mBinding.episode.setOnClickListener(this::setEpisode); mBinding.caption.setOnClickListener(this::setCaption); mBinding.subtitle.setOnClickListener(this::onSubtitle); mBinding.caption.setOnLongClickListener(this::onCaption); @@ -142,12 +139,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B mBinding.tunnelText.setText(getSwitch(Setting.isTunnel())); } - private void setEpisode(View view) { - int index = Setting.getEpisode(); - Setting.putEpisode(index = index == episode.length - 1 ? 0 : ++index); - mBinding.episodeText.setText(episode[index]); - } - private void setCaption(View view) { Setting.putCaption(!Setting.isCaption()); mBinding.captionText.setText(caption[Setting.isCaption() ? 1 : 0]); diff --git a/app/src/leanback/res/layout/activity_setting_custom.xml b/app/src/leanback/res/layout/activity_setting_custom.xml index 45284a508..587a40f27 100644 --- a/app/src/leanback/res/layout/activity_setting_custom.xml +++ b/app/src/leanback/res/layout/activity_setting_custom.xml @@ -79,5 +79,35 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/leanback/res/layout/activity_setting_player.xml b/app/src/leanback/res/layout/activity_setting_player.xml index c8845fce8..9f0289765 100644 --- a/app/src/leanback/res/layout/activity_setting_player.xml +++ b/app/src/leanback/res/layout/activity_setting_player.xml @@ -186,35 +186,6 @@ - - - - - - - -