From 8034555cdfca3288b70403764bdde970684304df Mon Sep 17 00:00:00 2001
From: okjack <okjackcaptain@gmail.com>
Date: Fri, 26 Jul 2024 11:44:29 +0800
Subject: [PATCH] Clean code

---
 app/src/main/java/com/fongmi/android/tv/bean/Drm.java     | 2 +-
 .../main/java/com/fongmi/android/tv/server/Server.java    | 2 +-
 .../main/java/com/fongmi/android/tv/utils/Sniffer.java    | 2 +-
 app/src/main/java/com/fongmi/android/tv/utils/Tbs.java    | 6 +++---
 .../main/java/com/fongmi/android/tv/utils/UrlUtil.java    | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Drm.java b/app/src/main/java/com/fongmi/android/tv/bean/Drm.java
index 58f847c66..4f5bf03cc 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Drm.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Drm.java
@@ -44,7 +44,7 @@ public class Drm {
 
     private String getUri() {
         if (getKey().startsWith("http")) return getKey();
-        return Server.get().getAddress("license/") + Util.base64(getKey(), Util.URL_SAFE);
+        return Server.get().getAddress("/license/") + Util.base64(getKey(), Util.URL_SAFE);
     }
 
     public MediaItem.DrmConfiguration get() {
diff --git a/app/src/main/java/com/fongmi/android/tv/server/Server.java b/app/src/main/java/com/fongmi/android/tv/server/Server.java
index 7fc271ff9..7dbdbeeeb 100644
--- a/app/src/main/java/com/fongmi/android/tv/server/Server.java
+++ b/app/src/main/java/com/fongmi/android/tv/server/Server.java
@@ -43,7 +43,7 @@ public class Server {
     }
 
     public String getAddress(String path) {
-        return getAddress(true) + "/" + path;
+        return getAddress(true) + path;
     }
 
     public String getAddress(boolean local) {
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java
index cbd113615..a1a3f04e8 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/Sniffer.java
@@ -21,7 +21,7 @@ public class Sniffer {
     public static final Pattern SNIFFER = Pattern.compile("http((?!http).){12,}?\\.(m3u8|mp4|mkv|flv|mp3|m4a|aac|mpd)\\?.*|http((?!http).){12,}\\.(m3u8|mp4|mkv|flv|mp3|m4a|aac|mpd)|http((?!http).)*?video/tos*|http((?!http).)*?obj/tos*");
 
     public static String getUrl(String text) {
-        if (Json.valid(text)) return text;
+        if (Json.valid(text) || text.contains("$")) return text;
         Matcher m = AI_PUSH.matcher(text);
         if (m.find()) return m.group(0);
         return text;
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java b/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java
index 49170055c..640b41b69 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/Tbs.java
@@ -31,10 +31,10 @@ public class Tbs {
 
     public static String getUrl() {
         File file = new File(Path.tv(), "x5.tbs.apk");
-        if (file.exists()) return Server.get().getAddress("file/TV/x5.tbs.apk");
+        if (file.exists()) return Server.get().getAddress("/file/TV/x5.tbs.apk");
         File x5 = new File(Path.download(), "x5.tbs.apk");
-        if (x5.exists()) return Server.get().getAddress("file/"+ Environment.DIRECTORY_DOWNLOADS +"/x5.tbs.apk");
-        return Server.get().getAddress("x5.tbs.apk");
+        if (x5.exists()) return Server.get().getAddress("/file/"+ Environment.DIRECTORY_DOWNLOADS +"/x5.tbs.apk");
+        return Server.get().getAddress("/x5.tbs.apk");
     }
 
     private static void tbsInit() {
diff --git a/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java b/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java
index 63dae1309..efb92405b 100644
--- a/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/UrlUtil.java
@@ -43,10 +43,10 @@ public class UrlUtil {
     public static String convert(String url) {
         String scheme = scheme(url);
         if ("clan".equals(scheme)) return convert(fixUrl(url));
-        if ("local".equals(scheme)) return url.replace("local://", Server.get().getAddress(""));
-        if ("assets".equals(scheme)) return url.replace("assets://", Server.get().getAddress(""));
-        if ("file".equals(scheme)) return url.replace("file://", Server.get().getAddress("file/"));
-        if ("proxy".equals(scheme)) return url.replace("proxy://", Server.get().getAddress("proxy?"));
+        if ("local".equals(scheme)) return url.replace("local://", Server.get().getAddress("/"));
+        if ("assets".equals(scheme)) return url.replace("assets://", Server.get().getAddress("/"));
+        if ("file".equals(scheme)) return url.replace("file://", Server.get().getAddress("/file/"));
+        if ("proxy".equals(scheme)) return url.replace("proxy://", Server.get().getAddress("/proxy?"));
         return url;
     }