From b283fb5404e998550ec70feb0582d540a804576b Mon Sep 17 00:00:00 2001
From: yangqiang3504 <412594121@qq.com>
Date: Fri, 19 Aug 2022 16:15:40 +0800
Subject: [PATCH] add - PushAgent XBiubiu

---
 .../com/github/catvod/spider/PushAgent.java   | 23 ++++++++++++-------
 .../com/github/catvod/spider/XBiubiu.java     |  3 ++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/github/catvod/spider/PushAgent.java b/app/src/main/java/com/github/catvod/spider/PushAgent.java
index 1e34978..5a7bd86 100644
--- a/app/src/main/java/com/github/catvod/spider/PushAgent.java
+++ b/app/src/main/java/com/github/catvod/spider/PushAgent.java
@@ -453,15 +453,17 @@ public class PushAgent extends Spider {
             Matcher matcher2 = pattern2.matcher(url);
             Matcher matcher = pattern.matcher(url);
             if (Misc.isVip(url) && !url.contains("qq.com") && !url.contains("mgtv.com")) {
+                String typeName = "官源";
                 Document doc = Jsoup.parse(OkHttpUtil.string(url, null));
                 String VodName = doc.select("head > title").text();
                 JSONObject result = new JSONObject();
                 JSONArray lists = new JSONArray();
                 JSONObject vodAtom = new JSONObject();
+                if(url.contains("iqiyi")) typeName = "爱奇艺";
                 vodAtom.put("vod_id", url);
                 vodAtom.put("vod_name", VodName);
                 vodAtom.put("vod_pic", "https://img.zcool.cn/community/0123545c74c5aea801213f261297df.png");
-                vodAtom.put("type_name", "官源");
+                vodAtom.put("type_name", typeName);
                 vodAtom.put("vod_year", "");
                 vodAtom.put("vod_area", "");
                 vodAtom.put("vod_remarks", "");
@@ -484,13 +486,16 @@ public class PushAgent extends Spider {
                 if (!playListA.isEmpty()) {
                     for (int j = 0; j < playListA.size(); j++) {
                         Element vod = playListA.get(j);
-                        String a = vod.select("div").attr("data-vid");
-                        String b = vod.select("div").attr("data-cid");
-                        String id = "https://v.qq.com/x/cover/" + b + "/" + a;
-                        String name = vod.select("div span").text();
-                        vodItems.add(name + "$" + id);
+                        String img = vod.select("img").attr("src");
+                        if(img.equals("")||!img.contains("trailerlite")){
+                            String a = vod.select("div").attr("data-vid");
+                            String b = vod.select("div").attr("data-cid");
+                            String id = "https://v.qq.com/x/cover/" + b + "/" + a + ".html";
+                            String name = vod.select("div span").text();
+                            vodItems.add(name + "$" + id);
+                        }
                     }
-                    String playList = TextUtils.join("#", vodItems);
+                    String playList = com.github.catvod.utils.TextUtils.join("#", vodItems);
                     vodAtom.put("vod_play_url", playList);
                 } else {
                     vodAtom.put("vod_play_url", "立即播放$" + url);
@@ -525,7 +530,9 @@ public class PushAgent extends Spider {
                     if (a.length() > 0) {
                         for (int i = 0; i < a.length(); i++) {
                             JSONObject jObj = a.getJSONObject(i);
-                            if (jObj.getString("isIntact").equals("1")) {
+                            String isnew = jObj.getString("isnew");
+                            String isvip = jObj.getString("isvip");
+                            if (!(isnew.equals("2")&&isvip.equals("0"))) {
                                 String VodName = jObj.getString("t4");
                                 String id = jObj.getString("video_id");
                                 String VodId = "https://www.mgtv.com/b/" + mgtv1.group(1) + "/" + id + ".html";
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 623a671..89e8ad4 100644
--- a/app/src/main/java/com/github/catvod/spider/XBiubiu.java
+++ b/app/src/main/java/com/github/catvod/spider/XBiubiu.java
@@ -191,7 +191,7 @@ public class XBiubiu extends Spider {
                         String link = subContent(lastParseContents.get(j), getRuleVal("bflianjieqian"), getRuleVal("bflianjiehou")).get(0);
                         vodItems.add(title + "$" + link);
                     }
-                    playList.add(TextUtils.join("#", vodItems));
+                    playList.add(0, TextUtils.join("#", vodItems));
                 } catch (Throwable th) {
                     th.printStackTrace();
                     break;
@@ -244,6 +244,7 @@ public class XBiubiu extends Spider {
             if (!getRuleVal("juqingqian").isEmpty() && !getRuleVal("juqinghou").isEmpty()) {
                 try {
                     desc = subContent(html, getRuleVal("juqingqian"), getRuleVal("juqinghou")).get(0);
+                    if(desc!=null)desc = desc.replaceAll(".*>(.*)", "$1");
                 } catch (Exception e) {
                     SpiderDebug.log(e);
                 }