diff --git a/app/src/main/java/com/fongmi/android/tv/server/Nano.java b/app/src/main/java/com/fongmi/android/tv/server/Nano.java index 6e0525df5..f44342c89 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/Nano.java +++ b/app/src/main/java/com/fongmi/android/tv/server/Nano.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -101,9 +100,8 @@ public class Nano extends NanoHTTPD { private Response proxy(IHTTPSession session) { try { - Map params = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + Map params = session.getParms(); params.putAll(session.getHeaders()); - params.putAll(session.getParms()); Object[] rs = ApiConfig.get().proxyLocal(params); return rs[0] instanceof Response ? (Response) rs[0] : newChunkedResponse(Response.Status.lookup((Integer) rs[0]), (String) rs[1], (InputStream) rs[2]); } catch (Exception e) { diff --git a/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java b/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java index 941f940ee..27fa52c12 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/M3U8.java @@ -59,7 +59,7 @@ public class M3U8 { BigDecimal t = BigDecimal.ZERO; Matcher m2 = REGEX_MEDIA_DURATION.matcher(group); while (m2.find()) t = t.add(new BigDecimal(m2.group(1))); - for (String ad : ads) if (t.toString().startsWith(ad)) line = line.replace(group, ""); + for (String ad : ads) if (t.toString().startsWith(ad)) line = line.replace(group + "\n" + TAG_DISCONTINUITY, ""); } return line; }