|
|
@@ -270,7 +270,8 @@ static RAUploadManager *sharedInstance;
|
|
|
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
|
|
|
{
|
|
|
|
|
|
- [self saveTasks];
|
|
|
+ NSLog(@"ovserver!!! %@",keyPath);
|
|
|
+// [self saveTasks];
|
|
|
if([keyPath isEqualToString:@"operationCount"])
|
|
|
{
|
|
|
|
|
|
@@ -344,7 +345,7 @@ static RAUploadManager *sharedInstance;
|
|
|
// [[self mutableArrayValueForKey:@"arr_queue"] addObject:task];
|
|
|
|
|
|
[[self mutableArrayValueForKey:@"arr_queue"] insertObject:task atIndex:0];
|
|
|
- [self saveTasks];
|
|
|
+// [self saveTasks];
|
|
|
}
|
|
|
|
|
|
if(self.newtaskStatus==TaskStatusWait)
|
|
|
@@ -462,7 +463,7 @@ static RAUploadManager *sharedInstance;
|
|
|
|
|
|
@synchronized(self) {
|
|
|
[[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];
|
|
|
- [self saveTasks];
|
|
|
+// [self saveTasks];
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -488,16 +489,16 @@ static RAUploadManager *sharedInstance;
|
|
|
@synchronized(self) {
|
|
|
NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
|
|
|
|
|
|
- NSMutableArray* save_arr = [NSMutableArray new];
|
|
|
- for(NSMutableDictionary* task in self.arr_queue)
|
|
|
- {
|
|
|
- NSMutableDictionary* savetask = [task mutableCopy];
|
|
|
- savetask[@"operation"] = nil;
|
|
|
- if([savetask[@"status"] intValue]==TaskStatusWait)
|
|
|
- savetask[@"status"]=[NSNumber numberWithInteger:TaskStatusStop];
|
|
|
- [save_arr addObject:savetask];
|
|
|
- }
|
|
|
- [defaults setObject:save_arr forKey:@"upload_queue"];
|
|
|
+// NSMutableArray* save_arr = [NSMutableArray new];
|
|
|
+// for(NSMutableDictionary* task in self.arr_queue)
|
|
|
+// {
|
|
|
+// NSMutableDictionary* savetask = [task mutableCopy];
|
|
|
+// savetask[@"operation"] = nil;
|
|
|
+// if([savetask[@"status"] intValue]==TaskStatusWait)
|
|
|
+// savetask[@"status"]=[NSNumber numberWithInteger:TaskStatusStop];
|
|
|
+// [save_arr addObject:savetask];
|
|
|
+// }
|
|
|
+ [defaults setObject:self.arr_queue forKey:@"upload_queue"];
|
|
|
[defaults synchronize];
|
|
|
}
|
|
|
}
|
|
|
@@ -566,7 +567,7 @@ static RAUploadManager *sharedInstance;
|
|
|
task[@"status"] = [NSNumber numberWithInt:TaskStatusStop] ;
|
|
|
task[@"progress"] = [NSNumber numberWithDouble:0.0];
|
|
|
task[@"msg"]= @"";
|
|
|
- [self saveTasks];
|
|
|
+// [self saveTasks];
|
|
|
if (operation.updateUI) { // 网络状态改变时,首先是正在进行的网络活动中断,然后才通知网络改变
|
|
|
operation.updateUI();
|
|
|
}
|
|
|
@@ -593,7 +594,7 @@ static RAUploadManager *sharedInstance;
|
|
|
|
|
|
RAUploadOperation* operation = [[RAUploadOperation alloc] initWithTaskinfo:task retry:self.maxRetry];
|
|
|
[operation setCompletionBlock:^{
|
|
|
- [self saveTasks];
|
|
|
+// [self saveTasks];
|
|
|
NSLog(@"%@ %@",block_task[@"name"],block_task[@"status"]);
|
|
|
switch ([block_task[@"status"] intValue]) {
|
|
|
|
|
|
@@ -620,7 +621,7 @@ static RAUploadManager *sharedInstance;
|
|
|
task[@"msg"] = nil;
|
|
|
|
|
|
task[@"status"] = [NSNumber numberWithInt:self.newtaskStatus] ;
|
|
|
- [self saveTasks];
|
|
|
+// [self saveTasks];
|
|
|
task[@"operation"] = operation;
|
|
|
[self.operation_queue addOperation:operation];
|
|
|
|