diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Result.java b/app/src/main/java/com/fongmi/android/tv/bean/Result.java index 567404aae..7cbd97fe7 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Result.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Result.java @@ -110,9 +110,7 @@ public class Result { } public static Result vod(Vod item) { - Result result = new Result(); - result.setList(Arrays.asList(item)); - return result; + return list(Arrays.asList(item)); } public List getTypes() { diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java index 41327a830..2506eeb80 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Vod.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Vod.java @@ -5,6 +5,8 @@ import android.view.View; import androidx.annotation.NonNull; +import com.fongmi.android.tv.R; +import com.fongmi.android.tv.utils.ResUtil; import com.fongmi.android.tv.utils.Trans; import com.fongmi.android.tv.utils.Utils; import com.google.gson.Gson; @@ -20,6 +22,7 @@ import org.simpleframework.xml.Text; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Locale; @@ -308,6 +311,12 @@ public class Vod { return getPosition() != -1 ? getEpisodes().get(getPosition()) : null; } + public static List create(String flag, String name, String url) { + Vod.Flag item = new Vod.Flag(flag); + item.getEpisodes().add(new Vod.Flag.Episode(name, url)); + return Arrays.asList(item); + } + @Override public boolean equals(Object obj) { if (this == obj) return true; diff --git a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java index fb7b2d652..6228308cd 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/SiteViewModel.java @@ -120,10 +120,8 @@ public class SiteViewModel extends ViewModel { Vod vod = new Vod(); vod.setVodId(id); vod.setVodName(id); - Vod.Flag flag = new Vod.Flag(ResUtil.getString(R.string.push)); - flag.getEpisodes().add(new Vod.Flag.Episode(ResUtil.getString(R.string.play), id)); vod.setVodPic("https://pic.rmb.bdstatic.com/bjh/1d0b02d0f57f0a42201f92caba5107ed.jpeg"); - vod.setVodFlags(List.of(flag)); + vod.setVodFlags(Vod.Flag.create(ResUtil.getString(R.string.push), ResUtil.getString(R.string.play), id)); return Result.vod(vod); } else { ArrayMap params = new ArrayMap<>();