Release 0.1.1

Author: zhujg-00

Example/Example-iOS/AppDelegate.m

@@ -41,8 +41,9 @@ - (void)startSensorsAnalyticsSDKWithConfigOptions:(NSDictionary *)launchOptions
     options.enableVisualizedAutoTrack = YES;
     options.enableJavaScriptBridge = YES;
     options.enableLog = YES;
+    options.flushNetworkPolicy = SensorsAnalyticsNetworkTypeALL;
+
     [SensorsAnalyticsSDK startWithConfigOptions:options];
-    [[SensorsAnalyticsSDK sharedInstance] setFlushNetworkPolicy:SensorsAnalyticsNetworkTypeALL];
 }
 
 - (void)startSensorsABTest {

Example/Example-macOS/AppDelegate.m

@@ -36,9 +36,9 @@ -  (void)startSensorsAnalyticsSDKWithLaunching:(NSNotification *)aNotification {
     SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:SADefaultServerURL launchOptions:nil];
     options.enableJavaScriptBridge = YES;
     options.enableLog = YES;
+    options.flushNetworkPolicy = SensorsAnalyticsNetworkTypeALL;
+    
     [SensorsAnalyticsSDK startWithConfigOptions:options];
-
-    [[SensorsAnalyticsSDK sharedInstance] setFlushNetworkPolicy:SensorsAnalyticsNetworkTypeALL];
 }
 
 - (void)startSensorsABTest {

Podfile

@@ -12,6 +12,7 @@ target 'Example-iOS' do
   #  pod 'SensorsABTesting'
 
   pod 'SensorsABTesting', :path => './'
+  pod 'SensorsAnalyticsSDK', ‘>= 3.1.1’
 end
 
 
@@ -23,4 +24,5 @@ target 'Example-macOS' do
   #  pod 'SensorsABTesting'
 
   pod 'SensorsABTesting', :path => './'
+  pod 'SensorsAnalyticsSDK', ‘>= 3.1.1’ 
 end

SensorsABTest/SABConstants.m

@@ -25,7 +25,7 @@
 #import "SABConstants.h"
 
 // 当前版本号
-NSString *const kSABLibVersion = @"0.1.0";
+NSString *const kSABLibVersion = @"0.1.1";
 
 // SA 最低支持版本
 #if TARGET_OS_OSX

SensorsABTest/SABManager.m

@@ -241,54 +241,42 @@ - (void)fetchABTestWithModeType:(SABFetchABTestModeType)type paramName:(NSString
         SABLogError(@"paramName: %@ error，paramName must be a valid string!", paramName);
         return;
     }
-    
-    dispatch_block_t fetchABTestBlock = ^() {
-        switch (type) {
-            case SABFetchABTestModeTypeCache: {
-                // 从缓存读取
-                id cacheValue = [self fetchCacheABTestWithParamName:paramName defaultValue:defaultValue];
-                return completionHandler(cacheValue ? : defaultValue);
-            }
-            case SABFetchABTestModeTypeFast: {
-                id cacheValue = [self fetchCacheABTestWithParamName:paramName defaultValue:defaultValue];
-                if (cacheValue) {
-                    return completionHandler(cacheValue);
-                }
-                [self fetchAsyncABTestWithParamName:paramName defaultValue:defaultValue timeoutInterval:timeoutInterval completionHandler:completionHandler];
-                break;
-            }
-            case SABFetchABTestModeTypeAsync: {
-                // 异步请求
-                [self fetchAsyncABTestWithParamName:paramName defaultValue:defaultValue timeoutInterval:timeoutInterval completionHandler:completionHandler];
+
+    switch (type) {
+        case SABFetchABTestModeTypeCache: {
+            // 从缓存读取
+            id cacheValue = [self fetchCacheABTestWithParamName:paramName defaultValue:defaultValue];
+            return completionHandler(cacheValue ? : defaultValue);
+        }
+        case SABFetchABTestModeTypeFast: {
+            id cacheValue = [self fetchCacheABTestWithParamName:paramName defaultValue:defaultValue];
+            if (cacheValue) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    completionHandler(cacheValue);
+                });
+                return;
             }
-                break;
-            default:
-                break;
+            [self fetchAsyncABTestWithParamName:paramName defaultValue:defaultValue timeoutInterval:timeoutInterval completionHandler:completionHandler];
+            break;
         }
-    };
-    
-    dispatch_queue_t saSerialQueue = [SABBridge saSerialQueue];
-    if (saSerialQueue) {
-        // Cache 获取试验，同步执行
-        if (type == SABFetchABTestModeTypeCache) {
-            dispatch_sync(saSerialQueue, fetchABTestBlock);
-        } else {
-            dispatch_async(saSerialQueue, fetchABTestBlock);
+        case SABFetchABTestModeTypeAsync: {
+            // 异步请求
+            [self fetchAsyncABTestWithParamName:paramName defaultValue:defaultValue timeoutInterval:timeoutInterval completionHandler:completionHandler];
         }
-    } else {
-        fetchABTestBlock();
+        break;
+        default:
+            break;
     }
 }
 
 /// 获取缓存试验
 - (nullable id)fetchCacheABTestWithParamName:(NSString *)paramName defaultValue:(id)defaultValue {
-    
     if (![SABValidUtils isValidString:paramName]) {
         SABLogError(@"paramName:：%@ error，paramName must be a valid string!", paramName);
         return nil;
     }
     SABExperimentResult *resultData = [self.dataManager cachedExperimentResultWithParamName:paramName];
-    
+
     if (!resultData) {
         SABLogWarn(@"The cache experiment result is empty, paramName: %@", paramName);
         return nil;
@@ -300,7 +288,7 @@ - (nullable id)fetchCacheABTestWithParamName:(NSString *)paramName defaultValue:
         SABLogWarn(@"The experiment result type is inconsistent with the defaultValue type of the interface setting, paramName: %@, experiment result type: %@, defaultValue type: %@", paramName, resulTypeString, defaultValueTypeString);
         return nil;
     }
-    
+
     if (!resultData.isWhiteList) {
         // 埋点
         [self trackABTestWithData:resultData];
@@ -313,19 +301,23 @@ - (void)fetchAsyncABTestWithParamName:(NSString *)paramName defaultValue:(id)def
     // 异步请求
     SABExperimentRequest *requestData = [[SABExperimentRequest alloc] initWithBaseURL:self.configOptions.baseURL projectKey:self.configOptions.projectKey];
     requestData.timeoutInterval = timeoutInterval;
+
+    __weak typeof(self) weakSelf = self;
     [self.dataManager asyncFetchAllExperimentWithRequest:requestData completionHandler:^(SABFetchResultResponse *_Nullable responseData, NSError *_Nullable error) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+
         if (error || !responseData) {
             SABLogError(@"asyncFetchAllExperimentWithRequest failure，error: %@", error);
             completionHandler(defaultValue);
             return;
         }
 
         // 获取缓存并触发 $ABTestTrigger 事件
-        id cacheValue = [self fetchCacheABTestWithParamName:paramName defaultValue:defaultValue];
+        id cacheValue = [strongSelf fetchCacheABTestWithParamName:paramName defaultValue:defaultValue];
 
         // 切到主线程回调结果
         dispatch_async(dispatch_get_main_queue(), ^{
-            completionHandler(cacheValue ?: defaultValue);
+            completionHandler(cacheValue ? : defaultValue);
         });
     }];
 }
@@ -339,21 +331,19 @@ - (void)fetchAllABTestResult {
 /// @param times 最大次数
 - (void)fetchAllABTestResultWithTimes:(NSInteger)times {
     NSInteger fetchIndex = times - 1;
-    
+
     SABExperimentRequest *requestData = [[SABExperimentRequest alloc] initWithBaseURL:self.configOptions.baseURL projectKey:self.configOptions.projectKey];
-    
-    [self.dataManager asyncFetchAllExperimentWithRequest:requestData completionHandler:^(SABFetchResultResponse * _Nullable responseData, NSError * _Nullable error) {
-        
+
+    [self.dataManager asyncFetchAllExperimentWithRequest:requestData completionHandler:^(SABFetchResultResponse *_Nullable responseData, NSError *_Nullable error) {
         if (fetchIndex <= 0 || !error) {
             return;
         }
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kSABAsyncFetchExperimentRetryIntervalTime * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self fetchAllABTestResultWithTimes:fetchIndex];
-        });
+                           [self fetchAllABTestResultWithTimes:fetchIndex];
+                       });
     }];
 }
 
