* [ios] bugfix iconfont load, support woff #1804
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 0250453.
acton393
commented
Dec 2, 2016
| url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; | ||
|
|
||
| WXBaseViewController *vc = [[WXBaseViewController alloc]initWithSourceURL:[NSURL URLWithString:url]]; | ||
| WXBaseViewController *vc = [[WXBaseViewController alloc]initWithSourceURL:[NSURL URLWithString:param[@"url"]]]; |
There was a problem hiding this comment.
取消 对 url 的utf-8 编码， 这个控制由前端同学来做，
acton393
commented
Dec 2, 2016
| @@ -84,34 +84,20 @@ - (void)addRule:(NSString*)type rule:(NSDictionary *)rule | |||
| return; | |||
| } | |||
| [fontFamily setObject:fontSrc forKey:@"src"]; | |||
| if ([fontURL isFileURL]) { | |||
| // local font file will be added directly if existed | |||
There was a problem hiding this comment.
对fileURL 的处理逻辑加到了下载fontURL中 getIconfont:
acton393
commented
Dec 2, 2016
| // remote font file | ||
| NSString *fontfile = [NSString stringWithFormat:@"%@/%@",WX_FONT_DOWNLOAD_DIR,[WXUtility md5:fontURL.path]]; | ||
| if ([WXUtility isFileExist:fontfile]) { | ||
| // if has been cached, load directly | ||
| [fontFamily setObject:[NSURL fileURLWithPath:fontfile] forKey:@"localSrc"]; | ||
| [_fontStorage setObject:fontFamily forKey:rule[@"fontFamily"]]; |
acton393
commented
Dec 2, 2016
| __weak typeof(self) weakSelf = self; | ||
| [WXUtility getIconfont:fontURL completion:^(NSURL * _Nonnull url, NSError * _Nullable error) { | ||
| if (!error && url) { | ||
| // load success | ||
| NSMutableDictionary * dictForFontFamily = [weakSelf.fontStorage objectForKey:rule[@"fontFamily"]]; | ||
| [dictForFontFamily setObject:url forKey:@"localSrc"]; | ||
| [weakSelf.fontStorage setObject:url forKey: dictForFontFamily]; |
acton393
commented
Dec 2, 2016
| @@ -350,19 +350,15 @@ + (UIFont *)fontWithSize:(CGFloat)size textWeight:(WXTextWeight)textWeight textS | |||
| if (fontFamilyDic[@"localSrc"]){ | |||
| NSString *fpath = [((NSURL*)fontFamilyDic[@"localSrc"]) path]; | |||
| if ([self isFileExist:fpath]) { | |||
| CGDataProviderRef fontDataProvider = CGDataProviderCreateWithFilename([fpath UTF8String]); | |||
There was a problem hiding this comment.
这种加载font 的方式不支持，woff 字体格式，换成 CoreText支持
acton393
commented
Dec 2, 2016
| @@ -396,12 +392,23 @@ + (UIFont *)fontWithSize:(CGFloat)size textWeight:(WXTextWeight)textWeight textS | |||
|
|
|||
| + (void)getIconfont:(NSURL *)url completion:(void(^)(NSURL *url, NSError *error))completionBlock | |||
| { | |||
| if ([url isFileURL]) { | |||
acton393
commented
Dec 2, 2016
| NSURLSession *session = [NSURLSession sharedSession]; | ||
| NSURLSessionDownloadTask *task = [session downloadTaskWithURL:url completionHandler:^(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error) { | ||
| NSURL * downloadPath = nil; | ||
| if (!error && location) { | ||
| NSHTTPURLResponse * httpResponse = (NSHTTPURLResponse*)response; |
There was a problem hiding this comment.
remote url is 404 , the error is nil , so add httpResponse status process
Current coverage is 88.44% (diff: 100%)
@@ ios-feature-20161208 #1804 diff @@
======================================================
Files 41 41
Lines 2233 2233
Methods 354 354
Messages 0 0
Branches 500 500
======================================================
Hits 1975 1975
Misses 258 258
Partials 0 0
|
kfeagle
reviewed
Dec 2, 2016
| NSURLSession *session = [NSURLSession sharedSession]; | ||
| NSURLSessionDownloadTask *task = [session downloadTaskWithURL:url completionHandler:^(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error) { | ||
| NSURL * downloadPath = nil; | ||
| if (!error && location) { | ||
| NSHTTPURLResponse * httpResponse = (NSHTTPURLResponse*)response; | ||
| if (200 == httpResponse.statusCode && !error && location) { | ||
| NSString *file = [NSString stringWithFormat:@"%@/%@",WX_FONT_DOWNLOAD_DIR,[WXUtility md5:[url path]]]; |
There was a problem hiding this comment.
这个地方是不是要改为 [url absoluteString]更好点，这个是完整的地址
[url path]是相对地址，假如两个服务器不同的字体用了相同的名字会出现bug
假如改的话，WXRuleManager.h 也同步更改
acton393
commented
Dec 2, 2016
|
|
||
| NSHTTPURLResponse * httpResponse = (NSHTTPURLResponse*)response; | ||
| if (200 == httpResponse.statusCode && !error && location) { | ||
| NSString *file = [NSString stringWithFormat:@"%@/%@",WX_FONT_DOWNLOAD_DIR,[WXUtility md5:[url absoluteString]]]; |
There was a problem hiding this comment.
@kfeagle 更新为 使用 url absoluteString
acton393
commented
Dec 2, 2016
| // remote font file | ||
| NSString *fontfile = [NSString stringWithFormat:@"%@/%@",WX_FONT_DOWNLOAD_DIR,[WXUtility md5:fontURL.path]]; | ||
| NSString *fontfile = [NSString stringWithFormat:@"%@/%@",WX_FONT_DOWNLOAD_DIR,[WXUtility md5:[fontURL absoluteString]]]; |
There was a problem hiding this comment.
@kfeagle 更新为使用 url absoluteString
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bugfix iconfont load, support woff