md转html - 优先请求服务器，拿不到数据时用本地模板

wanghengheng · wanghengheng · commit 81eb7bf45ade · 2015-09-15T11:17:58.000+08:00
diff --git a/Coding_iOS/Controllers/FileViewController.m b/Coding_iOS/Controllers/FileViewController.m
@@ -13,7 +13,6 @@
 #import "Coding_FileManager.h"
 #import "WebContentManager.h"
 #import "FunctionTipsManager.h"
-#import <MMMarkdown/MMMarkdown.h>
 #import "EaseToolBar.h"
 
 #import "FileActivitiesViewController.h"
@@ -178,21 +177,14 @@ - (void)loadWebView:(NSURL *)fileUrl{
         }];
     }
     if ([self.fileType isEqualToString:@"md"]){
-        NSError  *error = nil;
-        NSString *htmlStr;
-        @try {
-            NSString *mdStr = [NSString stringWithContentsOfURL:fileUrl encoding:NSUTF8StringEncoding error:&error];
-            htmlStr = [MMMarkdown HTMLStringWithMarkdown:mdStr error:&error];
-        }
-        @catch (NSException *exception) {
-            htmlStr = @"&#21152;&#36733;&#22833;&#36133;&#65281;";
-        }
-        
-        if (error) {
-            htmlStr = @"&#21152;&#36733;&#22833;&#36133;&#65281;";
-        }
-        NSString *contentStr = [WebContentManager markdownPatternedWithContent:htmlStr];
-        [self.contentWebView loadHTMLString:contentStr baseURL:nil];
+        NSString *mdStr = [NSString stringWithContentsOfURL:fileUrl encoding:NSUTF8StringEncoding error:nil];
+        [self.activityIndicator startAnimating];
+        [[Coding_NetAPIManager sharedManager] request_MDHtmlStr_WithMDStr:mdStr inProject:nil andBlock:^(id data, NSError *error) {
+            NSString *htmlStr;
+            htmlStr = data? data: @"&#21152;&#36733;&#22833;&#36133;";
+            NSString *contentStr = [WebContentManager markdownPatternedWithContent:htmlStr];
+            [self.contentWebView loadHTMLString:contentStr baseURL:nil];
+        }];
     }else if ([self.fileType isEqualToString:@"html"]){
         NSString* htmlString = [NSString stringWithContentsOfURL:fileUrl encoding:NSUTF8StringEncoding error:nil];
         [self.contentWebView loadHTMLString:htmlString baseURL:nil];
diff --git a/Coding_iOS/Util/Manager/Coding_NetAPIManager.m b/Coding_iOS/Util/Manager/Coding_NetAPIManager.m
@@ -10,6 +10,7 @@
 #import "JDStatusBarNotification.h"
 #import "UnReadManager.h"
 #import <NYXImagesKit/NYXImagesKit.h>
+#import <MMMarkdown/MMMarkdown.h>
 #import "MBProgressHUD+Add.h"
 
 @implementation Coding_NetAPIManager
@@ -2172,16 +2173,32 @@ - (void)request_MDHtmlStr_WithMDStr:(NSString *)mdStr inProject:(Project *)proje
         path = [NSString stringWithFormat:@"api/user/%@/project/%@/markdownNoAt", project.owner_user_name, project.name];
     }
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:path withParams:@{@"content" : mdStr} withMethodType:Post andBlock:^(id data, NSError *error) {
-        if (data) {
-            [MobClick event:kUmeng_Event_Request_Get label:@"md-html&#36716;&#21270;"];
+        [MobClick event:kUmeng_Event_Request_Get label:@"md-html&#36716;&#21270;"];
 
+        if (data) {
             id resultData = [data valueForKeyPath:@"data"];
             block(resultData, nil);
         }else{
-            block(nil, error);
+            block([self localMDHtmlStr_WithMDStr:mdStr], error);
         }
     }];
 }
+
+- (NSString *)localMDHtmlStr_WithMDStr:(NSString *)mdStr{
+    NSError  *error = nil;
+    NSString *htmlStr;
+    @try {
+        htmlStr = [MMMarkdown HTMLStringWithMarkdown:mdStr error:&error];
+    }
+    @catch (NSException *exception) {
+        htmlStr = @"&#21152;&#36733;&#22833;&#36133;&#65281;";
+    }
+    if (error) {
+        htmlStr = @"&#21152;&#36733;&#22833;&#36133;&#65281;";
+    }
+    return htmlStr;
+}
+
 - (void)request_VerifyTypeWithBlock:(void (^)(VerifyType type, NSError *error))block{
     [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/user/2fa/method" withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
         if (data) {
