Merge pull request #2214 from NickeyLin/fix/image

[iOS] Fix <image> can't display picture with url which contains Chinese words. (#2135)
apache · Apr 1, 2019 · 450a27c · 450a27c
2 parents 591c684 + 2d98598
commit 450a27c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -769,8 +769,12 @@ - (NSURL *)completeURL:(NSString *)url
     if (!url) {
         return nil;
     }
-
-    return [NSURL URLWithString:url relativeToURL:_scriptURL];
+    NSURL *result = [NSURL URLWithString:url relativeToURL:_scriptURL];
+    if (result) {
+        return result;
+    }
+    // if result is nil, try url-encode the 'url' string.
+    return [NSURL URLWithString:[url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] relativeToURL:_scriptURL];
 }
 
 - (BOOL)checkModuleEventRegistered:(NSString*)event moduleClassName:(NSString*)moduleClassName