Merge remote-tracking branch 'origin/dev' into dev

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);
     }

app/src/main/java/com/fongmi/android/tv/utils/Util.java

@@ -77,7 +77,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;
         }