diff --git a/app/src/main/java/com/github/catvod/bean/Result.java b/app/src/main/java/com/github/catvod/bean/Result.java index 5f114f09..96e3cf67 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -1,5 +1,6 @@ package com.github.catvod.bean; +import com.github.catvod.utils.Util; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.annotations.SerializedName; @@ -10,6 +11,7 @@ import org.json.JSONObject; import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -135,6 +137,13 @@ public class Result { return this; } + public Result chrome() { + Map header = new HashMap<>(); + header.put("User-Agent", Util.CHROME); + header(header); + return this; + } + public Result parse() { this.parse = 1; return this; diff --git a/app/src/main/java/com/github/catvod/spider/Push.java b/app/src/main/java/com/github/catvod/spider/Push.java index 935208cc..20a49ff5 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -37,8 +37,9 @@ public class Push extends Spider { @Override public String playerContent(String flag, String id, List vipFlags) { + if (id.startsWith("http") && id.contains("***")) id = id.replace("***", "#"); if (flag.equals("直連")) return Result.get().url(id).subs(getSubs(id)).string(); - if (flag.equals("嗅探")) return Result.get().parse().url(id).string(); + if (flag.equals("嗅探")) return Result.get().parse().url(id).chrome().string(); if (flag.equals("解析")) return Result.get().parse().jx().url(id).string(); return ali.playerContent(flag, id, vipFlags); } @@ -48,6 +49,7 @@ public class Push extends Spider { vod.setVodId(url); vod.setTypeName("FongMi"); vod.setVodName(url.startsWith("file://") ? new File(url).getName() : url); + if (url.startsWith("http") && url.contains("#")) url = url.replace("#", "***"); vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg"); vod.setVodPlayFrom(TextUtils.join("$$$", Arrays.asList("直連", "嗅探", "解析"))); vod.setVodPlayUrl(TextUtils.join("$$$", Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url))); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index ad0f8c90..3b4780fd 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 356f59c5..92218dd3 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -db8ee47ff1095679871f083b2f5bf388 +96a99e445d620353890869d95755b890