From 1baeb3980a343c065057b41adb685ee1018d6260 Mon Sep 17 00:00:00 2001 From: FongMi Date: Fri, 13 Jan 2023 14:16:16 +0800 Subject: [PATCH] Live url support $ --- app/src/main/java/com/fongmi/android/tv/bean/Channel.java | 2 ++ .../main/java/com/fongmi/android/tv/model/LiveViewModel.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java index 0469e239d..8664da069 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Channel.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Channel.java @@ -176,6 +176,8 @@ public class Channel { } 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); } diff --git a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java index 926d903eb..fe0638e9f 100644 --- a/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java +++ b/app/src/main/java/com/fongmi/android/tv/model/LiveViewModel.java @@ -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()); + String url = item.getUrls().get(item.getLine()).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));