Release 1.6.37

Author: wangzhzh

SensorsAnalyticsSDK/SensorsAnalyticsSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "1.6.36"
+  s.version      = "1.6.37"
   s.summary      = "The offical iOS SDK of Sensors Analytics."
   s.homepage     = "http://www.sensorsdata.cn"
   s.source       = { :git => 'https://github.com/sensorsdata/sa-sdk-ios.git', :tag => "v#{s.version}" } 

SensorsAnalyticsSDK/SensorsAnalyticsSDK/SensorsAnalyticsSDK.h

@@ -298,8 +298,6 @@ typedef NS_ENUM(NSInteger, SensorsAnalyticsTimeUnit) {
 /**
  * @abstract
  * 重置默认匿名id
- *
- * @return anonymousId 匿名id
  */
 - (void)resetAnonymousId;
 
@@ -341,7 +339,7 @@ typedef NS_ENUM(NSInteger, SensorsAnalyticsTimeUnit) {
  * 特别的，<code>NSSet</code>类型的value中目前只支持其中的元素是<code>NSString</code>
  *
  * @param event             event的名称
- * @param propertieDict     event的属性
+ * @param propertyDict     event的属性
  */
 - (void)track:(NSString *)event withProperties:(NSDictionary *)propertyDict;
 
@@ -396,7 +394,7 @@ typedef NS_ENUM(NSInteger, SensorsAnalyticsTimeUnit) {
  * 这个接口是一个较为复杂的功能，请在使用前先阅读相关说明: http://www.sensorsdata.cn/manual/track_signup.html，并在必要时联系我们的技术支持人员。
  *
  * @param newDistinctId     用户完成注册后生成的注册ID
- * @param propertieDict     event的属性
+ * @param propertyDict     event的属性
  */
 - (void)trackSignUp:(NSString *)newDistinctId withProperties:(NSDictionary *)propertyDict __attribute__((deprecated("已过时，请参考login")));
 
@@ -424,7 +422,7 @@ typedef NS_ENUM(NSInteger, SensorsAnalyticsTimeUnit) {
  * 这个接口是一个较为复杂的功能，请在使用前先阅读相关说明: https://sensorsdata.cn/manual/track_installation.html，并在必要时联系我们的技术支持人员。
  *
  * @param event             event的名称
- * @param propertieDict     event的属性
+ * @param propertyDict     event的属性
  */
 - (void)trackInstallation:(NSString *)event withProperties:(NSDictionary *)propertyDict;
 
@@ -469,9 +467,7 @@ typedef NS_ENUM(NSInteger, SensorsAnalyticsTimeUnit) {
  * Track $AppViewScreen事件
  *
  * @param url 当前页面url
- * @param 用户扩展属性
- *
- * @return
+ * @param properties 用户扩展属性
  */
 - (void)trackViewScreen:(NSString *)url withProperties:(NSDictionary *)properties;
 
@@ -651,8 +647,8 @@ typedef NS_ENUM(NSInteger, SensorsAnalyticsTimeUnit) {
  * 如前面所述，这个<code>NSSet</code>的元素必须是<code>NSString</code>，否则，会忽略
  * 同时，如果要append的Profile之前不存在，会初始化一个空的<code>NSSet</code>
  *
- * @param profile
- * @param content <#content description#>
+ * @param profile profile
+ * @param content description
  */
 - (void)append:(NSString *)profile by:(NSSet *)content;
 

SensorsAnalyticsSDK/SensorsAnalyticsSDK/SensorsAnalyticsSDK.m

@@ -4,10 +4,6 @@
 //  Created by 曹犟 on 15/7/1.
 //  Copyright (c) 2015年 SensorsData. All rights reserved.
 
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_7_1
-#define supportsWKWebKit
-#endif
-
 #import <objc/runtime.h>
 #include <sys/sysctl.h>
 
@@ -31,11 +27,7 @@
 #import "SensorsAnalyticsSDK.h"
 #import "JSONUtil.h"
 
-#if defined(supportsWKWebKit)
-#import <WebKit/WebKit.h>
-#endif
-
-#define VERSION @"1.6.36"
+#define VERSION @"1.6.37"
 
 #define PROPERTY_LENGTH_LIMITATION 8191
 
@@ -122,6 +114,7 @@ @implementation SensorsAnalyticsSDK {
     BOOL _showDebugAlertView;
     NSString *_referrerScreenUrl;
     NSDictionary *_lastScreenTrackProperties;
+    BOOL _applicationWillResignActive;
 }
 
 static SensorsAnalyticsSDK *sharedInstance = nil;
@@ -242,6 +235,7 @@ - (instancetype)initWithServerURL:(NSString *)serverURL
         _showDebugAlertView = YES;
         _referrerScreenUrl = nil;
         _lastScreenTrackProperties = nil;
+        _applicationWillResignActive = NO;
 
         _filterControllers = [[NSMutableArray alloc] init];
         _dateFormatter = [[NSDateFormatter alloc] init];
@@ -429,27 +423,32 @@ - (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request andPropert
 
     NSString *scheme = @"sensorsanalytics://getAppInfo";
     NSString *js = [NSString stringWithFormat:@"sensorsdata_app_js_bridge_call_js('%@')", jsonString];
+
+    //判断系统是否支持WKWebView
+    Class wkWebViewClass = NSClassFromString(@"WKWebView");
+
     if ([webView isKindOfClass:[UIWebView class]] == YES) {//UIWebView
         SADebug(@"showUpWebView: UIWebView");
         if ([request.URL.absoluteString rangeOfString:scheme].location != NSNotFound) {
             [webView stringByEvaluatingJavaScriptFromString:js];
             return YES;
         }
         return NO;
-    }
-#if defined(supportsWKWebKit )
-    else if([webView isKindOfClass:[WKWebView class]] == YES) {//WKWebView
+    } else if(wkWebViewClass && [webView isKindOfClass:wkWebViewClass] == YES) {//WKWebView
         SADebug(@"showUpWebView: WKWebView");
         if ([request.URL.absoluteString rangeOfString:scheme].location != NSNotFound) {
-            [webView evaluateJavaScript:js completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+            typedef void(^Myblock)(id,NSError *);
+            Myblock myBlock = ^(id _Nullable response, NSError * _Nullable error){
                 NSLog(@"response: %@ error: %@", response, error);
-            }];
+            };
+            SEL sharedManagerSelector = NSSelectorFromString(@"evaluateJavaScript:completionHandler:");
+            if (sharedManagerSelector) {
+                ((void (*)(id, SEL, NSString *, Myblock))[webView methodForSelector:sharedManagerSelector])(webView, sharedManagerSelector, js, myBlock);
+            }
             return YES;
         }
         return NO;
-    }
-#endif
-    else{
+    } else{
         SADebug(@"showUpWebView: not UIWebView or WKWebView");
         return NO;
     }
@@ -1692,6 +1691,12 @@ - (void)applicationWillEnterForeground:(NSNotification *)notification {
 - (void)applicationDidBecomeActive:(NSNotification *)notification {
     SADebug(@"%@ application did become active", self);
 
+    if (_applicationWillResignActive) {
+        _applicationWillResignActive = NO;
+        return;
+    }
+    _applicationWillResignActive = NO;
+
     // 是否首次启动
     BOOL isFirstStart = NO;
     if (![[NSUserDefaults standardUserDefaults] boolForKey:@"HasLaunchedOnce"]) {
@@ -1736,12 +1741,13 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification {
 
 - (void)applicationWillResignActive:(NSNotification *)notification {
     SADebug(@"%@ application will resign active", self);
-    
+    _applicationWillResignActive = YES;
     [self stopFlushTimer];
 }
 
 - (void)applicationDidEnterBackground:(NSNotification *)notification {
     SADebug(@"%@ application did enter background", self);
+    _applicationWillResignActive = NO;
 
     // 遍历trackTimer
     // eventAccumulatedDuration = eventAccumulatedDuration + timeStamp - eventBegin