Merge branch 'dev' into release

pull/194/head
FongMi 2 years ago
commit 779bbcb5e8
  1. 2
      app/src/main/java/com/fongmi/android/tv/server/process/Cache.java
  2. 4
      app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java

@ -28,7 +28,7 @@ public class Cache implements Process {
String key = params.get("key"); String key = params.get("key");
switch (Objects.requireNonNullElse(params.get("do"), "")) { switch (Objects.requireNonNullElse(params.get("do"), "")) {
case "get": case "get":
return Nano.success(getKey(rule, key)); return Nano.success(Prefers.getString(getKey(rule, key)));
case "set": case "set":
Prefers.put(getKey(rule, key), params.get("value")); Prefers.put(getKey(rule, key), params.get("value"));
return Nano.success(); return Nano.success();

@ -85,7 +85,7 @@ public class CustomWebView extends WebView {
if (TextUtils.isEmpty(host)) return empty; if (TextUtils.isEmpty(host)) return empty;
if (ApiConfig.get().getAds().contains(host)) return empty; if (ApiConfig.get().getAds().contains(host)) return empty;
Map<String, String> headers = request.getRequestHeaders(); Map<String, String> headers = request.getRequestHeaders();
if (isVideoFormat(url, headers)) post(headers, url); if (isVideoFormat(headers, url)) post(headers, url);
return super.shouldInterceptRequest(view, request); return super.shouldInterceptRequest(view, request);
} }
@ -102,7 +102,7 @@ public class CustomWebView extends WebView {
}; };
} }
private boolean isVideoFormat(String url, Map<String, String> headers) { private boolean isVideoFormat(Map<String, String> headers, String url) {
try { try {
Site site = ApiConfig.get().getSite(key); Site site = ApiConfig.get().getSite(key);
Spider spider = ApiConfig.get().getSpider(site); Spider spider = ApiConfig.get().getSpider(site);

Loading…
Cancel
Save