RA Image

修复批量操作后重复创新的问题。
修复上传列表clear后的刷新问题

RA Image/RA Image/AppDelegate.m

@@ -89,7 +89,7 @@
 
 - (NSString *)address {
     if (_address) {
-        return [_address stringByAppendingString:@"/wm_postgresql/index.php?_action=handset_new"];
+        return [_address stringByAppendingString:@"/index.php?_action=handset_new"];
     }
     return nil;
 }

RA Image/RA Image/UploadViewController.m

@@ -129,15 +129,11 @@
 //        if (cell.operation) {
 //            cell.operation.updateUI = nil;
 //        }
-        
-//<<<<<<< .mine
-//        DebugLog(@"cellForRowAtIndexPath %ld %p",indexPath.row,cell);
-//        DebugLog(@"item_json %@",item_json);
+
         RAUploadOperation* op = item_json[@"operation"];
-//
-//        
-//=======
-//>>>>>>> .r32582
+
+        
+
         NSString* status =nil;
         switch ([item_json[@"status"] intValue]) {
             case TaskStatusStart:
@@ -169,22 +165,14 @@
         
         
         
-        
-//<<<<<<< .mine
-//        
-//        __block RAUploadOperation* block_op = op;
-//        __block UploadCell* block_cell = cell;
-//        __block NSIndexPath* block_index = indexPath;
-//        long idx = indexPath.row;
-//        __weak typeof(self) weakself = self;
-//=======
-//        __block RAUploadOperation* block_op = op;
+   
+        //        __block RAUploadOperation* block_op = op;
 //        __block UploadCell* block_cell = cell;
 //        __block NSIndexPath* block_index = indexPath;
 //        long idx = indexPath.row;
 //        __weak typeof(self) weakself = self;
-//>>>>>>> .r32582
-//        DebugLog(@"OPERATION %p SET UPDATEUI",op);
+
+        
         op.updateUI=^(){
             
             
@@ -331,15 +319,7 @@
 //    
 //}
 //
-//<<<<<<< .mine
-//- (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
-//    UploadCell *upCell = (UploadCell *)cell;
-////    upCell.name = nil;
-////    upCell.progress = 0;
-////    upCell.state = nil;
-////    upCell.errorMsg = nil;
-////    
-//=======
+
 - (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath {
     UploadCell *upCell = (UploadCell *)cell;
     upCell.name = nil;
@@ -349,23 +329,10 @@
     if (upCell.operation) {
         upCell.operation.updateUI = nil;
     }
-//>>>>>>> .r32582
-////    AppDelegate* Appdelegate=(AppDelegate*)[UIApplication sharedApplication].delegate;
-////    if (indexPath.row < Appdelegate.uploadManager.arr_queue.count) {// Clear List先调用此方法，再调用numberOfRowsInSection，所以先判断避免Crash
-////        NSDictionary * item_json = Appdelegate.uploadManager.arr_queue[indexPath.row];
-////        RAUploadOperation* op = item_json[@"operation"];
-////        op.updateUI = nil;
-////    }
-//<<<<<<< .mine
-//    if (upCell.operation) {
-//        upCell.operation.updateUI = nil;
-//        DebugLog(@"OPERATION %p SET UPDATEUI",upCell.operation);
-//    }
-//}
-//=======
+
     
 }
-//>>>>>>> .r32582
+
 /*
 #pragma mark - UploadManager Delegate
 

common/upload/RAUploadManager.m

@@ -43,7 +43,7 @@
        
 
         self.newtaskStatus = TaskStatusWait;
-        self.maxThread = 1;
+        self.maxThread = 3;
 //        self.autoStart = true;
 //        self.removeError=true;
 //        self.removeFinish = true;