hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix subtitle style bug

Browse Source
pull/504/head
okjack 2 years ago
parent b69f5cfd48
commit 2bba8ef43f
5 changed files with 42 additions and 12 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
  2. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  3. 10
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  4. 12
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
  5. 10
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

12
app/src/leanback/java/com/fongmi/android/tv/ui/activity/CastActivity.java
Unescape View File

@ -97,6 +97,7 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List
mParser = new DIDLParser();
mR1 = this::hideControl;
mR2 = this::setTraffic;
setSubtitleView();
setVideoView();
checkAction();
}
@ -147,15 +148,20 @@ public class CastActivity extends BaseActivity implements CustomKeyDownCast.List
mPlayers.set(getExo(), getIjk());
mPlayers.setPlayer(Setting.getPlayer());
findViewById(R.id.timeBar).setNextFocusUpId(R.id.reset);
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[0]);
setScale(scale = Setting.getScale());
setSubtitle(Setting.getSubtitle());
setPlayerView();
setDecodeView();
}
private void setSubtitleView() {
setSubtitle(Setting.getSubtitle());
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getExo().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
getIjk().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
}
private void setPlayerView() {
getIjk().setPlayer(mPlayers.getPlayer());
mBinding.control.speed.setText(mPlayers.getSpeedText());

10
app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
Unescape View File

@ -150,6 +150,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP
mR4 = this::hideUI;
Server.get().start();
setRecyclerView();
setSubtitleView();
setVideoView();
setDisplayView();
setViewModel();
@ -211,14 +212,19 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, GroupP
private void setVideoView() {
mPlayers.set(getExo(), getIjk());
setScale(Setting.getLiveScale());
setSubtitle(Setting.getSubtitle());
mBinding.control.invert.setActivated(Setting.isInvert());
mBinding.control.across.setActivated(Setting.isAcross());
mBinding.control.change.setActivated(Setting.isChange());
findViewById(R.id.timeBar).setNextFocusUpId(R.id.player);
mBinding.control.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE);
}
private void setSubtitleView() {
setSubtitle(Setting.getSubtitle());
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
mBinding.control.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE);
getExo().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
getIjk().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
}
private void setDisplayView() {

10
app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
Unescape View File

@ -329,6 +329,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
setBackground(false);
setRecyclerView();
setEpisodeView();
setSubtitleView();
setVideoView();
setDisplayView();
setDanmuView();
@ -448,10 +449,15 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
private void setVideoView() {
mPlayers.set(getExo(), getIjk());
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
mBinding.control.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Setting.getReset()]);
}
private void setSubtitleView() {
setSubtitle(16);
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getExo().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
getIjk().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
}
private void setDanmuViewSettings() {

12
app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
Unescape View File

@ -174,6 +174,7 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom
Server.get().start();
setForeground(true);
setRecyclerView();
setSubtitleView();
setVideoView();
setDisplayView();
setViewModel();
@ -234,15 +235,20 @@ public class LiveActivity extends BaseActivity implements Clock.Callback, Custom
private void setVideoView() {
mPlayers.set(getExo(), getIjk());
setScale(Setting.getLiveScale());
setSubtitle(Setting.getSubtitle());
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
mBinding.control.action.invert.setActivated(Setting.isInvert());
mBinding.control.action.across.setActivated(Setting.isAcross());
mBinding.control.action.change.setActivated(Setting.isChange());
mBinding.control.action.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE);
}
private void setSubtitleView() {
setSubtitle(Setting.getSubtitle());
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getExo().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
getIjk().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
}
private void setDisplayView() {
mBinding.display.getRoot().setVisibility(View.VISIBLE);
mBinding.display.progress.setVisibility(View.GONE);

10
app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
Unescape View File

@ -319,6 +319,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
mPiP = new PiP();
setForeground(true);
setRecyclerView();
setSubtitleView();
setVideoView();
setDisplayView();
setDanmuView();
@ -412,11 +413,16 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
private void setVideoView() {
mPlayers.set(getExo(), getIjk());
if (isPort() && ResUtil.isLand(this)) enterFullscreen();
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
mBinding.control.action.reset.setText(ResUtil.getStringArray(R.array.select_reset)[Setting.getReset()]);
mBinding.video.addOnLayoutChangeListener((view, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> mPiP.update(getActivity(), view));
}
private void setSubtitleView() {
setSubtitle(14);
getExo().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getIjk().getSubtitleView().setStyle(ExoUtil.getCaptionStyle());
getExo().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
getIjk().getSubtitleView().setApplyEmbeddedStyles(!Setting.isCaption());
}
public void setDanmuViewSettings() {

Write Preview
Loading…
Cancel
Save