diff --git a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java index 07fc1656e..348513da4 100644 --- a/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java +++ b/app/src/main/java/com/fongmi/android/tv/api/LiveParser.java @@ -73,7 +73,7 @@ public class LiveParser { String[] split = line.split(","); if (split.length < 2) continue; if (Thread.interrupted()) break; - if (line.contains("#genre#")) live.getGroups().add(Group.create(split[0])); + if (line.contains("#genre#")) live.getGroups().add(Group.create(split[0], live.isPass())); if (live.getGroups().isEmpty()) live.getGroups().add(Group.create(R.string.live_group)); if (split[1].contains("://")) { Group group = live.getGroups().get(live.getGroups().size() - 1); diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Group.java b/app/src/main/java/com/fongmi/android/tv/bean/Group.java index c2cec191a..745bbe48f 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Group.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Group.java @@ -37,20 +37,28 @@ public class Group { return items == null ? Collections.emptyList() : items; } + public static Group create(@StringRes int resId) { + return new Group(ResUtil.getString(resId)); + } + public static Group create(String name) { return new Group(name); } - public static Group create(@StringRes int resId) { - return new Group(ResUtil.getString(resId)); + public static Group create(String name, boolean pass) { + return new Group(name, pass); } public Group(String name) { + this(name, false); + } + + public Group(String name, boolean pass) { this.name = name; this.position = -1; if (!name.contains("_")) return; setName(name.split("_")[0]); - setPass(name.split("_")[1]); + setPass(pass ? "" : name.split("_")[1]); } public List getChannel() { diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Live.java b/app/src/main/java/com/fongmi/android/tv/bean/Live.java index fbc101e42..f96a829ef 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Live.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Live.java @@ -21,6 +21,8 @@ public class Live { private int type; @SerializedName("boot") private boolean boot; + @SerializedName("pass") + private boolean pass; @SerializedName("name") private String name; @SerializedName("group") @@ -79,6 +81,10 @@ public class Live { return boot; } + public boolean isPass() { + return pass; + } + public String getName() { return TextUtils.isEmpty(name) ? "" : name; }