From 19615fcc955f98e1069c79776f770091c6b83828 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 31 May 2024 10:40:06 +0800 Subject: [PATCH] Fix bug --- .../java/com/fongmi/android/tv/ui/base/BaseActivity.java | 3 +-- .../java/com/fongmi/android/tv/ui/base/BaseActivity.java | 4 ++-- catvod/src/main/java/com/github/catvod/utils/Util.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/base/BaseActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/base/BaseActivity.java index 9d2013aa1..dc9dff195 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/base/BaseActivity.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/base/BaseActivity.java @@ -16,7 +16,6 @@ import androidx.recyclerview.widget.RecyclerView; import androidx.viewbinding.ViewBinding; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.bumptech.glide.signature.ObjectKey; @@ -111,7 +110,7 @@ public abstract class BaseActivity extends AppCompatActivity { } private void loadWall(File file) { - Glide.with(App.get()).load(file).centerCrop().signature(new ObjectKey(file.lastModified())).apply(new RequestOptions().override(ResUtil.getScreenWidth(), ResUtil.getScreenHeight())).into(new CustomTarget() { + Glide.with(App.get()).load(file).centerCrop().override(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()).signature(new ObjectKey(com.github.catvod.utils.Util.md5(file))).into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable drawable, @Nullable Transition transition) { getWindow().setBackgroundDrawable(drawable); diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java index cae4612a7..cf53fd33d 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/base/BaseActivity.java @@ -18,7 +18,6 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.viewbinding.ViewBinding; import com.bumptech.glide.Glide; -import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; import com.bumptech.glide.signature.ObjectKey; @@ -28,6 +27,7 @@ import com.fongmi.android.tv.Setting; import com.fongmi.android.tv.event.RefreshEvent; import com.fongmi.android.tv.utils.FileUtil; import com.fongmi.android.tv.utils.ResUtil; +import com.github.catvod.utils.Util; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -137,7 +137,7 @@ public abstract class BaseActivity extends AppCompatActivity { } private void loadWall(File file) { - Glide.with(App.get()).load(file).centerCrop().signature(new ObjectKey(file.lastModified())).apply(new RequestOptions().override(ResUtil.getScreenWidth(), ResUtil.getScreenHeight())).into(new CustomTarget() { + Glide.with(App.get()).load(file).centerCrop().override(ResUtil.getScreenWidth(), ResUtil.getScreenHeight()).signature(new ObjectKey(Util.md5(file))).into(new CustomTarget() { @Override public void onResourceReady(@NonNull Drawable drawable, @Nullable Transition transition) { getWindow().setBackgroundDrawable(drawable); diff --git a/catvod/src/main/java/com/github/catvod/utils/Util.java b/catvod/src/main/java/com/github/catvod/utils/Util.java index de4810e06..53978bf6e 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Util.java +++ b/catvod/src/main/java/com/github/catvod/utils/Util.java @@ -77,9 +77,9 @@ public class Util { try { MessageDigest digest = MessageDigest.getInstance("MD5"); FileInputStream fis = new FileInputStream(file); - byte[] byteArray = new byte[1024]; + byte[] bytes = new byte[4096]; int count; - while ((count = fis.read(byteArray)) != -1) digest.update(byteArray, 0, count); + while ((count = fis.read(bytes)) != -1) digest.update(bytes, 0, count); fis.close(); StringBuilder sb = new StringBuilder(); for (byte b : digest.digest()) sb.append(Integer.toString((b & 0xff) + 0x100, 16).substring(1));