diff --git a/app/src/main/java/com/github/catvod/spider/XBiubiu.java b/app/src/main/java/com/github/catvod/spider/XBiubiu.java index 66ec62b..9323409 100644 --- a/app/src/main/java/com/github/catvod/spider/XBiubiu.java +++ b/app/src/main/java/com/github/catvod/spider/XBiubiu.java @@ -122,10 +122,14 @@ public class XBiubiu extends Spider { ArrayList li = null; JSONArray videos = new JSONArray(); ArrayList jiequContents = subContent(parseContent, jiequshuzuqian, jiequshuzuhou); + String sousuohouzhui = getRuleVal("sousuohouzhui"); + String lianjieqian = getRuleVal("lianjieqian"); + String lianjiehou = getRuleVal("lianjiehou"); + String link = null; for (int i = 0; i < jiequContents.size(); i++) { try { String jiequContent = jiequContents.get(i); - String title = removeHtml(subContent(jiequContent, getRuleVal("biaotiqian"), getRuleVal("biaotihou")).get(0)); + String title = removeHtml(subContent(jiequContent, "html\" >", getRuleVal("biaotihou")).get(0)); String pic = ""; String tupianqian = getRuleVal("tupianqian").toLowerCase(); if (tupianqian.startsWith("http://") || tupianqian.startsWith("https://")) { @@ -137,8 +141,10 @@ public class XBiubiu extends Spider { pic = Misc.fixUrl(webUrl, pic); } } - String link = subContent(jiequContent, getRuleVal("lianjieqian"), getRuleVal("lianjiehou")).get(0); - link = getRuleVal("ljqianzhui").isEmpty() ? (link + getRuleVal("ljhouzhui")) : ("x:" + getRuleVal("ljqianzhui")) + link + getRuleVal("ljhouzhui"); + if(!lianjiehou.equals("")) { + link = subContent(jiequContent, lianjieqian, lianjiehou).get(0); + link = getRuleVal("ljqianzhui").isEmpty() ? (link + getRuleVal("ljhouzhui")) : ("x:" + getRuleVal("ljqianzhui")) + link + getRuleVal("ljhouzhui"); + } else link = jiequContent.replaceAll(".*\"(.*"+sousuohouzhui+".*?)\".*","$1"); String remark = !getRuleVal("fubiaotiqian").isEmpty() && !getRuleVal("fubiaotihou").isEmpty() ? removeHtml(subContent(jiequContent, getRuleVal("fubiaotiqian"), getRuleVal("fubiaotihou")).get(0)) : ""; JSONObject v = new JSONObject(); @@ -163,6 +169,7 @@ public class XBiubiu extends Spider { } return null; } + private static String removeUnicode(String str) { Pattern pattern = Pattern.compile("(\\\\u(\\w{4}))"); Matcher matcher = pattern.matcher(str); diff --git a/app/src/main/java/com/github/catvod/spider/Yiso.java b/app/src/main/java/com/github/catvod/spider/Yiso.java index 3084138..a5319b4 100644 --- a/app/src/main/java/com/github/catvod/spider/Yiso.java +++ b/app/src/main/java/com/github/catvod/spider/Yiso.java @@ -49,7 +49,6 @@ public class Yiso extends Spider { @Override public String searchContent(String key, boolean quick) { try { - PushAgent.getRefreshTk(); HashMap LT = sHeaders(); String url = "https://yiso.fun/api/search?name=" + URLEncoder.encode(key) + "&from=ali"; diff --git a/app/src/main/java/com/github/catvod/utils/Misc.java b/app/src/main/java/com/github/catvod/utils/Misc.java index c20f5ef..f8bde6b 100644 --- a/app/src/main/java/com/github/catvod/utils/Misc.java +++ b/app/src/main/java/com/github/catvod/utils/Misc.java @@ -22,7 +22,7 @@ public class Misc { public static PushAgent pushAgent = null; public static Integer type=1; public static String btype="N"; - public static boolean rflag = true; + public static boolean rflag = false; public static String apikey = "0ac44ae016490db2204ce0a042db2916"; public static boolean isVip(String url) { // 适配2.0.6的调用应用内解析列表的支持, 需要配合直连分析一起使用,参考cjt影视和极品直连