1.文件上传相关

创维盒子/双子星云手机/Assets.xcassets/Set/uploadFile_reStart.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "uploadFile_reStart@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "uploadFile_reStart@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordCell.m

@@ -233,18 +233,19 @@
     _fileSpeedlabel.hidden = YES;
     
     if(curUploadFileDataModel.curUploadStateType == uploadStateWait){
-        //_upLoadStateButton.image = [UIImage imageNamed:@"uploadFile_wait"];
         [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_wait"] forState:UIControlStateNormal];
     }
     else if(curUploadFileDataModel.curUploadStateType == uploadStateUploading){
-        //_upLoadStateButton.image = [UIImage imageNamed:@"uploadFile_suspend"];
         [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_suspend"] forState:UIControlStateNormal];
         _fileSpeedlabel.hidden = NO;
     }
     else if(curUploadFileDataModel.curUploadStateType == uploadStateSuspend){
-        //_upLoadStateButton.image = [UIImage imageNamed:@"uploadFile_start"];
         [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_start"] forState:UIControlStateNormal];
     }
+    else if(curUploadFileDataModel.curUploadStateType == uploadStateFail){
+        [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_reStart"] forState:UIControlStateNormal];
+        _progressBgView.hidden = YES;
+    }
     else{
         _upLoadStateButton.hidden = YES;
         _progressBgView.hidden = YES;
@@ -301,6 +302,9 @@
     if(curUploadFileDataModel.curUploadStateType == uploadStateDone){
         _fileProgresslabel.text = [[NSString alloc] initWithFormat:@"%@  %@",totalSizeStr,@"上传到：/sdcard/Download/"];
     }
+    else if(curUploadFileDataModel.curUploadStateType == uploadStateFail){
+        _fileProgresslabel.text = [[NSString alloc] initWithFormat:@"%@",totalSizeStr];
+    }
     else{
         _fileProgresslabel.text = [[NSString alloc] initWithFormat:@"%@/%@",didUploadStr,totalSizeStr];
         

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.h

@@ -35,6 +35,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 //文件上传完成
 - (void)uploadFileDoneFun;
+//文件上传失败
+- (void)uploadFileFailFun;
 
 //修改文件上传的状态
 - (void)changeUploadFileState:(uploadStateType)curUploadStateType withDidUploadBytes:(long)didUpLoadBytes withModel:(uploadFileDataModel*)model complete:(custom_complete_B)complete;

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

@@ -156,6 +156,9 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
                 curModel.videoData = [NSData new];
                 HLog(@"");
             }
+            else if(curUploadStateType == uploadStateFail){
+                
+            }
             
             [curModel bg_saveOrUpdateAsync:^(BOOL isSuccess) {
                 HLog(@"%@ 写入 %@", model.filename, isSuccess ? @"成功":@"失败");
@@ -223,6 +226,24 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }];
 }
 
+//文件上传失败
+- (void)uploadFileFailFun
+{
+    [self changeUploadFileState:uploadStateFail withDidUploadBytes:_curUploadFileDataModel.didUploadBytes withModel:_curUploadFileDataModel complete:^(BOOL isSuccess) {
+        [self->_fileModelDataArr removeObject:self->_curUploadFileDataModel];
+         
+        if(self->_fileModelDataArr.count > 0){
+            [self beginUploadFileFun];
+        }
+        else{
+            self->_isUploadIngType = NO;
+        }
+    }];
+    
+    mainBlock(^{
+        [[iToast makeText:NSLocalizedString(@"File_upload_fail",nil)] show];
+    });
+}
 
 //删除本地数据库记录
 - (void)deleteUploadFileRecordBy:(NSMutableArray *)delArr complete:(custom_complete_B)complete

创维盒子/双子星云手机/CloudPlayer/PlayerViewController+otherDelegate.mm

@@ -60,13 +60,11 @@
                     status = [[NSString  alloc] initWithFormat:@"%@",status];
                 }
                 
-                if ([status isEqualToString:@"1"]) {
+                if([status isEqualToString:@"1"])
+                {
                     //[self tryAgainApplyUploadFun];
-                    
-                    NSInteger fileLengt = self.curUploadFileDataMod.didUploadBytes;
-                    [[uploadFileManager shareInstance] changeUploadFileState:uploadStateFail withDidUploadBytes:fileLengt withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
-                        
-                    }];
+                    [self clearUploadFileDataFun];
+                    [[uploadFileManager shareInstance] uploadFileFailFun];
                     
                 }else if ([status isEqualToString:@"0"]){
                     if ([[data allKeys] containsObject:@"taskUid"]) {
@@ -109,9 +107,8 @@
                             self.cutFileDataArr = [self fileCutPartsBy:self.AllFileData withDidUpLoadSize:[fileLengthNum integerValue]];
                             
                             if(!self.cutFileDataArr){
-                                [[uploadFileManager shareInstance] changeUploadFileState:uploadStateFail withDidUploadBytes:[fileLengthNum integerValue] withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
-
-                                }];
+                                [self clearUploadFileDataFun];
+                                [[uploadFileManager shareInstance] uploadFileFailFun];
                                 
                                 self.taskUid = nil;
                                 
@@ -159,11 +156,9 @@
                 
                 if ([status isEqualToString:@"1"]) {
                     //[self tryAgainApplyUploadFun];
+                    [self clearUploadFileDataFun];
+                    [[uploadFileManager shareInstance] uploadFileFailFun];
                     
-                    NSInteger fileLengt = self.curUploadFileDataMod.didUploadBytes;
-                    [[uploadFileManager shareInstance] changeUploadFileState:uploadStateFail withDidUploadBytes:fileLengt withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
-                        
-                    }];
                 }else if ([status isEqualToString:@"0"]){
                     [self handleUploadingFun];
                 }
@@ -239,17 +234,22 @@
     else{
         HLog(@"上传完成");
         
-        //上传数据清空
-        self.taskUid = nil;
-        self.fileName = nil;
-        self.AllFileData = nil;
-        self.indexOfUploadFlie = 0;
-        self.cutFileDataArr = nil;
-        
+        [self clearUploadFileDataFun];
         [[uploadFileManager shareInstance] uploadFileDoneFun];
     }
 }
 
+-(void)clearUploadFileDataFun{
+    //上传数据清空
+    self.taskUid = nil;
+    self.fileName = nil;
+    self.AllFileData = nil;
+    self.indexOfUploadFlie = 0;
+    self.cutFileDataArr = nil;
+    self.curUploadFileDataMod = nil;
+    self.isSuspendUploadType = NO;
+    
+}
 
 - (Byte)getBCC:(NSData *)data {
     Byte bcc = 0;