Release 4.4.6

SensorsAnalyticsSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "4.4.5"
+  s.version      = "4.4.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}" }
@@ -36,8 +36,8 @@ Pod::Spec.new do |s|
     c.dependency 'SensorsAnalyticsSDK/Extension'
     c.public_header_files = 'SensorsAnalyticsSDK/JSBridge/SensorsAnalyticsSDK+JavaScriptBridge.h'
     c.source_files = 'SensorsAnalyticsSDK/Core/SAAlertController.{h,m}', 'SensorsAnalyticsSDK/JSBridge/**/*.{h,m}'
-    c.ios.source_files = 'SensorsAnalyticsSDK/RemoteConfig/**/*.{h,m}', 'SensorsAnalyticsSDK/ChannelMatch/**/*.{h,m}', 'SensorsAnalyticsSDK/Encrypt/**/*.{h,m}', 'SensorsAnalyticsSDK/Deeplink/**/*.{h,m}', 'SensorsAnalyticsSDK/DebugMode/**/*.{h,m}', 'SensorsAnalyticsSDK/Core/SAAlertController.h'
-    c.ios.public_header_files = 'SensorsAnalyticsSDK/{Encrypt,RemoteConfig,ChannelMatch,Deeplink,DebugMode}/{SAConfigOptions,SensorsAnalyticsSDK}+*.h', 'SensorsAnalyticsSDK/Encrypt/SAEncryptProtocol.h', 'SensorsAnalyticsSDK/Encrypt/SASecretKey.h', 'SensorsAnalyticsSDK/Deeplink/SASlinkCreator.h'
+    c.ios.source_files = 'SensorsAnalyticsSDK/RemoteConfig/**/*.{h,m}', 'SensorsAnalyticsSDK/ChannelMatch/**/*.{h,m}', 'SensorsAnalyticsSDK/Encrypt/**/*.{h,m}', 'SensorsAnalyticsSDK/Deeplink/**/*.{h,m}', 'SensorsAnalyticsSDK/DebugMode/**/*.{h,m}', 'SensorsAnalyticsSDK/Core/SAAlertController.h', 'SensorsAnalyticsSDK/UIRelated/**/*.{h,m}'
+    c.ios.public_header_files = 'SensorsAnalyticsSDK/{Encrypt,RemoteConfig,ChannelMatch,Deeplink,DebugMode}/{SAConfigOptions,SensorsAnalyticsSDK}+*.h', 'SensorsAnalyticsSDK/Encrypt/SAEncryptProtocol.h', 'SensorsAnalyticsSDK/Encrypt/SASecretKey.h', 'SensorsAnalyticsSDK/Deeplink/SASlinkCreator.h', 'SensorsAnalyticsSDK/UIRelated/UIView+SensorsAnalytics.h'
   end
 
   s.subspec 'Core' do |c|
@@ -125,4 +125,11 @@ Pod::Spec.new do |s|
     d.project_header_files = 'CellClick_HookDelegate_Deprecated/*.h'
   end
 
+  s.subspec 'Exposure' do |h|
+    h.ios.deployment_target = '8.0'
+    h.dependency 'SensorsAnalyticsSDK/Common'
+    h.source_files = 'SensorsAnalyticsSDK/Exposure/**/*.{h,m}'
+    h.public_header_files = 'SensorsAnalyticsSDK/Exposure/SAConfigOptions+Exposure.h', 'SensorsAnalyticsSDK/Exposure/SAExposureConfig.h', 'SensorsAnalyticsSDK/Exposure/SAExposureData.h', 'SensorsAnalyticsSDK/Exposure/SensorsAnalyticsSDK+Exposure.h', 'SensorsAnalyticsSDK/Exposure/UIView+ExposureIdentifier.h'
+  end
+
 end

SensorsAnalyticsSDK.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>PreviewsEnabled</key>
+	<false/>
+</dict>
 </plist>

