From 8c9526dc98fa48643f60a9f89b44c3fbaa3334ec Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Sat, 23 Aug 2025 14:41:08 +0800
Subject: [PATCH] Clean

---
 .../leanback/res/layout/adapter_channel.xml   |  1 -
 .../leanback/res/layout/view_widget_live.xml  |  1 -
 .../com/fongmi/android/tv/utils/ImgUtil.java  | 20 ++++++++-----------
 app/src/mobile/res/layout/adapter_channel.xml |  1 -
 .../mobile/res/layout/view_widget_live.xml    |  1 -
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/src/leanback/res/layout/adapter_channel.xml b/app/src/leanback/res/layout/adapter_channel.xml
index a21460d90..0d3505c67 100644
--- a/app/src/leanback/res/layout/adapter_channel.xml
+++ b/app/src/leanback/res/layout/adapter_channel.xml
@@ -27,7 +27,6 @@
         android:layout_width="48dp"
         android:layout_height="36dp"
         android:layout_marginEnd="12dp"
-        android:scaleType="fitCenter"
         android:visibility="gone" />
 
     <TextView
diff --git a/app/src/leanback/res/layout/view_widget_live.xml b/app/src/leanback/res/layout/view_widget_live.xml
index d8f7fd175..50a97f5ea 100644
--- a/app/src/leanback/res/layout/view_widget_live.xml
+++ b/app/src/leanback/res/layout/view_widget_live.xml
@@ -211,7 +211,6 @@
             android:layout_width="48dp"
             android:layout_height="36dp"
             android:layout_marginEnd="12dp"
-            android:scaleType="fitCenter"
             android:visibility="gone" />
 
         <TextView
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 3121ea670..696371e61 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
@@ -2,6 +2,7 @@ package com.fongmi.android.tv.utils;
 
 import static android.widget.ImageView.ScaleType.CENTER;
 import static android.widget.ImageView.ScaleType.CENTER_CROP;
+import static android.widget.ImageView.ScaleType.FIT_CENTER;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -51,20 +52,20 @@ public class ImgUtil {
     }
 
     public static void load(String text, String url, ImageView view, boolean rect) {
-        if (!TextUtils.isEmpty(url)) Glide.with(App.get()).asBitmap().load(getUrl(url)).skipMemoryCache(true).dontAnimate().sizeMultiplier(Setting.getThumbnail()).signature(getSignature(url)).listener(getListener(view)).into(view);
+        if (!TextUtils.isEmpty(url)) Glide.with(App.get()).asBitmap().load(getUrl(url)).skipMemoryCache(true).dontAnimate().sizeMultiplier(Setting.getThumbnail()).signature(getSignature(url)).listener(getListener(true, view)).into(view);
         else if (!text.isEmpty()) view.setImageDrawable(getTextDrawable(text.substring(0, 1), rect));
         else setError(view);
     }
 
     public static void loadVod(String text, String url, ImageView view) {
-        if (!TextUtils.isEmpty(url)) Glide.with(App.get()).asBitmap().load(getUrl(url)).listener(getListener(view)).into(view);
+        if (!TextUtils.isEmpty(url)) Glide.with(App.get()).asBitmap().load(getUrl(url)).listener(getListener(true, view)).into(view);
         else if (!text.isEmpty()) view.setImageDrawable(getTextDrawable(text.substring(0, 1), true));
         else setError(view);
     }
 
     public static void loadLive(String url, ImageView view) {
         view.setVisibility(TextUtils.isEmpty(url) ? View.GONE : View.VISIBLE);
-        if (!TextUtils.isEmpty(url)) Glide.with(App.get()).asBitmap().load(getUrl(url)).skipMemoryCache(true).dontAnimate().signature(getSignature(url)).listener(getListener(view, View.GONE)).into(view);
+        if (!TextUtils.isEmpty(url)) Glide.with(App.get()).asBitmap().load(getUrl(url)).skipMemoryCache(true).dontAnimate().signature(getSignature(url)).listener(getListener(false, view)).into(view);
     }
 
     private static Drawable getTextDrawable(String text, boolean rect) {
@@ -91,23 +92,18 @@ public class ImgUtil {
         for (Map.Entry<String, String> entry : map.entrySet()) builder.addHeader(UrlUtil.fixHeader(entry.getKey()), entry.getValue());
     }
 
-    private static RequestListener<Bitmap> getListener(ImageView view) {
-        return getListener(view, View.VISIBLE);
-    }
-
-    private static RequestListener<Bitmap> getListener(ImageView view, int visible) {
+    private static RequestListener<Bitmap> getListener(boolean vod, ImageView view) {
         return new RequestListener<>() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, @NonNull Target<Bitmap> target, boolean isFirstResource) {
-                if (visible == View.VISIBLE) setError(view);
-                view.setVisibility(visible);
+                if (!vod) view.setImageResource(R.drawable.ic_img_error);
+                else setError(view);
                 return true;
             }
 
             @Override
             public boolean onResourceReady(@NonNull Bitmap resource, @NonNull Object model, Target<Bitmap> target, @NonNull DataSource dataSource, boolean isFirstResource) {
-                view.setVisibility(View.VISIBLE);
-                view.setScaleType(CENTER_CROP);
+                view.setScaleType(vod ? CENTER_CROP : FIT_CENTER);
                 return false;
             }
         };
diff --git a/app/src/mobile/res/layout/adapter_channel.xml b/app/src/mobile/res/layout/adapter_channel.xml
index f093dc427..aef461956 100644
--- a/app/src/mobile/res/layout/adapter_channel.xml
+++ b/app/src/mobile/res/layout/adapter_channel.xml
@@ -28,7 +28,6 @@
         android:layout_width="44dp"
         android:layout_height="33dp"
         android:layout_marginEnd="12dp"
-        android:scaleType="fitCenter"
         android:visibility="gone" />
 
     <TextView
diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml
index e268c7c4f..33ad3e77d 100644
--- a/app/src/mobile/res/layout/view_widget_live.xml
+++ b/app/src/mobile/res/layout/view_widget_live.xml
@@ -179,7 +179,6 @@
             android:layout_width="44dp"
             android:layout_height="33dp"
             android:layout_marginEnd="12dp"
-            android:scaleType="fitCenter"
             android:visibility="gone" />
 
         <TextView