|
@@ -130,6 +130,7 @@
|
|
|
|
|
|
- (void)maskSwitchPressed:(UIButton *)maskSwitch{
|
|
|
|
|
|
+ maskSwitch.selected = !maskSwitch.selected;
|
|
|
if(_didClickSwitch){
|
|
|
_didClickSwitch(maskSwitch.selected);
|
|
|
}
|
|
@@ -266,14 +267,14 @@
|
|
|
NSString *urlStr = ksharedAppDelegate.NASFileService;
|
|
|
NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
|
|
|
|
|
|
- mImageView.image = [UIImage imageNamed:@"uploadFile_image"];
|
|
|
+ UIImage *placeholderImage = nil;
|
|
|
if([curNASFileAndFolderDataModel.type isEqualToString:@"video"])
|
|
|
{
|
|
|
- mImageView.image = [UIImage imageNamed:@"uploadFile_Video"];
|
|
|
+ placeholderImage = [UIImage imageNamed:@"uploadFile_Video"];
|
|
|
}
|
|
|
else if([curNASFileAndFolderDataModel.type isEqualToString:@"jpg"])
|
|
|
{
|
|
|
- mImageView.image = [UIImage imageNamed:@"uploadFile_image"];
|
|
|
+ placeholderImage = [UIImage imageNamed:@"uploadFile_image"];
|
|
|
|
|
|
//iOS格式的图片 代理拿不到缩略图
|
|
|
if([filePath rangeOfString:@".HEIC"].location != NSNotFound
|
|
@@ -325,12 +326,13 @@
|
|
|
||([curNASFileAndFolderDataModel.type isEqualToString:@"jpg"])){
|
|
|
fileUrl = [fileUrl stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
|
|
|
|
|
|
- [mImageView sd_setImageWithURL:[NSURL URLWithString:fileUrl] placeholderImage:mImageView.image completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
|
|
|
+ [mImageView sd_setImageWithURL:[NSURL URLWithString:fileUrl] placeholderImage:placeholderImage completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
|
|
|
// if(image){
|
|
|
-// HLog(@"11图片1:%@",imageURL.absoluteString);
|
|
|
+// //HLog(@"11图片1:%@",imageURL.absoluteString);
|
|
|
// }
|
|
|
// else{
|
|
|
-// HLog(@"11图片0:%@",imageURL.absoluteString);
|
|
|
+// //HLog(@"11图片0:%@",imageURL.absoluteString);
|
|
|
+//
|
|
|
// }
|
|
|
|
|
|
}];
|