Revert "Fix bug"

This reverts commit 3180a79768.
pull/69/head
FongMi 3 years ago
parent 3180a79768
commit 428aa208b3
  1. 3
      app/src/main/java/com/github/catvod/spider/Ali.java
  2. 14
      app/src/main/java/com/github/catvod/utils/Misc.java
  3. BIN
      jar/custom_spider.jar
  4. 2
      jar/custom_spider.jar.md5

@ -296,6 +296,7 @@ public class Ali {
Prefers.put("token", refreshToken = value.replace("\"", "")); Prefers.put("token", refreshToken = value.replace("\"", ""));
Init.show("請重新進入播放頁"); Init.show("請重新進入播放頁");
code.setVisibility(View.GONE); code.setVisibility(View.GONE);
Misc.removeView(code);
} }
private void showQRCode(String value) { private void showQRCode(String value) {
@ -303,7 +304,7 @@ public class Ali {
byte[] bytes = Base64.decode(value.split("base64,")[1], Base64.DEFAULT); byte[] bytes = Base64.decode(value.split("base64,")[1], Base64.DEFAULT);
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(Misc.dp2px(250), Misc.dp2px(250)); FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(Misc.dp2px(250), Misc.dp2px(250));
params.gravity = Gravity.CENTER; params.gravity = Gravity.CENTER;
Init.getActivity().addContentView(code = create(bytes), params); Misc.addView(code = create(bytes), params);
Init.show("請使用阿里雲盤 App 掃描二維碼"); Init.show("請使用阿里雲盤 App 掃描二維碼");
} }

@ -3,6 +3,7 @@ package com.github.catvod.utils;
import android.net.Uri; import android.net.Uri;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
@ -153,14 +154,23 @@ public class Misc {
return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getDisplayMetrics()); 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) { public static void loadWebView(String url, WebViewClient client) {
Init.run(() -> { Init.run(() -> {
WebView webView = new WebView(Init.context()); WebView webView = new WebView(Init.context());
webView.getSettings().setDatabaseEnabled(true); webView.getSettings().setDatabaseEnabled(true);
webView.getSettings().setDomStorageEnabled(true); webView.getSettings().setDomStorageEnabled(true);
webView.getSettings().setJavaScriptEnabled(true); webView.getSettings().setJavaScriptEnabled(true);
ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(0, 0); addView(webView, new ViewGroup.LayoutParams(0, 0));
Init.getActivity().addContentView(webView, params);
webView.setWebViewClient(client); webView.setWebViewClient(client);
webView.loadUrl(url); webView.loadUrl(url);
}); });

Binary file not shown.

@ -1 +1 @@
7f9cdce4e3c167bcc3118f4a039fb2fc 6aa710655b59e0b3f88a283a3c4668ec

Loading…
Cancel
Save