-
 #pragma mark - action
 /// track $ABTestTrigger
 - (void)trackABTestWithData:(SABExperimentResult *)resultData {
@@ -388,17 +378,15 @@ - (void)trackABTestWithData:(SABExperimentResult *)resultData {
     properties[kSABLoginId] = userIdenty.loginId;
     properties[kSABDistinctId] = userIdenty.distinctId;
     properties[kSABAnonymousId] = userIdenty.anonymousId;
-    
+
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         // 首次触发事件，添加版本号
         NSString *libVersion = [NSString stringWithFormat:@"%@:%@", kSABLibPrefix, kSABLibVersion];
         properties[kSABLibPluginVersion] = @[libVersion];
     });
 
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [SABBridge track:kSABTriggerEventName properties:properties];
-    });
+    [SABBridge track:kSABTriggerEventName properties:properties];
 }
 
 /// 开始更新计时

SensorsABTest/SABridge/SABBridge.h

@@ -43,8 +43,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// SA SDK 版本
 @property (class, nonatomic, copy, readonly) NSString *libVersion;
 
-@property (class, nonatomic, strong, readonly) dispatch_queue_t saSerialQueue;
-
 /// 调用 track 接口，追踪一个带有属性的 event
 /// @param eventName 事件名称
 /// @param properties 事件属性

SensorsABTest/SABridge/SABBridge.m

@@ -70,14 +70,9 @@ + (NSDictionary *)presetProperties {
     return [self propertyWithName:@"getPresetProperties"];
 }
 
-+ (dispatch_queue_t)saSerialQueue {
-    dispatch_queue_t serialQueue = [self propertyWithName:@"serialQueue"];
-    return serialQueue;
-}
-
 /// 根据方法名获取属性
 /// @param name 名称
-+ (instancetype)propertyWithName:(NSString *)name {
++ (id)propertyWithName:(NSString *)name {
     id sa = [self sensorsAnalyticsInstance];
     if (!sa) {
         SABLogWarn(@"Get SensorsAnalyticsSDK.sharedIntance failed");

SensorsABTesting.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'SensorsABTesting'
-  s.version      = "0.1.0"
+  s.version      = "0.1.1"
   s.summary      = 'The official iOS/macOS SDK of Sensors A/B Testing.'
   s.homepage     = 'http://www.sensorsdata.cn'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }