Fix last commit, handle moveItemFromIndex:toIndex:

StreetVoice · Mar 3, 2016 · 171898d · 171898d
1 parent 1fe05a0
commit 171898d
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/HysteriaPlayer/HysteriaPlayer.m b/HysteriaPlayer/HysteriaPlayer.m
@@ -429,15 +429,27 @@ - (BOOL)resetItemIndexIfNeeds:(AVPlayerItem *)item fromIndex:(NSInteger)sourceIn
 {
     NSInteger checkIndex = [[self getHysteriaIndex:item] integerValue];
     BOOL found = NO;
+    NSNumber *replaceOrder;
     if (checkIndex == sourceIndex) {
-        NSNumber *replaceOrder = [NSNumber numberWithInteger:destinationIndex];
-        [self setHysteriaIndex:item key:replaceOrder];
+        replaceOrder = [NSNumber numberWithInteger:destinationIndex];
+        found = YES;
+    } else if (checkIndex == destinationIndex) {
+        replaceOrder = sourceIndex > checkIndex ? @(checkIndex + 1) : @(checkIndex - 1);
+        found = YES;
+    } else if (checkIndex > destinationIndex && checkIndex < sourceIndex) {
+        replaceOrder = [NSNumber numberWithInteger:(checkIndex + 1)];
+        found = YES;
+    } else if (checkIndex < destinationIndex && checkIndex > sourceIndex) {
+        replaceOrder = [NSNumber numberWithInteger:(checkIndex - 1)];
         found = YES;
-    } else if (checkIndex >= destinationIndex) {
-        NSNumber *replaceOrder = [NSNumber numberWithInteger:(checkIndex + 1)];
+    }
+
+    if (replaceOrder) {
         [self setHysteriaIndex:item key:replaceOrder];
+        if (self.lastItemIndex == checkIndex) {
+            self.lastItemIndex = [replaceOrder integerValue];
+        }
     }
-
     return found;
 }