[iOS] Only use __enable_native_promise__ option when explicitly set i…

…n config. (#1617)
apache · Oct 3, 2018 · 5cbf24b · 5cbf24b
1 parent 1268a6d
commit 5cbf24b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.h b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.h
@@ -116,6 +116,7 @@ namespace WeexCore
         void PostMessage(const char* vm_id, const char* data, int dataLength) override {};
         void DispatchMessage(const char* client_id,
                              const char* data, int dataLength, const char* callback, const char* vm_id) override {};
+        void OnReceivedResult(long callback_id, std::unique_ptr<WeexJSResult>& result) override {};
     };
 
     class WXCoreMeasureFunctionBridge : public MeasureFunctionAdapter

diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
@@ -35,7 +35,7 @@
 #import <CommonCrypto/CommonCrypto.h>
 #import <CoreText/CoreText.h>
 #import "WXAppMonitorProtocol.h"
-
+#import "WXConfigCenterProtocol.h"
 #import "WXTextComponent.h"
 
 #define KEY_PASSWORD  @"com.taobao.Weex.123456"
@@ -209,7 +209,7 @@ + (NSDictionary *)getEnvironment
 
     NSMutableDictionary *data = [NSMutableDictionary dictionaryWithDictionary:@{
                                     @"platform":platform,
-                                    @"osName":platform,//osName is eaqual to platorm name in native
+                                    @"osName":platform, //osName is eaqual to platorm name in native
                                     @"osVersion":sysVersion,
                                     @"weexVersion":weexVersion,
                                     @"deviceModel":machine,
@@ -220,6 +220,20 @@ + (NSDictionary *)getEnvironment
                                     @"scale":@(scale),
                                     @"logLevel":[WXLog logLevelString] ?: @"error"
                                 }];
+
+    if ([[[UIDevice currentDevice] systemVersion] integerValue] >= 11) {
+        id configCenter = [WXSDKEngine handlerForProtocol:@protocol(WXConfigCenterProtocol)];
+        if ([configCenter respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
+            // update
+            BOOL isDefault = YES;
+            BOOL jsfmEnableNativePromiseOnIOS11AndLater = [[configCenter configForKey:@"iOS_weex_ext_config.jsfmEnableNativePromiseOnIOS11AndLater" defaultValue:@(NO) isDefault:&isDefault] boolValue];
+            if (!isDefault) {
+                // has this config explicitly
+                data[@"__enable_native_promise__"] = @(jsfmEnableNativePromiseOnIOS11AndLater);
+            }
+        }
+    }
+
     if ([WXSDKEngine customEnvironment]) {
         [data addEntriesFromDictionary:[WXSDKEngine customEnvironment]];
     }