[iOS] support bundleUrl on eagle

gubaojian · Dec 13, 2018 · 2046041 · 2046041
1 parent 411ffeb
commit 2046041
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m b/ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m
@@ -415,7 +415,7 @@ - (void)createInstance:(NSString *)instanceIdString
     NSMutableArray *sendQueue = [NSMutableArray array];
     [self.sendQueue setValue:sendQueue forKey:instanceIdString];
 
-    if (sdkInstance.dataRender && options) {
+    if (sdkInstance.dataRender && ![options[@"EXEC_JS"] boolValue]) {
         WX_MONITOR_INSTANCE_PERF_START(WXFirstScreenJSFExecuteTime, [WXSDKManager instanceForID:instanceIdString]);
         WX_MONITOR_INSTANCE_PERF_START(WXPTJSCreateInstance, [WXSDKManager instanceForID:instanceIdString]);
 

diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
@@ -774,7 +774,7 @@ + (void)createDataRenderInstance:(NSString *)pageId template:(NSString *)jsBundl
         if (!javascript) {
             return;
         }
-        [[WXSDKManager bridgeMgr] createInstanceForJS:pageId template:NSSTRING(javascript) options:nil data:data];
+        [[WXSDKManager bridgeMgr] createInstanceForJS:pageId template:NSSTRING(javascript) options:options data:data];
     });
 }
 
@@ -787,7 +787,7 @@ + (void)createDataRenderInstance:(NSString *)pageId contents:(NSData *)contents
         if (!javascript) {
             return;
         }
-        [[WXSDKManager bridgeMgr] createInstanceForJS:pageId template:NSSTRING(javascript) options:nil data:data];
+        [[WXSDKManager bridgeMgr] createInstanceForJS:pageId template:NSSTRING(javascript) options:options data:data];
     });
 }
 

diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.m
@@ -148,10 +148,12 @@ - (void)createInstanceForJS:(NSString *)instance
                   data:(id)data {
     if (!instance || !temp) return;
     __weak typeof(self) weakSelf = self;
+    NSMutableDictionary *newOptions = [options mutableCopy] ?: [NSMutableDictionary new];
+    newOptions[@"EXEC_JS"] = @(YES);
     WXPerformBlockOnBridgeThread(^(){
         [weakSelf.bridgeCtx createInstance:instance
                                   template:temp
-                                   options:options
+                                   options:newOptions
                                       data:data];
     });
 }