From 811f8e7a77363af7f995180b6d2c2b9c9073dcc2 Mon Sep 17 00:00:00 2001 From: FongMi Date: Wed, 24 Jan 2024 14:24:07 +0800 Subject: [PATCH] Fix seamless bug --- app/src/main/java/com/fongmi/android/tv/bean/Flag.java | 4 ++-- app/src/main/java/com/fongmi/android/tv/utils/Util.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java index 16ca50209..adc276259 100644 --- a/app/src/main/java/com/fongmi/android/tv/bean/Flag.java +++ b/app/src/main/java/com/fongmi/android/tv/bean/Flag.java @@ -112,8 +112,8 @@ public class Flag implements Parcelable { if (getEpisodes().size() == 1) return getEpisodes().get(0); for (Episode item : getEpisodes()) if (item.rule1(remarks)) return item; for (Episode item : getEpisodes()) if (item.rule2(number)) return item; - for (Episode item : getEpisodes()) if (item.rule3(remarks)) return item; - for (Episode item : getEpisodes()) if (item.rule4(remarks)) return item; + if (number == -1) for (Episode item : getEpisodes()) if (item.rule3(remarks)) return item; + if (number == -1) for (Episode item : getEpisodes()) if (item.rule4(remarks)) return item; if (getPosition() != -1) return getEpisodes().get(getPosition()); return strict ? null : getEpisodes().get(0); } diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Util.java b/app/src/main/java/com/fongmi/android/tv/utils/Util.java index e85c95018..aa2bcf5d4 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Util.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Util.java @@ -79,7 +79,7 @@ public class Util { public static int getDigit(String text) { try { if (text.startsWith("上") || text.startsWith("下")) return -1; - return Integer.parseInt(text.replaceAll("(mp4|H264|H265|720p|1080p|2160p|4k|4K)", "").replaceAll("\\D+", "")); + return Integer.parseInt(text.replaceAll("(?i)(mp4|H264|H265|720p|1080p|2160p|4K)", "").replaceAll("\\D+", "")); } catch (Exception e) { return -1; }