Release 4.5.6

Author: 王洋洋

SensorsAnalyticsSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "4.5.5"
+  s.version      = "4.5.6"
   s.summary      = "The official 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/AutoTrack/AppClick/SAAppClickTracker.m

@@ -33,6 +33,7 @@
 #import "UIViewController+SAAutoTrack.h"
 #import "SAModuleManager.h"
 #import "SALog.h"
+#import "SAUIProperties.h"
 
 @interface SAAppClickTracker ()
 
@@ -149,7 +150,8 @@ - (BOOL)isViewTypeIgnored:(Class)aClass {
 }
 
 - (BOOL)isIgnoreEventWithView:(UIView *)view {
-    return self.isIgnored || [self isViewTypeIgnored:[view class]];
+    UIViewController *viewController = [SAUIProperties findNextViewControllerByResponder:view];
+    return self.isIgnored || [self isViewTypeIgnored:[view class]] || [self isViewControllerIgnored:viewController];
 }
 
 #pragma mark – Private Methods

SensorsAnalyticsSDK/AutoTrack/SensorsAnalyticsSDK+SAAutoTrack.h

@@ -194,4 +194,31 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface SensorsAnalyticsSDK (SAReferrer)
+
+
+/**
+ * @abstract
+ * 获取 LastScreenUrl
+ *
+ * @return LastScreenUrl
+ */
+- (NSString *)getLastScreenUrl API_UNAVAILABLE(macos);
+
+/**
+ * @abstract
+ * 获取 LastScreenTrackProperties
+ *
+ * @return LastScreenTrackProperties
+ */
+- (NSDictionary *)getLastScreenTrackProperties API_UNAVAILABLE(macos);
+
+/**
+ * @abstract
+ * App 退出或进到后台时清空 referrer，默认情况下不清空
+ */
+- (void)clearReferrerWhenAppEnd API_UNAVAILABLE(macos);
+
+@end
+
 NS_ASSUME_NONNULL_END

SensorsAnalyticsSDK/AutoTrack/SensorsAnalyticsSDK+SAAutoTrack.m

@@ -30,6 +30,7 @@
 #import "SAWeakPropertyContainer.h"
 #include <objc/runtime.h>
 #import "SAUIProperties.h"
+#import "SAReferrerManager.h"
 
 @implementation UIImage (SensorsAnalytics)
 
@@ -116,3 +117,19 @@ - (void)enableAutoTrack:(SensorsAnalyticsAutoTrackEventType)eventType {
 }
 
 @end
+
+@implementation SensorsAnalyticsSDK (SAReferrer)
+
+- (NSString *)getLastScreenUrl {
+    return [SAReferrerManager sharedInstance].referrerURL;
+}
+
+- (NSDictionary *)getLastScreenTrackProperties {
+    return [SAReferrerManager sharedInstance].referrerProperties;
+}
+
+- (void)clearReferrerWhenAppEnd {
+    [SAReferrerManager sharedInstance].isClearReferrer = YES;
+}
+
+@end

SensorsAnalyticsSDK/Core/Referrer/SAReferrerManager.m

@@ -27,10 +27,12 @@
 
 @interface SAReferrerManager ()
 
-@property (atomic, copy, readwrite) NSDictionary *referrerProperties;
-@property (atomic, copy, readwrite) NSString *referrerURL;
-@property (nonatomic, copy, readwrite) NSString *referrerTitle;
+@property (atomic, copy) NSDictionary *referrerProperties;
+@property (atomic, copy) NSString *referrerURL;
+@property (nonatomic, copy) NSString *referrerTitle;
 @property (nonatomic, copy) NSString *currentTitle;
+@property (nonatomic, copy) NSString *currentScreenUrl;
+@property (nonatomic, copy) NSDictionary *currentScreenProperties;
 
 @end
 
