[WEEX-489][iOS] Fix resource not loaded when using dynamic framework …

…solution in some cases.
apache · Jul 2, 2018 · df0eb7d · df0eb7d
1 parent 9e8f8f6
commit df0eb7d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -528,6 +528,9 @@ - (void)createInstance:(NSString *)instanceIdString
         sdkInstance.bundleType = bundleType;
         if ([bundleType.lowercaseString isEqualToString:@"rax"]) {
              raxAPIScriptPath = [[NSBundle bundleForClass:[weakSelf class]] pathForResource:@"weex-rax-api" ofType:@"js"];
+			if (raxAPIScriptPath == nil) {
+				raxAPIScriptPath = [[NSBundle mainBundle] pathForResource:@"weex-rax-api" ofType:@"js"];
+			}
             raxAPIScript = [NSString stringWithContentsOfFile:raxAPIScriptPath encoding:NSUTF8StringEncoding error:nil];
             if (!raxAPIScript) {
                 WXLogError(@"weex-rax-api can not found");
@@ -565,6 +568,9 @@ - (void)createInstance:(NSString *)instanceIdString
 
                 if (WX_SYS_VERSION_LESS_THAN(@"10.2")) {
                     NSString *filePath = [[NSBundle bundleForClass:[weakSelf class]] pathForResource:@"weex-polyfill" ofType:@"js"];
+					if (filePath == nil) {
+						filePath = [[NSBundle mainBundle] pathForResource:@"weex-polyfill" ofType:@"js"];
+					}
                     NSString *script = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
                     if (script) {
                         [sdkInstance.instanceJavaScriptContext executeJavascript:script withSourceURL:[NSURL URLWithString:filePath]];

diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -207,6 +207,9 @@ + (void)initSDKEnvironment
         }
     }
     NSString *filePath = [[NSBundle bundleForClass:self] pathForResource:fileName ofType:@"js"];
+	if (filePath == nil) {
+		filePath = [[NSBundle mainBundle] pathForResource:fileName ofType:@"js"];
+	}
     NSString *script = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
     [WXSDKEngine initSDKEnvironment:script];
 
@@ -309,6 +312,9 @@ + (void)restart
         }
     }
     NSString *filePath = [[NSBundle bundleForClass:self] pathForResource:fileName ofType:@"js"];
+	if (filePath == nil) {
+		filePath = [[NSBundle mainBundle] pathForResource:fileName ofType:@"js"];
+	}
     NSString *script = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:nil];
     [self restartWithScript:script];
 }

diff --git a/ios/sdk/WeexSDK/Sources/View/WXErrorView.m b/ios/sdk/WeexSDK/Sources/View/WXErrorView.m
@@ -29,6 +29,9 @@ - (id) initWithFrame:(CGRect)frame
         UIImageView *imageView = [[UIImageView alloc]initWithFrame:self.bounds];
         NSBundle *bundle = [NSBundle bundleForClass:self.class];
         NSString *file = [bundle pathForResource:@"wx_load_error@3x" ofType:@"png"];
+		if (file == nil) {
+			file = [[NSBundle mainBundle] pathForResource:@"wx_load_error@3x" ofType:@"png"];
+		}
         imageView.image = [UIImage imageWithContentsOfFile:file];
         [self addSubview:imageView];