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 32b9642db..c2e0c0d57 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 @@ -318,7 +318,8 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen @Override public void onItemClick(Vod item) { - VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic()); + if (getHome().isIndex()) CollectActivity.start(getActivity(), item.getVodName()); + else VideoActivity.start(this, item.getVodId(), item.getVodName(), item.getVodPic()); } @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 0945029ac..07aeb5751 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 @@ -282,8 +282,8 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback mBinding.recycler.setMoveTop(false); getVideo(item.getVodId(), "1"); } 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()); + if (getSite().isIndex()) CollectActivity.start(getActivity(), item.getVodName()); + else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), isFolder() ? item.getVodName() : null); } } 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..71e434f3d 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", "indexs", "timeout", "playerType", "categories", "header", "style", "activated"}) public class Site implements Parcelable { @NonNull @@ -44,6 +44,8 @@ public class Site implements Parcelable { private String playUrl; @SerializedName("type") private Integer type; + @SerializedName("indexs") + private Integer indexs; @SerializedName("timeout") private Integer timeout; @SerializedName("playerType") @@ -139,6 +141,14 @@ public class Site implements Parcelable { this.type = type; } + public Integer getIndexs() { + return indexs == null ? 0 : indexs; + } + + public void setIndexs(Integer indexs) { + this.indexs = indexs; + } + public Integer getTimeout() { return timeout == null ? Constant.TIMEOUT_PLAY : Math.max(timeout, 1) * 1000; } @@ -199,6 +209,10 @@ public class Site implements Parcelable { this.activated = item.equals(this); } + public boolean isIndex() { + return getIndexs() == 1; + } + public boolean isSearchable() { return getSearchable() == 1; } @@ -274,6 +288,7 @@ public class Site implements Parcelable { dest.writeString(this.click); dest.writeString(this.playUrl); dest.writeValue(this.type); + dest.writeValue(this.indexs); dest.writeValue(this.timeout); dest.writeValue(this.playerType); dest.writeValue(this.searchable); @@ -293,6 +308,7 @@ public class Site implements Parcelable { this.click = in.readString(); this.playUrl = in.readString(); this.type = (Integer) in.readValue(Integer.class.getClassLoader()); + this.indexs = (Integer) in.readValue(Integer.class.getClassLoader()); this.timeout = (Integer) in.readValue(Integer.class.getClassLoader()); this.playerType = (Integer) in.readValue(Integer.class.getClassLoader()); this.searchable = (Integer) in.readValue(Integer.class.getClassLoader()); 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 ff76d5dde..0cf33db17 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 @@ -220,7 +220,8 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac mPages.add(Page.get(item, findPosition())); getVideo(item.getVodId(), "1"); } else { - VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), isFolder() ? item.getVodName() : null, false); + if (getSite().isIndex()) CollectActivity.start(getActivity(), item.getVodName()); + else VideoActivity.start(getActivity(), getKey(), item.getVodId(), item.getVodName(), item.getVodPic(), isFolder() ? item.getVodName() : null, false); } }