1.修复bug代码暂存

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

@@ -10,6 +10,7 @@
 #import <ImageIO/ImageIO.h>
 #import "RSATool.h"
 #import "connectDeviceManager.h"
+#import "uploadFileManager.h"
 
 @interface QRCodeScanForChangeDeviceViewController ()<AVCaptureMetadataOutputObjectsDelegate,AVCaptureVideoDataOutputSampleBufferDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate>
 
@@ -254,6 +255,9 @@ bool isDownType22 = YES;
 #pragma mark 处理扫码出来的数据
 - (void)handleScanCodeResultFun:(NSString*)resultStr
 {
+    
+    [[uploadFileManager shareInstance] suspendUploadFileFun:YES];
+    
     NSString *resStr = resultStr;
     if(resStr.length > 22)
     {

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

@@ -187,32 +187,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
     
     KWeakSelf
-    //if(_fileModelDataArr.count > 0){
-        
-        [self getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
-            complete(Arr);
-            [weakSelf handleUploadFileModelBg_idFun:Arr];
-        }];
-        
-        //骚操作 重新查出来 拿到bg_id
-//        [uploadFileDataModel bg_findAsync:upLoadFile_image_tableName limit:_fileModelDataArr.count orderBy:nil desc:YES complete:^(NSArray * _Nullable array) {
-//
-//            for (int i=0; i<array.count; i++) {
-//                uploadFileDataModel *bg_mod  = array[i];
-//
-//                for (uploadFileDataModel *data_mod in self->_fileModelDataArr) {
-//                    if([data_mod.filename isEqualToString:bg_mod.filename]){
-//                        data_mod.bg_id = bg_mod.bg_id;
-//                        //HLog(@"bg_id:%@",data_mod.bg_id);
-//                        break;
-//                    }
-//                }
-//            }
-//
-//            [weakSelf beginUploadFileFun];
-//        }];
-        
-    //}
+    [self getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
+        complete(Arr);
+        [weakSelf handleUploadFileModelBg_idFun:Arr];
+    }];
 }
 
 #pragma mark 处理当前的model 加上bg_id
@@ -458,8 +436,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     
     NSEnumerator *curArr = [_fileModelDataArr reverseObjectEnumerator];
     for (uploadFileDataModel*model in curArr) {
-        HLog(@"111hxd 2 %@ ",_fileModelDataArr)
-
         [self changeUploadFileState:uploadStateSuspend withDidUploadBytes:model.didUploadBytes withModel:model complete:^(BOOL isSuccess) {
             
         }];
@@ -473,7 +449,26 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     if(!_fileModelDataArr){
         _fileModelDataArr = [NSMutableArray new];
     }
-    [_fileModelDataArr addObjectsFromArray:Arr];
+    
+    for (uploadFileDataModel*addModel in Arr) {
+        
+        BOOL needAddModel = YES;
+        
+        for (uploadFileDataModel*preModel in _fileModelDataArr) {
+            if(addModel.bg_id.integerValue == preModel.bg_id.integerValue
+               || [addModel.localIdentifier isEqualToString:preModel.localIdentifier])
+            {
+                needAddModel = NO;
+                break;
+            }
+        }
+        
+        if(needAddModel){
+            [_fileModelDataArr addObject:addModel];
+        }
+    }
+    
+    //[_fileModelDataArr addObjectsFromArray:Arr];
     [self beginUploadFileFun];
 }
 

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

@@ -440,7 +440,8 @@
     if(self.isSuspendUploadType){
         //暂停
         self.taskUid = nil;
-        NSInteger didUploadSize = (self.indexOfUploadFlie+1) * (self.cutFileEachPieceSzie);
+        //NSInteger didUploadSize = (self.indexOfUploadFlie+1) * (self.cutFileEachPieceSzie);
+        NSInteger didUploadSize = fileLengthNum.longLongValue;
         [[uploadFileManager shareInstance] changeUploadFileState:uploadStateSuspend withDidUploadBytes:didUploadSize  withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
 
         }];