diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java index 72c1bb925..aef0fd795 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingCustomActivity.java @@ -53,6 +53,7 @@ public class SettingCustomActivity extends BaseActivity { mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); mBinding.smallWindowBackKeyText.setText((smallWindowBackKey = ResUtil.getStringArray(R.array.select_small_window_back_key))[Setting.getSmallWindowBackKey()]); mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig())); + mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); } @Override @@ -71,6 +72,7 @@ public class SettingCustomActivity extends BaseActivity { mBinding.incognito.setOnClickListener(this::setIncognito); mBinding.smallWindowBackKey.setOnClickListener(this::setSmallWindowBackKey); mBinding.homeChangeConfig.setOnClickListener(this::setHomeChangeConfig); + mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch); } private void setQuality(View view) { @@ -158,4 +160,9 @@ public class SettingCustomActivity extends BaseActivity { mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig())); } + private void setAggregatedSearch(View view) { + Setting.putAggregatedSearch(!Setting.isAggregatedSearch()); + mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); + } + } diff --git a/app/src/leanback/res/layout/activity_setting_custom.xml b/app/src/leanback/res/layout/activity_setting_custom.xml index 95e02a34b..743f22756 100644 --- a/app/src/leanback/res/layout/activity_setting_custom.xml +++ b/app/src/leanback/res/layout/activity_setting_custom.xml @@ -423,6 +423,7 @@ android:id="@+id/homeChangeConfig" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginEnd="16dp" android:layout_weight="1" android:background="@drawable/selector_item" android:focusable="true" @@ -448,6 +449,35 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/fongmi/android/tv/Setting.java b/app/src/main/java/com/fongmi/android/tv/Setting.java index ecb8d2126..ef74706e5 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -421,4 +421,12 @@ public class Setting { return Prefers.getBoolean("home_change_config", false); } + public static boolean isAggregatedSearch() { + return Prefers.getBoolean("aggregated_search", false); + } + + public static void putAggregatedSearch(boolean search) { + Prefers.put("aggregated_search", search); + } + } diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java index 875edafc7..e1a54a325 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java @@ -11,6 +11,7 @@ import androidx.room.PrimaryKey; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Constant; +import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.db.AppDatabase; import com.fongmi.android.tv.gson.ExtAdapter; import com.github.catvod.utils.Json; @@ -194,6 +195,7 @@ public class Site implements Parcelable { } public Integer getIndexs() { + if (Setting.isAggregatedSearch() && (indexs == null || indexs == 1)) return 1; return indexs == null ? 0 : indexs; } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 69c33d235..f05fb8686 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -76,6 +76,7 @@ 个性设置 图片品质 图片尺寸 + 聚合搜索 全屏菜单键 首页源锁定 无痕模式 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 739b8a506..20ec8c822 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -76,6 +76,7 @@ 個性設定 圖片品質 圖片尺寸 + 聚合搜索 全屏選單鍵 首頁源鎖定 無痕模式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0533c90bf..04bebbbe9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,6 +76,7 @@ Custom setting Image quality Image size + Aggregated search Fullscreen menu key Home site lock Incognito mode diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java index 583e9cd9b..7040f079c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingCustomFragment.java @@ -42,6 +42,7 @@ public class SettingCustomFragment extends BaseFragment { mBinding.danmuSyncText.setText(getSwitch(Setting.isDanmuSync())); mBinding.speedText.setText(getSpeedText()); mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); + mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig())); } @@ -53,6 +54,7 @@ public class SettingCustomFragment extends BaseFragment { mBinding.speed.setOnClickListener(this::setSpeed); mBinding.speed.setOnLongClickListener(this::resetSpeed); mBinding.incognito.setOnClickListener(this::setIncognito); + mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch); mBinding.homeChangeConfig.setOnClickListener(this::setHomeChangeConfig); } @@ -98,6 +100,11 @@ public class SettingCustomFragment extends BaseFragment { mBinding.incognitoText.setText(getSwitch(Setting.isIncognito())); } + private void setAggregatedSearch(View view) { + Setting.putAggregatedSearch(!Setting.isAggregatedSearch()); + mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); + } + private void setHomeChangeConfig(View view) { Setting.putHomeChangeConfig(!Setting.isHomeChangeConfig()); mBinding.homeChangeConfigText.setText(getSwitch(Setting.isHomeChangeConfig())); diff --git a/app/src/mobile/res/layout/fragment_setting_custom.xml b/app/src/mobile/res/layout/fragment_setting_custom.xml index d64b5dd98..3470facb9 100644 --- a/app/src/mobile/res/layout/fragment_setting_custom.xml +++ b/app/src/mobile/res/layout/fragment_setting_custom.xml @@ -152,6 +152,33 @@ + + + + + + + +