SensorsAnalyticsSDK/AutoTrack/AppClick/Cell/SAScrollViewDelegateProxy.m

@@ -29,6 +29,7 @@
 #import "UIScrollView+SAAutoTrack.h"
 #import "SAAutoTrackManager.h"
 #import <objc/message.h>
+#import "UIScrollView+SADelegateHashTable.h"
 
 @implementation SAScrollViewDelegateProxy
 

SensorsAnalyticsSDK/AutoTrack/AppClick/Cell/UIScrollView+SAAutoTrack.h

@@ -24,16 +24,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface UITableView (AutoTrack)
 
-@property (nonatomic, strong, nullable) NSHashTable *sensorsdata_delegateHashTable;
-
 - (void)sensorsdata_setDelegate:(id <UITableViewDelegate>)delegate;
 
 @end
 
 @interface UICollectionView (AutoTrack)
 
-@property (nonatomic, strong, nullable) NSHashTable *sensorsdata_delegateHashTable;
-
 - (void)sensorsdata_setDelegate:(id <UICollectionViewDelegate>)delegate;
 
 @end

SensorsAnalyticsSDK/AutoTrack/AppClick/Cell/UIScrollView+SAAutoTrack.m

@@ -29,24 +29,8 @@
 #import "SAConstants+Private.h"
 #import "SAAutoTrackManager.h"
 
-static const void *kSATableViewDelegateHashTable = &kSATableViewDelegateHashTable;
-static const void *kSACollectionViewDelegateHashTable = &kSACollectionViewDelegateHashTable;
-
 @implementation UITableView (AutoTrack)
 
