pull/123/head
FongMi 3 years ago
parent 579c24bc2b
commit 7f7ea43fc8
  1. 12
      app/src/main/java/com/fongmi/android/tv/bean/Channel.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java

@ -171,14 +171,18 @@ public class Channel {
setLine(getLine() > 0 ? getLine() - 1 : getUrls().size() - 1);
}
public String getCurrent() {
return getUrls().get(getLine());
}
public boolean isOnly() {
return getUrls().size() == 1;
}
public String getLineText() {
String current = getUrls().get(getLine());
if (current.contains("$")) return current.split("\\$")[1];
return isOnly() ? "" : ResUtil.getString(R.string.live_line, getLine() + 1);
if (getUrls().size() <= 1) return "";
if (getCurrent().contains("$")) return getCurrent().split("\\$")[1];
return ResUtil.getString(R.string.live_line, getLine() + 1);
}
public Channel setNumber(int number) {
@ -198,7 +202,7 @@ public class Channel {
}
public String getScheme() {
return Uri.parse(getUrls().get(getLine())).getScheme().toLowerCase();
return Uri.parse(getCurrent()).getScheme().toLowerCase();
}
public boolean isForce() {

@ -34,7 +34,7 @@ public class LiveViewModel extends ViewModel {
public void getUrl(Channel item) {
execute(() -> {
TVBus.get().stop();
String url = item.getUrls().get(item.getLine()).split("\\$")[0];
String url = item.getCurrent().split("\\$")[0];
if (item.isForce()) item.setUrl(Force.get().fetch(url));
else if (item.isZLive()) item.setUrl(ZLive.get().fetch(url));
else if (item.isTVBus()) item.setUrl(TVBus.get().fetch(url));

Loading…
Cancel
Save