diff --git a/app/build.gradle b/app/build.gradle index c777b1ffb..eab06e9c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,12 +21,12 @@ android { leanback { dimension "mode" versionCode 207 - versionName "20231116" + versionName "20231116#2" } mobile { dimension "mode" versionCode 207 - versionName "20231116" + versionName "20231116#2" } java { dimension "api" 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 27fa52c12..12b29f5f3 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 @@ -20,6 +20,7 @@ public class M3U8 { private static final String TAG_DISCONTINUITY = "#EXT-X-DISCONTINUITY"; private static final String TAG_MEDIA_DURATION = "#EXTINF"; + private static final String TAG_ENDLIST = "#EXT-X-ENDLIST"; private static final String TAG_KEY = "#EXT-X-KEY"; private static final Pattern REGEX_X_DISCONTINUITY = Pattern.compile("#EXT-X-DISCONTINUITY[\\s\\S]*?(?=#EXT-X-DISCONTINUITY|$)"); @@ -59,7 +60,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 + "\n" + TAG_DISCONTINUITY, ""); + for (String ad : ads) if (t.toString().startsWith(ad)) line = line.replace(group.replace(TAG_ENDLIST, ""), ""); } return line; }