1.删除逻辑优化

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

@@ -99,6 +99,7 @@
         }
         else if(tag == 1){
             uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+            vc.isNotUploadingType = YES;
             [self.navigationController pushViewController:vc animated:YES];
         }
     };

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

@@ -7,11 +7,15 @@
 
 #import <UIKit/UIKit.h>
 #import "uploadFileRecordViewController.h"
-
+#import "uploadFileRecordTableViewHeadView.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface uploadFileRecordBodyView : UIView
 @property (nonatomic,strong) UIScrollView *bgScrollV;
+@property (nonatomic,strong) uploadFileRecordTableViewHeadView *leftHeadView;
+@property (nonatomic,strong) uploadFileRecordTableViewHeadView *midHeadView;
+@property (nonatomic,strong) uploadFileRecordTableViewHeadView *rightHeadView;
+
 //点击
 @property (nonatomic,copy) void (^didScrollFun)(NSInteger index);
 @property(nonatomic,assign) NSInteger selectIndex;// 从1开始

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

@@ -9,15 +9,12 @@
 #import "uploadFileRecordCell.h"
 #import "UIScrollView+EmptyDataSet.h"
 #import "uploadFileDataModel.h"
-#import "uploadFileRecordTableViewHeadView.h"
 #import "ComontAlretViewController.h"
 #import "uploadFileManager.h"
 
 @interface uploadFileRecordBodyView ()<UITableViewDelegate,UITableViewDataSource,UIScrollViewDelegate,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 
-@property (nonatomic,strong) uploadFileRecordTableViewHeadView *leftHeadView;
-@property (nonatomic,strong) uploadFileRecordTableViewHeadView *midHeadView;
-@property (nonatomic,strong) uploadFileRecordTableViewHeadView *rightHeadView;
+
 @property (nonatomic,strong) NSMutableArray *selectModelArr;
 @end
 
@@ -303,6 +300,22 @@
         if([curTabview isKindOfClass:[UITableView class]]){
             [_allDataArr replaceObjectAtIndex:0 withObject:uploadingArr];
             [curTabview reloadData];
+            
+            BOOL isAllSuspendType = YES;
+            
+            for (uploadFileDataModel*model in uploadingArr) {
+                if(model.curUploadStateType != uploadStateSuspend){
+                    isAllSuspendType = NO;
+                    break;
+                }
+            }
+            
+            mainBlock(^{
+                //刷新
+                if(isAllSuspendType){
+                    self->_leftHeadView.rightButton.selected = YES;
+                }
+            });
         }
     }
     

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

@@ -25,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSMutableArray * _Nullable fileModelDataArr;
 @property (nonatomic, strong) uploadFileDataModel *curUploadFileDataModel;//当前上传的文件
 @property (nonatomic, assign) BOOL  isSuspendType;
-
+@property (nonatomic, assign) BOOL  isUploadIngType;
 //把TZAssetModel 转成 我们需要上传的model
 - (NSMutableArray*)handlTZAssetModelToUploadFileDataFunBy:(NSMutableArray*)indexPathsForSelectedItems;
 //暂停上传

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

@@ -103,6 +103,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 - (void)beginUploadFileFun
 {
     _isSuspendType = NO;
+    _isUploadIngType = YES;
     
     _curUploadFileDataModel = _fileModelDataArr.firstObject;
     
@@ -180,6 +181,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
     
     _isSuspendType = YES;
+    _isUploadIngType = NO;
+    
     [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileSuspendNotification object:nil];
     
     NSEnumerator *curArr = [_fileModelDataArr reverseObjectEnumerator];
@@ -214,6 +217,9 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         if(self->_fileModelDataArr.count > 0){
             [self beginUploadFileFun];
         }
+        else{
+            self->_isUploadIngType = NO;
+        }
     }];
 }
 
@@ -233,6 +239,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
     
     complete(isSuc);
+    
+    //继续下一个
+    [_fileModelDataArr removeObject:_curUploadFileDataModel];
+    [self beginUploadFileFun];
 }
 
 @end

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

@@ -12,7 +12,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface uploadFileRecordViewController : BaseViewController
-
+//
+@property (nonatomic, assign) BOOL isNotUploadingType;//非上传页面进入
 -(void)gotoUploadFile:(NSMutableArray*)indexPathsForSelectedItems;
 @end
 

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

@@ -193,6 +193,11 @@
                     [doneArr addObject:curModel];
                 }
                 else{
+                    //不是上传视频和进来的  所以上传状态（上传中和等待）改为暂停
+                    if(self->_isNotUploadingType && ![uploadFileManager shareInstance].isUploadIngType){
+                        curModel.curUploadStateType = uploadStateSuspend;
+                    }
+                    
                     [otherArr addObject:curModel];
                 }
             }

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

@@ -101,6 +101,7 @@
                                 mainBlock(^{
                                     [[iToast makeText:NSLocalizedString(@"File_upload_file_already_exists",nil)] show];
                                 });
+                                
                                 HLog(@"hxd already 上传任务异常终止")
                                 return;
                             }