|
@@ -140,10 +140,10 @@
|
|
|
|
|
|
|
|
for(NSMutableDictionary* task in arr)
|
|
for(NSMutableDictionary* task in arr)
|
|
|
{
|
|
{
|
|
|
- if([task[@"status"] intValue]==TaskStatusStart)
|
|
|
|
|
- task[@"status"]=[NSNumber numberWithInteger:TaskStatusWait];
|
|
|
|
|
|
|
+// if([task[@"status"] intValue]==TaskStatusStart)
|
|
|
|
|
+// task[@"status"]=[NSNumber numberWithInteger:TaskStatusWait];
|
|
|
|
|
|
|
|
- if(self.autoStart)
|
|
|
|
|
|
|
+ if(self.autoStart&&[task[@"status"] intValue]!=TaskStatusError&&[task[@"status"] intValue]!=TaskStatusFinish)
|
|
|
[self startTask:task];
|
|
[self startTask:task];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -166,6 +166,7 @@
|
|
|
|
|
|
|
|
RAUploadOperation* operation = task[@"operation"];
|
|
RAUploadOperation* operation = task[@"operation"];
|
|
|
[operation cancel];
|
|
[operation cancel];
|
|
|
|
|
+ task[@"operation"]=nil;
|
|
|
task[@"status"] = [NSNumber numberWithInt:TaskStatusStop] ;
|
|
task[@"status"] = [NSNumber numberWithInt:TaskStatusStop] ;
|
|
|
task[@"progress"] = [NSNumber numberWithDouble:0.0];
|
|
task[@"progress"] = [NSNumber numberWithDouble:0.0];
|
|
|
|
|
|