Pen Li 9 жил өмнө
parent
commit
10e65c7e35

+ 17 - 3
common/upload/RAUploadManager.m

@@ -19,11 +19,17 @@
         NSDictionary *param = [[NSUserDefaults standardUserDefaults] objectForKey:kUploadSetting];
         if (param) {
             BOOL autoUpload = [[param objectForKey:@"auto_upload"] boolValue];
+            BOOL autoRmFinish = [[param objectForKey:@"auto_rm_finish"] boolValue];
+            BOOL autoRmErr = [[param objectForKey:@"auto_rm_error"] boolValue];
             int retryCount = [[param objectForKey:@"retry_count"] intValue];
             self.autoStart = autoUpload;
+            self.removeFinish = autoRmFinish;
+            self.removeError = autoRmErr;
             self.maxRetry = retryCount;
         } else {
             self.autoStart = YES;
+            self.removeFinish = YES;
+            self.removeError = YES;
             self.maxRetry = 2;
         }
 
@@ -31,10 +37,10 @@
        
 
         self.newtaskStatus = TaskStatusWait;
-//        self.autoStart = true;
         self.maxThread = 3;
-        self.removeError=true;
-        self.removeFinish = true;
+//        self.autoStart = true;
+//        self.removeError=true;
+//        self.removeFinish = true;
         
         self.operation_queue = [NSOperationQueue new];
         self.operation_queue.maxConcurrentOperationCount = self.maxThread;
@@ -151,6 +157,13 @@
     [fmanager removeItemAtPath:[self filePath:task] error:&error];
     
     
+
+//    [self.arr_queue_lock lock];
+//    DebugLog(@"lock");
+//    [[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];
+//    DebugLog(@"unlock");
+//    [self.arr_queue_lock unlock];
+
 //    [self.arr_queue_lock lock];
 //    [[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];
 //    [self.arr_queue_lock unlock];
@@ -160,6 +173,7 @@
         [[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];
     }
 
+
 //    if (self.delegate && [self.delegate respondsToSelector:@selector(uploadManager:didRemoveTasks:)]) {
 //        [self.delegate uploadManager:self didRemoveTasks:@[task]];
 //    }

+ 2 - 1
common/upload/RAUploadOperation.m

@@ -85,10 +85,11 @@
     
     __block NSMutableDictionary* block_task = _taskinfo;
 //    NSString *md5 = [RAUtils md5WithFile:[self filePath:_taskinfo ]];
-    
+    DebugLog(@"task %@",_taskinfo);
     NSString* file_path = [self filePath:_taskinfo];
     if(file_path==nil)
     {
+        DebugLog(@"error no file");
         block_task[@"status"]=[NSNumber numberWithInt:TaskStatusError];
         block_task[@"progress"]=[NSNumber numberWithDouble:0.0];
         [self willChangeValueForKey:@"isFinished"];