pull/589/head
FongMi 9 months ago
parent 328e36d0ca
commit 9ba0105626
  1. 4
      app/src/main/java/com/fongmi/android/tv/bean/Result.java
  2. 3
      app/src/main/java/com/fongmi/android/tv/gson/DanmakuAdapter.java

@ -199,7 +199,7 @@ public class Result implements Parcelable {
} }
public List<Sub> getSubs() { public List<Sub> getSubs() {
return subs == null ? new ArrayList<>() : subs; return subs == null ? new ArrayList<>() : new ArrayList<>(subs);
} }
public JsonElement getHeader() { public JsonElement getHeader() {
@ -235,7 +235,7 @@ public class Result implements Parcelable {
} }
public List<Danmaku> getDanmaku() { public List<Danmaku> getDanmaku() {
return !Setting.isDanmakuLoad() || danmaku == null ? new ArrayList<>() : danmaku; return !Setting.isDanmakuLoad() || danmaku == null ? new ArrayList<>() : new ArrayList<>(danmaku);
} }
public String getFormat() { public String getFormat() {

@ -9,7 +9,6 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonParseException; import com.google.gson.JsonParseException;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.List; import java.util.List;
public class DanmakuAdapter implements JsonDeserializer<List<Danmaku>> { public class DanmakuAdapter implements JsonDeserializer<List<Danmaku>> {
@ -19,6 +18,6 @@ public class DanmakuAdapter implements JsonDeserializer<List<Danmaku>> {
if (!json.isJsonPrimitive()) return App.gson().fromJson(json, typeOfT); if (!json.isJsonPrimitive()) return App.gson().fromJson(json, typeOfT);
String text = json.getAsString().trim(); String text = json.getAsString().trim();
if (Json.isArray(text)) return App.gson().fromJson(text, typeOfT); if (Json.isArray(text)) return App.gson().fromJson(text, typeOfT);
else return Arrays.asList(Danmaku.from(text)); else return List.of(Danmaku.from(text));
} }
} }

Loading…
Cancel
Save