冒泡解析

wanghengheng · wanghengheng · commit d9d92ef2e685 · 2015-01-27T17:09:59.000+08:00
diff --git a/Coding_iOS/Models/HtmlMedia.m b/Coding_iOS/Models/HtmlMedia.m
@@ -32,9 +32,15 @@ - (instancetype)initWithString:(NSString *)htmlString showType:(MediaShowType)sh
 - (void)analyseHtmlElement:(TFHppleElement* )element withShowType:(MediaShowType)showType{
     HtmlMediaItem *item = nil;
     if (element.isTextNode) {
-        if ([element.content stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]].length > 0
-            || (![_contentDisplay hasSuffix:@"\n"] && _contentDisplay.length > 0)) {
+        if ([element.content stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]].length > 0) {
             [_contentDisplay appendString:element.content];
+        }else if (![_contentDisplay hasSuffix:@"\n"] && _contentDisplay.length > 0){
+            NSCharacterSet *lineSet = [NSCharacterSet newlineCharacterSet];
+            if ([element.content rangeOfCharacterFromSet:lineSet].location != NSNotFound) {
+                [_contentDisplay appendString:@"\n"];
+            }else{
+                [_contentDisplay appendString:element.content];
+            }
         }
     }else if ([element.tagName isEqualToString:@"br"]){
         if (![_contentDisplay hasSuffix:@"\n"] && _contentDisplay.length > 0) {
