1.代码优化 修复bug

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

@@ -120,7 +120,7 @@
         // 文件删除成功
     } else {
         // 文件删除失败
-        NSLog(@"删除文件失败：%@", error);
+        NSLog(@"删除文件失败：%@-----%@",fileName,error);
     }
     
     return success;

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

@@ -369,6 +369,8 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         if(isSuc){
             if(uploadFileDataMod.curUploadFileType == uploadFileTypeVideo){
                 [cachesFileManager removeItemAtPath:uploadFileDataMod.videoFirstImageName type:uploadFileTypeImage error:nil];
+                
+                [cachesFileManager removeItemAtPath:uploadFileDataMod.filename type:uploadFileTypeVideo error:nil];
             }
             else{
                 [cachesFileManager removeItemAtPath:uploadFileDataMod.filename type:uploadFileTypeImage error:nil];
@@ -382,7 +384,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     //继续下一个
     if(_fileModelDataArr){
         [_fileModelDataArr removeObject:_curUploadFileDataModel];
-        [self beginUploadFileFun];
+        _isUploadIngType = NO;
+        if(_fileModelDataArr.count >=1){
+            [self beginUploadFileFun];
+        }
     }
     
 }

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

@@ -258,6 +258,39 @@
 #pragma mark 底部删除点击
 -(void)didClickBottomDeleteFun
 {
+    NSString *delTipTip = nil;
+    if(_selectIndex == 1){
+        delTipTip = NSLocalizedString(@"File_upload_Record_clear_uploading_Tip_msg",nil);;
+    }
+    else if(_selectIndex == 2){
+        delTipTip = NSLocalizedString(@"File_upload_Record_clear_done_Tip_msg",nil);
+    }
+    else if(_selectIndex == 3){
+        delTipTip = NSLocalizedString(@"File_upload_Record_clear_fail_Tip_msg",nil);
+    }
+    
+    /*弹窗提示二次确认*/
+    KWeakSelf
+    ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
+                                                                                     msg:delTipTip
+                                                                                imageStr:nil
+                                                                             cancelTitle:NSLocalizedString(@"other_cancel",nil)
+                                                                                 okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES
+                                                                              didClickOk:^{
+        [weakSelf didClickBottomDeleteFunAfterAleartFun];
+    } didClickCancel:^{
+        
+    }];
+    nextVC.modalPresentationStyle = UIModalPresentationCustom;
+  
+    [self presentViewController:nextVC animated:YES completion:^{
+        nextVC.view.superview.backgroundColor = [UIColor clearColor];
+    }];
+}
+
+
+-(void)didClickBottomDeleteFunAfterAleartFun
+{
     if(_selectIndex == 1){
         [_leftTableView deleteModelOneByOneFun];
     }
@@ -326,7 +359,7 @@
 {
     
     KWeakSelf
-    [[uploadFileManager shareInstance] getDataInDatabaseFun:NO complete:^(NSMutableArray * _Nonnull Arr) {
+    [[uploadFileManager shareInstance] getDataInDatabaseFun:_isNotUploadingType complete:^(NSMutableArray * _Nonnull Arr) {
         //[weakSelf setRecordBodyDataFunBy:Arr];
         
         if(!Arr ||Arr.count != 3){
@@ -577,21 +610,18 @@
 {
     _isEditType = isEditType;
     
+    _leftButton.hidden = !isEditType;
+    _rightButton.hidden = !isEditType;
+    self.backBtn.hidden = isEditType;
+    
+    _uploadFileRecordEditBottomV.hidden = !isEditType;
+    _uploadFileRecordheadV.userInteractionEnabled = !isEditType;
+    _uploadFileRecordBgScorllV.scrollEnabled = !isEditType;
+    
+    _leftHeadView.rightButton.userInteractionEnabled = !isEditType;
+    
     if(_isEditType){
-        _leftButton.hidden = NO;
-        _rightButton.hidden = NO;
-        self.backBtn.hidden = YES;
-        _uploadFileRecordEditBottomV.hidden = NO;
-        _uploadFileRecordheadV.userInteractionEnabled = NO;
-        _uploadFileRecordBgScorllV.scrollEnabled = NO;
-        
-//        [_uploadFileRecordBodyV mas_remakeConstraints:^(MASConstraintMaker *make) {
-//            make.left.mas_equalTo(0);
-//            make.right.mas_equalTo(0);
-//            make.bottom.mas_equalTo(_uploadFileRecordEditBottomV.mas_top).offset(0.0);
-//            make.top.mas_equalTo(_uploadFileRecordheadV.mas_bottom).offset(0.0);
-//        }];
-        
+       
         CGFloat curHeight = SCREEN_H - CGRectGetMaxY(self.navBarBGView.frame) - 50 - 15 - (60 + safeArea);
         [_uploadFileRecordBgScorllV mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(0);
@@ -624,22 +654,7 @@
         
     }
     else{
-        _leftButton.hidden = YES;
-        _rightButton.hidden = YES;
-        self.backBtn.hidden = NO;
-        
-        _uploadFileRecordEditBottomV.hidden = YES;
-        _uploadFileRecordheadV.userInteractionEnabled = YES;
-        _uploadFileRecordBgScorllV.scrollEnabled = YES;
-        
-//        [_uploadFileRecordBodyV mas_remakeConstraints:^(MASConstraintMaker *make) {
-//            make.left.mas_equalTo(0);
-//            make.right.mas_equalTo(0);
-//            make.top.mas_equalTo(_uploadFileRecordheadV.mas_bottom).offset(0.0);
-//            make.bottom.mas_equalTo(0);
-//        }];
-        
-        
+
         CGFloat curHeight = SCREEN_H - CGRectGetMaxY(self.navBarBGView.frame) - 50 - 15;
         [_uploadFileRecordBgScorllV mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.left.mas_equalTo(0);
@@ -691,7 +706,7 @@
     /*弹窗提示二次确认*/
     KWeakSelf
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
-                                                                                     msg:NSLocalizedString(@"File_upload_Record_clear_Tip_msg",nil)
+                                                                                     msg:NSLocalizedString(@"File_upload_Record_clear_done_Tip_msg",nil)
                                                                                 imageStr:nil
                                                                              cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                  okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES
@@ -726,7 +741,7 @@
     /*弹窗提示二次确认*/
     KWeakSelf
     ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"File_upload_Record_clear_Tip_title",nil)
-                                                                                     msg:NSLocalizedString(@"File_upload_Record_clear_Tip_msg",nil)
+                                                                                     msg:NSLocalizedString(@"File_upload_Record_clear_fail_Tip_msg",nil)
                                                                                 imageStr:nil
                                                                              cancelTitle:NSLocalizedString(@"other_cancel",nil)
                                                                                  okTitle:NSLocalizedString(@"other_comment_ok",nil) isOkBtnHighlight:YES

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

@@ -163,10 +163,11 @@
     if (![[TZImageManager manager] authorizationStatusAuthorized]){
         [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
             if(status == PHAuthorizationStatusAuthorized){
-                mainBlock(^{
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     [self.photoGroupView setupGroup];
                     [self delayedSetPhotoGroupViewFrameFun];
                 });
+                
             }
         }];
     }

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

@@ -253,9 +253,6 @@ ComontAlretViewControllerDelegate>
                 [self didCanConnectServerFun];
             }
         }
-        
-        //做版本检测
-        [self checkVersionFun];
     }
     
     
@@ -265,6 +262,9 @@ ComontAlretViewControllerDelegate>
 - (void)didCanConnectServerFun{
     [_checkThridConnectTimer invalidate];
     
+    //做版本检测
+    [self checkVersionFun];
+    
     [self connectVideoServer];
     [self opencommandChannelManagerrc_openURL];
     

创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -266,7 +266,9 @@
 "File_upload_Record_all_open"   = "全部开启";
 "File_upload_Record_clear_Record"   = "清空记录";
 "File_upload_Record_clear_Tip_title"   = "温馨提示";
-"File_upload_Record_clear_Tip_msg"   = "仅删除记录，不会删除文件中心的文件";
+"File_upload_Record_clear_done_Tip_msg"   = "仅删除记录，不会删除文件中心的文件";
+"File_upload_Record_clear_fail_Tip_msg"   = "清空所选已失败的任务？";
+"File_upload_Record_clear_uploading_Tip_msg"   = "任务未完成，确定删除选中的任务?";
 "File_upload_Record_select_all"   = "全选";
 "File_upload_Record_delete"   = "删除";
 "File_upload_fail"   = "文件上传失败";