Release 4.2.6

SensorsAnalyticsSDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "4.2.5"
+  s.version      = "4.2.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/AppPush/SAAppPushManager.m

@@ -26,7 +26,7 @@
 #import "SAApplicationDelegateProxy.h"
 #import "SASwizzle.h"
 #import "SALog.h"
-#import "UIApplication+PushClick.h"
+#import "UIApplication+SAPushClick.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SAMethodHelper.h"
 #import "SAConfigOptions+AppPush.h"

SensorsAnalyticsSDK/AppPush/SAApplicationDelegateProxy.m

@@ -24,8 +24,8 @@
 
 #import "SAApplicationDelegateProxy.h"
 #import "SAClassHelper.h"
-#import "NSObject+DelegateProxy.h"
-#import "UIApplication+PushClick.h"
+#import "NSObject+SADelegateProxy.h"
+#import "UIApplication+SAPushClick.h"
 #import "SensorsAnalyticsSDK.h"
 #import "SAAppPushConstants.h"
 #import "SALog.h"

SensorsAnalyticsSDK/AppPush/SAUNUserNotificationCenterDelegateProxy.m

@@ -24,7 +24,7 @@
 
 #import "SAUNUserNotificationCenterDelegateProxy.h"
 #import "SAClassHelper.h"
-#import "NSObject+DelegateProxy.h"
+#import "NSObject+SADelegateProxy.h"
 #import "SAAppPushConstants.h"
 #import "SensorsAnalyticsSDK.h"
 #import "SALog.h"

SensorsAnalyticsSDK/AppPush/UIApplication+PushClick.h → SensorsAnalyticsSDK/AppPush/UIApplication+SAPushClick.h

@@ -1,5 +1,5 @@
 //
-// UIApplication+PushClick.h
+// UIApplication+SAPushClick.h
 // SensorsAnalyticsSDK
 //
 // Created by 陈玉国 on 2021/1/7.

SensorsAnalyticsSDK/AppPush/UIApplication+PushClick.m → SensorsAnalyticsSDK/AppPush/UIApplication+SAPushClick.m

@@ -1,5 +1,5 @@
 //
-// UIApplication+PushClick.m
+// UIApplication+SAPushClick.m
 // SensorsAnalyticsSDK
 //
 // Created by 陈玉国 on 2021/1/7.
@@ -22,7 +22,7 @@
 #error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
 #endif
 
-#import "UIApplication+PushClick.h"
+#import "UIApplication+SAPushClick.h"
 #import "SAApplicationDelegateProxy.h"
 #import <objc/runtime.h>
 

SensorsAnalyticsSDK/AppPush/UNUserNotificationCenter+PushClick.h → SensorsAnalyticsSDK/AppPush/UNUserNotificationCenter+SAPushClick.h

@@ -1,5 +1,5 @@
 //
-// UNUserNotificationCenter+AutoTrack.h
+// UNUserNotificationCenter+SAPushClick.h
 // SensorsAnalyticsSDK
 //
 // Created by 陈玉国 on 2021/1/7.

SensorsAnalyticsSDK/AppPush/UNUserNotificationCenter+PushClick.m → SensorsAnalyticsSDK/AppPush/UNUserNotificationCenter+SAPushClick.m

@@ -1,5 +1,5 @@
 //
-// UNUserNotificationCenter+AutoTrack.m
+// UNUserNotificationCenter+SAPushClick.m
 // SensorsAnalyticsSDK
 //
 // Created by 陈玉国 on 2021/1/7.
@@ -22,7 +22,7 @@
 #error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
 #endif
 
-#import "UNUserNotificationCenter+PushClick.h"
+#import "UNUserNotificationCenter+SAPushClick.h"
 #import "SAUNUserNotificationCenterDelegateProxy.h"
 
 @implementation UNUserNotificationCenter (PushClick)

SensorsAnalyticsSDK/AutoTrack/AppClick/Cell/SAScrollViewDelegateProxy.h

@@ -19,7 +19,7 @@
 //
 
 #import "SADelegateProxy.h"
-#import "NSObject+DelegateProxy.h"
+#import "NSObject+SADelegateProxy.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

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

@@ -1,5 +1,5 @@
 //
-// UIScrollView+AutoTrack.h
+// UIScrollView+SAAutoTrack.h
 // SensorsAnalyticsSDK
 //
 // Created by 张敏超🍎 on 2019/6/19.

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

@@ -1,5 +1,5 @@
 //
-// UIScrollView+AutoTrack.m
+// UIScrollView+SAAutoTrack.m
 // SensorsAnalyticsSDK
 //
 // Created by 张敏超🍎 on 2019/6/19.
@@ -22,7 +22,7 @@
 #error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
 #endif
 
