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 6ad41f502..77c877ef1 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 @@ -517,6 +517,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List private void setPlayer(Result result) { result.getUrl().set(mQualityAdapter.getPosition()); + if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, Html.fromHtml(result.getDesc()).toString()); setUseParse(VodConfig.hasParse() && ((result.getPlayUrl().isEmpty() && VodConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1)); mPlayers.start(result, isUseParse(), getSite().isChangeable() ? getSite().getTimeout() : -1); mBinding.control.parse.setVisibility(isUseParse() ? View.VISIBLE : View.GONE); 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 9eedcd6c3..ee5e4913e 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 @@ -64,12 +64,12 @@ public class Result implements Parcelable { private String jxFrom; @SerializedName("flag") private String flag; + @SerializedName("desc") + private String desc; @SerializedName("format") private String format; @SerializedName("click") private String click; - @SerializedName("js") - private String js; @SerializedName("key") private String key; @SerializedName("pagecount") @@ -224,6 +224,10 @@ public class Result implements Parcelable { this.flag = flag; } + public String getDesc() { + return TextUtils.isEmpty(desc) ? "" : desc; + } + public String getFormat() { return format; } @@ -236,14 +240,6 @@ public class Result implements Parcelable { this.click = click; } - public String getJs() { - return TextUtils.isEmpty(js) ? "" : js; - } - - public void setJs(String js) { - this.js = js; - } - public String getKey() { return TextUtils.isEmpty(key) ? "" : key; } 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 2efff1f84..660327ae8 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 @@ -70,6 +70,9 @@ public class Vod implements Parcelable { @SerializedName("vod_play_url") private String vodPlayUrl; + @SerializedName("vod_wallpaper") + private String vodWallpaper; + @SerializedName("vod_tag") private String vodTag; @@ -166,6 +169,10 @@ public class Vod implements Parcelable { return TextUtils.isEmpty(vodPlayUrl) ? "" : vodPlayUrl; } + public String getVodWallpaper() { + return TextUtils.isEmpty(vodWallpaper) ? "" : vodWallpaper; + } + public String getVodTag() { 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 29328c7fb..f5226401f 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 @@ -531,6 +531,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo private void setPlayer(Result result) { result.getUrl().set(mQualityAdapter.getPosition()); + if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, Html.fromHtml(result.getDesc()).toString()); setUseParse(VodConfig.hasParse() && ((result.getPlayUrl().isEmpty() && VodConfig.get().getFlags().contains(result.getFlag())) || result.getJx() == 1)); if (mControlDialog != null && mControlDialog.isVisible()) mControlDialog.setParseVisible(isUseParse()); mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE);