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

Merge branch 'FongMi:dev' into dev

Browse Source
pull/230/head
okcaptain 2 years ago committed by GitHub
parent 424b5fa607 f5e32836b9
commit 9eacbb8111
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 27 additions and 30 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. 23
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
  2. 2
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  3. 5
      app/src/main/java/com/fongmi/android/tv/player/Players.java
  4. 2
      app/src/main/res/values-zh-rTW/strings.xml
  5. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  6. 23
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java

23
app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
Unescape View File

@ -58,9 +58,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.player.requestFocus();
mBinding.uaText.setText(Setting.getUa());
mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad()));
mBinding.bufferText.setText(String.valueOf(Setting.getBuffer()));
mBinding.subtitleText.setText(String.valueOf(Setting.getSubtitle()));
mBinding.danmuLoadText.setText(getSwitch(Setting.getDanmuLoad()));
mBinding.danmuSizeText.setText(String.valueOf(Setting.getDanmuSize()));
mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(3)));
mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha()));
@ -90,9 +90,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.caption.setOnLongClickListener(this::onCaption);
mBinding.danmuSize.setOnClickListener(this::onDanmuSize);
mBinding.danmuLine.setOnClickListener(this::onDanmuLine);
mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad);
mBinding.danmuAlpha.setOnClickListener(this::onDanmuAlpha);
mBinding.danmuSpeed.setOnClickListener(this::setDanmuSpeed);
mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad);
}
private void setVisible() {
@ -184,7 +184,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.subtitleText.setText(String.valueOf(size));
}
public void onDanmuSize(View view) {
private void onDanmuSize(View view) {
DanmuSizeDialog.create(this).show();
}
@ -194,17 +194,22 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
Setting.putDanmuSize(size);
}
public void onDanmuLine(View view) {
private void onDanmuLine(View view) {
DanmuLineDialog.create(this).show();
}
private void setDanmuLoad(View view) {
Setting.putDanmuLoad(!Setting.isDanmuLoad());
mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad()));
}
@Override
public void setDanmuLine(int line) {
mBinding.danmuLineText.setText(String.valueOf(line));
Setting.putDanmuLine(line);
}
public void onDanmuAlpha(View view) {
private void onDanmuAlpha(View view) {
DanmuAlphaDialog.create(this).show();
}
@ -214,15 +219,9 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
Setting.putDanmuAlpha(alpha);
}
public void setDanmuSpeed(View view) {
private void setDanmuSpeed(View view) {
int index = Setting.getDanmuSpeed();
Setting.putDanmuSpeed(index = index == danmuSpeed.length - 1 ? 0 : ++index);
mBinding.danmuSpeedText.setText(danmuSpeed[index]);
}
public void setDanmuLoad(View view) {
boolean load = Setting.getDanmuLoad();
Setting.putDanmuLoad(!load);
mBinding.danmuLoadText.setText(getSwitch(!load));
}
}

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

@ -504,8 +504,8 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List
}
private void checkDanmu(String danmu) {
if (!Setting.getDanmuLoad()) return;
mBinding.danmaku.release();
if (!Setting.isDanmuLoad()) return;
mBinding.danmaku.setVisibility(danmu.isEmpty() ? View.GONE : View.VISIBLE);
if (danmu.length() > 0) App.execute(() -> mBinding.danmaku.prepare(new Parser(danmu), mDanmakuContext));
}

5
app/src/main/java/com/fongmi/android/tv/player/Players.java
Unescape View File

@ -355,11 +355,10 @@ public class Players implements Player.Listener, IMediaPlayer.Listener, Analytic
public void play() {
if (isEnd()) return;
session.setActive(true);
boolean danmuResume = true;
if (isPlaying()) danmuResume = false;
boolean resume = !isPlaying();
if (isExo()) playExo();
if (isIjk()) playIjk();
if (hasDanmu() && danmuResume) danmuView.resume();
if (hasDanmu() && resume) danmuView.resume();
setPlaybackState(PlaybackStateCompat.STATE_PLAYING);
}

2
app/src/main/res/values-zh-rTW/strings.xml
Unescape View File

@ -84,7 +84,7 @@
<string name="player_scale">縮放比例</string>
<string name="player_caption">字幕樣式</string>
<string name="player_subtitle">字幕大小</string>
<string name="player_danmu_load">彈幕加載</string>
<string name="player_danmu_load">彈幕載入</string>
<string name="player_danmu_speed">彈幕速度</string>
<string name="player_danmu_size">彈幕大小</string>
<string name="player_danmu_line">彈幕行數</string>

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

@ -585,8 +585,8 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
}
private void checkDanmu(String danmu) {
if (!Setting.getDanmuLoad()) return;
mBinding.danmaku.release();
if (!Setting.isDanmuLoad()) return;
mBinding.danmaku.setVisibility(danmu.isEmpty() ? View.GONE : View.VISIBLE);
if (danmu.length() > 0) App.execute(() -> mBinding.danmaku.prepare(new Parser(danmu), mDanmakuContext));
}

23
app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
Unescape View File

@ -63,8 +63,8 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
mBinding.captionText.setText(getSwitch(Setting.isCaption()));
mBinding.bufferText.setText(String.valueOf(Setting.getBuffer()));
mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad()));
mBinding.subtitleText.setText(String.valueOf(Setting.getSubtitle()));
mBinding.danmuLoadText.setText(getSwitch(Setting.getDanmuLoad()));
mBinding.danmuSizeText.setText(String.valueOf(Setting.getDanmuSize()));
mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(2)));
mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha()));
@ -91,9 +91,9 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.caption.setOnClickListener(this::setCaption);
mBinding.subtitle.setOnClickListener(this::onSubtitle);
mBinding.caption.setOnLongClickListener(this::onCaption);
mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad);
mBinding.danmuSize.setOnClickListener(this::onDanmuSize);
mBinding.danmuLine.setOnClickListener(this::onDanmuLine);
mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad);
mBinding.danmuAlpha.setOnClickListener(this::onDanmuAlpha);
mBinding.danmuSpeed.setOnClickListener(this::onDanmuSpeed);
mBinding.background.setOnClickListener(this::onBackground);
@ -184,13 +184,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.subtitleText.setText(String.valueOf(size));
}
public void setDanmuLoad(View view) {
boolean load = Setting.getDanmuLoad();
Setting.putDanmuLoad(!load);
mBinding.danmuLoadText.setText(getSwitch(!load));
}
public void onDanmuSize(View view) {
private void onDanmuSize(View view) {
DanmuSizeDialog.create(this).show();
}
@ -200,7 +194,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
Setting.putDanmuSize(size);
}
public void onDanmuLine(View view) {
private void onDanmuLine(View view) {
DanmuLineDialog.create(this).show();
}
@ -210,7 +204,12 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
Setting.putDanmuLine(line);
}
public void onDanmuAlpha(View view) {
private void setDanmuLoad(View view) {
Setting.putDanmuLoad(!Setting.isDanmuLoad());
mBinding.danmuLoadText.setText(getSwitch(Setting.isDanmuLoad()));
}
private void onDanmuAlpha(View view) {
DanmuAlphaDialog.create(this).show();
}
@ -220,7 +219,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
Setting.putDanmuAlpha(alpha);
}
public void onDanmuSpeed(View view) {
private void onDanmuSpeed(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_danmu_speed).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(danmuSpeed, Setting.getDanmuSpeed(), (dialog, which) -> {
mBinding.danmuSpeedText.setText(danmuSpeed[which]);
Setting.putDanmuSpeed(which);

Write Preview
Loading…
Cancel
Save