diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodListHolder.java b/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodListHolder.java index 487332da5..a146271d1 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodListHolder.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodListHolder.java @@ -25,6 +25,7 @@ public class VodListHolder extends BaseVodHolder { public void initView(Vod item) { binding.name.setText(item.getVodName()); binding.remark.setText(item.getVodRemarks()); + binding.name.setVisibility(item.getNameVisible()); binding.remark.setVisibility(item.getRemarkVisible()); binding.getRoot().setOnClickListener(v -> listener.onItemClick(item)); binding.getRoot().setOnLongClickListener(v -> listener.onLongClick(item)); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java b/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java index a4ead7990..2924f1bfa 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java @@ -28,6 +28,7 @@ public class VodOvalHolder extends BaseVodHolder { @Override public void initView(Vod item) { binding.name.setText(item.getVodName()); + binding.name.setVisibility(item.getNameVisible()); binding.getRoot().setOnClickListener(v -> listener.onItemClick(item)); binding.getRoot().setOnLongClickListener(v -> listener.onLongClick(item)); ImgUtil.load(item.getVodPic(), binding.image); diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java b/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java index b06a1ef5c..39c082200 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java @@ -33,6 +33,7 @@ public class VodRectHolder extends BaseVodHolder { binding.remark.setText(item.getVodRemarks()); binding.site.setVisibility(item.getSiteVisible()); binding.year.setVisibility(item.getYearVisible()); + binding.name.setVisibility(item.getNameVisible()); binding.remark.setVisibility(item.getRemarkVisible()); binding.getRoot().setOnClickListener(v -> listener.onItemClick(item)); binding.getRoot().setOnLongClickListener(v -> listener.onLongClick(item)); diff --git a/app/src/leanback/res/layout/adapter_vod_oval.xml b/app/src/leanback/res/layout/adapter_vod_oval.xml index a776b047b..a2ba50812 100644 --- a/app/src/leanback/res/layout/adapter_vod_oval.xml +++ b/app/src/leanback/res/layout/adapter_vod_oval.xml @@ -11,8 +11,8 @@ android:id="@+id/image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/black_20" android:layout_margin="8dp" + android:background="@color/black_20" android:scaleType="center" app:shapeAppearanceOverlay="@style/Vod.Circle" tools:src="@drawable/ic_img_loading" /> diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java index 006bd10b1..90d3b7060 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java @@ -61,8 +61,9 @@ public class Result { private List subs; @SerializedName("pagecount") private int pagecount; - + @SerializedName("error") private boolean error; + @SerializedName("msg") private String msg; public static Result fromJson(String str) { 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 b0c0a96ab..786fd1aee 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 @@ -195,6 +195,10 @@ public class Vod { return getSite() != null || getVodYear().length() < 4 ? View.GONE : View.VISIBLE; } + public int getNameVisible() { + return getVodName().isEmpty() ? View.GONE : View.VISIBLE; + } + public int getRemarkVisible() { return getVodRemarks().isEmpty() ? View.GONE : View.VISIBLE; } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java index d8497f2b0..8b01b7415 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodListHolder.java @@ -25,6 +25,7 @@ public class VodListHolder extends BaseVodHolder { public void initView(Vod item) { binding.name.setText(item.getVodName()); binding.remark.setText(item.getVodRemarks()); + binding.name.setVisibility(item.getNameVisible()); binding.remark.setVisibility(item.getRemarkVisible()); binding.getRoot().setOnClickListener(v -> listener.onItemClick(item)); binding.getRoot().setOnLongClickListener(v -> listener.onLongClick(item)); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java index 450ead004..d11865300 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodOvalHolder.java @@ -28,6 +28,7 @@ public class VodOvalHolder extends BaseVodHolder { @Override public void initView(Vod item) { binding.name.setText(item.getVodName()); + binding.name.setVisibility(item.getNameVisible()); binding.getRoot().setOnClickListener(v -> listener.onItemClick(item)); binding.getRoot().setOnLongClickListener(v -> listener.onLongClick(item)); ImgUtil.load(item.getVodPic(), binding.image); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java index 37c268142..0f0baa9b5 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/holder/VodRectHolder.java @@ -32,6 +32,7 @@ public class VodRectHolder extends BaseVodHolder { binding.site.setText(item.getSiteName()); binding.remark.setText(item.getVodRemarks()); binding.site.setVisibility(item.getSiteVisible()); + binding.name.setVisibility(item.getNameVisible()); binding.year.setVisibility(item.getYearVisible()); binding.remark.setVisibility(item.getRemarkVisible()); binding.getRoot().setOnClickListener(v -> listener.onItemClick(item));