From 9bac8fcec4ce435d306ea0069bc95237905423a2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 26 Feb 2025 11:00:54 +0800 Subject: [PATCH] Clean code --- .../com/fongmi/android/tv/api/LiveParser.java | 2 +- .../java/com/fongmi/android/tv/bean/Live.java | 36 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) 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 1fea0a9d0..787a5fdcb 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 @@ -52,7 +52,7 @@ public class LiveParser { } private static String getText(Live live) throws Exception { - if (live.getType() == 3) return live.spider().liveContent(live.getUrl()); + if (!live.getApi().isEmpty()) return live.spider().liveContent(live.getUrl()); return OkHttp.string(UrlUtil.convert(live.getUrl()), live.getHeaders()); } 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 0571013b7..78429620a 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 @@ -76,14 +76,6 @@ public class Live { @SerializedName("referer") private String referer; - @Ignore - @SerializedName("username") - private String username; - - @Ignore - @SerializedName("password") - private String password; - @Ignore @SerializedName("timeZone") private String timeZone; @@ -91,10 +83,6 @@ public class Live { @SerializedName("keep") private String keep; - @Ignore - @SerializedName("type") - private Integer type; - @Ignore @SerializedName("timeout") private Integer timeout; @@ -219,30 +207,10 @@ public class Live { return TextUtils.isEmpty(referer) ? "" : referer; } - public String getUsername() { - return TextUtils.isEmpty(username) ? "" : username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return TextUtils.isEmpty(password) ? "" : password; - } - - public void setPassword(String password) { - this.password = password; - } - public String getTimeZone() { return TextUtils.isEmpty(timeZone) ? "" : timeZone; } - public void setTimeZone(String timeZone) { - this.timeZone = timeZone; - } - public String getKeep() { return TextUtils.isEmpty(keep) ? "" : keep; } @@ -251,10 +219,6 @@ public class Live { this.keep = keep; } - public Integer getType() { - return type == null ? 0 : type; - } - public Integer getTimeout() { return timeout == null ? Constant.TIMEOUT_PLAY : Math.max(timeout, 1) * 1000; }