diff --git a/app/src/main/java/com/github/catvod/bean/alist/Drive.java b/app/src/main/java/com/github/catvod/bean/alist/Drive.java index 392da8fe..4564369e 100644 --- a/app/src/main/java/com/github/catvod/bean/alist/Drive.java +++ b/app/src/main/java/com/github/catvod/bean/alist/Drive.java @@ -17,6 +17,8 @@ public class Drive { @SerializedName("drives") private List drives; + @SerializedName("vodPic") + private String vodPic; @SerializedName("name") private String name; @SerializedName("server") @@ -40,6 +42,10 @@ public class Drive { this.name = name; } + public String getVodPic() { + return TextUtils.isEmpty(vodPic) ? "https://s1.ax1x.com/2023/04/03/pp4F4bT.png" : vodPic; + } + public String getName() { return TextUtils.isEmpty(name) ? "" : name; } 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 3647dc86..2fd05288 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 @@ -36,7 +36,8 @@ public class Item { } public static List arrayFrom(String str) { - Type listType = new TypeToken>() {}.getType(); + Type listType = new TypeToken>() { + }.getType(); return new Gson().fromJson(str, listType); } @@ -112,8 +113,8 @@ public class Item { return id + getPath() + "/" + getName(); } - public String getPic() { - return getThumb().isEmpty() && isFolder() ? "https://s1.ax1x.com/2023/04/03/pp4F4bT.png" : getThumb(); + public String getPic(String pic) { + return getThumb().isEmpty() && isFolder() ? pic : getThumb(); } public String getRemark() { @@ -124,11 +125,11 @@ public class Item { return isFolder() ? "folder" : "file"; } - public Vod getVod(String id) { - return new Vod(getVodId(id), getName(), getPic(), getRemark(), getVodTag()); + public Vod getVod(String id, String pic) { + return new Vod(getVodId(id), getName(), getPic(pic), getRemark(), getVodTag()); } - public Vod getVod(Drive drive) { - return new Vod(getVodId(drive.getName()), getName(), getPic(), drive.getName(), getVodTag()); + public Vod getVod(Drive drive, String pic) { + return new Vod(getVodId(drive.getName()), getName(), getPic(pic), drive.getName(), getVodTag()); } } 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 a497cf66..c7e8b179 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -30,6 +30,7 @@ import java.util.concurrent.CountDownLatch; public class AList extends Spider { private List drives; + private String vodPic; private String ext; private List getFilter() { @@ -42,7 +43,9 @@ public class AList extends Spider { private void fetchRule() { if (drives != null && !drives.isEmpty()) return; if (ext.startsWith("http")) ext = OkHttp.string(ext); - drives = Drive.objectFrom(ext).getDrives(); + Drive drive = Drive.objectFrom(ext); + drives = drive.getDrives(); + vodPic = drive.getVodPic(); } private Drive getDrive(String name) { @@ -84,8 +87,8 @@ public class AList extends Spider { Sorter.sort(type, order, folders); Sorter.sort(type, order, files); } - for (Item item : folders) list.add(item.getVod(tid)); - for (Item item : files) list.add(item.getVod(tid)); + for (Item item : folders) list.add(item.getVod(tid, vodPic)); + for (Item item : files) list.add(item.getVod(tid, vodPic)); return Result.get().vod(list).page().string(); } @@ -108,9 +111,9 @@ public class AList extends Spider { Vod vod = new Vod(); vod.setVodId(id); vod.setVodName(name); + vod.setVodPic(vodPic); vod.setVodPlayFrom(key); vod.setVodPlayUrl(TextUtils.join("#", playUrls)); - vod.setVodPic("http://img1.3png.com/281e284a670865a71d91515866552b5f172b.png"); return Result.string(vod); } @@ -167,7 +170,7 @@ public class AList extends Spider { try { String response = OkHttp.postJson(drive.searchApi(), drive.params(keyword)); List items = Item.arrayFrom(getSearchJson(drive.isNew(), response)); - for (Item item : items) if (!item.ignore(drive.isNew())) list.add(item.getVod(drive)); + for (Item item : items) if (!item.ignore(drive.isNew())) list.add(item.getVod(drive, vodPic)); } catch (Exception ignored) { } finally { cd.countDown(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 2ca74112..76655a90 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 a906025b..fa47b68e 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -debd4cf545c08d546b477c80319b9ad0 +9dad9b968f26436fc4e681d0dc372d55