From b92c1c4582df65ceef9ee9ee911374ef553fc894 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 22 Jan 2026 11:19:12 +0800 Subject: [PATCH] Clean code --- .../android/tv/ui/activity/VideoActivity.java | 14 ++++++++------ .../java/com/fongmi/android/tv/bean/Result.java | 8 ++++++++ .../android/tv/ui/activity/VideoActivity.java | 16 +++++++++------- 3 files changed, 25 insertions(+), 13 deletions(-) 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 02ffec766..f2942e00c 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,9 +518,9 @@ 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.hasArtwork()) setArtwork(result.getArtwork()); if (result.hasPosition()) mHistory.setPosition(result.getPosition()); - if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, result.getDesc()); + if (result.hasDesc()) 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); mBinding.control.parse.setVisibility(isUseParse() ? View.VISIBLE : View.GONE); @@ -913,12 +913,14 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List App.post(mR2, 500); } - private void setArtwork() { - setArtwork(mHistory.getVodPic()); + private void setArtwork(String url) { + mHistory.setVodPic(url); + setMetadata(); + setArtwork(); } - private void setArtwork(String url) { - ImgUtil.load(this, url, new CustomTarget<>() { + private void setArtwork() { + ImgUtil.load(this, mHistory.getVodPic(), 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 1ced44cd5..596a50b4a 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 @@ -305,10 +305,18 @@ public class Result implements Parcelable { return !getMsg().isEmpty(); } + public boolean hasArtwork() { + return !getArtwork().isEmpty(); + } + public boolean hasPosition() { return getPosition() != null; } + public boolean hasDesc() { + return !getDesc().isEmpty(); + } + public String getRealUrl() { return getPlayUrl() + getUrl().v(); } 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 0635c25de..e1463e144 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,9 +548,9 @@ 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.hasArtwork()) setArtwork(result.getArtwork()); if (result.hasPosition()) mHistory.setPosition(result.getPosition()); - if (!result.getDesc().isEmpty()) setText(mBinding.content, R.string.detail_content, result.getDesc()); + if (result.hasDesc()) setText(mBinding.content, 0, 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()); mBinding.control.parse.setVisibility(isFullscreen() && isUseParse() ? View.VISIBLE : View.GONE); @@ -1001,12 +1001,14 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo App.post(mR1, Constant.INTERVAL_HIDE); } - private void setArtwork() { - setArtwork(mHistory.getVodPic()); + private void setArtwork(String url) { + mHistory.setVodPic(url); + setMetadata(); + setArtwork(); } - private void setArtwork(String url) { - ImgUtil.load(this, url, new CustomTarget<>() { + private void setArtwork() { + ImgUtil.load(this, mHistory.getVodPic(), new CustomTarget<>() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource); @@ -1434,7 +1436,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } public void setRotate(boolean rotate) { - this.rotate = rotate;; + this.rotate = rotate; if (fullscreen && !rotate) setPadding(mBinding.control.getRoot()); else noPadding(mBinding.control.getRoot()); }