瀏覽代碼

1.备份UI交互修改

huangxiaodong 1 年之前
父節點
當前提交
dbc97c8d50

+ 4 - 4
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFileRecordCell.m

@@ -171,7 +171,6 @@
     _rightTiplabel.numberOfLines = 0;
     //_fileSpeedlabel.backgroundColor = [UIColor blackColor];
     [self.contentView addSubview:_rightTiplabel];
-    _rightTiplabel.hidden = YES;
     
     [_rightTiplabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-15.0);
@@ -230,9 +229,6 @@
 
 - (void)setCurPhotosBackupsTaskModel:(photosBackupsTaskModel *)curPhotosBackupsTaskModel
 {
-    _curPhotosBackupsTaskModel.imageData = nil;
-    _curPhotosBackupsTaskModel = nil;
-    
     _curPhotosBackupsTaskModel = curPhotosBackupsTaskModel;
     
     //test code
@@ -244,6 +240,10 @@
     
     if(_curPhotosBackupsTaskModel.curBackupsState == backupsStateUploading){
        
+        _upLoadStateButton.hidden = NO;
+        _progressBgView.hidden = NO;
+        _rightTiplabel.hidden = YES;
+        
         [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_suspend"] forState:UIControlStateNormal];
         _fileSpeedlabel.hidden = NO;
         

+ 20 - 16
创维盒子/双子星云手机/Class/Set/uploadFile/photoView/backupsFilerecordTableView.m

@@ -61,6 +61,10 @@
 {
     _photosBackupsIngTaskModel = photosBackupsIngTaskModel;
     
+//    if(_photosBackupsIngTaskModel.curBackupsState == backupsStateDone){
+//        NSInteger i;
+//    }
+    
     if(backupsingArr.count >=1){
         
         if(_photosBackupsIngTaskModel.curBackupsState == backupsStateUploading
@@ -76,9 +80,9 @@
             [backupsDoneArr insertObject:_photosBackupsIngTaskModel atIndex:0];
         }
     }
-    else{
-        [backupsingArr removeObjectAtIndex:0];
-        [backupsDoneArr insertObject:_photosBackupsIngTaskModel atIndex:0];
+    else if(_photosBackupsIngTaskModel.curBackupsState == backupsStateUploading)
+    {//先进界面 再备份
+        [backupsingArr addObject:_photosBackupsIngTaskModel];
     }
     
     NSMutableArray*newDataArr = [NSMutableArray new];
@@ -171,9 +175,9 @@
         NSMutableArray *curArr = _curDataArr[section];
     
         if(row < curArr.count){
-            uploadFileDataModel *model = curArr[row];
+            photosBackupsTaskModel *model = curArr[row];
             cell.curPhotosBackupsTaskModel = model;
-            cell.isEditType = _isEditType;
+            //cell.isEditType = _isEditType;
 
             if(_isEditType){
                 if([_selectModelArr containsObject:model]){
@@ -186,23 +190,23 @@
             
             KWeakSelf
             cell.didLongPressClick = ^{
-                [weakSelf didLongPressClickFun];
+                //[weakSelf didLongPressClickFun];
             };
 
             cell.didClckSelectBut = ^(BOOL isSelect) {
-                [weakSelf selectModelOneByOne:model BySelect:isSelect];
+                //[weakSelf selectModelOneByOne:model BySelect:isSelect];
             };
 
             cell.didTapPressClick = ^{
-                if(model.curUploadStateType == uploadStateUploading){
-                    [weakSelf handleUploadingStateTapFunBy:YES with:model];
-                }
-                else if(model.curUploadStateType == uploadStateSuspend){
-                    [weakSelf handleUploadingStateTapFunBy:NO with:model];
-                }
-                else if(model.curUploadStateType == uploadStateFail){
-                    [weakSelf handleUploadFailStateWith:model];
-                }
+//                if(model.curUploadStateType == uploadStateUploading){
+//                    [weakSelf handleUploadingStateTapFunBy:YES with:model];
+//                }
+//                else if(model.curUploadStateType == uploadStateSuspend){
+//                    [weakSelf handleUploadingStateTapFunBy:NO with:model];
+//                }
+//                else if(model.curUploadStateType == uploadStateFail){
+//                    [weakSelf handleUploadFailStateWith:model];
+//                }
             };
         }
     

+ 2 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/backupsFileManager.m

@@ -130,6 +130,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     {
         _curPhotosBackupsTaskMod.curBackupsState = backupsStateDone;
         [self RefreshDatabaseFun];
+        [self changeBackupsFileStateWithSpeedFun];
         return;
     }
     
@@ -143,6 +144,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     if(index >= _curPhotosBackupsTaskMod.LocalIdentifierArr.count){
         _curPhotosBackupsTaskMod.curBackupsState = backupsStateDone;
         [self RefreshDatabaseFun];
+        [self changeBackupsFileStateWithSpeedFun];
         return;
     }