diff --git a/app/src/leanback/java/com/fongmi/android/tv/Product.java b/app/src/leanback/java/com/fongmi/android/tv/Product.java index d4464288b..fb227a08d 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/Product.java +++ b/app/src/leanback/java/com/fongmi/android/tv/Product.java @@ -14,9 +14,7 @@ public class Product { } public static int getColumn(Vod.Style style) { - if (style.isLand()) return getColumn() - 1; - if (style.isFull()) return 3; - return getColumn(); + return style.isLand() ? getColumn() - 1 : getColumn(); } public static int[] getSpec(Vod.Style style) { diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/base/ViewType.java b/app/src/leanback/java/com/fongmi/android/tv/ui/base/ViewType.java index 05d0b3559..0f691e2d0 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/base/ViewType.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/base/ViewType.java @@ -4,6 +4,5 @@ public class ViewType { public static final int RECT = 0; public static final int OVAL = 1; - public static final int FULL = 2; - public static final int LIST = 3; + public static final int LIST = 2; } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodFullHolder.java b/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodFullHolder.java deleted file mode 100644 index 14da326ee..000000000 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodFullHolder.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.fongmi.android.tv.ui.holder; - -import androidx.annotation.NonNull; - -import com.fongmi.android.tv.bean.Vod; -import com.fongmi.android.tv.databinding.AdapterVodFullBinding; -import com.fongmi.android.tv.ui.base.BaseVodHolder; -import com.fongmi.android.tv.utils.ImgUtil; - -public class VodFullHolder extends BaseVodHolder { - - private final AdapterVodFullBinding binding; - - public VodFullHolder(@NonNull AdapterVodFullBinding binding) { - super(binding.getRoot()); - this.binding = binding; - } - - public VodFullHolder size(int[] size) { - binding.getRoot().getLayoutParams().width = size[0]; - binding.getRoot().getLayoutParams().height = size[1]; - return this; - } - - @Override - public void initView(Vod item) { - ImgUtil.load(item.getVodPic(), binding.image); - } -} diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/VodPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/VodPresenter.java index 090e69c64..1c66be946 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/VodPresenter.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/VodPresenter.java @@ -7,13 +7,11 @@ import androidx.leanback.widget.Presenter; import com.fongmi.android.tv.Product; import com.fongmi.android.tv.bean.Vod; -import com.fongmi.android.tv.databinding.AdapterVodFullBinding; import com.fongmi.android.tv.databinding.AdapterVodListBinding; import com.fongmi.android.tv.databinding.AdapterVodOvalBinding; import com.fongmi.android.tv.databinding.AdapterVodRectBinding; import com.fongmi.android.tv.ui.base.BaseVodHolder; import com.fongmi.android.tv.ui.base.ViewType; -import com.fongmi.android.tv.ui.holder.VodFullHolder; import com.fongmi.android.tv.ui.holder.VodListHolder; import com.fongmi.android.tv.ui.holder.VodOvalHolder; import com.fongmi.android.tv.ui.holder.VodRectHolder; @@ -46,8 +44,6 @@ public class VodPresenter extends Presenter { switch (style.getViewType()) { case ViewType.LIST: return new VodListHolder(AdapterVodListBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false), mListener); - case ViewType.FULL: - return new VodFullHolder(AdapterVodFullBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)).size(size); case ViewType.OVAL: return new VodOvalHolder(AdapterVodOvalBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false), mListener).size(size); default: diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java index e16709151..f0101cf8d 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java @@ -508,10 +508,6 @@ public class Vod { return getType().equals("oval"); } - public boolean isFull() { - return getType().equals("full"); - } - public boolean isList() { return getType().equals("list"); } @@ -524,8 +520,6 @@ public class Vod { switch (getType()) { case "oval": return ViewType.OVAL; - case "full": - return ViewType.FULL; case "list": return ViewType.LIST; default: diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java index 508715ac8..be99459a6 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/adapter/VodAdapter.java @@ -7,13 +7,11 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.fongmi.android.tv.bean.Vod; -import com.fongmi.android.tv.databinding.AdapterVodFullBinding; import com.fongmi.android.tv.databinding.AdapterVodListBinding; import com.fongmi.android.tv.databinding.AdapterVodOvalBinding; import com.fongmi.android.tv.databinding.AdapterVodRectBinding; import com.fongmi.android.tv.ui.base.BaseVodHolder; import com.fongmi.android.tv.ui.base.ViewType; -import com.fongmi.android.tv.ui.holder.VodFullHolder; import com.fongmi.android.tv.ui.holder.VodListHolder; import com.fongmi.android.tv.ui.holder.VodOvalHolder; import com.fongmi.android.tv.ui.holder.VodRectHolder; @@ -25,8 +23,8 @@ public class VodAdapter extends RecyclerView.Adapter { private final OnClickListener mListener; private final List mItems; - private Vod.Style style; - private int[] size; + private final Vod.Style style; + private final int[] size; public VodAdapter(OnClickListener listener, Vod.Style style, int[] size) { this.mListener = listener; @@ -46,10 +44,6 @@ public class VodAdapter extends RecyclerView.Adapter { return style; } - public boolean isLinear() { - return style.isList() || style.isFull(); - } - public void addAll(List items) { int position = mItems.size() + 1; mItems.addAll(items); @@ -82,8 +76,6 @@ public class VodAdapter extends RecyclerView.Adapter { switch (viewType) { case ViewType.LIST: return new VodListHolder(AdapterVodListBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false), mListener); - case ViewType.FULL: - return new VodFullHolder(AdapterVodFullBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false)); case ViewType.OVAL: return new VodOvalHolder(AdapterVodOvalBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false), mListener).size(size); default: diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java b/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java index 3a93b0f95..b04054511 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/base/ViewType.java @@ -4,9 +4,8 @@ public class ViewType { public static final int RECT = 0; public static final int OVAL = 1; - public static final int FULL = 2; - public static final int LIST = 3; - public static final int GRID = 4; + public static final int LIST = 2; + public static final int GRID = 3; public static final int DARK = 0; public static final int LIGHT = 1; 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 0acf63e2d..e03e6dc22 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 @@ -116,7 +116,7 @@ public class TypeFragment extends BaseFragment implements CustomScroller.Callbac private void setStyle(Vod.Style style) { mBinding.recycler.setAdapter(mAdapter = new VodAdapter(this, style, Product.getSpec(getActivity(), style))); - mBinding.recycler.setLayoutManager(mAdapter.isLinear() ? new LinearLayoutManager(getActivity()) : new GridLayoutManager(getContext(), Product.getColumn(style))); + mBinding.recycler.setLayoutManager(style.isList() ? new LinearLayoutManager(getActivity()) : new GridLayoutManager(getContext(), Product.getColumn(style))); } private void setViewModel() { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodFullHolder.java b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodFullHolder.java deleted file mode 100644 index 7e2e846cd..000000000 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodFullHolder.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.fongmi.android.tv.ui.holder; - -import android.graphics.Bitmap; -import android.graphics.drawable.Drawable; -import android.widget.ImageView; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.bumptech.glide.request.target.CustomTarget; -import com.bumptech.glide.request.transition.Transition; -import com.fongmi.android.tv.R; -import com.fongmi.android.tv.bean.Vod; -import com.fongmi.android.tv.databinding.AdapterVodFullBinding; -import com.fongmi.android.tv.ui.base.BaseVodHolder; -import com.fongmi.android.tv.utils.ImgUtil; - -public class VodFullHolder extends BaseVodHolder { - - private final AdapterVodFullBinding binding; - - public VodFullHolder(@NonNull AdapterVodFullBinding binding) { - super(binding.getRoot()); - this.binding = binding; - } - - @Override - public void initView(Vod item) { - ImgUtil.load(item.getVodPic(), binding.image, new CustomTarget<>() { - @Override - public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition transition) { - binding.image.setScaleType(ImageView.ScaleType.FIT_CENTER); - binding.image.setImageBitmap(resource); - } - - @Override - public void onLoadFailed(@Nullable Drawable errorDrawable) { - binding.image.setScaleType(ImageView.ScaleType.CENTER); - binding.image.setImageResource(R.drawable.ic_img_error); - } - - @Override - public void onLoadCleared(@Nullable Drawable placeholder) { - } - }); - } -}