From ebe418e0725ccff625f71775221ee36319364191 Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 7 Feb 2024 12:17:44 +0800 Subject: [PATCH 1/2] TV dialog background,danmu size,indexs --- .../android/tv/ui/activity/HomeActivity.java | 3 +- .../tv/ui/activity/SettingCustomActivity.java | 7 ----- .../android/tv/ui/dialog/EpisodeDialog.java | 2 -- .../android/tv/ui/fragment/VodFragment.java | 7 +++-- .../res/drawable/ic_action_choose.xml | 2 +- .../leanback/res/drawable/ic_action_size.xml | 2 +- .../res/drawable/shape_bottom_sheet.xml | 2 +- .../res/drawable/shape_trans_bottom_sheet.xml | 11 ------- .../res/layout/activity_setting_custom.xml | 29 ------------------- .../leanback/res/layout/dialog_danmu_size.xml | 2 +- app/src/leanback/res/layout/dialog_track.xml | 2 +- app/src/leanback/res/values/styles.xml | 14 --------- .../java/com/fongmi/android/tv/Setting.java | 8 ----- .../java/com/fongmi/android/tv/bean/Site.java | 18 +++++++++++- .../android/tv/ui/activity/VideoActivity.java | 4 +-- .../tv/ui/fragment/SettingCustomFragment.java | 8 ----- .../android/tv/ui/fragment/TypeFragment.java | 6 +++- app/src/mobile/res/layout/dialog_danmu.xml | 2 +- .../res/layout/fragment_setting_custom.xml | 27 ----------------- 19 files changed, 36 insertions(+), 120 deletions(-) delete mode 100644 app/src/leanback/res/drawable/shape_trans_bottom_sheet.xml diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java index 0e2487377..51cca8b67 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java @@ -20,7 +20,6 @@ import com.android.cast.dlna.dmr.DLNARendererService; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Product; import com.fongmi.android.tv.R; -import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.Updater; import com.fongmi.android.tv.api.config.LiveConfig; import com.fongmi.android.tv.api.config.VodConfig; @@ -321,7 +320,7 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void onItemClick(Vod item) { - if (Setting.isAggregatedSearch()) CollectActivity.start(this, item.getVodName()); + if (getHome().isIndexs()) CollectActivity.start(this, item.getVodName()); else VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic()); } 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 aafb08e41..026e9b772 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 @@ -44,7 +44,6 @@ public class SettingCustomActivity extends BaseActivity { mBinding.displayNetspeedText.setText(getSwitch(Setting.isDisplaySpeed())); mBinding.displayDurationText.setText(getSwitch(Setting.isDisplayDuration())); mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); - mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); mBinding.fullscreenMenuKeyText.setText((fullscreenMenuKey = ResUtil.getStringArray(R.array.select_fullscreen_menu_key))[Setting.getFullscreenMenuKey()]); } @@ -58,7 +57,6 @@ public class SettingCustomActivity extends BaseActivity { mBinding.displayDuration.setOnClickListener(this::setDisplayDuration); mBinding.speed.setOnClickListener(this::setSpeed); mBinding.speed.setOnLongClickListener(this::resetSpeed); - mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch); mBinding.fullscreenMenuKey.setOnClickListener(this::setfullscreenMenuKey); } @@ -111,11 +109,6 @@ public class SettingCustomActivity extends BaseActivity { return true; } - private void setAggregatedSearch(View view) { - Setting.putAggregatedSearch(!Setting.isAggregatedSearch()); - mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); - } - private void setfullscreenMenuKey(View view) { int index = Setting.getFullscreenMenuKey(); Setting.putFullscreenMenuKey(index = index == fullscreenMenuKey.length - 1 ? 0 : ++index); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java index 1a6027109..07d444f16 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDialog.java @@ -18,7 +18,6 @@ import androidx.leanback.widget.ItemBridgeAdapter; import androidx.leanback.widget.OnChildViewHolderSelectedListener; import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; -import com.fongmi.android.tv.R; import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.bean.Episode; import com.fongmi.android.tv.databinding.DialogEpisodeBinding; @@ -48,7 +47,6 @@ public class EpisodeDialog extends BaseDialog implements ArrayPresenter.OnClickL @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - setStyle(STYLE_NORMAL, R.style.TransBottomSheetDialog); BottomSheetDialog dialog = (BottomSheetDialog) super.onCreateDialog(savedInstanceState); dialog.setOnKeyListener(new DialogInterface.OnKeyListener() { @Override diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index c3274efd3..ceb9f9613 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -19,7 +19,6 @@ import androidx.viewbinding.ViewBinding; import com.fongmi.android.tv.App; import com.fongmi.android.tv.Product; import com.fongmi.android.tv.R; -import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.api.config.VodConfig; import com.fongmi.android.tv.bean.Filter; import com.fongmi.android.tv.bean.Page; @@ -97,6 +96,10 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback return VodConfig.get().getSite(getKey()); } + private boolean isIndexs() { + return getSite().isIndexs(); + } + private Page getLastPage() { return mPages.get(mPages.size() - 1); } @@ -283,7 +286,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback mBinding.recycler.setMoveTop(false); getVideo(item.getVodId(), "1"); } else { - if (Setting.isAggregatedSearch()) CollectActivity.start(getActivity(), item.getVodName()); + if (isIndexs()) CollectActivity.start(getActivity(), item.getVodName()); else if (!isFolder()) VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic()); else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), item.getVodName()); } diff --git a/app/src/leanback/res/drawable/ic_action_choose.xml b/app/src/leanback/res/drawable/ic_action_choose.xml index 854b5fc20..40c06e7e4 100644 --- a/app/src/leanback/res/drawable/ic_action_choose.xml +++ b/app/src/leanback/res/drawable/ic_action_choose.xml @@ -1,7 +1,7 @@ - + - - - - - - - \ No newline at end of file diff --git a/app/src/leanback/res/layout/activity_setting_custom.xml b/app/src/leanback/res/layout/activity_setting_custom.xml index 1e93476d3..e7f16f06a 100644 --- a/app/src/leanback/res/layout/activity_setting_custom.xml +++ b/app/src/leanback/res/layout/activity_setting_custom.xml @@ -217,35 +217,6 @@ - - - - - - - - diff --git a/app/src/leanback/res/values/styles.xml b/app/src/leanback/res/values/styles.xml index f357a9d52..664d4fbdd 100644 --- a/app/src/leanback/res/values/styles.xml +++ b/app/src/leanback/res/values/styles.xml @@ -32,18 +32,4 @@ @style/ModalBottomSheetDialog - - - - - 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 cc2320567..e55a2330e 100644 --- a/app/src/main/java/com/fongmi/android/tv/Setting.java +++ b/app/src/main/java/com/fongmi/android/tv/Setting.java @@ -373,14 +373,6 @@ public class Setting { Prefers.put("play_speed", speed); } - public static boolean isAggregatedSearch() { - return Prefers.getBoolean("aggregated_search", false); - } - - public static void putAggregatedSearch(boolean search) { - Prefers.put("aggregated_search", search); - } - public static void putFullscreenMenuKey(int key) { Prefers.put("fullscreen_menu_key", key); } 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 87ff6ed79..00e178f47 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 @@ -22,7 +22,7 @@ import java.util.List; import okhttp3.Headers; -@Entity(ignoredColumns = {"api", "ext", "jar", "click", "playUrl", "type", "timeout", "playerType", "categories", "header", "style", "activated"}) +@Entity(ignoredColumns = {"api", "ext", "jar", "click", "playUrl", "type", "timeout", "playerType", "categories", "header", "style", "activated", "indexs"}) public class Site implements Parcelable { @NonNull @@ -54,6 +54,8 @@ public class Site implements Parcelable { private Integer changeable; @SerializedName("recordable") private Integer recordable; + @SerializedName("indexs") + private Integer indexs; @SerializedName("categories") private List categories; @SerializedName("header") @@ -171,6 +173,18 @@ public class Site implements Parcelable { this.recordable = recordable; } + public boolean isIndexs() { + return getIndexs() == 1; + } + + public Integer getIndexs() { + return indexs == null ? 0 : indexs; + } + + public void setIndexs(Integer indexs) { + this.indexs = indexs; + } + public List getCategories() { return categories == null ? Collections.emptyList() : categories; } @@ -279,6 +293,7 @@ public class Site implements Parcelable { dest.writeValue(this.searchable); dest.writeValue(this.changeable); dest.writeValue(this.recordable); + dest.writeValue(this.indexs); dest.writeStringList(this.categories); dest.writeParcelable(this.style, flags); dest.writeByte(this.activated ? (byte) 1 : (byte) 0); @@ -298,6 +313,7 @@ public class Site implements Parcelable { this.searchable = (Integer) in.readValue(Integer.class.getClassLoader()); this.changeable = (Integer) in.readValue(Integer.class.getClassLoader()); this.recordable = (Integer) in.readValue(Integer.class.getClassLoader()); + this.indexs = (Integer) in.readValue(Integer.class.getClassLoader()); this.categories = in.createStringArrayList(); this.style = in.readParcelable(Style.class.getClassLoader()); this.activated = in.readByte() != 0; diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index 8021dc338..d08d616d2 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -662,7 +662,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo mBinding.control.prevRoot.setVisibility(items.size() < 2 ? View.GONE : View.VISIBLE); mBinding.episode.setVisibility(items.size() == 0 ? View.GONE : View.VISIBLE); mBinding.reverse.setVisibility(items.size() < 2 ? View.GONE : View.VISIBLE); - mBinding.more.setVisibility(items.size() < 10 ? View.GONE : View.VISIBLE); + mBinding.more.setVisibility(items.size() < 3 ? View.GONE : View.VISIBLE); mEpisodeAdapter.addAll(items); } @@ -1025,7 +1025,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo mBinding.control.danmuSetting.setVisibility(isLock() || !Setting.isDanmuLoad() || !isVisible(mBinding.danmaku) ? View.GONE : View.VISIBLE); mBinding.control.setting.setVisibility(mHistory == null || isFullscreen() ? View.GONE : View.VISIBLE); mBinding.control.right.rotate.setVisibility(isFullscreen() && !isLock() ? View.VISIBLE : View.GONE); - mBinding.control.keep.setVisibility(mHistory == null || isFullscreen() ? View.GONE : View.VISIBLE); + mBinding.control.keep.setVisibility(mHistory == null ? View.GONE : View.VISIBLE); mBinding.control.right.back.setVisibility(isFullscreen() && !isLock() ? View.VISIBLE : View.GONE); mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE); mBinding.control.action.getRoot().setVisibility(isFullscreen() ? View.VISIBLE : View.GONE); 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 f7f1285b6..11f4d9637 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 @@ -39,7 +39,6 @@ public class SettingCustomFragment extends BaseFragment { mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]); mBinding.danmuSyncText.setText(getSwitch(Setting.isDanmuSync())); mBinding.speedText.setText(Setting.getPlaySpeed() + "x"); - mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); } @Override @@ -49,7 +48,6 @@ public class SettingCustomFragment extends BaseFragment { mBinding.danmuSync.setOnClickListener(this::setDanmuSync); mBinding.speed.setOnClickListener(this::setSpeed); mBinding.speed.setOnLongClickListener(this::resetSpeed); - mBinding.aggregatedSearch.setOnClickListener(this::setAggregatedSearch); } private boolean onTitle(View view) { @@ -85,10 +83,4 @@ public class SettingCustomFragment extends BaseFragment { return true; } - private void setAggregatedSearch(View view) { - Setting.putAggregatedSearch(!Setting.isAggregatedSearch()); - mBinding.aggregatedSearchText.setText(getSwitch(Setting.isAggregatedSearch())); - } - - } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java index 1dc3fa0dc..f095f574c 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/TypeFragment.java @@ -69,6 +69,10 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac return isFolder() ? Style.list() : getSite().getStyle(mPages.isEmpty() ? getArguments().getParcelable("style") : getLastPage().getStyle()); } + private boolean isIndexs() { + return getSite().isIndexs(); + } + private HashMap getExtend() { Serializable extend = getArguments().getSerializable("extend"); return extend == null ? new HashMap<>() : (HashMap) extend; @@ -222,7 +226,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac mPages.add(Page.get(item, findPosition())); getVideo(item.getVodId(), "1"); } else { - if (Setting.isAggregatedSearch()) CollectActivity.start(getActivity(), item.getVodName()); + if (isIndexs()) CollectActivity.start(getActivity(), item.getVodName()); else if (item.isManga()) DetailActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic()); else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), isFolder() ? item.getVodName() : null, false); } diff --git a/app/src/mobile/res/layout/dialog_danmu.xml b/app/src/mobile/res/layout/dialog_danmu.xml index 3ebec69dc..bc4d2d9dc 100644 --- a/app/src/mobile/res/layout/dialog_danmu.xml +++ b/app/src/mobile/res/layout/dialog_danmu.xml @@ -84,7 +84,7 @@ android:layout_weight="3" android:layout_height="wrap_content" android:gravity="center_vertical|center" - android:stepSize="0.2" + android:stepSize="0.1" android:valueFrom="0.6" android:valueTo="2" app:trackColorInactive="@color/blue_50" /> diff --git a/app/src/mobile/res/layout/fragment_setting_custom.xml b/app/src/mobile/res/layout/fragment_setting_custom.xml index 91b3ff484..2c566b0c2 100644 --- a/app/src/mobile/res/layout/fragment_setting_custom.xml +++ b/app/src/mobile/res/layout/fragment_setting_custom.xml @@ -126,33 +126,6 @@ - - - - - - - - \ No newline at end of file From edf38369cae69e71740e32d40868b97dda10368d Mon Sep 17 00:00:00 2001 From: okjack Date: Wed, 7 Feb 2024 12:18:07 +0800 Subject: [PATCH 2/2] build.gradle --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index a236e08aa..e5813634b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 21 targetSdk 28 versionCode 225 - versionName "0206" + versionName "0207" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]