diff --git a/app/src/main/java/com/github/catvod/bean/Danmaku.java b/app/src/main/java/com/github/catvod/bean/Danmaku.java new file mode 100644 index 0000000..bec51d6 --- /dev/null +++ b/app/src/main/java/com/github/catvod/bean/Danmaku.java @@ -0,0 +1,35 @@ +package com.github.catvod.bean; + +import com.google.gson.Gson; +import com.google.gson.annotations.SerializedName; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.List; + +public class Danmaku { + + @SerializedName("url") + private String url; + @SerializedName("name") + private String name; + + public static List arrayFrom(String str) { + Type listType = new TypeToken>() {}.getType(); + return new Gson().fromJson(str, listType); + } + + public static Danmaku create() { + return new Danmaku(); + } + + public Danmaku name(String name) { + this.name = name; + return this; + } + + public Danmaku url(String url) { + this.url = url; + return this; + } +} 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 afbc8eb..0f3dcf2 100644 --- a/app/src/main/java/com/github/catvod/bean/Result.java +++ b/app/src/main/java/com/github/catvod/bean/Result.java @@ -29,7 +29,7 @@ public class Result { @SerializedName("format") private String format; @SerializedName("danmaku") - private String danmaku; + private List danmaku; @SerializedName("click") private String click; @SerializedName("msg") @@ -175,7 +175,7 @@ public class Result { return this; } - public Result danmaku(String danmaku) { + public Result danmaku(List danmaku) { this.danmaku = danmaku; return this; } diff --git a/app/src/main/java/com/github/catvod/spider/Bili.java b/app/src/main/java/com/github/catvod/spider/Bili.java index 766cd0a..b192398 100644 --- a/app/src/main/java/com/github/catvod/spider/Bili.java +++ b/app/src/main/java/com/github/catvod/spider/Bili.java @@ -4,6 +4,7 @@ import android.content.Context; import android.text.TextUtils; import com.github.catvod.bean.Class; +import com.github.catvod.bean.Danmaku; import com.github.catvod.bean.Filter; import com.github.catvod.bean.Result; import com.github.catvod.bean.Vod; @@ -199,7 +200,7 @@ public class Bili extends Spider { url.add(acceptDesc[i]); url.add(Proxy.getUrl() + "?do=bili" + "&aid=" + aid + "&cid=" + cid + "&qn=" + acceptQuality[i] + "&type=mpd"); } - return Result.get().url(url).danmaku(dan).dash().header(getHeader()).string(); + return Result.get().url(url).danmaku(Arrays.asList(Danmaku.create().name("B站").url(dan))).dash().header(getHeader()).string(); } public static Object[] proxy(Map params) {