Update danmaku

pull/103/head
FongMi 10 months ago
parent 26dd28e7d2
commit 2b1b83397b
  1. 35
      app/src/main/java/com/github/catvod/bean/Danmaku.java
  2. 4
      app/src/main/java/com/github/catvod/bean/Result.java
  3. 3
      app/src/main/java/com/github/catvod/spider/Bili.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<Danmaku> arrayFrom(String str) {
Type listType = new TypeToken<List<Danmaku>>() {}.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;
}
}

@ -29,7 +29,7 @@ public class Result {
@SerializedName("format") @SerializedName("format")
private String format; private String format;
@SerializedName("danmaku") @SerializedName("danmaku")
private String danmaku; private List<Danmaku> danmaku;
@SerializedName("click") @SerializedName("click")
private String click; private String click;
@SerializedName("msg") @SerializedName("msg")
@ -175,7 +175,7 @@ public class Result {
return this; return this;
} }
public Result danmaku(String danmaku) { public Result danmaku(List<Danmaku> danmaku) {
this.danmaku = danmaku; this.danmaku = danmaku;
return this; return this;
} }

@ -4,6 +4,7 @@ import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import com.github.catvod.bean.Class; import com.github.catvod.bean.Class;
import com.github.catvod.bean.Danmaku;
import com.github.catvod.bean.Filter; import com.github.catvod.bean.Filter;
import com.github.catvod.bean.Result; import com.github.catvod.bean.Result;
import com.github.catvod.bean.Vod; import com.github.catvod.bean.Vod;
@ -199,7 +200,7 @@ public class Bili extends Spider {
url.add(acceptDesc[i]); url.add(acceptDesc[i]);
url.add(Proxy.getUrl() + "?do=bili" + "&aid=" + aid + "&cid=" + cid + "&qn=" + acceptQuality[i] + "&type=mpd"); 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<String, String> params) { public static Object[] proxy(Map<String, String> params) {

Loading…
Cancel
Save