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 b2da611ec..665fae117 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 @@ -450,7 +450,7 @@ public class Vod { if (this == obj) return true; if (!(obj instanceof Episode)) return false; Episode it = (Episode) obj; - return (!TextUtils.isEmpty(getUrl()) && !TextUtils.isEmpty(it.getUrl()) && getUrl().equals(it.getUrl())) || (!TextUtils.isEmpty(getName()) && !TextUtils.isEmpty(it.getName()) && getName().equals(it.getName())); + return getUrl().equals(it.getUrl()) && getName().equals(it.getName()); } static class Sorter implements Comparator { 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 f0ee1e164..874b376d8 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,6 +4,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.RectF; +import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.view.View; import android.widget.ImageView; @@ -16,6 +17,7 @@ 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.request.RequestListener; +import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.target.Target; import com.bumptech.glide.signature.ObjectKey; import com.fongmi.android.tv.App; @@ -35,6 +37,10 @@ public class ImgUtil { load(url, view, ImageView.ScaleType.CENTER); } + public static void load(String url, CustomTarget target) { + if (!TextUtils.isEmpty(url)) Glide.with(App.get()).load(checkUrl(url)).dontAnimate().into(target); + } + public static void load(String url, ImageView view, ImageView.ScaleType scaleType) { view.setScaleType(scaleType); if (TextUtils.isEmpty(url)) view.setImageResource(R.drawable.ic_img_error); diff --git a/app/src/main/res/drawable-nodpi/radio.webp b/app/src/main/res/drawable-nodpi/radio.webp deleted file mode 100644 index 00d392c79..000000000 Binary files a/app/src/main/res/drawable-nodpi/radio.webp and /dev/null differ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b03f253c5..8b84cb3d0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -19,7 +19,6 @@ true false false - @drawable/radio