-#import "UIScrollView+AutoTrack.h"
+#import "UIScrollView+SAAutoTrack.h"
 #import "SAScrollViewDelegateProxy.h"
 #import <objc/runtime.h>
 #import <objc/message.h>

SensorsAnalyticsSDK/AutoTrack/AppClick/Gesture/Target/SAGestureTarget.m

@@ -26,7 +26,7 @@
 #import "SAGestureViewProcessorFactory.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SAConstants+Private.h"
-#import "UIView+AutoTrack.h"
+#import "UIView+SAAutoTrack.h"
 #import "SAAutoTrackUtils.h"
 #import "SAAutoTrackManager.h"
 

SensorsAnalyticsSDK/AutoTrack/AppClick/SAAppClickTracker.m

@@ -29,8 +29,8 @@
 #import "SAConstants.h"
 #import "SAValidator.h"
 #import "SAAutoTrackUtils.h"
-#import "UIView+AutoTrack.h"
-#import "UIViewController+AutoTrack.h"
+#import "UIView+SAAutoTrack.h"
+#import "UIViewController+SAAutoTrack.h"
 #import "SAModuleManager.h"
 #import "SALog.h"
 

SensorsAnalyticsSDK/AutoTrack/AppClick/UIApplication+AutoTrack.h → SensorsAnalyticsSDK/AutoTrack/AppClick/UIApplication+SAAutoTrack.h

@@ -1,5 +1,5 @@
 //
-// UIApplication+AutoTrack.h
+// UIApplication+SAAutoTrack.h
 // SensorsAnalyticsSDK
 //
 // Created by 王灼洲 on 17/3/22.

SensorsAnalyticsSDK/AutoTrack/AppClick/UIApplication+AutoTrack.m → SensorsAnalyticsSDK/AutoTrack/AppClick/UIApplication+SAAutoTrack.m

@@ -1,5 +1,5 @@
 //
-// UIApplication+AutoTrack.m
+// UIApplication+SAAutoTrack.m
 // SensorsAnalyticsSDK
 //
 // Created by 王灼洲 on 17/3/22.
@@ -22,13 +22,13 @@
 #error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
 #endif
 
-#import "UIApplication+AutoTrack.h"
+#import "UIApplication+SAAutoTrack.h"
 #import "SALog.h"
 #import "SensorsAnalyticsSDK.h"
-#import "UIView+AutoTrack.h"
+#import "UIView+SAAutoTrack.h"
 #import "SAConstants+Private.h"
 #import "SensorsAnalyticsSDK+Private.h"
-#import "UIViewController+AutoTrack.h"
+#import "UIViewController+SAAutoTrack.h"
 #import "SAAutoTrackUtils.h"
 #import "SAAutoTrackManager.h"
 

SensorsAnalyticsSDK/AutoTrack/AppClick/UIView+AutoTrack.h → SensorsAnalyticsSDK/AutoTrack/AppClick/UIView+SAAutoTrack.h

@@ -1,5 +1,5 @@
 //
-// UIView+sa_autoTrack.h
+// UIView+SAAutoTrack.h
 // SensorsAnalyticsSDK
 //
 // Created by 向作为 on 2018/6/11.

SensorsAnalyticsSDK/AutoTrack/AppClick/UIView+AutoTrack.m → SensorsAnalyticsSDK/AutoTrack/AppClick/UIView+SAAutoTrack.m

@@ -1,5 +1,5 @@
 //
-// UIView+sa_autoTrack.m
+// UIView+SAAutoTrack.m
 // SensorsAnalyticsSDK
 //
 // Created by 向作为 on 2018/6/11.
@@ -22,7 +22,7 @@
 #error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
 #endif
 
-#import "UIView+AutoTrack.h"
+#import "UIView+SAAutoTrack.h"
 #import "SAAutoTrackUtils.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import <objc/runtime.h>

SensorsAnalyticsSDK/AutoTrack/AppPageLeave/SAAppPageLeaveTracker.m

@@ -38,6 +38,7 @@ @implementation SAPageLeaveObject
 @interface SAAppPageLeaveTracker ()
 
 @property (nonatomic, copy) NSString *referrerURL;
+@property (nonatomic, assign) SAAppLifecycleState appState;
 
 @end
 
@@ -78,6 +79,11 @@ - (void)trackPageEnter:(UIViewController *)viewController {
     }
     NSString *address = [NSString stringWithFormat:@"%p", viewController];
     if (self.pageLeaveObjects[address]) {
+        SAPageLeaveObject *object = self.pageLeaveObjects[address];
+        if (![object isKindOfClass:[SAPageLeaveObject class]]) {
+            return;
+        }
+        object.timestamp = [[NSDate date] timeIntervalSince1970];
         return;
     }
     SAPageLeaveObject *object = [[SAPageLeaveObject alloc] init];
