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 8ba94fe4..5f114f09 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -28,6 +28,8 @@ public class Result { private String format; @SerializedName("danmaku") private String danmaku; + @SerializedName("msg") + private String msg; @SerializedName("url") private Object url; @SerializedName("subs") @@ -85,6 +87,10 @@ public class Result { return Result.get().vod(item).string(); } + public static String error(String msg) { + return Result.get().vod(Collections.emptyList()).msg(msg).string(); + } + public static Result get() { return new Result(); } @@ -159,6 +165,11 @@ public class Result { return this; } + public Result msg(String msg) { + this.msg = msg; + return this; + } + public Result format(String format) { this.format = format; return this; diff --git a/app/src/main/java/com/github/catvod/spider/Kanqiu.java b/app/src/main/java/com/github/catvod/spider/Kanqiu.java index a41dcfa7..e881e499 100644 --- a/app/src/main/java/com/github/catvod/spider/Kanqiu.java +++ b/app/src/main/java/com/github/catvod/spider/Kanqiu.java @@ -84,10 +84,7 @@ public class Kanqiu extends Spider { @Override public String detailContent(List ids) throws Exception { - if (ids.get(0).equals(siteUrl)) { - Notify.show("比赛尚未开始"); - return Result.string(new Vod()); - } + if (ids.get(0).equals(siteUrl)) return Result.error("比賽尚未開始"); String content = OkHttp.string(ids.get(0) + "-url", getHeader()); JSONArray linksArray = new JSONObject(content).getJSONArray("links"); List vodItems = new ArrayList<>(); diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index b0bd9cbe..b31437ea 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 be75967b..9d92789f 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -d793cc92ea62550b731392d15bacb859 +55c157414346e3ff571baad0a223bf15