|
@@ -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];
|
|
|
+// }
|
|
|
};
|
|
|
}
|
|
|
|