@@ -110,8 +116,11 @@ - (void)trackPageLeave:(UIViewController *)viewController {
     if (object.referrerURL) {
         tempProperties[kSAEventPropertyScreenReferrerUrl] = object.referrerURL;
     }
-    [self trackWithProperties:tempProperties];
     [self.pageLeaveObjects removeObjectForKey:address];
+    if (self.appState == SAAppLifecycleStateEnd || self.appState == SAAppLifecycleStateStartPassively) {
+        return;
+    }
+    [self trackWithProperties:tempProperties];
 }
 
 - (void)trackWithProperties:(NSDictionary *)properties {
@@ -122,6 +131,7 @@ - (void)trackWithProperties:(NSDictionary *)properties {
 - (void)appLifecycleStateWillChange:(NSNotification *)notification {
     NSDictionary *userInfo = notification.userInfo;
     SAAppLifecycleState newState = [userInfo[kSAAppLifecycleNewStateKey] integerValue];
+    self.appState = newState;
     // 冷（热）启动
     if (newState == SAAppLifecycleStateStart) {
         [self.pageLeaveObjects enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, SAPageLeaveObject * _Nonnull obj, BOOL * _Nonnull stop) {

SensorsAnalyticsSDK/AutoTrack/AppViewScreen/SAAppViewScreenTracker.m

@@ -24,7 +24,7 @@
 
 #import "SAAppViewScreenTracker.h"
 #import "SensorsAnalyticsSDK+Private.h"
-#import "UIViewController+AutoTrack.h"
+#import "UIViewController+SAAutoTrack.h"
 #import "SAAppLifecycle.h"
 #import "SAConstants+Private.h"
 #import "SAValidator.h"

SensorsAnalyticsSDK/AutoTrack/AppViewScreen/UIViewController+AutoTrack.h → SensorsAnalyticsSDK/AutoTrack/AppViewScreen/UIViewController+SAAutoTrack.h

@@ -1,5 +1,5 @@
 //
-// UIViewController+AutoTrack.h
+// UIViewController+SAAutoTrack.h
 // SensorsAnalyticsSDK
 //
 // Created by 王灼洲 on 2017/10/18.

SensorsAnalyticsSDK/AutoTrack/AppViewScreen/UIViewController+AutoTrack.m → SensorsAnalyticsSDK/AutoTrack/AppViewScreen/UIViewController+SAAutoTrack.m

@@ -1,5 +1,5 @@
 //
-// UIViewController+AutoTrack.m
+// UIViewController+SAAutoTrack.m
 // SensorsAnalyticsSDK
 //
 // Created by 王灼洲 on 2017/10/18.
@@ -23,11 +23,11 @@
 #endif
 
 
-#import "UIViewController+AutoTrack.h"
+#import "UIViewController+SAAutoTrack.h"
 #import "SensorsAnalyticsSDK.h"
 #import "SACommonUtility.h"
 #import "SALog.h"
-#import "UIView+AutoTrack.h"
+#import "UIView+SAAutoTrack.h"
 #import "SAAutoTrackManager.h"
 #import "SAWeakPropertyContainer.h"
 #import <objc/runtime.h>

SensorsAnalyticsSDK/AutoTrack/SAAutoTrackManager.m

@@ -28,8 +28,8 @@
 #import "SAModuleManager.h"
 #import "SAAppLifecycle.h"
 #import "SALog.h"
-#import "UIApplication+AutoTrack.h"
-#import "UIViewController+AutoTrack.h"
+#import "UIApplication+SAAutoTrack.h"
+#import "UIViewController+SAAutoTrack.h"
 #import "SASwizzle.h"
 #import "SAAppStartTracker.h"
 #import "SAAppEndTracker.h"

SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.m

@@ -26,7 +26,7 @@
 #import "SAConstants+Private.h"
 #import "SACommonUtility.h"
 #import "SensorsAnalyticsSDK.h"
-#import "UIView+AutoTrack.h"
+#import "UIView+SAAutoTrack.h"
 #import "SALog.h"
 #import "SAAlertController.h"
 #import "SAModuleManager.h"

SensorsAnalyticsSDK/Core/Builder/SAPresetPropertyObject.m

@@ -29,6 +29,8 @@
 
 #if TARGET_OS_IOS
 #import <UIKit/UIKit.h>
+#elif TARGET_OS_OSX
+#import <AppKit/AppKit.h>
 #endif
 
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST

SensorsAnalyticsSDK/Core/HookDelegate/NSObject+DelegateProxy.h → SensorsAnalyticsSDK/Core/HookDelegate/NSObject+SADelegateProxy.h

@@ -1,5 +1,5 @@
 //
-// NSObject+DelegateProxy.h
+// NSObject+SADelegateProxy.h
 // SensorsAnalyticsSDK
 //
 // Created by yuqiang on 2020/11/5.

SensorsAnalyticsSDK/Core/HookDelegate/NSObject+DelegateProxy.m → SensorsAnalyticsSDK/Core/HookDelegate/NSObject+SADelegateProxy.m

@@ -22,7 +22,7 @@
 #error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
 #endif
 
-#import "NSObject+DelegateProxy.h"
+#import "NSObject+SADelegateProxy.h"
 #import <objc/runtime.h>
 
 static void *const kSANSObjectDelegateOptionalSelectorsKey = (void *)&kSANSObjectDelegateOptionalSelectorsKey;

SensorsAnalyticsSDK/Core/HookDelegate/SADelegateProxy.m

@@ -26,7 +26,7 @@
 #import "SAClassHelper.h"
 #import "SAMethodHelper.h"
 #import "SALog.h"
-#import "NSObject+DelegateProxy.h"
+#import "NSObject+SADelegateProxy.h"
 #import <objc/message.h>
 
 static NSString * const kSANSObjectRemoveObserverSelector = @"removeObserver:forKeyPath:";

SensorsAnalyticsSDK/Core/HookDelegate/SAMethodHelper.m

@@ -26,7 +26,7 @@
 #import <objc/runtime.h>
 #import "SALog.h"
 #import "SASwizzle.h"
-#import "NSObject+DelegateProxy.h"
+#import "NSObject+SADelegateProxy.h"
 
 @implementation SAMethodHelper
 

SensorsAnalyticsSDK/Core/NSString+HashCode.h → SensorsAnalyticsSDK/Core/NSString+SAHashCode.h

@@ -1,5 +1,5 @@
 //
-// NSString+HashCode.h
+// NSString+SAHashCode.h
 // SensorsAnalyticsSDK
 //
 // Created by 王灼洲 on 2017/7/6.

SensorsAnalyticsSDK/Core/NSString+HashCode.m → SensorsAnalyticsSDK/Core/NSString+SAHashCode.m

@@ -1,5 +1,5 @@
 //
-// NSString+HashCode.m
+// NSString+SAHashCode.m
 // SensorsAnalyticsSDK
 //
 // Created by 王灼洲 on 2017/7/6.
@@ -23,7 +23,7 @@
 #endif
 
 
-#import "NSString+HashCode.h"
+#import "NSString+SAHashCode.h"
 
 @implementation NSString (HashCode)
 

SensorsAnalyticsSDK/Core/Network/SANetwork.m

@@ -27,7 +27,7 @@
 #import "SAModuleManager.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SensorsAnalyticsSDK.h"
-#import "NSString+HashCode.h"
+#import "NSString+SAHashCode.h"
 #import "SAGzipUtility.h"
 #import "SALog.h"
 #import "SAJSONUtil.h"

SensorsAnalyticsSDK/Core/SAKeyChainItemWrapper.m

@@ -33,8 +33,8 @@
 @implementation SAKeyChainItemWrapper
 + (NSString *)saUdid {
     NSDictionary *result = [self fetchPasswordWithAccount:kSAUdidAccount service:kSAService];
-    NSString *sa_udid =  [result objectForKey:(__bridge id)kSecValueData];
-    return sa_udid;
+    NSString *udid = [result objectForKey:(__bridge id)kSecValueData];
+    return udid;
 }
 
 + (NSString *)saveUdid:(NSString *)udid {

SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m

@@ -53,7 +53,7 @@
 #import "SAUserDefaultsStorePlugin.h"
 #import "SASessionProperty.h"
 
-#define VERSION @"4.2.5"
+#define VERSION @"4.2.6"
 
 void *SensorsAnalyticsQueueTag = &SensorsAnalyticsQueueTag;
 

SensorsAnalyticsSDK/Core/Tracker/SAEventFlush.m

@@ -23,7 +23,7 @@
 #endif
 
 #import "SAEventFlush.h"
-#import "NSString+HashCode.h"
+#import "NSString+SAHashCode.h"
 #import "SAGzipUtility.h"
 #import "SAModuleManager.h"
 #import "SAObject+SAConfigOptions.h"

SensorsAnalyticsSDK/Visualized/Config/SAVisualPropertiesConfig.m

@@ -25,7 +25,7 @@
 #import "SAVisualPropertiesConfig.h"
 #import "UIView+SAElementPath.h"
 #import "SAVisualizedUtils.h"
-#import "UIView+AutoTrack.h"
+#import "UIView+SAAutoTrack.h"
 #import "SAValidator.h"
 #import "SAViewNode.h"