pull/171/head
FongMi 3 years ago
parent 6fec913e26
commit 8b6980b337
  1. 2
      app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/api/JsLoader.java
  3. 12
      app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java
  4. 2
      app/src/main/java/com/fongmi/android/tv/ui/custom/CustomWebView.java

@ -229,7 +229,7 @@ public class ApiConfig {
return ext;
}
public Spider getCSP(Site site) {
public Spider getSpider(Site site) {
boolean js = site.getApi().contains(".js");
boolean py = site.getApi().startsWith("py_");
boolean csp = site.getApi().startsWith("csp_");

@ -55,7 +55,7 @@ public class JsLoader {
private Spider find(Map<String, String> params) {
if (!params.containsKey("siteKey")) return spiders.get(recent);
Site site = ApiConfig.get().getSite(params.get("siteKey"));
return site.isEmpty() ? null : ApiConfig.get().getCSP(site);
return site.isEmpty() ? null : ApiConfig.get().getSpider(site);
}
public Object[] proxyInvoke(Map<String, String> params) {

@ -66,7 +66,7 @@ public class SiteViewModel extends ViewModel {
execute(result, () -> {
Site site = ApiConfig.get().getHome();
if (site.getType() == 3) {
Spider spider = ApiConfig.get().getCSP(site);
Spider spider = ApiConfig.get().getSpider(site);
String homeContent = spider.homeContent(true);
SpiderDebug.log(homeContent);
ApiConfig.get().setRecent(site);
@ -94,7 +94,7 @@ public class SiteViewModel extends ViewModel {
execute(result, () -> {
Site site = ApiConfig.get().getSite(key);
if (site.getType() == 3) {
Spider spider = ApiConfig.get().getCSP(site);
Spider spider = ApiConfig.get().getSpider(site);
String categoryContent = spider.categoryContent(tid, page, filter, extend);
SpiderDebug.log(categoryContent);
ApiConfig.get().setRecent(site);
@ -117,7 +117,7 @@ public class SiteViewModel extends ViewModel {
execute(result, () -> {
Site site = ApiConfig.get().getSite(key);
if (site.getType() == 3) {
Spider spider = ApiConfig.get().getCSP(site);
Spider spider = ApiConfig.get().getSpider(site);
String detailContent = spider.detailContent(Arrays.asList(id));
SpiderDebug.log(detailContent);
ApiConfig.get().setRecent(site);
@ -152,7 +152,7 @@ public class SiteViewModel extends ViewModel {
Source.get().stop();
Site site = ApiConfig.get().getSite(key);
if (site.getType() == 3) {
Spider spider = ApiConfig.get().getCSP(site);
Spider spider = ApiConfig.get().getSpider(site);
String playerContent = spider.playerContent(flag, id, ApiConfig.get().getFlags());
SpiderDebug.log(playerContent);
ApiConfig.get().setRecent(site);
@ -197,7 +197,7 @@ public class SiteViewModel extends ViewModel {
public void searchContent(Site site, String keyword, boolean quick) throws Throwable {
if (site.getType() == 3) {
Spider spider = ApiConfig.get().getCSP(site);
Spider spider = ApiConfig.get().getSpider(site);
String searchContent = spider.searchContent(Trans.t2s(keyword), quick);
SpiderDebug.log(site.getName() + "," + searchContent);
post(site, Result.fromJson(searchContent));
@ -214,7 +214,7 @@ public class SiteViewModel extends ViewModel {
public void searchContent(Site site, String keyword, String page) {
execute(result, () -> {
if (site.getType() == 3) {
Spider spider = ApiConfig.get().getCSP(site);
Spider spider = ApiConfig.get().getSpider(site);
String searchContent = spider.searchContent(Trans.t2s(keyword), false, page);
SpiderDebug.log(site.getName() + "," + searchContent);
Result result = Result.fromJson(searchContent);

@ -105,7 +105,7 @@ public class CustomWebView extends WebView {
private boolean isVideoFormat(String url, Map<String, String> headers) {
try {
Site site = ApiConfig.get().getSite(key);
Spider spider = ApiConfig.get().getCSP(site);
Spider spider = ApiConfig.get().getSpider(site);
if (spider.manualVideoCheck()) return spider.isVideoFormat(url);
return Sniffer.isVideoFormat(url, headers);
} catch (Exception ignored) {

Loading…
Cancel
Save