diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index 69044b6..56f54ed 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -296,7 +296,6 @@ public class Ali { Prefers.put("token", refreshToken = value.replace("\"", "")); Init.show("請重新進入播放頁"); code.setVisibility(View.GONE); - Misc.removeView(code); } private void showQRCode(String value) { @@ -304,7 +303,7 @@ public class Ali { byte[] bytes = Base64.decode(value.split("base64,")[1], Base64.DEFAULT); FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(Misc.dp2px(250), Misc.dp2px(250)); params.gravity = Gravity.CENTER; - Misc.addView(code = create(bytes), params); + Init.getActivity().addContentView(code = create(bytes), params); Init.show("請使用阿里雲盤 App 掃描二維碼"); } diff --git a/app/src/main/java/com/github/catvod/utils/Misc.java b/app/src/main/java/com/github/catvod/utils/Misc.java index 1f178b4..c33743d 100644 --- a/app/src/main/java/com/github/catvod/utils/Misc.java +++ b/app/src/main/java/com/github/catvod/utils/Misc.java @@ -3,7 +3,6 @@ package com.github.catvod.utils; import android.net.Uri; import android.util.DisplayMetrics; import android.util.TypedValue; -import android.view.View; import android.view.ViewGroup; import android.webkit.WebView; import android.webkit.WebViewClient; @@ -154,23 +153,14 @@ public class Misc { return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getDisplayMetrics()); } - public static void addView(View view, ViewGroup.LayoutParams params) { - ViewGroup group = Init.getActivity().getWindow().getDecorView().findViewById(android.R.id.content); - group.addView(view, params); - } - - public static void removeView(View view) { - ViewGroup group = Init.getActivity().getWindow().getDecorView().findViewById(android.R.id.content); - group.removeView(view); - } - public static void loadWebView(String url, WebViewClient client) { Init.run(() -> { WebView webView = new WebView(Init.context()); webView.getSettings().setDatabaseEnabled(true); webView.getSettings().setDomStorageEnabled(true); webView.getSettings().setJavaScriptEnabled(true); - addView(webView, new ViewGroup.LayoutParams(0, 0)); + ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(0, 0); + Init.getActivity().addContentView(webView, params); webView.setWebViewClient(client); webView.loadUrl(url); }); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 994f24e..ce48342 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 34af081..4b20c4a 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -6aa710655b59e0b3f88a283a3c4668ec +7f9cdce4e3c167bcc3118f4a039fb2fc