From 835326bd6cf804cffcfec4da1b3bb176a93304c6 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 15 Aug 2022 17:10:15 +0800 Subject: [PATCH] Clean code --- .../java/com/fongmi/android/tv/player/Players.java | 2 +- .../fongmi/android/tv/ui/custom/CustomWebView.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/player/Players.java b/app/src/main/java/com/fongmi/android/tv/player/Players.java index 19380150d..b16cfaa5e 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/Players.java +++ b/app/src/main/java/com/fongmi/android/tv/player/Players.java @@ -191,7 +191,7 @@ public class Players implements Player.Listener { exoPlayer.setPlaybackSpeed(1.0f); } if (webView != null) { - webView.stop(); + webView.stop(false); } } diff --git a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java index fe6f98eb1..a2a954512 100644 --- a/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java +++ b/app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java @@ -52,6 +52,7 @@ public class CustomWebView extends WebView { getSettings().setJavaScriptEnabled(true); getSettings().setBlockNetworkImage(true); getSettings().setLoadWithOverviewMode(true); + getSettings().setLoadsImagesAutomatically(false); getSettings().setJavaScriptCanOpenWindowsAutomatically(false); getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); setWebViewClient(webViewClient()); @@ -94,12 +95,8 @@ public class CustomWebView extends WebView { @Override public void run() { if (retry > 5) return; - if (retry++ == 5) { - stop(); - PlayerEvent.error(R.string.error_play_parse); - } else { - reload(); - } + if (retry++ == 5) stop(true); + else reload(); } }; @@ -112,13 +109,14 @@ public class CustomWebView extends WebView { private void post(Map headers, String url) { handler.removeCallbacks(mTimer); handler.post(() -> { - stop(); + stop(false); Players.get().setMediaSource(headers, url); }); } - public void stop() { + public void stop(boolean error) { stopLoading(); loadUrl("about:blank"); + if (error) PlayerEvent.error(R.string.error_play_parse); } }