Add default accept

pull/137/head
FongMi 3 years ago
parent 635311b5c7
commit aec63eee56
  1. 4
      app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
  2. 5
      catvod/src/main/java/com/github/catvod/net/OkHttp.java

@ -26,6 +26,7 @@ import com.github.catvod.crawler.SpiderDebug;
import com.github.catvod.net.OkHttp;
import com.github.catvod.utils.Trans;
import com.github.catvod.utils.Util;
import com.google.common.net.HttpHeaders;
import java.io.IOException;
import java.util.ArrayList;
@ -39,6 +40,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import okhttp3.FormBody;
import okhttp3.Headers;
import okhttp3.Response;
public class SiteViewModel extends ViewModel {
@ -92,7 +94,7 @@ public class SiteViewModel extends ViewModel {
return Result.fromJson(homeContent);
}
} else {
String homeContent = OkHttp.newCall(site.getApi()).execute().body().string();
String homeContent = OkHttp.newCall(site.getApi(), Headers.of(HttpHeaders.ACCEPT, OkHttp.ACCEPT)).execute().body().string();
SpiderDebug.log(homeContent);
return fetchPic(site, Result.fromType(site.getType(), homeContent));
}

@ -24,6 +24,7 @@ import okhttp3.dnsoverhttps.DnsOverHttps;
public class OkHttp {
public static final String ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7";
private static final int TIMEOUT = 30 * 1000;
private static final int CACHE = 100 * 1024 * 1024;
@ -67,7 +68,7 @@ public class OkHttp {
public static Call newCall(String url) {
Uri uri = Uri.parse(url);
if (uri.getUserInfo() != null) return newCall(url, Headers.of(HttpHeaders.AUTHORIZATION, Util.basic(uri)));
return client().newCall(new Request.Builder().url(url).headers(Headers.of()).build());
return client().newCall(new Request.Builder().url(url).build());
}
public static Call newCall(OkHttpClient client, String url) {
@ -79,7 +80,7 @@ public class OkHttp {
}
public static Call newCall(String url, ArrayMap<String, String> params) {
return client().newCall(new Request.Builder().url(buildUrl(url, params)).build());
return client().newCall(new Request.Builder().url(buildUrl(url, params)).headers(Headers.of(HttpHeaders.ACCEPT, ACCEPT)).build());
}
public static Call newCall(String url, ArrayMap<String, String> params, Headers headers) {

Loading…
Cancel
Save