@@ -46,21 +48,23 @@ + (instancetype)sharedInstance {
 }
 
 - (NSDictionary *)propertiesWithURL:(NSString *)currentURL eventProperties:(NSDictionary *)eventProperties {
-    NSString *referrerURL = self.referrerURL;
+    self.referrerURL = self.currentScreenUrl;
+    self.referrerProperties = self.currentScreenProperties;
     NSMutableDictionary *newProperties = [NSMutableDictionary dictionaryWithDictionary:eventProperties];
 
     // 客户自定义属性中包含 $url 时，以客户自定义内容为准
     if (!newProperties[kSAEventPropertyScreenUrl]) {
         newProperties[kSAEventPropertyScreenUrl] = currentURL;
     }
     // 客户自定义属性中包含 $referrer 时，以客户自定义内容为准
-    if (referrerURL && !newProperties[kSAEventPropertyScreenReferrerUrl]) {
-        newProperties[kSAEventPropertyScreenReferrerUrl] = referrerURL;
+    if (self.referrerURL && !newProperties[kSAEventPropertyScreenReferrerUrl]) {
+        newProperties[kSAEventPropertyScreenReferrerUrl] = self.referrerURL;
     }
-    // $referrer 内容以最终页面浏览事件中的 $url 为准
-    self.referrerURL = newProperties[kSAEventPropertyScreenUrl];
-    self.referrerProperties = newProperties;
 
+    NSMutableDictionary *lastScreenProperties = [NSMutableDictionary dictionaryWithDictionary:newProperties];
+    [lastScreenProperties removeObjectForKey:kSAEventPropertyScreenReferrerUrl];
+    self.currentScreenProperties = [lastScreenProperties copy];
+    self.currentScreenUrl = newProperties[kSAEventPropertyScreenUrl];
     dispatch_async(self.serialQueue, ^{
         [self cacheReferrerTitle:newProperties];
     });

SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK+Public.h

@@ -331,28 +331,6 @@ extern NSString * const SensorsAnalyticsIdentityKeyEmail;
  */
 - (NSString *)getCookieWithDecode:(BOOL)decode;
 
-/**
- * @abstract
- * 获取 LastScreenUrl
- *
- * @return LastScreenUrl
- */
-- (NSString *)getLastScreenUrl API_UNAVAILABLE(macos);
-
-/**
- * @abstract
- * App 退出或进到后台时清空 referrer，默认情况下不清空
- */
-- (void)clearReferrerWhenAppEnd API_UNAVAILABLE(macos);
-
-/**
- * @abstract
- * 获取 LastScreenTrackProperties
- *
- * @return LastScreenTrackProperties
- */
-- (NSDictionary *)getLastScreenTrackProperties API_UNAVAILABLE(macos);
-
 /**
  * @abstract
  * 修改入库之前的事件属性
@@ -428,6 +406,14 @@ extern NSString * const SensorsAnalyticsIdentityKeyEmail;
  */
 - (void)registerPropertyPlugin:(SAPropertyPlugin *)plugin;
 
+/**
+ * @abstract
+ * 注销属性插件
+ *
+ * @param pluginClass 插件类型
+ */
+- (void)unregisterPropertyPluginWithPluginClass:(Class)pluginClass;
+
 /**
  * @abstract
  * 得到 SDK 的版本

SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m

@@ -64,7 +64,7 @@
 #import "SALimitKeyManager.h"
 #import "NSDictionary+SACopyProperties.h"
 
-#define VERSION @"4.5.5"
+#define VERSION @"4.5.6"
 
 void *SensorsAnalyticsQueueTag = &SensorsAnalyticsQueueTag;
 
@@ -845,6 +845,12 @@ - (void)registerPropertyPlugin:(SAPropertyPlugin *)plugin {
     });
 }
 
+- (void)unregisterPropertyPluginWithPluginClass:(Class)pluginClass {
+    dispatch_async(self.serialQueue, ^{
+        [SAPropertyPluginManager.sharedInstance unregisterPropertyPluginWithPluginClass:pluginClass];
+    });
+}
+
 #pragma mark - Local caches
 
 - (void)startFlushTimer {
@@ -883,18 +889,6 @@ - (void)stopFlushTimer {
     });
 }
 
-- (NSString *)getLastScreenUrl {
-    return [SAReferrerManager sharedInstance].referrerURL;
-}
-
-- (void)clearReferrerWhenAppEnd {
-    [SAReferrerManager sharedInstance].isClearReferrer = YES;
-}
-
-- (NSDictionary *)getLastScreenTrackProperties {
-    return [SAReferrerManager sharedInstance].referrerProperties;
-}
-
 - (SensorsAnalyticsDebugMode)debugMode {
     return self.configOptions.debugMode;
 }
@@ -999,9 +993,6 @@ - (void)clearKeychainData {
 #pragma mark - setup Flow
 
 - (void)trackEventObject:(SABaseEventObject *)object properties:(NSDictionary *)properties {
-    if (object.isSignUp) {
-        [[NSNotificationCenter defaultCenter] postNotificationName:SA_TRACK_LOGIN_NOTIFICATION object:nil];
-    }
     NSString *eventName = object.event;
     if (!object.hybridH5 && eventName) {
         object.isInstantEvent = [self.configOptions.instantEvents containsObject:eventName];
@@ -1011,6 +1002,11 @@ - (void)trackEventObject:(SABaseEventObject *)object properties:(NSDictionary *)
     input.identifier = self.identifier;
     input.properties = [properties sensorsdata_deepCopy];
     [SAFlowManager.sharedInstance startWithFlowID:kSATrackFlowId input:input completion:nil];
+
+    // H5 打通场景，在 Flow 实现登录，通知放在最后，防止外部不能及时拿到最新 loginId
+    if (object.isSignUp) {
+        [[NSNotificationCenter defaultCenter] postNotificationName:SA_TRACK_LOGIN_NOTIFICATION object:nil];
+    }
 }
 
 - (void)flushAllEventRecords {