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 4d6c457..11737db 100644 --- a/app/src/main/java/com/github/catvod/spider/PushAgent.java +++ b/app/src/main/java/com/github/catvod/spider/PushAgent.java @@ -467,17 +467,13 @@ public class PushAgent extends Spider { Matcher matcher2 = pattern2.matcher(url); Matcher matcher = pattern.matcher(url); List vodItems = new ArrayList<>(); + String typeName = Misc.getWebName(url, 0); if (Misc.isVip(url) && !url.contains("qq.com") && !url.contains("mgtv.com")) { - String typeName = "官源",vpic=""; Document doc = Jsoup.parse(OkHttpUtil.string(url, Misc.Headers(0,url))); String VodName = doc.select("head > title").text(); JSONObject result = new JSONObject(); JSONArray lists = new JSONArray(); JSONObject vodAtom = new JSONObject(); - if(url.contains("iqiyi")) { - typeName = "爱奇艺"; - vpic = "http://image.xinjun58.com/sp/pic/bg/iqiyi.jpg"; - }else if(url.contains("bili"))vpic="http://image.xinjun58.com/sp/pic/bg/bili.jpg"; vodAtom.put("vod_id", url); vodAtom.put("vod_name", VodName); vodAtom.put("vod_pic", pic); @@ -530,7 +526,7 @@ public class PushAgent extends Spider { vodAtom.put("vod_id", url); vodAtom.put("vod_name", VodName); vodAtom.put("vod_pic", pic); - vodAtom.put("type_name", "腾讯TV"); + vodAtom.put("type_name", typeName); vodAtom.put("vod_year", ""); vodAtom.put("vod_area", ""); vodAtom.put("vod_remarks", remarks); @@ -574,7 +570,7 @@ public class PushAgent extends Spider { vodAtom.put("vod_id", url); vodAtom.put("vod_name", VodNames); vodAtom.put("vod_pic", pic); - vodAtom.put("type_name", "芒果TV"); + vodAtom.put("type_name", typeName); vodAtom.put("vod_year", ""); vodAtom.put("vod_area", ""); vodAtom.put("vod_remarks", ""); @@ -729,6 +725,7 @@ public class PushAgent extends Spider { vodAtom.put("vod_name", VodName); vodAtom.put("vod_pic", pic); vodAtom.put("type_name", "嗅探"); + vodAtom.put("type_name", typeName); vodAtom.put("vod_content", url); lists.put(vodAtom); diff --git a/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java b/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java index 6a06b38..a90c839 100644 --- a/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java +++ b/app/src/main/java/com/github/catvod/spider/PushAgentQQ.java @@ -129,7 +129,7 @@ public class PushAgentQQ extends Spider { v.put("vod_id", url + "$$$" + pic + "$$$" + name); v.put("vod_name", name); v.put("vod_pic", pic); - v.put("vod_remarks", Misc.getWebName(url)); + v.put("vod_remarks", Misc.getWebName(url,0)); videos.put(v); } 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 8ab5b2b..0f2b8f1 100644 --- a/app/src/main/java/com/github/catvod/spider/XBiubiu.java +++ b/app/src/main/java/com/github/catvod/spider/XBiubiu.java @@ -255,6 +255,8 @@ public class XBiubiu extends Spider { SpiderDebug.log(e); } } + + director = ids.get(0);//查看网址 JSONObject vod = new JSONObject(); vod.put("vod_id", ids.get(0)); vod.put("vod_name", title);