|
@@ -194,8 +194,8 @@
|
|
|
else{
|
|
|
self.selectButton.hidden = YES;
|
|
|
|
|
|
- if(_curShareFileDataModel.downloadBoxStateType == downloadBoxStateBegin
|
|
|
- ||_curShareFileDataModel.downloadBoxStateType == downloadBoxStateDownloadloading
|
|
|
+ if(//_curShareFileDataModel.downloadBoxStateType == downloadBoxStateBegin
|
|
|
+ _curShareFileDataModel.downloadBoxStateType == downloadBoxStateDownloadloading
|
|
|
||_curShareFileDataModel.downloadBoxStateType == downloadBoxStateSuspend){
|
|
|
_upLoadStateButton.hidden = NO;
|
|
|
}
|
|
@@ -301,10 +301,11 @@
|
|
|
didUploadStr = [[NSString alloc] initWithFormat:@"%.2fG",didUploadSize_k/1024.0/1024.0];
|
|
|
}
|
|
|
|
|
|
- if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateBegin){
|
|
|
- [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_wait"] forState:UIControlStateNormal];
|
|
|
- }
|
|
|
- else if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateDownloadloading){
|
|
|
+// if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateBegin){
|
|
|
+// [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_wait"] forState:UIControlStateNormal];
|
|
|
+// }
|
|
|
+// else
|
|
|
+ if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateDownloadloading){
|
|
|
[_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_suspend"] forState:UIControlStateNormal];
|
|
|
_fileSpeedlabel.hidden = NO;
|
|
|
|
|
@@ -414,6 +415,7 @@
|
|
|
//MP4、AVI、FLV、WMV、MKV、TS、MOV、RMVB。
|
|
|
|
|
|
NSString *fileUrl = curShareFileDataModel.headUrl;
|
|
|
+ HLog(@"11图片1:%@",fileUrl);
|
|
|
fileUrl = [fileUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
|
|
UIImage * defaultImage = [UIImage imageNamed:@"uploadFile_image"];
|
|
|
[_fileImageView sd_setImageWithURL:[NSURL URLWithString:fileUrl] placeholderImage:defaultImage completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
|
|
@@ -430,6 +432,7 @@
|
|
|
//MP4、AVI、FLV、WMV、MKV、TS、MOV、RMVB。
|
|
|
|
|
|
NSString *fileUrl = curShareFileDataModel.headUrl;
|
|
|
+ HLog(@"11图片1:%@",fileUrl);
|
|
|
fileUrl = [fileUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
|
|
UIImage * defaultImage = [UIImage imageNamed:@"uploadFile_Video"];
|
|
|
[_fileImageView sd_setImageWithURL:[NSURL URLWithString:fileUrl] placeholderImage:defaultImage completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
|
|
@@ -518,10 +521,11 @@
|
|
|
didUploadStr = [[NSString alloc] initWithFormat:@"%.2fG",didUploadSize_k/1024.0/1024.0];
|
|
|
}
|
|
|
|
|
|
- if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateBegin){
|
|
|
- [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_wait"] forState:UIControlStateNormal];
|
|
|
- }
|
|
|
- else if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateDownloadloading){
|
|
|
+// if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateBegin){
|
|
|
+// [_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_wait"] forState:UIControlStateNormal];
|
|
|
+// }
|
|
|
+// else
|
|
|
+ if(curShareFileDataModel.downloadBoxStateType == downloadBoxStateDownloadloading){
|
|
|
[_upLoadStateButton setImage:[UIImage imageNamed:@"uploadFile_suspend"] forState:UIControlStateNormal];
|
|
|
_fileSpeedlabel.hidden = NO;
|
|
|
|
|
@@ -659,18 +663,18 @@
|
|
|
NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
|
|
HLog(@"下载中:%lld --- %lld \n%@\n%@",downloadedSize,totalSize,urlString,_curShareFileDataModel.fileUrl);
|
|
|
|
|
|
- if (![urlString isEqualToString:_curShareFileDataModel.fileUrl]
|
|
|
- ||downloadedSize== totalSize) { // 不是这一个任务
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
if(_curShareFileDataModel
|
|
|
- &&(_curShareFileDataModel.downloadBoxStateType == downloadBoxStateDone
|
|
|
- ||_curShareFileDataModel.downloadBoxStateType == downloadBoxStateFail)
|
|
|
+ &&(_curShareFileDataModel.downloadBoxStateType != downloadBoxStateDownloadloading)
|
|
|
){
|
|
|
+ HLog(@"当前状态 -- %u",_curShareFileDataModel.downloadBoxStateType);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if (![urlString isEqualToString:_curShareFileDataModel.fileUrl]
|
|
|
+ ||downloadedSize == totalSize) { // 不是这一个任务
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
_curShareFileDataModel.downloadBoxStateType = downloadBoxStateDownloadloading;
|
|
|
_curShareFileDataModel.currentSize = downloadedSize;
|
|
|
_curShareFileDataModel.curTimeInterval = [[NSDate date] timeIntervalSince1970];
|