pull/229/head
okjack 2 years ago
parent 8b6eef9d29
commit e6ad7de18e
  1. 8
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
  2. 1
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  3. 29
      app/src/leanback/res/layout/activity_setting_player.xml
  4. 8
      app/src/main/java/com/fongmi/android/tv/Setting.java
  5. 1
      app/src/main/res/values-zh-rCN/strings.xml
  6. 1
      app/src/main/res/values-zh-rTW/strings.xml
  7. 1
      app/src/main/res/values/strings.xml
  8. 1
      app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
  9. 8
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
  10. 27
      app/src/mobile/res/layout/fragment_setting_player.xml

@ -60,6 +60,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
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()));
@ -91,6 +92,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.danmuLine.setOnClickListener(this::onDanmuLine);
mBinding.danmuAlpha.setOnClickListener(this::onDanmuAlpha);
mBinding.danmuSpeed.setOnClickListener(this::setDanmuSpeed);
mBinding.danmuLoad.setOnClickListener(this::setDanmuLoad);
}
private void setVisible() {
@ -217,4 +219,10 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
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));
}
}

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

@ -157,6 +157,35 @@
</LinearLayout>
<LinearLayout
android:id="@+id/danmuLoad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/player_danmu_load"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:id="@+id/danmuLoadText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="開" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuSpeed"
android:layout_width="match_parent"

@ -249,6 +249,14 @@ public class Setting {
Prefers.put("danmu", danmu);
}
public static boolean getDanmuLoad() {
return Prefers.getBoolean("danmu_load");
}
public static void putDanmuLoad(boolean load) {
Prefers.put("danmu_load", load);
}
public static int getDanmuSpeed() {
return Prefers.getInt("danmu_speed", 2);
}

@ -84,6 +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_speed">弹幕速度</string>
<string name="player_danmu_size">弹幕大小</string>
<string name="player_danmu_line">弹幕行数</string>

@ -84,6 +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_speed">彈幕速度</string>
<string name="player_danmu_size">彈幕大小</string>
<string name="player_danmu_line">彈幕行數</string>

@ -84,6 +84,7 @@
<string name="player_scale">Scale</string>
<string name="player_caption">Caption style</string>
<string name="player_subtitle">Subtitle size</string>
<string name="player_danmu_load">Danmu load</string>
<string name="player_danmu_speed">Danmu speed</string>
<string name="player_danmu_size">Danmu size</string>
<string name="player_danmu_line">Danmu line</string>

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

@ -64,6 +64,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.captionText.setText(getSwitch(Setting.isCaption()));
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(2)));
mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha()));
@ -90,6 +91,7 @@ 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.danmuAlpha.setOnClickListener(this::onDanmuAlpha);
@ -182,6 +184,12 @@ 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) {
DanmuSizeDialog.create(this).show();
}

@ -183,6 +183,33 @@
</LinearLayout>
<LinearLayout
android:id="@+id/danmuLoad"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/player_danmu_load"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/danmuLoadText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="開" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuSpeed"
android:layout_width="match_parent"

Loading…
Cancel
Save