Fix bug

2 years ago · da44dcc8ec
parent 7c1dba6cf7
commit da44dcc8ec
1 changed files with 2 additions and 1 deletions
--- a/app/src/main/java/com/fongmi/android/tv/bean/History.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/History.java
@ -272,7 +272,8 @@ public class History {

    private void merge(List<History> items, boolean force) {
        for (History item : items) {
-            if (!force && (getKey().equals(item.getKey()) || Math.abs(item.getDuration() - getDuration()) > 10 * 60 * 1000)) continue;
+            if (getDuration() > 0 && item.getDuration() > 0 && Math.abs(getDuration() - item.getDuration()) > 10 * 60 * 1000) continue;
+            if (!force && getKey().equals(item.getKey())) continue;
            checkParam(item);
            item.delete();
        }