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 036f6ce53..2b934c739 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,17 +508,12 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick } private void setArtwork(String url) { - ImgUtil.load(url, R.drawable.radio, new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { + ImgUtil.load(url, new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource); } - @Override - public void onLoadFailed(@Nullable Drawable error) { - mBinding.exo.setDefaultArtwork(error); - } - @Override public void onLoadCleared(@Nullable Drawable placeholder) { } 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 9b34f1054..7b4cdb7ae 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 @@ -918,17 +918,12 @@ public class VideoActivity extends BaseActivity implements CustomKeyDownVod.List } private void setArtwork(String url) { - ImgUtil.load(url, R.drawable.radio, new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { + ImgUtil.load(url, new CustomTarget<>(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()) { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition transition) { mBinding.exo.setDefaultArtwork(resource); } - @Override - public void onLoadFailed(@Nullable Drawable error) { - mBinding.exo.setDefaultArtwork(error); - } - @Override public void onLoadCleared(@Nullable Drawable placeholder) { } diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java index ad1b647ac..0708be24b 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/fragment/VodFragment.java @@ -202,7 +202,7 @@ public class VodFragment extends BaseFragment implements CustomScroller.Callback } private boolean checkLastSize(List items, Style style) { - if (mLast == null || items.size() == 0) return false; + if (mLast == null || items.isEmpty()) return false; int size = Product.getColumn(style) - mLast.size(); if (size == 0) return false; size = Math.min(size, items.size()); 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 a579bf493..ad24501fc 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 @@ -34,9 +34,8 @@ public class ImgUtil { return new ObjectKey(url + "_" + Setting.getQuality()); } - public static void load(String url, int error, CustomTarget target) { - if (TextUtils.isEmpty(url)) target.onLoadFailed(ResUtil.getDrawable(error)); - else Glide.with(App.get()).asDrawable().load(getUrl(url)).error(error).skipMemoryCache(true).dontAnimate().signature(getSignature(url)).into(target); + public static void load(String url, CustomTarget target) { + if (!TextUtils.isEmpty(url)) Glide.with(App.get()).asDrawable().load(getUrl(url)).skipMemoryCache(true).dontAnimate().signature(getSignature(url)).into(target); } public static void rect(String text, String url, ImageView view) { 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 bf359f56a..e82a78c2f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,7 +24,6 @@ true false false - @drawable/radio