diff --git a/app/build.gradle b/app/build.gradle
index 8a46ff124..93dfcbcda 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
applicationId "com.fongmi.android.tv"
minSdk 24
targetSdk 36
- versionCode 428
- versionName "4.2.8"
+ versionCode 429
+ versionName "4.2.9"
javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/schemas".toString(), "eventBusIndex": "com.fongmi.android.tv.event.EventIndex"]
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 2e4af1f85..235f3e3ad 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
@@ -50,6 +50,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.uaText.setText(Setting.getUa());
mBinding.aacText.setText(getSwitch(Setting.isPreferAAC()));
mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
+ mBinding.adblockText.setText(getSwitch(Setting.isAdblock()));
mBinding.speedText.setText(format.format(Setting.getSpeed()));
mBinding.bufferText.setText(String.valueOf(Setting.getBuffer()));
mBinding.backgroundText.setText(getSwitch(Setting.isBackgroundOn()));
@@ -71,6 +72,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.render.setOnClickListener(this::setRender);
mBinding.tunnel.setOnClickListener(this::setTunnel);
mBinding.caption.setOnClickListener(this::setCaption);
+ mBinding.adblock.setOnClickListener(this::setAdblock);
mBinding.caption.setOnLongClickListener(this::onCaption);
mBinding.background.setOnClickListener(this::onBackground);
mBinding.audioDecode.setOnClickListener(this::setAudioDecode);
@@ -142,6 +144,11 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
mBinding.captionText.setText(caption[Setting.isCaption() ? 1 : 0]);
}
+ private void setAdblock(View view) {
+ Setting.putAdblock(!Setting.isAdblock());
+ mBinding.adblockText.setText(getSwitch(Setting.isAdblock()));
+ }
+
private boolean onCaption(View view) {
if (Setting.isCaption()) startActivity(new Intent(Settings.ACTION_CAPTIONING_SETTINGS));
return Setting.isCaption();
diff --git a/app/src/leanback/res/layout/activity_setting_player.xml b/app/src/leanback/res/layout/activity_setting_player.xml
index 919f88bcf..e13481477 100644
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
@@ -320,6 +320,35 @@
+
+
+
+
+
+
+
+
getRegex(Uri uri) {
- return getRule(uri).getRegex();
- }
-
public static List getScript(Uri uri) {
return getRule(uri).getScript();
}
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2976eeace..23d1a5ab7 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -98,6 +98,7 @@
视频软解
AAC优先
弹幕加载
+ 智能去广
隧道模式
缓冲时间
长按倍速
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2aa723eec..337d3b45a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -98,6 +98,7 @@
視訊軟解
AAC優先
彈幕載入
+ 智慧去廣
隧道模式
緩衝時間
長按倍速
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f426d375..37462de20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,6 +99,7 @@
Video software decode
Prefer aac track
Danmaku load
+ Remove ads
Tunnel mode
Buffer time
Press speed
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 9385289d5..cd1c47a7a 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
@@ -53,6 +53,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.uaText.setText(Setting.getUa());
mBinding.aacText.setText(getSwitch(Setting.isPreferAAC()));
mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
+ mBinding.adblockText.setText(getSwitch(Setting.isAdblock()));
mBinding.speedText.setText(format.format(Setting.getSpeed()));
mBinding.bufferText.setText(String.valueOf(Setting.getBuffer()));
mBinding.audioDecodeText.setText(getSwitch(Setting.isAudioPrefer()));
@@ -75,6 +76,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.render.setOnClickListener(this::setRender);
mBinding.tunnel.setOnClickListener(this::setTunnel);
mBinding.caption.setOnClickListener(this::setCaption);
+ mBinding.adblock.setOnClickListener(this::setAdblock);
mBinding.caption.setOnLongClickListener(this::onCaption);
mBinding.background.setOnClickListener(this::onBackground);
mBinding.audioDecode.setOnClickListener(this::setAudioDecode);
@@ -148,6 +150,11 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
return Setting.isCaption();
}
+ private void setAdblock(View view) {
+ Setting.putAdblock(!Setting.isAdblock());
+ mBinding.adblockText.setText(getSwitch(Setting.isAdblock()));
+ }
+
private void onBackground(View view) {
new MaterialAlertDialogBuilder(requireActivity()).setTitle(R.string.player_background).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(background, Setting.getBackground(), (dialog, which) -> {
mBinding.backgroundText.setText(background[which]);
diff --git a/app/src/mobile/res/layout/fragment_setting_player.xml b/app/src/mobile/res/layout/fragment_setting_player.xml
index 8690082e3..852be9a62 100644
--- a/app/src/mobile/res/layout/fragment_setting_player.xml
+++ b/app/src/mobile/res/layout/fragment_setting_player.xml
@@ -317,6 +317,33 @@
+
+
+
+
+
+
+
+