From 7d1bd4dc86043055d8a707a1a9f2157ca29ad19c Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 3 Aug 2022 23:15:16 +0800
Subject: [PATCH] Fix load image bug

---
 .../com/fongmi/android/tv/utils/ImgUtil.java  | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

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 27753cce9..b8acbc311 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
@@ -4,14 +4,15 @@ import android.graphics.drawable.Drawable;
 import android.text.TextUtils;
 import android.widget.ImageView;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.amulyakhare.textdrawable.TextDrawable;
 import com.amulyakhare.textdrawable.util.ColorGenerator;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.target.CustomTarget;
-import com.bumptech.glide.request.transition.Transition;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.signature.ObjectKey;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.R;
@@ -23,33 +24,27 @@ public class ImgUtil {
             String text = vodName.isEmpty() ? "" : vodName.substring(0, 1);
             view.setImageDrawable(TextDrawable.builder().buildRect(text, ColorGenerator.MATERIAL.getColor(text)));
         } else {
-            ImgUtil.load(vodPic, view);
+            load(vodPic, view);
         }
     }
 
     public static void load(String url, ImageView view) {
         float thumbnail = 1 - Prefers.getThumbnail() * 0.3f;
-        Glide.with(App.get()).load(url).thumbnail(thumbnail).signature(new ObjectKey(url + "_" + thumbnail)).placeholder(R.drawable.ic_img_loading).into(customTarget(view));
+        Glide.with(App.get()).load(url).thumbnail(thumbnail).signature(new ObjectKey(url + "_" + thumbnail)).placeholder(R.drawable.ic_img_loading).error(R.drawable.ic_img_error).listener(getListener(view)).into(view);
     }
 
-    private static CustomTarget<Drawable> customTarget(ImageView view) {
-        return new CustomTarget<>() {
+    private static RequestListener<Drawable> getListener(ImageView view) {
+        return new RequestListener<>() {
             @Override
-            public void onLoadFailed(@Nullable Drawable errorDrawable) {
+            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
                 view.setScaleType(ImageView.ScaleType.CENTER);
-                view.setImageResource(R.drawable.ic_img_error);
+                return false;
             }
 
             @Override
-            public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+            public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
                 view.setScaleType(ImageView.ScaleType.CENTER_CROP);
-                view.setImageDrawable(resource);
-            }
-
-            @Override
-            public void onLoadCleared(@Nullable Drawable placeholder) {
-                view.setScaleType(ImageView.ScaleType.CENTER);
-                view.setImageDrawable(null);
+                return false;
             }
         };
     }