Przeglądaj źródła

RA Image iOS

修复下载列表排序不对的问题。
Ray Zhang 8 lat temu
rodzic
commit
600b0612e4

BIN
RA Image/RA Image.xcodeproj/project.xcworkspace/xcuserdata/ray.xcuserdatad/UserInterfaceState.xcuserstate


+ 4 - 4
RA Image/RA Image/UploadViewController.m

@@ -145,7 +145,7 @@
                 status=@"stop";
                 break;
             case TaskStatusError:
-                status=@"warring";
+                status=@"warning";
                 break;
             case TaskStatusWait:
                 status=@"waiting";
@@ -155,7 +155,7 @@
                 break;
                 
             default:
-                status=@"warring";
+                status=@"warning";
                 break;
         }
         
@@ -188,7 +188,7 @@
                     status=@"stop";
                     break;
                 case TaskStatusError:
-                    status=@"warring";
+                    status=@"warning";
                     break;
                 case TaskStatusWait:
                     status=@"waiting";
@@ -198,7 +198,7 @@
                     break;
                     
                 default:
-                    status=@"warring";
+                    status=@"warning";
                     break;
             }
             double progress =[item_json[@"progress"] doubleValue];

+ 6 - 2
common/upload/RAUploadManager.m

@@ -193,7 +193,9 @@
 //    [self.arr_queue_lock unlock];
     
     @synchronized(self) {
-        [[self mutableArrayValueForKey:@"arr_queue"] addObject:task];
+//        [[self mutableArrayValueForKey:@"arr_queue"] addObject:task];
+        
+        [[self mutableArrayValueForKey:@"arr_queue"] insertObject:task atIndex:0];
     }
     
     if(self.newtaskStatus==TaskStatusWait)
@@ -216,7 +218,9 @@
 //        [[self mutableArrayValueForKey:@"arr_queue"] addObjectsFromArray:tasks];
         
         
-        NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([self mutableArrayValueForKey:@"arr_queue"].count,tasks.count )];
+//        NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([self mutableArrayValueForKey:@"arr_queue"].count,tasks.count )];
+        
+                NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0,tasks.count )];
         [[self mutableArrayValueForKey:@"arr_queue"] insertObjects:tasks atIndexes:indexSet];
     }
     

+ 1 - 1
common/upload/RAUploadOperation.m

@@ -108,7 +108,7 @@
             if(r==2)
                 block_task[@"msg"]=@"upload successful";
             else
-                block_task[@"msg"]=[@"warring: " stringByAppendingString:result[@"msg"]];
+                block_task[@"msg"]=[@"warning: " stringByAppendingString:result[@"msg"]];
         }
         else
         {