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 bc97b3f15..f95075df9 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 @@ -27,15 +27,15 @@ public class ImgUtil { public static void load(String url, ImageView view) { view.setScaleType(ImageView.ScaleType.CENTER); if (TextUtils.isEmpty(url)) view.setImageResource(R.drawable.ic_img_error); - else Glide.with(App.get()).asBitmap().load(getUrl(url)).skipMemoryCache(true).dontAnimate().sizeMultiplier(Prefers.getThumbnail()).signature(new ObjectKey(url + "_" + Prefers.getQuality())).placeholder(R.drawable.ic_img_loading).listener(getListener(view)).into(view); + else Glide.with(App.get()).asBitmap().load(getUrl(Utils.checkProxy(url))).skipMemoryCache(true).dontAnimate().sizeMultiplier(Prefers.getThumbnail()).signature(new ObjectKey(url + "_" + Prefers.getQuality())).placeholder(R.drawable.ic_img_loading).listener(getListener(view)).into(view); } public static void loadKeep(String url, ImageView view) { - Glide.with(App.get()).load(url).error(R.drawable.ic_img_error).placeholder(R.drawable.ic_img_loading).into(view); + Glide.with(App.get()).load(Utils.checkProxy(url)).error(R.drawable.ic_img_error).placeholder(R.drawable.ic_img_loading).into(view); } public static void loadHistory(String url, ImageView view) { - Glide.with(App.get()).load(url).error(R.drawable.ic_img_error).placeholder(R.drawable.ic_img_loading).into(view); + Glide.with(App.get()).load(Utils.checkProxy(url)).error(R.drawable.ic_img_error).placeholder(R.drawable.ic_img_loading).into(view); } public static void loadLive(String url, ImageView view) { diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java index 474b758a2..3599d7984 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java @@ -4,18 +4,21 @@ import java.util.regex.Pattern; public class Sniffer { + public static final Pattern BLOCK = Pattern.compile("http((?!http).)*renren.pro(.*).demo.m3u8"); + public static final Pattern RULE = Pattern.compile( - "http((?!http).){12,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)\\?.*|" + + "http((?!http).){12,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)\\?.*|" + "http((?!http).){12,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)|" + "http((?!http).)*?video/tos*" ); public static final Pattern CUSTOM = Pattern.compile( - "http((?!http).)*?xg.php\\?id=|" + + "http((?!http).)*?xg.php\\?id=|" + "http((?!http).)*?/m3/(.*)\\.css|" + "http((?!http).)*?_playback/\\?video_id=|" + "http((?!http).)*huoshan.com(.*)?item_id=|" + - "http((?!http).)*qianpailive.com(.*)&vid=|"+ + "http((?!http).)*renren.pro(.*).m3u8|" + + "http((?!http).)*qianpailive.com(.*)&vid=|" + "http((?!http).)*douyin.com(.*)&is_play_url=" ); } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java index f092525fa..ef40e70cd 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Utils.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Utils.java @@ -72,6 +72,7 @@ public class Utils { } public static boolean isVideoFormat(String url, Map headers) { + if (Sniffer.BLOCK.matcher(url).find()) return false; if (Sniffer.CUSTOM.matcher(url).find()) return true; if (headers.containsKey("Accept") && headers.get("Accept").startsWith("image")) return false; if (url.contains("url=http") || url.contains(".js") || url.contains(".css") || url.contains(".html")) return false;