-- (void)setSensorsdata_delegateHashTable:(NSHashTable *)delegateHashTable {
-    objc_setAssociatedObject(self, kSATableViewDelegateHashTable, delegateHashTable, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (NSHashTable *)sensorsdata_delegateHashTable {
-    NSHashTable *delegateHashTable = objc_getAssociatedObject(self, kSATableViewDelegateHashTable);
-    if (!delegateHashTable) {
-        delegateHashTable = [NSHashTable weakObjectsHashTable];
-        self.sensorsdata_delegateHashTable = delegateHashTable;
-    }
-    return delegateHashTable;
-}
-
 - (void)sensorsdata_setDelegate:(id <UITableViewDelegate>)delegate {
     //resolve optional selectors
     [SAScrollViewDelegateProxy resolveOptionalSelectorsForDelegate:delegate];
@@ -71,19 +55,6 @@ - (void)sensorsdata_setDelegate:(id <UITableViewDelegate>)delegate {
 
 @implementation UICollectionView (AutoTrack)
 
-- (void)setSensorsdata_delegateHashTable:(NSHashTable *)delegateHashTable {
-    objc_setAssociatedObject(self, kSACollectionViewDelegateHashTable, delegateHashTable, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (NSHashTable *)sensorsdata_delegateHashTable {
-    NSHashTable *delegateHashTable = objc_getAssociatedObject(self, kSACollectionViewDelegateHashTable);
-    if (!delegateHashTable) {
-        delegateHashTable = [NSHashTable weakObjectsHashTable];
-        self.sensorsdata_delegateHashTable = delegateHashTable;
-    }
-    return delegateHashTable;
-}
-
 - (void)sensorsdata_setDelegate:(id <UICollectionViewDelegate>)delegate {
     //resolve optional selectors
     [SAScrollViewDelegateProxy resolveOptionalSelectorsForDelegate:delegate];

SensorsAnalyticsSDK/AutoTrack/AppClick/Gesture/Processor/SAGeneralGestureViewProcessor.m

@@ -27,6 +27,7 @@
 #import "SAAlertController.h"
 #import "SAAutoTrackUtils.h"
 #import "SAJSONUtil.h"
+#import "SAUIProperties.h"
 
 static NSArray <UIView *>* sensorsdata_searchVisualSubView(NSString *type, UIView *view) {
     NSMutableArray *subViews = [NSMutableArray array];
@@ -116,7 +117,7 @@ - (BOOL)isTrackable {
         return NO;
     }
     // 屏蔽 SAAlertController 的点击事件
-    UIViewController *viewController = [SAAutoTrackUtils findNextViewControllerByResponder:self.gesture.view];
+    UIViewController *viewController = [SAUIProperties findNextViewControllerByResponder:self.gesture.view];
     if ([viewController isKindOfClass:UIAlertController.class] && [viewController.nextResponder isKindOfClass:SAAlertController.class]) {
         return NO;
     }
@@ -145,7 +146,7 @@ - (BOOL)isTrackable {
         return NO;
     }
     // 屏蔽 SAAlertController 的点击事件
-    UIViewController *viewController = [SAAutoTrackUtils findNextViewControllerByResponder:self.gesture.view];
+    UIViewController *viewController = [SAUIProperties findNextViewControllerByResponder:self.gesture.view];
     if ([viewController isKindOfClass:UIAlertController.class] && [viewController.nextResponder isKindOfClass:SAAlertController.class]) {
         return NO;
     }

SensorsAnalyticsSDK/AutoTrack/AppClick/UIApplication+SAAutoTrack.m

@@ -31,6 +31,7 @@
 #import "UIViewController+SAAutoTrack.h"
 #import "SAAutoTrackUtils.h"
 #import "SAAutoTrackManager.h"
+#import "UIView+SensorsAnalytics.h"
 
 @implementation UIApplication (AutoTrack)
 

SensorsAnalyticsSDK/AutoTrack/AppClick/UIView+SAAutoTrack.m

@@ -28,6 +28,9 @@
 #import <objc/runtime.h>
 #import "SAViewElementInfoFactory.h"
 #import "SAAutoTrackManager.h"
+#import "SAUIProperties.h"
+#import "UIView+SARNView.h"
+#import "UIView+SensorsAnalytics.h"
 
 static void *const kSALastAppClickIntervalPropertyName = (void *)&kSALastAppClickIntervalPropertyName;
 
@@ -78,7 +81,7 @@ - (NSString *)sensorsdata_elementContent {
         return nil;
 #pragma clang diagnostic pop
     }
-    if ([SAAutoTrackUtils isKindOfRNView:self]) { // RN 元素，https://reactnative.dev
+    if ([self isSensorsdataRNView]) { // RN 元素，https://reactnative.dev
         NSString *content = [self.accessibilityLabel stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
         if (content.length > 0) {
             return content;
@@ -122,16 +125,6 @@ - (NSString *)sensorsdata_elementId {
     return self.sensorsAnalyticsViewID;
 }
 
-- (UIViewController *)sensorsdata_viewController {
-    UIViewController *viewController = [SAAutoTrackUtils findNextViewControllerByResponder:self];
-
-    // 获取当前 controller 作为 screen_name
-    if (!viewController || [viewController isKindOfClass:UIAlertController.class]) {
-        viewController = [SAAutoTrackUtils currentViewController];
-    }
-    return viewController;
-}
-
 @end
 
 @implementation UILabel (AutoTrack)
@@ -154,7 +147,7 @@ - (NSString *)sensorsdata_elementContent {
 
 - (NSString *)sensorsdata_elementPosition {
     if ([NSStringFromClass(self.class) isEqualToString:@"UISegment"]) {
-        NSInteger index = [SAAutoTrackUtils itemIndexForResponder:self];
+        NSInteger index = [SAUIProperties indexWithResponder:self];
         return index > 0 ? [NSString stringWithFormat:@"%ld", (long)index] : @"0";
     }
     return [super sensorsdata_elementPosition];
@@ -201,7 +194,7 @@ - (NSString *)sensorsdata_elementType {
 - (NSString *)sensorsdata_elementPosition {
     // UITabBarItem
     if ([NSStringFromClass(self.class) isEqualToString:@"UITabBarButton"]) {
-        NSInteger index = [SAAutoTrackUtils itemIndexForResponder:self];
+        NSInteger index = [SAUIProperties indexWithResponder:self];
         if (index < 0) {
             index = 0;
         }

SensorsAnalyticsSDK/AutoTrack/AppPageLeave/SAAppPageLeaveTracker.m

@@ -30,6 +30,7 @@
 #import "SAAppLifecycle.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SAAutoTrackManager.h"
+#import "SAUIProperties.h"
 
 @implementation SAPageLeaveObject
 
@@ -95,7 +96,7 @@ - (void)trackPageEnter:(UIViewController *)viewController {
         currentURL = [screenAutoTrackerController getScreenUrl];
     }
     currentURL = [currentURL isKindOfClass:NSString.class] ? currentURL : NSStringFromClass(viewController.class);
-    object.referrerURL = [self referrerURLWithURL:currentURL eventProperties:[SAAutoTrackUtils propertiesWithViewController:(UIViewController<SAAutoTrackViewControllerProperty> *)viewController]];
+    object.referrerURL = [self referrerURLWithURL:currentURL eventProperties:[SAUIProperties propertiesWithViewController:(UIViewController<SAAutoTrackViewControllerProperty> *)viewController]];
     self.pageLeaveObjects[address] = object;
 }
 
@@ -148,7 +149,7 @@ - (void)appLifecycleStateWillChange:(NSNotification *)notification {
 
 - (NSMutableDictionary *)propertiesWithViewController:(UIViewController<SAAutoTrackViewControllerProperty> *)viewController {
     NSMutableDictionary *eventProperties = [[NSMutableDictionary alloc] init];
-    NSDictionary *autoTrackProperties = [SAAutoTrackUtils propertiesWithViewController:viewController];
+    NSDictionary *autoTrackProperties = [SAUIProperties propertiesWithViewController:viewController];
     [eventProperties addEntriesFromDictionary:autoTrackProperties];
     if (eventProperties[kSAEventPropertyScreenUrl]) {
         return eventProperties;

SensorsAnalyticsSDK/AutoTrack/AppViewScreen/SAAppViewScreenTracker.m

@@ -32,6 +32,7 @@
 #import "SAReferrerManager.h"
 #import "SAModuleManager.h"
 #import "SensorsAnalyticsSDK+SAAutoTrack.h"
+#import "SAUIProperties.h"
 
 @interface SAAppViewScreenTracker ()
 
@@ -140,7 +141,7 @@ - (BOOL)isBlackListContainsViewController:(UIViewController *)viewController {
 - (NSDictionary *)buildWithViewController:(UIViewController *)viewController properties:(NSDictionary<NSString *, id> *)properties autoTrack:(BOOL)autoTrack {
     NSMutableDictionary *eventProperties = [[NSMutableDictionary alloc] init];
 
-    NSDictionary *autoTrackProperties = [SAAutoTrackUtils propertiesWithViewController:viewController];
+    NSDictionary *autoTrackProperties = [SAUIProperties propertiesWithViewController:viewController];
     [eventProperties addEntriesFromDictionary:autoTrackProperties];
 
     if (autoTrack) {

SensorsAnalyticsSDK/AutoTrack/AppViewScreen/UIViewController+SAAutoTrack.m

@@ -40,27 +40,6 @@ - (BOOL)sensorsdata_isIgnored {
     return ![[SAAutoTrackManager defaultManager].appClickTracker shouldTrackViewController:self];
 }
 
-- (NSString *)sensorsdata_screenName {
-    return NSStringFromClass([self class]);
-}
-
-- (NSString *)sensorsdata_title {
-    __block NSString *titleViewContent = nil;
-    __block NSString *controllerTitle = nil;
-    [SACommonUtility performBlockOnMainThread:^{
-        titleViewContent = self.navigationItem.titleView.sensorsdata_elementContent;
-        controllerTitle = self.navigationItem.title;
-    }];
-    if (titleViewContent.length > 0) {
-        return titleViewContent;
-    }
-
-    if (controllerTitle.length > 0) {
-        return controllerTitle;
-    }
-    return nil;
-}
-
 - (void)sa_autotrack_viewDidAppear:(BOOL)animated {
     // 防止 tabbar 切换，可能漏采 $AppViewScreen 全埋点
     if ([self isKindOfClass:UINavigationController.class]) {

SensorsAnalyticsSDK/AutoTrack/SAAutoTrackProperty.h

@@ -22,29 +22,23 @@
 #import <Foundation/Foundation.h>
 
 @protocol SAAutoTrackViewControllerProperty <NSObject>
+
 @property (nonatomic, readonly) BOOL sensorsdata_isIgnored;
-@property (nonatomic, copy, readonly) NSString *sensorsdata_screenName;
-@property (nonatomic, copy, readonly) NSString *sensorsdata_title;
+
 @end
 
 #pragma mark -
 @protocol SAAutoTrackViewProperty <NSObject>
+
 @property (nonatomic, readonly) BOOL sensorsdata_isIgnored;
 /// 记录上次触发点击事件的开机时间
 @property (nonatomic, assign) NSTimeInterval sensorsdata_timeIntervalForLastAppClick;
 
-@property (nonatomic, copy, readonly) NSString *sensorsdata_elementType;
-@property (nonatomic, copy, readonly) NSString *sensorsdata_elementContent;
-@property (nonatomic, copy, readonly) NSString *sensorsdata_elementId;
-
-/// 元素位置，UISegmentedControl 中返回选中的 index，
-@property (nonatomic, copy, readonly) NSString *sensorsdata_elementPosition;
-
-/// 获取 view 所在的 viewController，或者当前的 viewController
-@property (nonatomic, readonly) UIViewController<SAAutoTrackViewControllerProperty> *sensorsdata_viewController;
 @end
 
 #pragma mark -
 @protocol SAAutoTrackCellProperty <SAAutoTrackViewProperty>
+
 - (NSString *)sensorsdata_elementPositionWithIndexPath:(NSIndexPath *)indexPath;
+
 @end

SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.h

@@ -26,50 +26,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SAAutoTrackUtils : NSObject
 
-#if UIKIT_DEFINE_AS_PROPERTIES
-/// 返回当前的 ViewController
-@property(class, nonatomic, readonly) UIViewController *currentViewController;
-#else
-+ (UIViewController *)currentViewController;
-#endif
-
-/**
- 获取响应链中的下一个 UIViewController
-
- @param responder 响应链中的对象
- @return 下一个 ViewController
- */
-+ (nullable UIViewController *)findNextViewControllerByResponder:(UIResponder *)responder;
-
 /// 在间隔时间内是否采集 $AppClick 全埋点
 + (BOOL)isValidAppClickForObject:(id<SAAutoTrackViewProperty>)object;
 
-/// 判断是否为 RN 元素
-+ (BOOL)isKindOfRNView:(UIView *)view;
 @end
 
 #pragma mark -
 @interface SAAutoTrackUtils (Property)
 
-/**
- 通过响应链找到 对象的序号
-
- -1：nextResponder 不是父视图或同类元素，比如 controller.view，涉及路径不带序号
- >=0：元素序号
-
- @param responder 响应链中的对象，可以是 UIView 或者 UIViewController
- @return 序号
- */
-+ (NSInteger )itemIndexForResponder:(UIResponder *)responder;
-
-/**
- 采集 ViewController 中的事件属性
-
- @param viewController 需要采集的 ViewController
- @return 事件中与 ViewController 相关的属性字典
- */
-+ (NSMutableDictionary<NSString *, NSString *> *)propertiesWithViewController:(UIViewController<SAAutoTrackViewControllerProperty> *)viewController;
-
 /**
  通过 AutoTrack 控件，获取事件的属性