diff --git a/app/src/main/java/com/github/catvod/bean/alist/Item.java b/app/src/main/java/com/github/catvod/bean/alist/Item.java index 4ab77f90..534a2932 100644 --- a/app/src/main/java/com/github/catvod/bean/alist/Item.java +++ b/app/src/main/java/com/github/catvod/bean/alist/Item.java @@ -93,6 +93,10 @@ public class Item { return getType() == 1; } + public boolean isVideo(boolean v3) { + return getType() == (v3 ? 2 : 3); + } + public boolean ignore(boolean v3) { if (v3) return getType() == 0 || getType() == 4; return getType() == 0 || getType() == 2 || getType() == 5; diff --git a/app/src/main/java/com/github/catvod/spider/AList.java b/app/src/main/java/com/github/catvod/spider/AList.java index 4bf9dde3..c051ff75 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -1,6 +1,7 @@ package com.github.catvod.spider; import android.content.Context; +import android.text.TextUtils; import com.github.catvod.bean.Class; import com.github.catvod.bean.Filter; @@ -94,16 +95,20 @@ public class AList extends Spider { public String detailContent(List ids) throws Exception { fetchRule(); String id = ids.get(0); - Item item = getDetail(id); + String key = id.contains("/") ? id.substring(0, id.indexOf("/")) : id; String path = id.substring(0, id.lastIndexOf("/")); + String name = path.substring(path.lastIndexOf("/") + 1); + Drive drive = getDrive(key); List parents = getList(path, false); + Sorter.sort("name", "asc", parents); + List playUrls = new ArrayList<>(); + for (Item item : parents) if (item.isVideo(drive.isNew())) playUrls.add(Trans.get(item.getName()) + "$" + item.getUrl() + findSubs(path, parents)); Vod vod = new Vod(); - vod.setVodId(item.getVodId(id)); - vod.setVodName(item.getName()); - vod.setVodPic(item.getPic()); - vod.setVodTag(item.getVodTag()); - vod.setVodPlayFrom("播放"); - vod.setVodPlayUrl(Trans.get(item.getName()) + "$" + item.getUrl() + findSubs(path, parents)); + vod.setVodId(id); + vod.setVodName(name); + vod.setVodPlayFrom("AList"); + vod.setVodPlayUrl(TextUtils.join("#", playUrls)); + vod.setVodPic("http://img1.3png.com/281e284a670865a71d91515866552b5f172b.png"); return Result.string(vod); } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 206c06c6..79fa2eab 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 4ae88c95..6f7380a6 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -3d99b9f6015e1779941725bbb179eb5f +d54084d0ba8d794dd2768ad3492fd208