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 39663d69..a6b5235b 100644 --- a/app/src/main/java/com/github/catvod/spider/Push.java +++ b/app/src/main/java/com/github/catvod/spider/Push.java @@ -1,12 +1,13 @@ package com.github.catvod.spider; import android.content.Context; +import android.text.TextUtils; import com.github.catvod.bean.Result; import com.github.catvod.bean.Vod; import com.github.catvod.crawler.Spider; -import com.github.catvod.utils.Utils; +import java.util.Arrays; import java.util.List; public class Push extends Spider { @@ -20,26 +21,27 @@ public class Push extends Spider { public String detailContent(List ids) throws Exception { String url = ids.get(0).trim(); if (url.contains("aliyundrive")) return Ali.get().detailContent(ids); - if (Utils.isVip(url)) return Result.string(vod(url, "官源")); - if (Utils.isVideoFormat(url)) return Result.string(vod(url, "直連")); - return Result.string(vod(url, "網頁")); + List playFrom = Arrays.asList("直連", "嗅探", "解析"); + List playUrl = Arrays.asList("播放$" + url, "播放$" + url, "播放$" + url); + Vod vod = create(url); + vod.setVodPlayFrom(TextUtils.join("$$$", playFrom)); + vod.setVodPlayUrl(TextUtils.join("$$$", playUrl)); + return Result.string(vod); } @Override public String playerContent(String flag, String id, List vipFlags) { if (flag.contains("畫")) return Ali.get().playerContent(flag, id); - if (flag.equals("官源")) return Result.get().parse().jx().url(id).string(); - if (flag.equals("網頁")) return Result.get().parse().url(id).string(); + if (flag.equals("嗅探")) return Result.get().parse().url(id).string(); + if (flag.equals("解析")) return Result.get().parse().jx().url(id).string(); return Result.get().url(id).string(); } - private Vod vod(String url, String type) { + private Vod create(String url) { Vod vod = new Vod(); - vod.setTypeName(type); + vod.setTypeName("FongMi"); vod.setVodId(url); vod.setVodName(url); - vod.setVodPlayFrom(type); - vod.setVodPlayUrl("播放$" + url); vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg"); return vod; } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 10e45b5b..4b38a56d 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 8484e70f..6457a4d9 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -5f350e3b859432e66db59eebc3ccce78 +384628eab024a2a40a57835d2f0684d8