diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
index cd6447daf..c7bf1f058 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
@@ -295,6 +295,7 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
@Override
public void setDoh(Doh doh) {
+ ExoUtil.reset();
OkHttp.get().setDoh(doh);
Notify.progress(getActivity());
Setting.putDoh(doh.toString());
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 3e67cb0c0..fa30ea257 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
@@ -16,7 +16,6 @@ import com.fongmi.android.tv.impl.DanmuLineCallback;
import com.fongmi.android.tv.impl.DanmuSizeCallback;
import com.fongmi.android.tv.impl.SubtitleCallback;
import com.fongmi.android.tv.impl.UaCallback;
-import com.fongmi.android.tv.player.ExoUtil;
import com.fongmi.android.tv.player.Players;
import com.fongmi.android.tv.ui.base.BaseActivity;
import com.fongmi.android.tv.ui.dialog.BufferDialog;
@@ -37,7 +36,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
private String[] player;
private String[] render;
private String[] scale;
- private String[] http;
public static void start(Activity activity) {
activity.startActivity(new Intent(activity, SettingPlayerActivity.class));
@@ -64,7 +62,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.danmuSizeText.setText(format.format(Setting.getDanmuSize()));
mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(3)));
mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha()));
- mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]);
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()]);
@@ -74,7 +71,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
@Override
protected void initEvent() {
mBinding.ua.setOnClickListener(this::onUa);
- mBinding.http.setOnClickListener(this::setHttp);
mBinding.scale.setOnClickListener(this::setScale);
mBinding.buffer.setOnClickListener(this::onBuffer);
mBinding.player.setOnClickListener(this::setPlayer);
@@ -103,13 +99,6 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
Setting.putUa(ua);
}
- private void setHttp(View view) {
- int index = Setting.getHttp();
- Setting.putHttp(index = index == http.length - 1 ? 0 : ++index);
- mBinding.httpText.setText(http[index]);
- ExoUtil.reset();
- }
-
private void setScale(View view) {
int index = Setting.getScale();
Setting.putScale(index = index == scale.length - 1 ? 0 : ++index);
diff --git a/app/src/leanback/res/layout/activity_setting_player.xml b/app/src/leanback/res/layout/activity_setting_player.xml
index 9aa980fa4..17ff8e5a8 100644
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
@@ -114,35 +114,6 @@
tools:text="關" />
-
-
-
-
-
-
-
-
弹幕透明
后台播放
隧道模式
- 连线方式
缓冲时间
User-Agent
@@ -176,11 +175,6 @@
- 重播
-
- - 预设
- - OkHttp
-
-
- 预设
- 系统
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 84d753f03..921e54687 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -89,7 +89,6 @@
彈幕透明
背景播放
隧道模式
- 連線方式
緩衝時間
User-Agent
@@ -176,11 +175,6 @@
- 重播
-
- - 預設
- - OkHttp
-
-
- 預設
- 系統
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0dc852e64..bbe038a68 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,6 @@
Danmu alpha
Background play
Tunnel mode
- HTTP method
Buffer time
User-Agent
@@ -181,11 +180,6 @@
- Replay
-
- - Default
- - OkHttp
-
-
- Default
- System
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
index 1eb2bd1bb..6ef7b8e54 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
@@ -299,6 +299,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
}
private void setDoh(Doh doh) {
+ ExoUtil.reset();
OkHttp.get().setDoh(doh);
Notify.progress(getActivity());
Setting.putDoh(doh.toString());
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
index 6d089c778..f03cf4d2f 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
@@ -42,7 +42,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
private String[] player;
private String[] render;
private String[] scale;
- private String[] http;
public static SettingPlayerFragment newInstance() {
return new SettingPlayerFragment();
@@ -69,7 +68,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.danmuSizeText.setText(format.format(Setting.getDanmuSize()));
mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(2)));
mBinding.danmuAlphaText.setText(String.valueOf(Setting.getDanmuAlpha()));
- mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]);
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()]);
@@ -80,7 +78,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
@Override
protected void initEvent() {
mBinding.ua.setOnClickListener(this::onUa);
- mBinding.http.setOnClickListener(this::setHttp);
mBinding.scale.setOnClickListener(this::onScale);
mBinding.buffer.setOnClickListener(this::onBuffer);
mBinding.player.setOnClickListener(this::setPlayer);
@@ -110,13 +107,6 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
Setting.putUa(ua);
}
- private void setHttp(View view) {
- int index = Setting.getHttp();
- Setting.putHttp(index = index == http.length - 1 ? 0 : ++index);
- mBinding.httpText.setText(http[index]);
- ExoUtil.reset();
- }
-
private void onScale(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_scale).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(scale, Setting.getScale(), (dialog, which) -> {
mBinding.scaleText.setText(scale[which]);
diff --git a/app/src/mobile/res/layout/fragment_setting_player.xml b/app/src/mobile/res/layout/fragment_setting_player.xml
index 39d1e337a..bf30c4b75 100644
--- a/app/src/mobile/res/layout/fragment_setting_player.xml
+++ b/app/src/mobile/res/layout/fragment_setting_player.xml
@@ -140,33 +140,6 @@
tools:text="關" />
-
-
-
-
-
-
-
-