From e58661141e68b1ece0b3983a4a617f68c6795177 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 16 Apr 2026 14:56:21 +0800 Subject: [PATCH] Fix wall load --- .../fongmi/android/tv/ui/custom/CustomWallView.java | 13 ++++++++----- .../java/com/fongmi/android/tv/utils/ResUtil.java | 4 ---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWallView.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWallView.java index 3f36f24c7..fe7a67902 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWallView.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWallView.java @@ -22,7 +22,6 @@ import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.databinding.ViewWallBinding; import com.fongmi.android.tv.event.ConfigEvent; import com.fongmi.android.tv.utils.FileUtil; -import com.fongmi.android.tv.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -91,16 +90,20 @@ public class CustomWallView extends FrameLayout implements DefaultLifecycleObser } private void load() { - File file = FileUtil.getWall(Setting.getWall()); + int wall = Setting.getWall(); + File file = FileUtil.getWall(wall); cache = Drawable.createFromPath(FileUtil.getWallCache().getAbsolutePath()); - if (!file.getName().endsWith("0")) loadRes(ResUtil.getDrawable(file.getName())); + if (Setting.getWallType() == 0 && wall != 0) loadRes(wall); else if (Setting.getWallType() == 2) loadVideo(file); else if (Setting.getWallType() == 1) loadGif(file); else loadImage(); } - private void loadRes(int resId) { - binding.image.setImageResource(resId); + private void loadRes(int wall) { + if (wall == 1) binding.image.setImageResource(R.drawable.wallpaper_1); + else if (wall == 2) binding.image.setImageResource(R.drawable.wallpaper_2); + else if (wall == 3) binding.image.setImageResource(R.drawable.wallpaper_3); + else if (wall == 4) binding.image.setImageResource(R.drawable.wallpaper_4); } private void loadVideo(File file) { diff --git a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java index 2e2aa9798..bccf036d7 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/ResUtil.java @@ -100,10 +100,6 @@ public class ResUtil { return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getDisplayMetrics()); } - public static int getDrawable(String resId) { - return App.get().getResources().getIdentifier(resId, "drawable", App.get().getPackageName()); - } - public static String getString(@StringRes int resId) { return App.get().getResources().getString(resId); }