1.修复上传中 点击返回后再次进入 偶现闪退问题--- 把重新拿数据改为不重新拿

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

@@ -106,6 +106,13 @@
     [self getAllDataFun];
 }
 
+- (void)viewWillDisappear:(BOOL)animated
+{
+    [super viewWillDisappear:animated];
+    
+    [SVProgressHUD dismiss];
+}
+
 #pragma mark 获取数据
 - (void)getAllDataFun
 {
@@ -529,8 +536,13 @@
 - (void)getUploadDataInDatabaseFun
 {
     
+    //查询是否为nas上传中
+    BOOL isUploadingType = [nasMixUploadManager shareManager].isUploadIngType;
+    //判断是否要重新拿数据
+    BOOL isNeedRegetDataType = !isUploadingType;
+    
     KWeakSelf
-    [[nasUploadFileManager shareInstance] getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
+    [[nasUploadFileManager shareInstance] getDataInDatabaseFun:isNeedRegetDataType complete:^(NSMutableArray * _Nonnull Arr) {
         //[weakSelf setRecordBodyDataFunBy:Arr];
         
         weakSelf.didGetUploadDataType = YES;
@@ -543,7 +555,7 @@
         
         NSMutableArray *curLoadIngArr = Arr[0];
         //不是上传视频和进来的  所以上传状态（上传中和等待）改为重新上传
-        if(!weakSelf.isUploadingType){
+        if(!weakSelf.isUploadingType && isNeedRegetDataType){
             //改为暂停
 //            for (uploadFileDataModel * curModel in curLoadIngArr) {
 //                curModel.curUploadStateType = uploadStateSuspend;

创维盒子/双子星云手机/NAS/nasUploadManager/nasMixUploadManager.h

@@ -18,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface nasMixUploadManager : NSObject
 
 @property(nonatomic,assign) NSInteger maxUploadLoadCount;//默认一个
+@property (nonatomic, assign) BOOL  isUploadIngType;//是否上传中
 /** 实例化对象（单例） */
 + (instancetype)shareManager;
 

创维盒子/双子星云手机/NAS/nasUploadManager/nasMixUploadManager.m

@@ -876,6 +876,20 @@ didReceiveResponse:(NSURLResponse *)response
     return NO;
 }
 
+
+- (BOOL)isUploadIngType
+{
+    if(self.uploadWaitingUrlArr.count >0){
+        return YES;
+    }
+    
+    if(self.uploadingOperationArr.count >0){
+        return YES;
+    }
+    
+    return NO;
+}
+
 #pragma mark - lazy load
 - (NSMutableArray *)uploadWaitingUrlArr {
     

创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.h

@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSMutableArray * _Nullable databaseArr;
 
 @property (nonatomic, assign) BOOL  isSuspendType;
-@property (nonatomic, assign) BOOL  isUploadIngType;
+//@property (nonatomic, assign) BOOL  isUploadIngType;//弃用
 @property (nonatomic, assign) BOOL  isNewAddTaskType;
 @property (nonatomic, assign) NSInteger  curUploadModelNumbers;
 @property (nonatomic, assign) NSInteger  reUploadIngSelectIndex;

创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.m

@@ -389,7 +389,7 @@
 #pragma mark 上传完成所有任务
 - (void)didUploadAllTaskDoneFun
 {
-    self->_isUploadIngType = NO;
+    //self->_isUploadIngType = NO;
     [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileAllTaskDoneNotification object:nil];
 }