diff --git a/app/src/main/java/com/github/catvod/bean/Result.java b/app/src/main/java/com/github/catvod/bean/Result.java index 1b9fe58..4a5abaa 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -1,5 +1,7 @@ package com.github.catvod.bean; +import androidx.annotation.NonNull; + import com.google.gson.Gson; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; @@ -26,8 +28,8 @@ public class Result { private String header; @SerializedName("url") private String url; - @SerializedName("sub") - private List sub; + @SerializedName("subs") + private List subs; @SerializedName("parse") private int parse; @SerializedName("jx") @@ -129,8 +131,8 @@ public class Result { return this; } - public Result sub(List sub) { - this.sub = sub; + public Result subs(List subs) { + this.subs = subs; return this; } @@ -154,6 +156,7 @@ public class Result { return toString(); } + @NonNull @Override public String toString() { return new Gson().toJson(this); 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 a61a2a5..ef223d8 100644 --- a/app/src/main/java/com/github/catvod/spider/AList.java +++ b/app/src/main/java/com/github/catvod/spider/AList.java @@ -125,7 +125,7 @@ public class AList extends Spider { @Override public String playerContent(String flag, String id, List vipFlags) { String[] ids = id.split("~~~"); - return Result.get().url(getDetail(ids[0]).getUrl()).sub(getSub(ids)).string(); + return Result.get().url(getDetail(ids[0]).getUrl()).subs(getSub(ids)).string(); } private Item getDetail(String id) { diff --git a/app/src/main/java/com/github/catvod/spider/Ali.java b/app/src/main/java/com/github/catvod/spider/Ali.java index 8e81dfe..105f96b 100644 --- a/app/src/main/java/com/github/catvod/spider/Ali.java +++ b/app/src/main/java/com/github/catvod/spider/Ali.java @@ -99,9 +99,9 @@ public class Ali { String[] ids = id.split("\\+"); if (auth.isEmpty()) refreshAccessToken(); if (flag.equals("原畫")) { - return Result.get().url(getDownloadUrl(ids[0])).sub(getSub(ids)).header(getHeaders()).string(); + return Result.get().url(getDownloadUrl(ids[0])).subs(getSub(ids)).header(getHeaders()).string(); } else { - return Result.get().url(getPreviewUrl(ids[0])).sub(getSub(ids)).header(getHeaders()).string(); + return Result.get().url(getPreviewUrl(ids[0])).subs(getSub(ids)).header(getHeaders()).string(); } } diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index 014dd4e..1ab4245 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 38ca12e..57c0795 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -0c652bdac4683c84e151f867dd3abe54 +462dc3df9ddfcbb3c1933c172f634f7c