From 0549b4dca14d75168efd2258eeca25dc8025c68e Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Wed, 1 Oct 2025 01:28:13 +0800 Subject: [PATCH] Fix bug --- .../fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../fongmi/android/tv/ui/activity/VideoActivity.java | 2 +- .../java/com/fongmi/android/tv/utils/ImgUtil.java | 11 +++-------- .../fongmi/android/tv/ui/activity/LiveActivity.java | 2 +- .../fongmi/android/tv/ui/activity/VideoActivity.java | 2 +- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 399c96ba4..2b88b4e60 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -508,7 +508,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void setArtwork() { - ImgUtil.load(mChannel.getLogo(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { + ImgUtil.load(this, mChannel.getLogo(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource); 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 b070aa328..1730ecd70 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 @@ -912,7 +912,7 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void setArtwork() { - ImgUtil.load(mHistory.getVodPic(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { + ImgUtil.load(this, mHistory.getVodPic(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { @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/utils/ImgUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java index 251a3bdd4..26326c1d8 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ImgUtil.java @@ -3,6 +3,7 @@ package com.fongmi.android.tv.utils; import static android.widget.ImageView.ScaleType.CENTER_CROP; import static android.widget.ImageView.ScaleType.FIT_CENTER; +import android.content.Context; import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.view.View; @@ -13,22 +14,16 @@ import androidx.annotation.Nullable; import com.bumptech.glide.Glide; import com.bumptech.glide.load.DataSource; -import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.GlideException; import com.bumptech.glide.load.model.GlideUrl; import com.bumptech.glide.load.model.LazyHeaders; -import com.bumptech.glide.load.resource.gif.GifDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; -import com.bumptech.glide.request.transition.Transition; -import com.bumptech.glide.signature.ObjectKey; -import com.fongmi.android.tv.App; import com.fongmi.android.tv.R; import com.fongmi.android.tv.impl.CustomTarget; import com.github.catvod.utils.Json; import com.google.common.net.HttpHeaders; -import java.io.File; import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -39,8 +34,8 @@ public class ImgUtil { private static final Set failed = new HashSet<>(); - public static void load(String url, CustomTarget target) { - Glide.with(App.get()).load(getUrl(url)).error(R.drawable.artwork).into(target); + public static void load(Context context, String url, CustomTarget target) { + Glide.with(context).load(getUrl(url)).error(R.drawable.artwork).into(target); } public static void load(String text, String url, ImageView view) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java index 88f587c06..3e7652b50 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java @@ -524,7 +524,7 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener } private void setArtwork() { - ImgUtil.load(mChannel.getUrl(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { + ImgUtil.load(this, mChannel.getUrl(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource); 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 7e61825ba..9bf5d72fb 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 @@ -991,7 +991,7 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo } private void setArtwork() { - ImgUtil.load(mHistory.getVodPic(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { + ImgUtil.load(this, mHistory.getVodPic(), new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource);