diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java index 209b513ed..05aed8076 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java @@ -238,7 +238,7 @@ public class SiteViewModel extends ViewModel { } private String call(Site site, ArrayMap params, boolean limit) throws IOException { - Call call = fetchExt(site, params, limit).length() <= 1000 ? OkHttp.newCall(site.isProxy(), site.getApi(), params, site.getHeaders()) : OkHttp.newCall(site.isProxy(), site.getApi(), OkHttp.toBody(params), site.getHeaders()); + Call call = fetchExt(site, params, limit).length() <= 1000 ? OkHttp.newCall(site.isProxy(), site.getApi(), site.getHeaders(), params) : OkHttp.newCall(site.isProxy(), site.getApi(), site.getHeaders(), OkHttp.toBody(params)); return call.execute().body().string(); } @@ -264,7 +264,7 @@ public class SiteViewModel extends ViewModel { ArrayMap params = new ArrayMap<>(); params.put("ac", site.getType() == 0 ? "videolist" : "detail"); params.put("ids", TextUtils.join(",", ids)); - String response = OkHttp.newCall(site.isProxy(), site.getApi(), params, site.getHeaders()).execute().body().string(); + String response = OkHttp.newCall(site.isProxy(), site.getApi(), site.getHeaders(), params).execute().body().string(); result.setList(Result.fromType(site.getType(), response).getList()); return result; } diff --git a/catvod/src/main/java/com/github/catvod/crawler/Spider.java b/catvod/src/main/java/com/github/catvod/crawler/Spider.java index d9a7887a6..2e296525a 100644 --- a/catvod/src/main/java/com/github/catvod/crawler/Spider.java +++ b/catvod/src/main/java/com/github/catvod/crawler/Spider.java @@ -78,7 +78,7 @@ public abstract class Spider { return OkHttp.dns(); } - public static OkHttpClient client(boolean proxy, boolean redirect, int timeout) { - return OkHttp.client(proxy, redirect, timeout); + public OkHttpClient client() { + return OkHttp.client(proxy); } } diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java index a8be8bf20..250cb2358 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -108,6 +108,10 @@ public class OkHttp { return client.newCall(new Request.Builder().url(url).build()); } + public static Call newCall(OkHttpClient client, String url, Headers headers) { + return client.newCall(new Request.Builder().url(url).headers(headers).build()); + } + public static Call newCall(String url, Headers headers) { return newCall(true, url, headers); } @@ -116,12 +120,12 @@ public class OkHttp { return client(proxy).newCall(new Request.Builder().url(url).headers(headers).build()); } - public static Call newCall(boolean proxy, String url, ArrayMap params, Headers headers) { + public static Call newCall(boolean proxy, String url, Headers headers, ArrayMap params) { return client(proxy).newCall(new Request.Builder().url(buildUrl(url, params)).headers(headers).build()); } - public static Call newCall(boolean proxy, String url, RequestBody body, Headers headers) { - return client(proxy).newCall(new Request.Builder().url(url).post(body).headers(headers).build()); + public static Call newCall(boolean proxy, String url, Headers headers, RequestBody body) { + return client(proxy).newCall(new Request.Builder().url(url).headers(headers).post(body).build()); } public static Call newCall(OkHttpClient client, String url, RequestBody body) { diff --git a/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java b/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java index c3e13906a..baa163865 100644 --- a/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java +++ b/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java @@ -99,7 +99,7 @@ public class Spider extends com.github.catvod.crawler.Spider { Headers header = getHeader(object.optString("header")); ArrayMap param = getParam(object.optString("param")); if (object.optString("type").equals("stream")) { - return new Object[]{code, type, OkHttp.newCall(proxy(), url, param, header).execute().body().byteStream()}; + return new Object[]{code, type, OkHttp.newCall(proxy(), url, header, param).execute().body().byteStream()}; } else { if (content.isEmpty()) content = OkHttp.newCall(proxy(), url, header).execute().body().string(); return new Object[]{code, type, new ByteArrayInputStream(content.getBytes())};