diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java index a4220e73e..c613a9b3a 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java @@ -518,6 +518,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setPlayer(Result result) { result.getUrl().set(mQualityAdapter.getPosition()); + if (!result.getArtwork().isEmpty()) setArtwork(result.getArtwork()); if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, result.getDesc()); setUseParse(VodConfig.hasParse() && ((result.getPlayUrl().isEmpty() && VodConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1)); mPlayers.start(result, isUseParse(), getSite().isChangeable() ? getSite().getTimeout() : -1); @@ -909,7 +910,11 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void setArtwork() { - ImgUtil.load(this, mHistory.getVodPic(), new CustomTarget<>() { + setArtwork(mHistory.getVodPic()); + } + + private void setArtwork(String url) { + ImgUtil.load(this, url, new CustomTarget<>() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource); 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 5d543a69d..7e18ea975 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 @@ -69,6 +69,8 @@ public class Result implements Parcelable { private List subs; @SerializedName("playUrl") private String playUrl; + @SerializedName("artwork") + private String artwork; @SerializedName("jxFrom") private String jxFrom; @SerializedName("flag") @@ -217,6 +219,10 @@ public class Result implements Parcelable { this.playUrl = playUrl; } + public String getArtwork() { + return TextUtils.isEmpty(artwork) ? "" : artwork; + } + public String getJxFrom() { return TextUtils.isEmpty(jxFrom) ? "" : jxFrom; } 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 06fafd4c6..6f37654e4 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 @@ -77,9 +77,6 @@ public class Vod implements Parcelable, Diffable { @SerializedName("vod_play_url") private String vodPlayUrl; - @SerializedName("vod_wallpaper") - private String vodWallpaper; - @SerializedName("vod_tag") private String vodTag; @@ -192,10 +189,6 @@ public class Vod implements Parcelable, Diffable { this.vodPlayUrl = vodPlayUrl; } - public String getWallpaper() { - return TextUtils.isEmpty(vodWallpaper) ? "" : vodWallpaper; - } - public String getTag() { return TextUtils.isEmpty(vodTag) ? "" : vodTag; } 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 37f4d56c6..154e3cbe9 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 @@ -548,6 +548,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setPlayer(Result result) { result.getUrl().set(mQualityAdapter.getPosition()); + if (!result.getArtwork().isEmpty()) setArtwork(result.getArtwork()); if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, result.getDesc()); setUseParse(VodConfig.hasParse() && ((result.getPlayUrl().isEmpty() && VodConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1)); if (mControlDialog != null && mControlDialog.isVisible()) mControlDialog.setParseVisible(isUseParse()); @@ -995,7 +996,11 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setArtwork() { - ImgUtil.load(this, mHistory.getVodPic(), new CustomTarget<>() { + setArtwork(mHistory.getVodPic()); + } + + private void setArtwork(String url) { + ImgUtil.load(this, url, new CustomTarget<>() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource);