leanote/leanote-ios
1
0
Fork 0
mirror of https://github.com/leanote/leanote-ios.git synced 2025-11-28 01:05:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

leanote 图片下载不全, https的图片 #25

Browse Source
This commit is contained in:
life
2015-11-08 15:50:12 +08:00
parent fee6ac7b30
commit 22b6bcebbd
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Leanote/service/NoteService.m
View File

@@ -637,16 +637,26 @@
if([Common isBlankString:content]) {
return content;
}
// https链接的问题
NSString *host = [[UserService getHost] lowercaseString];
if ([host rangeOfString:@"https"].location == NSNotFound) {
host = [host stringByReplacingOccurrencesOfString:@"http" withString:@"https*"];
}
else {
host = [host stringByReplacingOccurrencesOfString:@"https" withString:@"https*"];
}
// 非markdown
if(!isMarkdown) {
NSString *pattern = [NSString stringWithFormat:@"src=('|\")%@/(api/)*file/(outputImage|getImage)\\?fileId=([a-z0-9A-Z]{24})('|\")", [UserService getHost]];
NSString *pattern = [NSString stringWithFormat:@"src=('|\")%@/(api/)*file/(outputImage|getImage)\\?fileId=([a-z0-9A-Z]{24})('|\")", host];
NSRegularExpression *regularExpression = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:nil];
content = [regularExpression stringByReplacingMatchesInString:content options:0 range:NSMakeRange(0, content.length) withTemplate:@"src=\"leanote://getImage?fileId=$4\""];
}
// markdown
else {
NSString *pattern = [NSString stringWithFormat: @"!\\[(.*?)\\]\\(%@/(api/)*file/(outputImage|getImage)\\?fileId=([a-z0-9A-Z]{24})\\)", [UserService getHost]];
NSString *pattern = [NSString stringWithFormat: @"!\\[(.*?)\\]\\(%@/(api/)*file/(outputImage|getImage)\\?fileId=([a-z0-9A-Z]{24})\\)", host];
NSRegularExpression *regularExpression = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:nil];
content = [regularExpression stringByReplacingMatchesInString:content options:0 range:NSMakeRange(0, content.length) withTemplate:@"![$1](leanote://getImage?fileId=$4)"];
}