1.1.2版本修复bug

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -2494,7 +2494,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2573,7 +2573,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -606,6 +606,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         [where appendString:curStr];
         isSuc = [uploadFileDataModel bg_delete:upLoadFile_image_tableName where:where];
         
+        [self handleDatabaseArrByDelete:uploadFileDataMod];
         //删除本地图片
         if(isSuc && isDelCache){
             //判断是否可以删除本地缓存
@@ -614,7 +615,6 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
                 NSMutableArray *uploadDoneArr = _databaseArr[1];
                 NSMutableArray *uploadFailArr = _databaseArr[2];
                 
-                [self handleDatabaseArrByDelete:uploadFileDataMod];
                 
                 BOOL isNeedDel = YES;
                 for (uploadFileDataModel *baseUploadFileDataMod in uploadingArr) {

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

@@ -597,33 +597,49 @@
     
     //UI和数据还没准备好
     if(!_leftTableView){
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [[NSNotificationCenter defaultCenter] postNotificationName:uploadFileDeteleNotification object:uploadFileDataMod];
         });
         
         return;
     }
     
-    if([uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
-        
-        NSMutableArray *curArr = _leftTableView.curDataArr;
+    KWeakSelf
+    [[uploadFileManager shareInstance] getDataInDatabaseFun:NO complete:^(NSMutableArray * _Nonnull Arr) {
         
-        NSInteger index = 0;
-        for (uploadFileDataModel*mod in curArr) {
-            HLog(@"bg_id:%@ ?=? %@",mod.bg_id,uploadFileDataMod.bg_id);
-            
-            if(mod.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
-                [curArr removeObject:mod];
-                break;
-            }
-            
-            index++;
+        if(!Arr ||Arr.count != 3){
+            HLog(@"数据库出错\n\n\n");
+            return;
         }
         
-        //精准刷新
-        //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:nil withfailArr:nil];
-        [self.leftTableView reloadDataFun];
-    }
+        NSMutableArray *curLoadIngArr = Arr[0];
+        
+        mainBlock(^{
+            weakSelf.leftTableView.curDataArr = curLoadIngArr;
+            [weakSelf.leftTableView reloadDataFun];
+        });
+    }];
+    
+//    if([uploadFileDataMod isKindOfClass:[uploadFileDataModel class]] ){
+//
+//        NSMutableArray *curArr = _leftTableView.curDataArr;
+//
+//        NSInteger index = 0;
+//        for (uploadFileDataModel*mod in curArr) {
+//            HLog(@"bg_id:%@ ?=? %@",mod.bg_id,uploadFileDataMod.bg_id);
+//
+//            if(mod.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
+//                [curArr removeObject:mod];
+//                break;
+//            }
+//
+//            index++;
+//        }
+//
+//        //精准刷新
+//        //[self.uploadFileRecordBodyV RefreshDataWithUploadingArr:_allDataArr[0] withDoneArr:nil withfailArr:nil];
+//        [self.leftTableView reloadDataFun];
+//    }
     
 }
 

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

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