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 386e0c1ea..4dda114d0 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; @@ -115,7 +114,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/main/java/com/fongmi/android/tv/player/ParseJob.java b/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java index 66c2cb093..40e334c80 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ParseJob.java @@ -1,5 +1,7 @@ package com.fongmi.android.tv.player; +import android.text.TextUtils; + import com.fongmi.android.tv.App; import com.fongmi.android.tv.Constant; import com.fongmi.android.tv.api.config.VodConfig; @@ -61,8 +63,9 @@ public class ParseJob implements ParseCallback { } private String getClick(Result result) { - if (result.getClick().length() > 0) return result.getClick(); - return VodConfig.get().getSite(result.getKey()).getClick(); + String click = VodConfig.get().getSite(result.getKey()).getClick(); + if (!TextUtils.isEmpty(click)) return click; + return result.getClick(); } private void execute(Result result) { 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 56425987a..53978bf6e 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Util.java +++ b/catvod/src/main/java/com/github/catvod/utils/Util.java @@ -75,12 +75,11 @@ public class Util { public static String md5(File file) { try { - if (!file.exists()) return ""; 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));