瀏覽代碼

1.传输列表添加loading

huangxiaodong 1 年之前
父節點
當前提交
7a815d32d3
共有 1 個文件被更改,包括 35 次插入1 次删除
  1. 35 1
      创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.m

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

@@ -44,6 +44,10 @@
 @property (nonatomic, strong) uploadFileRecordEditBottomView *uploadFileRecordEditBottomV;
 @property (nonatomic,assign) BOOL isEditType;
 @property(nonatomic,assign) NSInteger selectIndex;// 从1开始
+
+@property (nonatomic,assign) BOOL didGetUploadDataType;
+@property (nonatomic,assign) BOOL didGetDownloadDataType;
+@property (nonatomic,assign) BOOL didGetbackupsloadDataType;
 @end
 
 @implementation uploadFileRecordViewController
@@ -82,6 +86,8 @@
 #pragma mark 获取数据
 - (void)getAllDataFun
 {
+    [self showNewIndicatorWithCanBack:YES canTouch:NO];
+    
     if(!_isUploadingType){
         [self getUploadDataInDatabaseFun];
     }
@@ -99,6 +105,18 @@
     [self getBackupsDatabaseFun];
 }
 
+- (void)handleRemoveIndicator
+{
+    if(_didGetUploadDataType
+       && _didGetDownloadDataType
+       && _didGetbackupsloadDataType){
+        mainBlock(^{
+            [self removeNewIndicator];
+        });
+    }
+   
+}
+
 - (void)delayChangeUIFun
 {
     _selectIndex = 2;
@@ -385,6 +403,11 @@
 
 -(void)gotoUploadFile:(NSMutableArray*)indexPathsForSelectedItems
 {
+    KWeakSelf
+    mainBlock(^{
+        weakSelf.didGetUploadDataType = YES;
+        [weakSelf handleRemoveIndicator];
+    });
     
     [self realGotoUploadFile:indexPathsForSelectedItems];
 }
@@ -413,6 +436,9 @@
     [[uploadFileManager shareInstance] getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
         //[weakSelf setRecordBodyDataFunBy:Arr];
         
+        weakSelf.didGetUploadDataType = YES;
+        [weakSelf handleRemoveIndicator];
+        
         if(!Arr ||Arr.count != 3){
             HLog(@"数据库出错\n\n\n");
             return;
@@ -439,6 +465,8 @@
     KWeakSelf
     [photosBackupsTaskModel bg_findAsync:backups_photos_tableName limit:1 orderBy:nil desc:YES complete:^(NSArray * _Nullable array) {
         mainBlock(^{
+            weakSelf.didGetbackupsloadDataType = YES;
+            [weakSelf handleRemoveIndicator];
             weakSelf.rightTableView.curDataArr = array;
         });
             
@@ -451,6 +479,9 @@
     KWeakSelf
     [[downloadManager shareInstance] getDataInDatabaseFun:isRegetType complete:^(NSMutableArray * _Nonnull Arr) {
       
+        weakSelf.didGetDownloadDataType = YES;
+        [weakSelf handleRemoveIndicator];
+        
         if(!Arr ||Arr.count != 3){
             HLog(@"数据库出错\n\n\n");
             return;
@@ -804,12 +835,15 @@
     KWeakSelf
     [[downloadManager shareInstance] handleCouldPhoneFileModelToDownloadFileDataFunBy:selectedItems complete:^(NSMutableArray * _Nonnull Arr) {
         
+        weakSelf.didGetDownloadDataType = YES;
+        [weakSelf handleRemoveIndicator];
+  
         if(!Arr ||Arr.count != 3){
             HLog(@"数据库出错\n\n\n");
             return;
         }
         
-        NSMutableArray *curLoadIngArr = Arr[0];
+        //NSMutableArray *curLoadIngArr = Arr[0];
         
         mainBlock(^{
             weakSelf.midTableView.outSideDataArr = Arr;