|
|
@@ -59,7 +59,7 @@
|
|
|
|
|
|
//1. 排查上传中
|
|
|
for (customUploadOperation *operationDoing in self.uploadingOperationArr) {
|
|
|
- if([operationDoing.fileModel.filename isEqualToString:model.filename]){
|
|
|
+ if([operationDoing.fileModel.localIdentifier isEqualToString:model.localIdentifier]){
|
|
|
needAddType = NO;
|
|
|
break;
|
|
|
}
|
|
|
@@ -67,7 +67,7 @@
|
|
|
|
|
|
//1. 排查等待下载
|
|
|
for (uploadFileDataModel *waitModel in self.uploadWaitingUrlArr) {
|
|
|
- if([waitModel.filename isEqualToString:model.filename]){
|
|
|
+ if([waitModel.localIdentifier isEqualToString:model.localIdentifier]){
|
|
|
needAddType = NO;
|
|
|
break;
|
|
|
}
|
|
|
@@ -792,14 +792,14 @@ didReceiveResponse:(NSURLResponse *)response
|
|
|
HLog(@"取消任务-- %@--%@",fileModel.filename,fileModel.taskId)
|
|
|
@synchronized (self) {
|
|
|
for (uploadFileDataModel*waitModel in _uploadWaitingUrlArr) {
|
|
|
- if([waitModel.filename isEqualToString:fileModel.filename]){
|
|
|
+ if([waitModel.localIdentifier isEqualToString:fileModel.localIdentifier]){
|
|
|
[_uploadWaitingUrlArr removeObject:waitModel];
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
for (customUploadOperation*operation in _uploadingOperationArr) {
|
|
|
- if([operation.fileModel.filename isEqualToString:fileModel.filename]){
|
|
|
+ if([operation.fileModel.localIdentifier isEqualToString:fileModel.localIdentifier]){
|
|
|
operation.isCancelType = YES;
|
|
|
[operation.dataTask cancel];
|
|
|
[_uploadingOperationArr removeObject:operation];
|