RA Image

修改提示消息，去掉 error failed

RA Image/RA Image/UploadViewController.m

@@ -135,7 +135,7 @@
                 status=@"stop";
                 break;
             case TaskStatusError:
-                status=@"error";
+                status=@"warring";
                 break;
             case TaskStatusWait:
                 status=@"waiting";
@@ -145,7 +145,7 @@
                 break;
                 
             default:
-                status=@"error";
+                status=@"warring";
                 break;
         }
         
@@ -167,7 +167,7 @@
                     status=@"stop";
                     break;
                 case TaskStatusError:
-                    status=@"error";
+                    status=@"warring";
                     break;
                 case TaskStatusWait:
                     status=@"waiting";
@@ -177,7 +177,7 @@
                     break;
                     
                 default:
-                    status=@"error";
+                    status=@"warring";
                     break;
             }
             double progress =[item_json[@"progress"] doubleValue];

common/upload/RAUploadOperation.m

@@ -101,18 +101,21 @@
     [NetworkUtils upload:[self filePath:_taskinfo ]  Params:_taskinfo[@"params"] ToHost:_taskinfo[@"url"] Result:^(NSMutableDictionary *result) {
         DebugLog(@"upload result: %@",result);
         int r=[result[@"result"] intValue];
-        if(r==2)
+        if(r==2|| r==RESULT_BARCODE_ERROR)
         {
             block_task[@"status"]=[NSNumber numberWithInt:TaskStatusFinish];
-            block_task[@"msg"]=@"upload successful";
+            if(r==2)
+                block_task[@"msg"]=@"upload successful";
+            else
+                block_task[@"msg"]=[@"warring: " stringByAppendingString:result[@"msg"]];
         }
         else
         {
-            if([block_task[@"retry"] intValue]>=_maxRetry|| r==RESULT_BARCODE_ERROR)
+            if([block_task[@"retry"] intValue]>=_maxRetry)
             {
                 block_task[@"status"]=[NSNumber numberWithInt:TaskStatusError];
                 block_task[@"progress"]=[NSNumber numberWithDouble:0.0];
-                block_task[@"msg"]=[@"error: " stringByAppendingString:result[@"msg"]];
+                block_task[@"msg"]=result[@"msg"];
                 
             }
             else
@@ -121,7 +124,7 @@
                 block_task[@"status"]=[NSNumber numberWithInt:TaskStatusWait];
                 block_task[@"progress"]=[NSNumber numberWithDouble:0.0];
                 
-                block_task[@"msg"]=result[@"upload failed, retry..."];
+                block_task[@"msg"]=result[@"connection lost, retry..."];
                 
                 RAUploadOperation* operation = [[RAUploadOperation alloc] initWithTaskinfo:block_task retry:_maxRetry];
                 operation.updateUI= self.updateUI;