diff --git a/.gitignore b/.gitignore
index 7495af75..3c509ae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1,6 @@
 .DS_Store
 git.properties
 
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
-*.iml
-
-## Directory-based project format:
-.idea/
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Python
-__pycache__
-*.pyc
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-# java build files
-target
-ui/node_modules
-gulpfile.js
-
-# debug scripts.
-deploy.sh
-ftpsync.settings
-
-*.swp
-.DS_Store
-
 # Xcode
 build/*
 *.pbxuser
@@ -63,5 +19,51 @@ profile
 *.p12
 *.mobileprovision
 
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
 # AppCode
 .idea
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+Carthage/Checkouts
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/ReleaseNote.md
+fastlane/README.md
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
\ No newline at end of file
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
index ab17105e..39d1841e 100644
--- a/Example/Example.xcodeproj/project.pbxproj
+++ b/Example/Example.xcodeproj/project.pbxproj
@@ -7,12 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		4DC0584E232F7C16008D5C7E /* AdSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DC0584D232F7C16008D5C7E /* AdSupport.framework */; };
 		4DCD115922927F6E0091D129 /* SensorsAnalyticsSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB30C2622284229F0004061D /* SensorsAnalyticsSDK.framework */; };
 		4DCD115A22927F6E0091D129 /* SensorsAnalyticsSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB30C2622284229F0004061D /* SensorsAnalyticsSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4DCD115B22927F6E0091D129 /* SensorsAnalyticsExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB6EBB2522855F0C003CFBA8 /* SensorsAnalyticsExtension.framework */; };
 		4DCD115C22927F6E0091D129 /* SensorsAnalyticsExtension.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB6EBB2522855F0C003CFBA8 /* SensorsAnalyticsExtension.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		4DCD115D22927F790091D129 /* SensorsAnalyticsSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB30C2622284229F0004061D /* SensorsAnalyticsSDK.framework */; };
 		4DCD115E22927F790091D129 /* SensorsAnalyticsSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CB30C2622284229F0004061D /* SensorsAnalyticsSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		8881569323B2F83900007AD1 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CB30C23A228418000004061D /* MainInterface.storyboard */; };
 		CB30C204228414420004061D /* TestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C1D8228414420004061D /* TestViewController.m */; };
 		CB30C205228414420004061D /* JSCallOCViewController2.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C1D9228414420004061D /* JSCallOCViewController2.m */; };
 		CB30C206228414420004061D /* test2.html in Resources */ = {isa = PBXBuildFile; fileRef = CB30C1DC228414420004061D /* test2.html */; };
@@ -31,7 +33,6 @@
 		CB30C21A228414940004061D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB30C1CE228414420004061D /* ViewController.swift */; };
 		CB30C2222284165A0004061D /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB30C2212284165A0004061D /* WebKit.framework */; };
 		CB30C2332284173B0004061D /* SensorsDataExtention.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = CB30C2282284173B0004061D /* SensorsDataExtention.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		CB30C241228418000004061D /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CB30C239228418000004061D /* MainInterface.storyboard */; };
 		CB30C242228418000004061D /* ShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C23B228418000004061D /* ShareViewController.m */; };
 		CB30C246228421C60004061D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CB30C1E3228414420004061D /* Main.storyboard */; };
 		CB30C247228421C60004061D /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB30C1E1228414420004061D /* LaunchScreen.xib */; };
@@ -104,6 +105,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		4DC0584D232F7C16008D5C7E /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
 		CB30C15C228413B20004061D /* SensorsData.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SensorsData.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CB30C18C2284140E0004061D /* SensorsDataSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SensorsDataSwift.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CB30C1CE228414420004061D /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -142,7 +144,7 @@
 		CB30C2212284165A0004061D /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		CB30C223228416640004061D /* SensorsAnalyticsSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SensorsAnalyticsSDK.framework; path = "../../../../Library/Developer/Xcode/DerivedData/SensorsAnalyticsSDK-hhqmjeoyzfdasagvypdnnkywlofx/Build/Products/Debug-iphoneos/SensorsAnalyticsSDK.framework"; sourceTree = "<group>"; };
 		CB30C2282284173B0004061D /* SensorsDataExtention.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = SensorsDataExtention.appex; sourceTree = BUILT_PRODUCTS_DIR; };
-		CB30C23A228418000004061D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = MainInterface.storyboard; sourceTree = "<group>"; };
+		CB30C23A228418000004061D /* MainInterface.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainInterface.storyboard; sourceTree = "<group>"; };
 		CB30C23B228418000004061D /* ShareViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShareViewController.m; sourceTree = "<group>"; };
 		CB30C23C228418000004061D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CB30C23D228418000004061D /* ShareViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShareViewController.h; sourceTree = "<group>"; };
@@ -175,6 +177,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4DC0584E232F7C16008D5C7E /* AdSupport.framework in Frameworks */,
 				CB30C261228422830004061D /* libsqlite3.tbd in Frameworks */,
 				CB30C25F2284227C0004061D /* libz.tbd in Frameworks */,
 				CB30C25D228422730004061D /* UIKit.framework in Frameworks */,
@@ -295,6 +298,7 @@
 		CB30C2202284165A0004061D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				4DC0584D232F7C16008D5C7E /* AdSupport.framework */,
 				CB6EBB5822857161003CFBA8 /* SensorsAnalyticsSDK.framework */,
 				CB6EBB5722857145003CFBA8 /* SensorsAnalyticsSDK.framework */,
 				CB6EBB5622857145003CFBA8 /* SensorsAnalyticsSDK.framework */,
@@ -328,7 +332,7 @@
 				CB30C240228418000004061D /* SensorsDataExtention.entitlements */,
 				CB30C23D228418000004061D /* ShareViewController.h */,
 				CB30C23B228418000004061D /* ShareViewController.m */,
-				CB30C239228418000004061D /* MainInterface.storyboard */,
+				CB30C23A228418000004061D /* MainInterface.storyboard */,
 				CB30C23C228418000004061D /* Info.plist */,
 			);
 			path = SensorsDataExtention;
@@ -398,9 +402,10 @@
 		CB30C0B02284115D0004061D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				CLASSPREFIX = SA;
 				LastSwiftUpdateCheck = 1020;
 				LastUpgradeCheck = 1020;
-				ORGANIZATIONNAME = SensorsData;
+				ORGANIZATIONNAME = "Sensors Data Co., Ltd";
 				TargetAttributes = {
 					CB30C15B228413B20004061D = {
 						CreatedOnToolsVersion = 10.2.1;
@@ -430,7 +435,6 @@
 			knownRegions = (
 				en,
 				Base,
-				global,
 			);
 			mainGroup = CB30C0AF2284115D0004061D;
 			productRefGroup = CB30C0B92284115D0004061D /* Products */;
@@ -471,7 +475,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CB30C241228418000004061D /* MainInterface.storyboard in Resources */,
+				8881569323B2F83900007AD1 /* MainInterface.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -555,14 +559,6 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
-		CB30C239228418000004061D /* MainInterface.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CB30C23A228418000004061D /* Base */,
-			);
-			name = MainInterface.storyboard;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/SensorsData.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/SensorsData.xcscheme
index 1d27bf9e..0cd79e97 100644
--- a/Example/Example.xcodeproj/xcshareddata/xcschemes/SensorsData.xcscheme
+++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/SensorsData.xcscheme
@@ -41,8 +41,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -52,8 +50,8 @@
             ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -75,8 +73,6 @@
             ReferencedContainer = "container:Example.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Example/SensorsData/AppDelegate.h b/Example/SensorsData/AppDelegate.h
index 76e5b0c0..d9db9c79 100644
--- a/Example/SensorsData/AppDelegate.h
+++ b/Example/SensorsData/AppDelegate.h
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 曹犟 on 15/7/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/AppDelegate.m b/Example/SensorsData/AppDelegate.m
index feeb83a6..a67c3a44 100644
--- a/Example/SensorsData/AppDelegate.m
+++ b/Example/SensorsData/AppDelegate.m
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 曹犟 on 15/7/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -31,15 +31,19 @@ @implementation AppDelegate
 
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
- 
+
     SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:Sa_Default_ServerURL launchOptions:launchOptions];
     options.autoTrackEventType = SensorsAnalyticsEventTypeAppStart | SensorsAnalyticsEventTypeAppEnd | SensorsAnalyticsEventTypeAppClick | SensorsAnalyticsEventTypeAppViewScreen;
     options.enableTrackAppCrash = YES;
 //    options.flushInterval = 10 * 1000;
 //    options.flushBulkSize = 100;
+    options.enableHeatMap = YES;
+    options.enableVisualizedAutoTrack = YES;
+    options.enableJavaScriptBridge = YES;
+    options.enableLog = YES;
     options.maxCacheSize = 20000;
-    [SensorsAnalyticsSDK sharedInstanceWithConfig:options];
-    
+    [SensorsAnalyticsSDK startWithConfigOptions:options];
+
     [[SensorsAnalyticsSDK sharedInstance] registerSuperProperties:@{@"AAA":UIDevice.currentDevice.identifierForVendor.UUIDString}];
     [[SensorsAnalyticsSDK sharedInstance] registerDynamicSuperProperties:^NSDictionary * _Nonnull{
         __block UIApplicationState appState;
@@ -52,12 +56,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         }
         return @{@"__APPState__":@(appState)};
     }];
-    
-    [[SensorsAnalyticsSDK sharedInstance] enableLog:YES];
 
-//    [[SensorsAnalyticsSDK sharedInstance] enableHeatMap];
-//    [[SensorsAnalyticsSDK sharedInstance] enableVisualizedAutoTrack];
-    [[SensorsAnalyticsSDK sharedInstance] addWebViewUserAgentSensorsDataFlag];
     [[SensorsAnalyticsSDK sharedInstance] trackInstallation:@"AppInstall" withProperties:@{@"testValue" : @"testKey"}];
     //[[SensorsAnalyticsSDK sharedInstance] addHeatMapViewControllers:[NSArray arrayWithObject:@"DemoController"]];
 
@@ -93,7 +92,7 @@ - (void)applicationWillEnterForeground:(UIApplication *)application {
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     //@"group.cn.com.sensorsAnalytics.share"
     [[SensorsAnalyticsSDK sharedInstance]trackEventFromExtensionWithGroupIdentifier:@"group.cn.com.sensorsAnalytics.share" completion:^(NSString *identifiy ,NSArray *events){
-        
+
     }];
 //   NSArray  *eventArray = [[SAAppExtensionDataManager sharedInstance] readAllEventsWithGroupIdentifier: @"group.cn.com.sensorsAnalytics.share"];
 //    NSLog(@"applicationDidBecomeActive::::::%@",eventArray);
@@ -113,3 +112,4 @@ - (void)applicationWillTerminate:(UIApplication *)application {
 }
 
 @end
+
diff --git a/Example/SensorsData/AutoTrackViewController.h b/Example/SensorsData/AutoTrackViewController.h
index 67291e98..c09290b9 100644
--- a/Example/SensorsData/AutoTrackViewController.h
+++ b/Example/SensorsData/AutoTrackViewController.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/4/27.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/AutoTrackViewController.m b/Example/SensorsData/AutoTrackViewController.m
index 49ebfaea..a90dd12e 100644
--- a/Example/SensorsData/AutoTrackViewController.m
+++ b/Example/SensorsData/AutoTrackViewController.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/4/27.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -41,10 +41,10 @@ - (void)viewDidLoad {
 
     UIBarButtonItem *rightItem = [[UIBarButtonItem alloc] initWithTitle:@"下一页" style:UIBarButtonItemStyleDone target:self action:@selector(nextAction)];
     self.navigationItem.rightBarButtonItem = rightItem;
-    
+
     self.myLabel.userInteractionEnabled = YES;
-    UITapGestureRecognizer *labelTapGestureRecognizer = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(labelTouchUpInside:)];
-    [self.myLabel addGestureRecognizer:labelTapGestureRecognizer];
+    UILongPressGestureRecognizer *longGestureRecognizer = [[UILongPressGestureRecognizer alloc]initWithTarget:self action:@selector(longTouchUpInside:)];
+    [self.myLabel addGestureRecognizer:longGestureRecognizer];
 
     UITapGestureRecognizer *imageViewTapGestureRecognizer = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(imageViewTouchUpInside:)];
     self.imageView.userInteractionEnabled = YES;
@@ -52,8 +52,8 @@ - (void)viewDidLoad {
 
     [self.myButton1 setAttributedTitle:[[NSAttributedString alloc]initWithString:@"attributedTitle - button1" attributes:@{ NSFontAttributeName: [UIFont systemFontOfSize:13], NSForegroundColorAttributeName: [UIColor redColor] }] forState:UIControlStateNormal];
 
-    [self.myLabel setAttributedText:[[NSAttributedString alloc]initWithString:@"attributedText" attributes:@{ NSFontAttributeName: [UIFont systemFontOfSize:13], NSForegroundColorAttributeName: [UIColor redColor] }]];
-//    self.myLabel.text = @"text----";
+    [self.myLabel setAttributedText:[[NSAttributedString alloc]initWithString:@"attributedText-longGesture" attributes:@{ NSFontAttributeName: [UIFont systemFontOfSize:13], NSForegroundColorAttributeName: [UIColor redColor] }]];
+    //    self.myLabel.text = @"text----";
 
 }
 -(IBAction)stepperOnClick:(UIStepper*)sender {
@@ -69,16 +69,19 @@ -(IBAction)picSwitchClick:(UISwitch *)sender {
 }
 
 - (IBAction)onButton1Click:(UIButton *)sender {
-
 }
 
 - (IBAction)segmentOnClick:(UISegmentedControl *)sender {
+    
+}
+
+- (IBAction)pageValueChanged:(UIPageControl *)sender {
 
 }
 
--(void) labelTouchUpInside:(UITapGestureRecognizer *)recognizer{
+-(void) longTouchUpInside:(UILongPressGestureRecognizer *)recognizer{
     UILabel *label=(UILabel*)recognizer.view;
-    NSLog(@"%@被点击了",label.text);
+    NSLog(@"%@手势长按",label.text);
 
 }
 
diff --git a/Example/SensorsData/Base.lproj/LaunchScreen.xib b/Example/SensorsData/Base.lproj/LaunchScreen.xib
index 14dc0659..5eacaba1 100644
--- a/Example/SensorsData/Base.lproj/LaunchScreen.xib
+++ b/Example/SensorsData/Base.lproj/LaunchScreen.xib
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,7 +11,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015年 SensorsData. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2015年 Sensors Data Co., Ltd. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="20" y="439" width="440" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
diff --git a/Example/SensorsData/Base.lproj/Main.storyboard b/Example/SensorsData/Base.lproj/Main.storyboard
index f9a49116..a9d1fbed 100644
--- a/Example/SensorsData/Base.lproj/Main.storyboard
+++ b/Example/SensorsData/Base.lproj/Main.storyboard
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="O4G-ih-TAZ">
-    <device id="retina4_0" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="O4G-ih-TAZ">
+    <device id="retina4_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -21,14 +19,14 @@
                             <tableViewSection id="liH-bH-H2Z">
                                 <cells>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="uG1-aa-isO">
-                                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uG1-aa-isO" id="CuM-4t-6gZ">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试track" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9ks-bs-3g6">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -43,14 +41,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="fS5-iN-SBM">
-                                        <rect key="frame" x="0.0" y="44" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="72" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fS5-iN-SBM" id="9Lw-0E-Ci0">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试track_signup" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZqZ-gB-ftf">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -65,14 +63,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="3q7-78-CLU">
-                                        <rect key="frame" x="0.0" y="88" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="116" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3q7-78-CLU" id="bgU-vb-jLj">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试track_installation" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FC5-hh-o38">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -87,14 +85,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="FQ1-9r-QnK">
-                                        <rect key="frame" x="0.0" y="132" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="160" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FQ1-9r-QnK" id="yS6-1l-1ad">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试profile_set" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H2g-h2-5cO">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -109,14 +107,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="kRr-EW-dt8">
-                                        <rect key="frame" x="0.0" y="176" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="204" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kRr-EW-dt8" id="8VL-6N-ECm">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试profile_append" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vno-wu-pxb">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -131,14 +129,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="Oqf-lc-qgn">
-                                        <rect key="frame" x="0.0" y="220" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="248" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Oqf-lc-qgn" id="vTI-Cz-TZz">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试profile_increment" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WYF-OO-uEl">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -153,14 +151,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="1Ie-NC-Tor">
-                                        <rect key="frame" x="0.0" y="264" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="292" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Ie-NC-Tor" id="Cph-sN-554">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试profile_unset" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tZY-78-owS">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -175,14 +173,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="U9P-ro-Ahb">
-                                        <rect key="frame" x="0.0" y="308" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="336" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="U9P-ro-Ahb" id="LXp-Cm-V8T">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试profile_delete" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d8i-i8-TZs">
-                                                    <rect key="frame" x="8" y="0.0" width="304" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="304" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -197,14 +195,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" id="QcM-On-LHT">
-                                        <rect key="frame" x="0.0" y="352" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="380" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="QcM-On-LHT" id="aIs-aQ-Rw4">
-                                            <rect key="frame" x="0.0" y="0.0" width="286" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="293" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试flush" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SDq-0f-Dsw">
-                                                    <rect key="frame" x="8" y="0.0" width="270" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="277" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -219,14 +217,14 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" id="dKN-0q-GZn">
-                                        <rect key="frame" x="0.0" y="396" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="424" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="dKN-0q-GZn" id="FhT-PN-nla">
-                                            <rect key="frame" x="0.0" y="0.0" width="286" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="293" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试无埋点" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lpv-YT-FlG">
-                                                    <rect key="frame" x="8" y="0.0" width="270" height="43.5"/>
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试全埋点" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lpv-YT-FlG">
+                                                    <rect key="frame" x="8" y="0.0" width="277" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -245,14 +243,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" id="22u-cc-If8">
-                                        <rect key="frame" x="0.0" y="440" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="468" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="22u-cc-If8" id="VKJ-QS-ply">
-                                            <rect key="frame" x="0.0" y="0.0" width="286" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="293" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试JS注入(UIWebView)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WJ6-6f-OcJ">
-                                                    <rect key="frame" x="8" y="0.0" width="270" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="277" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -270,14 +268,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" id="5dy-g8-CJ2">
-                                        <rect key="frame" x="0.0" y="484" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="512" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5dy-g8-CJ2" id="oX3-Hi-oku">
-                                            <rect key="frame" x="0.0" y="0.0" width="286" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="293" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="测试JS注入(WKWebView)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jYk-bT-PWv">
-                                                    <rect key="frame" x="8" y="0.0" width="270" height="43.5"/>
+                                                    <rect key="frame" x="8" y="0.0" width="277" height="44"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -360,7 +358,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AQe-ge-t3D">
-                                <rect key="frame" x="36" y="81" width="100" height="30"/>
+                                <rect key="frame" x="36" y="61" width="100" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="qLw-ur-L7e"/>
                                     <constraint firstAttribute="height" constant="30" id="yzL-aX-bxa"/>
@@ -371,14 +369,14 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OYz-cB-xTq">
-                                <rect key="frame" x="193" y="81" width="91" height="30"/>
+                                <rect key="frame" x="193" y="61" width="91" height="30"/>
                                 <state key="normal" title="第二个button"/>
                                 <connections>
                                     <segue destination="E0X-FZ-J62" kind="show" id="ebD-e1-sIg"/>
                                 </connections>
                             </button>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="我是TextField" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Xab-Ib-gIt">
-                                <rect key="frame" x="20" y="119" width="280" height="35"/>
+                                <rect key="frame" x="20" y="99" width="280" height="35"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="35" id="86e-Kh-afL"/>
                                 </constraints>
@@ -438,7 +436,7 @@
                                 </connections>
                             </slider>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="textView 测试" translatesAutoresizingMaskIntoConstraints="NO" id="aUe-hT-WT6">
-                                <rect key="frame" x="20" y="164" width="280" height="42"/>
+                                <rect key="frame" x="20" y="141" width="142" height="42"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="42" id="HmR-5p-deX"/>
@@ -447,7 +445,7 @@
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e12-WC-C07">
-                                <rect key="frame" x="16" y="208" width="288" height="47"/>
+                                <rect key="frame" x="16" y="188" width="288" height="67"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" placeholderIntrinsicWidth="100" placeholderIntrinsicHeight="100" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dwJ-g7-Edd">
                                         <rect key="frame" x="44" y="3" width="159" height="31"/>
@@ -463,8 +461,8 @@
                                 </subviews>
                                 <color key="backgroundColor" red="0.76287969544560374" green="0.82009100126807222" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="bottom" secondItem="dwJ-g7-Edd" secondAttribute="bottom" constant="112" id="IvW-td-2Lm"/>
-                                    <constraint firstAttribute="trailing" secondItem="dwJ-g7-Edd" secondAttribute="trailing" constant="140" id="LqF-7i-I5j"/>
+                                    <constraint firstAttribute="bottom" secondItem="dwJ-g7-Edd" secondAttribute="bottom" constant="33" id="IvW-td-2Lm"/>
+                                    <constraint firstAttribute="trailing" secondItem="dwJ-g7-Edd" secondAttribute="trailing" constant="85" id="LqF-7i-I5j"/>
                                     <constraint firstItem="dwJ-g7-Edd" firstAttribute="leading" secondItem="e12-WC-C07" secondAttribute="leading" constant="44" id="iQN-iS-NCI"/>
                                     <constraint firstItem="dwJ-g7-Edd" firstAttribute="top" secondItem="e12-WC-C07" secondAttribute="top" constant="3" id="uTv-mh-FZ7"/>
                                 </constraints>
@@ -475,6 +473,17 @@
                                     <constraint firstAttribute="height" constant="103" id="Iln-Rr-rPi"/>
                                 </constraints>
                             </imageView>
+                            <pageControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" numberOfPages="5" translatesAutoresizingMaskIntoConstraints="NO" id="qDq-Ge-Oep">
+                                <rect key="frame" x="170" y="141" width="130" height="37"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="37" id="IZu-D4-oaa"/>
+                                </constraints>
+                                <color key="pageIndicatorTintColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="currentPageIndicatorTintColor" systemColor="systemPurpleColor" red="0.68627450980000004" green="0.32156862749999998" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <connections>
+                                    <action selector="pageValueChanged:" destination="pvM-Qg-FGW" eventType="valueChanged" id="XgN-eR-vu8"/>
+                                </connections>
+                            </pageControl>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
@@ -484,17 +493,20 @@
                             <constraint firstItem="dJT-Ih-ZOR" firstAttribute="top" secondItem="g3O-Bv-ZAs" secondAttribute="bottom" constant="14" id="5Do-2N-HlU"/>
                             <constraint firstItem="dJT-Ih-ZOR" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="acF-uD-hra" secondAttribute="trailing" constant="20" id="5y6-Am-MDl"/>
                             <constraint firstItem="OYz-cB-xTq" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="AQe-ge-t3D" secondAttribute="trailing" constant="8" symbolic="YES" id="7ph-e6-pHk"/>
-                            <constraint firstItem="e12-WC-C07" firstAttribute="top" secondItem="aUe-hT-WT6" secondAttribute="bottom" constant="2" id="9TO-pn-RTl"/>
+                            <constraint firstItem="e12-WC-C07" firstAttribute="top" secondItem="aUe-hT-WT6" secondAttribute="bottom" constant="5" id="9TO-pn-RTl"/>
                             <constraint firstItem="OYz-cB-xTq" firstAttribute="baseline" secondItem="AQe-ge-t3D" secondAttribute="baseline" id="9so-gv-FbV"/>
                             <constraint firstItem="AQe-ge-t3D" firstAttribute="top" secondItem="Hlw-57-PgH" secondAttribute="bottom" constant="17" id="DRV-ag-JAP"/>
                             <constraint firstItem="g3O-Bv-ZAs" firstAttribute="top" secondItem="L9V-ek-xdw" secondAttribute="bottom" constant="15" id="I3K-a9-2dw"/>
                             <constraint firstItem="cYd-MJ-ZpM" firstAttribute="top" secondItem="dJT-Ih-ZOR" secondAttribute="bottom" constant="16" id="I9i-6p-Sy1"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="qDq-Ge-Oep" secondAttribute="trailing" constant="4" id="JwD-S6-Z2C"/>
                             <constraint firstItem="cYd-MJ-ZpM" firstAttribute="top" secondItem="acF-uD-hra" secondAttribute="bottom" constant="16" id="N0T-Ew-ybF"/>
                             <constraint firstItem="g3O-Bv-ZAs" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="6vd-Bp-g3F" secondAttribute="trailing" constant="8" symbolic="YES" id="S5x-Jo-GDT"/>
                             <constraint firstAttribute="trailingMargin" secondItem="cYd-MJ-ZpM" secondAttribute="trailing" constant="20" id="VxM-OW-6nH"/>
+                            <constraint firstItem="qDq-Ge-Oep" firstAttribute="top" secondItem="Xab-Ib-gIt" secondAttribute="bottom" constant="7" id="bM9-PX-Ow9"/>
                             <constraint firstItem="6vd-Bp-g3F" firstAttribute="leading" secondItem="aL4-Bo-yVD" secondAttribute="leadingMargin" constant="20" id="cv2-5D-3J9"/>
                             <constraint firstItem="AQe-ge-t3D" firstAttribute="leading" secondItem="aL4-Bo-yVD" secondAttribute="leadingMargin" constant="20" id="dZh-JH-5j7"/>
                             <constraint firstItem="OYz-cB-xTq" firstAttribute="trailing" secondItem="dJT-Ih-ZOR" secondAttribute="trailing" id="dzG-NS-xFe"/>
+                            <constraint firstItem="qDq-Ge-Oep" firstAttribute="leading" secondItem="aUe-hT-WT6" secondAttribute="trailing" constant="8" id="ehl-N0-Tnk"/>
                             <constraint firstItem="6l3-Lz-8eY" firstAttribute="top" secondItem="cYd-MJ-ZpM" secondAttribute="bottom" constant="30" id="fVU-WD-z8A"/>
                             <constraint firstItem="L9V-ek-xdw" firstAttribute="trailing" secondItem="aL4-Bo-yVD" secondAttribute="trailingMargin" id="g0G-Yb-xCQ"/>
                             <constraint firstItem="acF-uD-hra" firstAttribute="top" secondItem="6vd-Bp-g3F" secondAttribute="bottom" constant="15" id="ggV-xd-JiU"/>
@@ -506,9 +518,9 @@
                             <constraint firstItem="L9V-ek-xdw" firstAttribute="top" secondItem="e12-WC-C07" secondAttribute="bottom" constant="45" id="pT5-TI-ePK"/>
                             <constraint firstItem="g3O-Bv-ZAs" firstAttribute="centerX" secondItem="dJT-Ih-ZOR" secondAttribute="centerX" id="phV-48-CDS"/>
                             <constraint firstItem="e12-WC-C07" firstAttribute="trailing" secondItem="aL4-Bo-yVD" secondAttribute="trailingMargin" id="svU-dk-lNI"/>
-                            <constraint firstItem="aUe-hT-WT6" firstAttribute="top" secondItem="Xab-Ib-gIt" secondAttribute="bottom" constant="10" id="vuv-Ej-y3v"/>
+                            <constraint firstItem="aUe-hT-WT6" firstAttribute="top" secondItem="Xab-Ib-gIt" secondAttribute="bottom" constant="7" id="vuv-Ej-y3v"/>
                             <constraint firstAttribute="trailingMargin" secondItem="Xab-Ib-gIt" secondAttribute="trailing" constant="4" id="wEy-AC-rmn"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="aUe-hT-WT6" secondAttribute="trailing" constant="4" id="y40-sg-Iel"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="aUe-hT-WT6" secondAttribute="trailing" constant="142" id="y40-sg-Iel"/>
                         </constraints>
                     </view>
                     <tabBarItem key="tabBarItem" title="TestVC" id="A3F-AE-1kA"/>
@@ -525,7 +537,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="b9t-xA-BCI" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="770.39999999999998" y="704.79760119940033"/>
+            <point key="canvasLocation" x="768.75" y="704.57746478873241"/>
         </scene>
         <!--Test View Controller-->
         <scene sceneID="4Me-yb-Kxd">
@@ -540,7 +552,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5wG-vy-4Mj">
-                                <rect key="frame" x="137" y="231" width="46" height="30"/>
+                                <rect key="frame" x="137" y="211" width="46" height="30"/>
                                 <state key="normal" title="Button"/>
                                 <connections>
                                     <action selector="onButtonClick2:" destination="E0X-FZ-J62" eventType="touchUpInside" id="xst-DB-Ao1"/>
@@ -548,7 +560,7 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C6C-vc-DD3" customClass="UIControl">
-                                <rect key="frame" x="16" y="307" width="288" height="128"/>
+                                <rect key="frame" x="16" y="287" width="288" height="128"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Opn-LX-ky9">
                                         <rect key="frame" x="16" y="53.5" width="73" height="21"/>
@@ -621,7 +633,7 @@
                 <navigationController title="Main" id="O4G-ih-TAZ" sceneMemberID="viewController">
                     <tabBarItem key="tabBarItem" title="Item" id="gZu-Rz-HTd"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="RfU-Ya-ZLw">
-                        <rect key="frame" x="0.0" y="20" width="320" height="44"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -652,10 +664,10 @@
             <point key="canvasLocation" x="724" y="-110"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="ic_test.png" width="750" height="446"/>
-    </resources>
     <inferredMetricsTieBreakers>
         <segue reference="7su-2u-HKJ"/>
     </inferredMetricsTieBreakers>
+    <resources>
+        <image name="ic_test.png" width="750" height="446"/>
+    </resources>
 </document>
diff --git a/Example/SensorsData/DemoController.h b/Example/SensorsData/DemoController.h
index 0bc93907..28f3c109 100644
--- a/Example/SensorsData/DemoController.h
+++ b/Example/SensorsData/DemoController.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by ZouYuhan on 1/19/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/DemoController.m b/Example/SensorsData/DemoController.m
index cd22283b..38c1b5dc 100644
--- a/Example/SensorsData/DemoController.m
+++ b/Example/SensorsData/DemoController.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by ZouYuhan on 1/19/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -141,7 +141,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
             [self testFlush];
             break;
         case 9l:
-            NSLog(@"进入无埋点测试页面");
+            NSLog(@"进入全埋点测试页面");
             [self testCodeless];
             break;
         default:
diff --git a/Example/SensorsData/Info.plist b/Example/SensorsData/Info.plist
index 5cac609d..1a50049e 100644
--- a/Example/SensorsData/Info.plist
+++ b/Example/SensorsData/Info.plist
@@ -20,32 +20,14 @@
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
 	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>sa8a9ab067</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>chenchen</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>sa3f6d7cb5</string>
-			</array>
-		</dict>
 		<dict>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>cctest</string>
+			<string>bj</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>safda6b8ac</string>
+				<string>sf20191010nb</string>
 			</array>
 		</dict>
 	</array>
diff --git a/Example/SensorsData/JSCallOCViewController.h b/Example/SensorsData/JSCallOCViewController.h
index fa18e2c4..f90255ae 100644
--- a/Example/SensorsData/JSCallOCViewController.h
+++ b/Example/SensorsData/JSCallOCViewController.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 16/9/6.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/JSCallOCViewController.m b/Example/SensorsData/JSCallOCViewController.m
index de956306..345335d5 100644
--- a/Example/SensorsData/JSCallOCViewController.m
+++ b/Example/SensorsData/JSCallOCViewController.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 16/9/6.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/JSCallOCViewController2.h b/Example/SensorsData/JSCallOCViewController2.h
index 79aa7d74..cfcbde4c 100644
--- a/Example/SensorsData/JSCallOCViewController2.h
+++ b/Example/SensorsData/JSCallOCViewController2.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 16/9/6.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/JSCallOCViewController2.m b/Example/SensorsData/JSCallOCViewController2.m
index 8ae17b22..12c78e81 100644
--- a/Example/SensorsData/JSCallOCViewController2.m
+++ b/Example/SensorsData/JSCallOCViewController2.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 16/9/6.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ - (void)viewDidLoad
 //    NSString *httpStr=@"https://www.sensorsdata.cn/test/in.html";
 //    NSURL *httpUrl=[NSURL URLWithString:httpStr];
 //    NSURLRequest *request=[NSURLRequest requestWithURL:httpUrl];
-    
+
     [self.webView loadRequest:request];
 
 }
@@ -59,21 +59,14 @@ - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSStrin
 }
 
 - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler {
-    if ([[SensorsAnalyticsSDK sharedInstance] showUpWebView:webView WithRequest:navigationAction.request]) {
-        decisionHandler(WKNavigationActionPolicyCancel);
-        return;
-    }
-
     decisionHandler(WKNavigationActionPolicyAllow);
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context {
-    if (!_webView.loading) {
-        //[[SensorsAnalyticsSDK sharedInstance] showUpWebView:_webView];
-    }
 }
 
 -(void)dealloc {
     [_webView removeObserver:self forKeyPath:@"loading"];
 }
 @end
+
diff --git a/Example/SensorsData/TestCollectionViewController.h b/Example/SensorsData/TestCollectionViewController.h
index becd0589..0b5bc0f2 100644
--- a/Example/SensorsData/TestCollectionViewController.h
+++ b/Example/SensorsData/TestCollectionViewController.h
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 王灼洲 on 2017/11/3.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/TestCollectionViewController.m b/Example/SensorsData/TestCollectionViewController.m
index 7b30ba81..9d638acd 100644
--- a/Example/SensorsData/TestCollectionViewController.m
+++ b/Example/SensorsData/TestCollectionViewController.m
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 王灼洲 on 2017/11/3.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/TestTableViewController.h b/Example/SensorsData/TestTableViewController.h
index 7770da92..6afaf6ae 100644
--- a/Example/SensorsData/TestTableViewController.h
+++ b/Example/SensorsData/TestTableViewController.h
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 王灼洲 on 2017/10/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/TestTableViewController.m b/Example/SensorsData/TestTableViewController.m
index d404f5c2..5ffbfd0b 100644
--- a/Example/SensorsData/TestTableViewController.m
+++ b/Example/SensorsData/TestTableViewController.m
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 王灼洲 on 2017/10/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/TestViewController.h b/Example/SensorsData/TestViewController.h
index e23eb79d..87be250e 100644
--- a/Example/SensorsData/TestViewController.h
+++ b/Example/SensorsData/TestViewController.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/9/14.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/TestViewController.m b/Example/SensorsData/TestViewController.m
index 7ae9f69d..f0dc34e0 100644
--- a/Example/SensorsData/TestViewController.m
+++ b/Example/SensorsData/TestViewController.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/9/14.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/ViewController.h b/Example/SensorsData/ViewController.h
index cd3c6c16..53f5bd75 100644
--- a/Example/SensorsData/ViewController.h
+++ b/Example/SensorsData/ViewController.h
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 曹犟 on 15/7/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/ViewController.m b/Example/SensorsData/ViewController.m
index b3811d6e..b0e4409d 100644
--- a/Example/SensorsData/ViewController.m
+++ b/Example/SensorsData/ViewController.m
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 曹犟 on 15/7/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsData/main.m b/Example/SensorsData/main.m
index 224bc399..c82dcdc8 100644
--- a/Example/SensorsData/main.m
+++ b/Example/SensorsData/main.m
@@ -3,7 +3,7 @@
 //  SensorsData
 //
 //  Created by 曹犟 on 15/7/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsDataExtention/ShareViewController.h b/Example/SensorsDataExtention/ShareViewController.h
index 4ddc3c1e..a64a3357 100644
--- a/Example/SensorsDataExtention/ShareViewController.h
+++ b/Example/SensorsDataExtention/ShareViewController.h
@@ -3,7 +3,7 @@
 //  share
 //
 //  Created by 王灼洲 on 2018/1/12.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsDataExtention/ShareViewController.m b/Example/SensorsDataExtention/ShareViewController.m
index 6dad7fb3..46f7dfbf 100644
--- a/Example/SensorsDataExtention/ShareViewController.m
+++ b/Example/SensorsDataExtention/ShareViewController.m
@@ -3,7 +3,7 @@
 //  share
 //
 //  Created by 王灼洲 on 2018/1/12.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Example/SensorsDataSwift/AppDelegate.swift b/Example/SensorsDataSwift/AppDelegate.swift
index 91a33bb9..f0d2bd67 100644
--- a/Example/SensorsDataSwift/AppDelegate.swift
+++ b/Example/SensorsDataSwift/AppDelegate.swift
@@ -3,7 +3,7 @@
 //  SensorsDataSwift
 //
 //  Created by 王灼洲 on 2017/11/9.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let options = SAConfigOptions(serverURL: "http://sdk-test.cloud.sensorsdata.cn:8006/sa?project=default&token=95c73ae661f85aa0", launchOptions: launchOptions)
         options.maxCacheSize = 10000;
         options.autoTrackEventType = [.eventTypeAppClick,.eventTypeAppStart,.eventTypeAppEnd,.eventTypeAppViewScreen]
-        SensorsAnalyticsSDK.sharedInstance(withConfig: options)
+        SensorsAnalyticsSDK.start(configOptions: options)
 
         SensorsAnalyticsSDK.sharedInstance()?.setFlushNetworkPolicy(SensorsAnalyticsNetworkType.typeALL)
         SensorsAnalyticsSDK.sharedInstance()?.enableHeatMap()
diff --git a/Example/SensorsDataSwift/ViewController.swift b/Example/SensorsDataSwift/ViewController.swift
index e3dc30d2..eb17b5ac 100644
--- a/Example/SensorsDataSwift/ViewController.swift
+++ b/Example/SensorsDataSwift/ViewController.swift
@@ -3,7 +3,7 @@
 //  SensorsDataSwift
 //
 //  Created by 王灼洲 on 2017/11/9.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..b91f36dc
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+gem "cocoapods"
+gem "xcode-install"
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000..069b8c46
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,248 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.1)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.2)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    aws-eventstream (1.1.0)
+    aws-partitions (1.310.0)
+    aws-sdk-core (3.94.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-kms (1.30.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.63.1)
+      aws-sdk-core (~> 3, >= 3.83.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.1.3)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+    babosa (1.0.3)
+    claide (1.0.3)
+    cocoapods (1.9.1)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.9.1)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.6.6)
+      nap (~> 1.0)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.1)
+      activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.3.0)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.5.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander-fastlane (4.4.6)
+      highline (~> 1.7.2)
+    concurrent-ruby (1.1.6)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    digest-crc (0.5.1)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.5)
+    emoji_regex (1.0.1)
+    escape (0.0.4)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    excon (0.73.0)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
+    faraday-cookie_jar (0.0.6)
+      faraday (>= 0.7.4)
+      http-cookie (~> 1.0.0)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
+    fastimage (2.1.7)
+    fastlane (2.146.1)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.3, < 3.0.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.2, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored
+      commander-fastlane (>= 4.4.6, < 5.0.0)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 2.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 0.17)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 0.13.1)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-api-client (>= 0.29.2, < 0.37.0)
+      google-cloud-storage (>= 1.15.0, < 2.0.0)
+      highline (>= 1.7.2, < 2.0.0)
+      json (< 3.0.0)
+      jwt (~> 2.1.0)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multi_xml (~> 0.5)
+      multipart-post (~> 2.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      public_suffix (~> 2.0.0)
+      rubyzip (>= 1.3.0, < 2.0.0)
+      security (= 0.1.3)
+      simctl (~> 1.6.3)
+      slack-notifier (>= 2.0.0, < 3.0.0)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3)
+    ffi (1.12.2)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    google-api-client (0.36.4)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.9)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      signet (~> 0.12)
+    google-cloud-core (1.5.0)
+      google-cloud-env (~> 1.0)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.3.1)
+      faraday (>= 0.17.3, < 2.0)
+    google-cloud-errors (1.0.0)
+    google-cloud-storage (1.26.1)
+      addressable (~> 2.5)
+      digest-crc (~> 0.4)
+      google-api-client (~> 0.33)
+      google-cloud-core (~> 1.2)
+      googleauth (~> 0.9)
+      mini_mime (~> 1.0)
+    googleauth (0.12.0)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.4, < 3.0)
+      memoist (~> 0.16)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (~> 0.14)
+    highline (1.7.10)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.4.0)
+    json (2.3.0)
+    jwt (2.1.0)
+    memoist (0.16.2)
+    mini_magick (4.10.1)
+    mini_mime (1.0.2)
+    minitest (5.14.0)
+    molinillo (0.6.6)
+    multi_json (1.14.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nanaimo (0.2.6)
+    nap (1.1.0)
+    naturally (2.2.0)
+    netrc (0.11.0)
+    os (1.1.0)
+    plist (3.5.0)
+    public_suffix (2.0.5)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rouge (2.0.7)
+    ruby-macho (1.4.0)
+    rubyzip (1.3.0)
+    security (0.1.3)
+    signet (0.14.0)
+      addressable (~> 2.3)
+      faraday (>= 0.17.3, < 2.0)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.8)
+      CFPropertyList
+      naturally
+    slack-notifier (2.3.2)
+    terminal-notifier (2.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thread_safe (0.3.6)
+    tty-cursor (0.7.1)
+    tty-screen (0.7.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    typhoeus (1.3.1)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    uber (0.1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
+    word_wrap (1.0.0)
+    xcode-install (2.6.4)
+      claide (>= 0.9.1, < 1.1.0)
+      fastlane (>= 2.1.0, < 3.0.0)
+    xcodeproj (1.16.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.2.6)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods
+  fastlane
+  xcode-install
+
+BUNDLED WITH
+   1.17.2
diff --git a/LICENSE b/LICENSE
index 2244a500..23e2cef7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2015－2018 Sensors Data Inc.
+   Copyright 2015－2020 Sensors Data Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index d89a61b9..23cea79a 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![logo](https://github.com/sensorsdata/sa-sdk-android/raw/master/docs/logo.png)
+![logo](https://opensource.sensorsdata.cn/wp-content/uploads/logo.png)
 <br><br>
 [![License](https://img.shields.io/github/license/sensorsdata/sa-sdk-ios.svg)](https://github.com/sensorsdata/sa-sdk-ios/blob/master/LICENSE)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/sensorsdata/sa-sdk-ios.svg)](http://isitmaintained.com/project/sensorsdata/sa-sdk-ios "Average time to resolve an issue")
@@ -17,7 +17,11 @@
 
 ## SDK 简介
 
-SensorsAnalytics SDK 是国内第一家，也是目前唯一的开源商用版用户行为采集 SDK，目前支持代码埋点、全埋点、App 点击图、可视化全埋点等。其采集全面而灵活、性能良好，并一直优化更新。目前有 600 多家付费客户，1500+ 的 App 集成了 SensorsAnalytics SDK，使用它作为 App 数据采集利器，帮助其精准运营和支撑业务发展，其稳定和功能，经过了客户选择和时间的验证。
+SensorsAnalytics SDK 是国内第一家开源商用版用户行为采集 SDK，目前支持代码埋点、全埋点、App 点击图、可视化全埋点等。目前已累计有 1000 多家付费客户，2000+ 的 App 集成使用，作为 App 数据采集利器，致力于帮助客户挖掘更多的商业价值，为其精准运营和业务支撑提供了可靠的数据来源。其采集全面而灵活、性能良好，并一直保持稳定的迭代，经受住了时间和客户的考验。
+
+## 基本要求
+
+iOS 8.0 及以上，Xcode 9.0 及以上。
 
 ## 集成文档
 
@@ -26,7 +30,11 @@ SensorsAnalytics SDK 是国内第一家，也是目前唯一的开源商用版
 
 ## 贡献
 
-我们欢迎并非常感谢您的贡献。有关提交代码和贡献工作流的详细信息，可参考 [CONTRIBUTING.md](CONTRIBUTING.md)。
+* 1.  在您的 GitHub 账户下 fork sa-sdk-ios 开源项目；
+* 2.  根据您的需求在本地 clone 一份 sa-sdk-ios 源码；
+* 3.  您修改或者新增功能后，push 到您 fork 的远程分支；
+* 4.  创建 pull request，向 sa-sdk-ios 官方开发分支提交合入请求；
+* 5.  神策 SDK 研发团队会及时 review 代码，测试通过后合入。
 
 ## 规划
 
@@ -34,14 +42,22 @@ SensorsAnalytics SDK 是国内第一家，也是目前唯一的开源商用版
 
 ## 讨论
 
-可加入神策官方 SDK QQ 讨论群：<br><br>
-![ QQ 讨论群](https://github.com/sensorsdata/sa-sdk-android/raw/master/docs/qrCode.jpeg)
+| 扫码加入神策数据开源社区 QQ 群<br>群号：785122381 | 扫码加入神策数据开源社区微信群 |
+| ------ | ------ |
+|![ QQ 讨论群](https://opensource.sensorsdata.cn/wp-content/uploads/ContentCommonPic_1.png) | ![ 微信讨论群 ](https://opensource.sensorsdata.cn/wp-content/uploads/ContentCommonPic_2.png) |
 
-## 新书推荐
+## 公众号
 
-| 《数据驱动：从方法到实践》 | 《Android 全埋点解决方案》 |
+| 扫码关注<br>神策数据开源社区 | 扫码关注<br>神策数据开源社区服务号 |
 | ------ | ------ |
-| [![《数据驱动：从方法到实践》](https://github.com/sensorsdata/sa-sdk-android/raw/master/docs/data_driven_book.jpg)](https://u.jd.com/dWkE2x) | [![《Android 全埋点解决方案》](https://github.com/sensorsdata/sa-sdk-android/raw/master/docs/android_autotrack_book.jpg)](https://u.jd.com/2JFaeG) |
+|![ 微信订阅号 ](https://opensource.sensorsdata.cn/wp-content/uploads/ContentCommonPic_3.png) | ![ 微信服务号 ](https://opensource.sensorsdata.cn/wp-content/uploads/ContentCommonPic_4.png) |
+
+
+## 新书推荐
+
+| 《数据驱动：从方法到实践》 | 《Android 全埋点解决方案》 | 《iOS 全埋点解决方案》
+| ------ | ------ | ------ |
+| [![《数据驱动：从方法到实践》](https://opensource.sensorsdata.cn/wp-content/uploads/data_driven_book_1.jpg)](https://item.jd.com/12322322.html) | [![《Android 全埋点解决方案》](https://opensource.sensorsdata.cn/wp-content/uploads/Android-全埋点thumbnail_1.png)](https://item.jd.com/12574672.html) | [![《iOS 全埋点解决方案》](https://opensource.sensorsdata.cn/wp-content/uploads/iOS-全埋点thumbnail_1.png)](https://item.jd.com/12867068.html)
 
 
 ## 感谢
@@ -51,7 +67,7 @@ SensorsAnalytics SDK 是国内第一家，也是目前唯一的开源商用版
 
 ## License
 
-Copyright 2015－2019 Sensors Data Inc.
+Copyright 2015－2020 Sensors Data Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -64,5 +80,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-**同时，我们禁止一切基于神策数据开源 SDK 的商业活动！**
diff --git a/ROADMAP.md b/ROADMAP.md
new file mode 100755
index 00000000..8b137891
--- /dev/null
+++ b/ROADMAP.md
@@ -0,0 +1 @@
+
diff --git a/SensorsAnalyticsExtension/SensorsAnalyticsExtension.h b/SensorsAnalyticsExtension/SensorsAnalyticsExtension.h
index fd5567fc..482c1710 100644
--- a/SensorsAnalyticsExtension/SensorsAnalyticsExtension.h
+++ b/SensorsAnalyticsExtension/SensorsAnalyticsExtension.h
@@ -3,7 +3,7 @@
 //  SANetworkTests
 //
 //  Created by 张敏超 on 2019/3/12.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK.podspec b/SensorsAnalyticsSDK-pre.podspec
similarity index 73%
rename from SensorsAnalyticsSDK.podspec
rename to SensorsAnalyticsSDK-pre.podspec
index 5f43b9fa..a5e43936 100644
--- a/SensorsAnalyticsSDK.podspec
+++ b/SensorsAnalyticsSDK-pre.podspec
@@ -1,129 +1,137 @@
 Pod::Spec.new do |s|
-  s.name         = "SensorsAnalyticsSDK"
-  s.version      = "1.11.11"
-  s.summary      = "The official iOS SDK of Sensors Analytics."
+  s.name         = "SensorsAnalyticsSDK-pre"
+  s.version      = "2.1.0-pre"
+  s.summary      = "The official iOS SDK Pre of Sensors Analytics."
   s.homepage     = "http://www.sensorsdata.cn"
   s.source       = { :git => 'https://github.com/sensorsdata/sa-sdk-ios.git', :tag => "v#{s.version}" } 
   s.license = { :type => "Apache License, Version 2.0" }
   s.author = { "Yuhan ZOU" => "zouyuhan@sensorsdata.cn" }
-  s.platform = :ios, "7.0"
+  s.platform = :ios, "8.0"
   s.default_subspec = 'core'
   s.frameworks = 'UIKit', 'Foundation', 'SystemConfiguration', 'CoreTelephony', 'CoreGraphics', 'QuartzCore', 'CoreLocation', 'CoreMotion'
   s.libraries = 'icucore', 'sqlite3', 'z'
 
   s.subspec 'core' do |c|
-    c.source_files  = "SensorsAnalyticsSDK/VisualizedAutoTrack/*.{h,m}", "SensorsAnalyticsSDK/*.{h,m}","SensorsAnalyticsSDK/HeatMap/*.{h,m}"
+    c.source_files  =  "SensorsAnalyticsSDK/**/*.{h,m}"
     c.public_header_files = "SensorsAnalyticsSDK/SensorsAnalyticsSDK.h","SensorsAnalyticsSDK/SAAppExtensionDataManager.h","SensorsAnalyticsSDK/SASecurityPolicy.h","SensorsAnalyticsSDK/SAConfigOptions.h","SensorsAnalyticsSDK/SAConstants.h"
     c.resource = 'SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle'
   end
 
   # 打开 log
   s.subspec 'LOG' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_ENABLE_LOG=1'}
   end
 
-  # 自动采集 $referrer
-  s.subspec 'AUTOTRACT_APPVIEWSCREEN_URL' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
-    f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_AUTOTRACT_APPVIEWSCREEN_URL=1'}
-  end
-
   # 禁用 GPS 定位采集，相关代码不参与编译
   s.subspec 'DISABLE_TRACK_GPS' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_TRACK_GPS=1'}
   end
 
   # 禁用设备方向采集
   s.subspec 'DISABLE_TRACK_DEVICE_ORIENTATION' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION=1'}
   end
 
   # 禁用 debugMode 下弹框提示
   s.subspec 'DISABLE_DEBUG_WARNING' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_DEBUG_WARNING=1'}
   end
 
   # 不采集 UICollectionView 点击事件
   s.subspec 'DISABLE_AUTOTRACK_UICOLLECTIONVIEW' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UICOLLECTIONVIEW=1'}
   end
 
   # 不采集 UITableView 点击事件
   s.subspec 'DISABLE_AUTOTRACK_UITABLEVIEW' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UITABLEVIEW=1'}
   end
 
   # 不采集 UIImage 的名称
   s.subspec 'DISABLE_AUTOTRACK_UIIMAGE_IMAGENAME' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UIIMAGE_IMAGENAME=1'}
   end
 
   # 不采集手势点击事件
   s.subspec 'DISABLE_AUTOTRACK_GESTURE' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_AUTOTRACK_GESTURE=1'}
   end
 
   # 开启 React Native 页面控件的自动采集 $AppClick 事件
   s.subspec 'ENABLE_REACT_NATIVE_APPCLICK' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_REACT_NATIVE=1'}
   end
 
-  # 允许使用私有 API
+  # 允许使用私有 API，v2.0.0 已废弃，待删除
   s.subspec 'ENABLE_NO_PUBLIC_APIS' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_ENABLE_NO_PUBLICK_APIS=1'}
   end
 
   # 不采集 UITabBar 点击事件 
   s.subspec 'DISABLE_AUTOTRACK_UITABBAR' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UITABBAR=1'}
   end
 
   # 采集 crash slideAdress 信息，需要打开 enableTrackAppCrash 才生效
   s.subspec 'CRASH_SLIDEADDRESS' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_CRASH_SLIDEADDRESS=1'}
   end
 
   # 不采集 $device_id
   s.subspec 'DISABLE_AUTOTRACK_DEVICEID' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_AUTOTRACK_DEVICEID=1'}
   end
 
   # 支持非 UIViewController 实现 UITableView 或 UICollectionView delegate 的点击事件采集
   s.subspec 'ENABLE_AUTOTRACK_DIDSELECTROW' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_ENABLE_AUTOTRACK_DIDSELECTROW=1'}
   end
 
   # trackInstallation 不保存在 keychain，卸载重装会重新触发激活事件
   s.subspec 'DISABLE_INSTALLATION_MARK_IN_KEYCHAIN' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_INSTALLATION_MARK_IN_KEYCHAIN=1'}
   end
 
    # 禁用 keychain
    # 卸载重装会重新触发激活事件并且匿名 Id 可能会被重置
   s.subspec 'DISABLE_KEYCHAIN' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_KEYCHAIN=1'}
   end
 
   # 支持自动采集 UIViewController 子页面的 $AppViewScreen
   s.subspec 'ENABLE_CHILD_VIEWSCREEN' do |f|
-    f.dependency 'SensorsAnalyticsSDK/core'
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
     f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_ENABLE_AUTOTRACK_CHILD_VIEWSCREEN=1'}
   end
 
+  # 禁用 UIWebView
+  s.subspec 'DISABLE_UIWEBVIEW' do |f|
+    # 需要使用 WKWebView，支持最低版本为 iOS 8
+    f.platform = :ios, "8.0"
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
+    f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_UIWEBVIEW=1'}
+  end
+
+  # 禁用私有 API，可视化全埋点模块存在私有类名字符串判断
+  s.subspec 'DISABLE_PRIVATE_APIS' do |f|
+    f.dependency 'SensorsAnalyticsSDK-pre/core'
+    f.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS=1'}
+  end 
+
 end
diff --git a/SensorsAnalyticsSDK.xcodeproj/project.pbxproj b/SensorsAnalyticsSDK.xcodeproj/project.pbxproj
index a573dff6..54db4652 100644
--- a/SensorsAnalyticsSDK.xcodeproj/project.pbxproj
+++ b/SensorsAnalyticsSDK.xcodeproj/project.pbxproj
@@ -7,99 +7,114 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		4D5A01FB2411ECB2007E651A /* UIView+HeatMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D5A01F92411ECB2007E651A /* UIView+HeatMap.h */; };
+		4D5A01FC2411ECB2007E651A /* UIView+HeatMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D5A01FA2411ECB2007E651A /* UIView+HeatMap.m */; };
+		4D5A02032411EDFA007E651A /* UIView+VisualizedAutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D5A02012411EDFA007E651A /* UIView+VisualizedAutoTrack.h */; };
+		4D5A02042411EDFA007E651A /* UIView+VisualizedAutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D5A02022411EDFA007E651A /* UIView+VisualizedAutoTrack.m */; };
+		4D6118D9242F052100FB02E0 /* SAVisualizedViewPathProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D6118D8242F052100FB02E0 /* SAVisualizedViewPathProperty.h */; };
+		4D650D82242B46CB006B01BF /* SAJSTouchEventView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D650D80242B46CB006B01BF /* SAJSTouchEventView.h */; };
+		4D650D83242B46CB006B01BF /* SAJSTouchEventView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D650D81242B46CB006B01BF /* SAJSTouchEventView.m */; };
 		4D6A189122978F5B00F6B218 /* ElementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D6A188E22978F5B00F6B218 /* ElementViewController.m */; };
 		4D6A189222978F5B00F6B218 /* SAAutoTrackUtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D6A188F22978F5B00F6B218 /* SAAutoTrackUtilsTest.m */; };
+		4D76AEEF2364393400B4D0AF /* SAUtilsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D76AEEE2364393400B4D0AF /* SAUtilsTest.m */; };
+		4D9D5E31240E4ADE00E6A9A5 /* SAVisualizedUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D9D5E2F240E4ADE00E6A9A5 /* SAVisualizedUtils.h */; };
+		4D9D5E32240E4ADE00E6A9A5 /* SAVisualizedUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D9D5E30240E4ADE00E6A9A5 /* SAVisualizedUtils.m */; };
+		4DA4CB87237936BC006892D6 /* SAVisualizedAbstractMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DA4CB80237936BB006892D6 /* SAVisualizedAbstractMessage.m */; };
+		4DA4CB88237936BC006892D6 /* SAVisualizedConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DA4CB81237936BB006892D6 /* SAVisualizedConnection.m */; };
+		4DA4CB89237936BC006892D6 /* SAVisualizedConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DA4CB82237936BB006892D6 /* SAVisualizedConnection.h */; };
+		4DA4CB8A237936BC006892D6 /* SAVisualizedMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DA4CB83237936BB006892D6 /* SAVisualizedMessage.h */; };
+		4DA4CB8B237936BC006892D6 /* SAVisualizedSnapshotMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DA4CB84237936BB006892D6 /* SAVisualizedSnapshotMessage.m */; };
+		4DA4CB8C237936BC006892D6 /* SAVisualizedSnapshotMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DA4CB85237936BC006892D6 /* SAVisualizedSnapshotMessage.h */; };
+		4DA4CB8D237936BC006892D6 /* SAVisualizedAbstractMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DA4CB86237936BC006892D6 /* SAVisualizedAbstractMessage.h */; };
+		4DB14DD92456C107002C224C /* SALogMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DCA2456C106002C224C /* SALogMessage.h */; };
+		4DB14DDA2456C107002C224C /* SAAbstractLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DCB2456C106002C224C /* SAAbstractLogger.h */; };
+		4DB14DDB2456C107002C224C /* SALoggerPrePostFixFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB14DCC2456C106002C224C /* SALoggerPrePostFixFormatter.m */; };
+		4DB14DDC2456C107002C224C /* SAConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DCD2456C106002C224C /* SAConsoleLogger.h */; };
+		4DB14DDD2456C107002C224C /* SALog.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DCE2456C106002C224C /* SALog.h */; };
+		4DB14DDE2456C107002C224C /* SAFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB14DCF2456C106002C224C /* SAFileLogger.m */; };
+		4DB14DDF2456C107002C224C /* SALoggerConsoleFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB14DD02456C106002C224C /* SALoggerConsoleFormatter.m */; };
+		4DB14DE02456C107002C224C /* SALoggerPrePostFixFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DD12456C106002C224C /* SALoggerPrePostFixFormatter.h */; };
+		4DB14DE12456C107002C224C /* SAAbstractLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB14DD22456C106002C224C /* SAAbstractLogger.m */; };
+		4DB14DE22456C107002C224C /* SALogMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB14DD32456C106002C224C /* SALogMessage.m */; };
+		4DB14DE32456C107002C224C /* SAFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DD42456C106002C224C /* SAFileLogger.h */; };
+		4DB14DE42456C107002C224C /* SALog.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB14DD52456C106002C224C /* SALog.m */; };
+		4DB14DE52456C107002C224C /* SAConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB14DD62456C106002C224C /* SAConsoleLogger.m */; };
+		4DB14DE62456C107002C224C /* SALog+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DD72456C106002C224C /* SALog+Private.h */; };
+		4DB14DE72456C107002C224C /* SALoggerConsoleFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB14DD82456C106002C224C /* SALoggerConsoleFormatter.h */; };
+		4DBE3C1D24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DBE3C1B24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.h */; };
+		4DBE3C1E24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DBE3C1C24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.m */; };
+		6523731E23EBC44000A786A2 /* SAHeatMapObjectSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6523731C23EBC44000A786A2 /* SAHeatMapObjectSerializer.m */; };
+		6523731F23EBC44000A786A2 /* SAHeatMapObjectSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6523731D23EBC44000A786A2 /* SAHeatMapObjectSerializer.h */; };
+		8888473424530F9100EBA7F6 /* SAReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 8888472E24530F9100EBA7F6 /* SAReachability.m */; };
+		8888473524530F9100EBA7F6 /* SAReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = 8888472F24530F9100EBA7F6 /* SAReachability.h */; };
+		8888473624530F9100EBA7F6 /* SASecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 8888473024530F9100EBA7F6 /* SASecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		8888473724530F9100EBA7F6 /* SANetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = 8888473124530F9100EBA7F6 /* SANetwork.h */; };
+		8888473824530F9100EBA7F6 /* SANetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 8888473224530F9100EBA7F6 /* SANetwork.m */; };
+		8888473924530F9100EBA7F6 /* SASecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = 8888473324530F9100EBA7F6 /* SASecurityPolicy.m */; };
+		A83129AA246E400B00A18C25 /* SAPresetPropertyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A83129A9246E400B00A18C25 /* SAPresetPropertyTests.m */; };
+		A84FE7B8247661110090BC37 /* SAReadWriteLock.h in Headers */ = {isa = PBXBuildFile; fileRef = A84FE7B6247661100090BC37 /* SAReadWriteLock.h */; };
+		A84FE7B9247661110090BC37 /* SAReadWriteLock.m in Sources */ = {isa = PBXBuildFile; fileRef = A84FE7B7247661100090BC37 /* SAReadWriteLock.m */; };
+		A86663CA249A892E0065A540 /* SAEncryptSecretKeyHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = A86663C8249A892E0065A540 /* SAEncryptSecretKeyHandler.h */; };
+		A86663CB249A892E0065A540 /* SAEncryptSecretKeyHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A86663C9249A892E0065A540 /* SAEncryptSecretKeyHandler.m */; };
+		A869D69F242F57F600069B6E /* WKWebView+SABridge.h in Headers */ = {isa = PBXBuildFile; fileRef = A869D69B242F57F600069B6E /* WKWebView+SABridge.h */; };
+		A869D6A0242F57F600069B6E /* SAScriptMessageHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = A869D69C242F57F600069B6E /* SAScriptMessageHandler.m */; };
+		A869D6A1242F57F600069B6E /* WKWebView+SABridge.m in Sources */ = {isa = PBXBuildFile; fileRef = A869D69D242F57F600069B6E /* WKWebView+SABridge.m */; };
+		A869D6A2242F57F600069B6E /* SAScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = A869D69E242F57F600069B6E /* SAScriptMessageHandler.h */; };
+		A8E962EB246A4373006A337D /* SAPresetProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = A8E962E9246A4373006A337D /* SAPresetProperty.h */; };
+		A8E962EC246A4373006A337D /* SAPresetProperty.m in Sources */ = {isa = PBXBuildFile; fileRef = A8E962EA246A4373006A337D /* SAPresetProperty.m */; };
 		CB30C03F22840EC00004061D /* SATypeDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFD222840EBF0004061D /* SATypeDescription.m */; };
-		CB30C04022840EC00004061D /* SASecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFD322840EBF0004061D /* SASecurityPolicy.m */; };
 		CB30C04222840EC00004061D /* NSString+HashCode.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFD522840EBF0004061D /* NSString+HashCode.m */; };
-		CB30C04322840EC00004061D /* UIView+SAHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFD622840EBF0004061D /* UIView+SAHelpers.h */; };
-		CB30C04422840EC00004061D /* SANetwork+URLUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFD722840EBF0004061D /* SANetwork+URLUtils.m */; };
 		CB30C04522840EC00004061D /* NSInvocation+SAHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFD822840EBF0004061D /* NSInvocation+SAHelpers.h */; };
 		CB30C04622840EC00004061D /* SAObjectIdentityProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFD922840EBF0004061D /* SAObjectIdentityProvider.h */; };
-		CB30C04822840EC00004061D /* SANetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFDB22840EBF0004061D /* SANetwork.m */; };
 		CB30C04922840EC00004061D /* SensorsAnalyticsSDK.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFDC22840EBF0004061D /* SensorsAnalyticsSDK.m */; };
 		CB30C04A22840EC00004061D /* SAObjectSerializerContext.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFDD22840EBF0004061D /* SAObjectSerializerContext.h */; };
 		CB30C04C22840EC00004061D /* SAClassDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFDF22840EBF0004061D /* SAClassDescription.h */; };
 		CB30C04D22840EC00004061D /* SASDKRemoteConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFE022840EBF0004061D /* SASDKRemoteConfig.m */; };
-		CB30C04E22840EC00004061D /* SAAbstractDesignerMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFE122840EBF0004061D /* SAAbstractDesignerMessage.h */; };
-		CB30C04F22840EC00004061D /* SAObjectSelector.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFE222840EBF0004061D /* SAObjectSelector.m */; };
 		CB30C05022840EC00004061D /* SAConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFE322840EBF0004061D /* SAConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CB30C05122840EC00004061D /* SASwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFE422840EBF0004061D /* SASwizzle.h */; };
 		CB30C05422840EC00004061D /* SensorsAnalyticsExceptionHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFE722840EBF0004061D /* SensorsAnalyticsExceptionHandler.m */; };
 		CB30C05522840EC00004061D /* NSObject+SensorsAnalyticsDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFE822840EBF0004061D /* NSObject+SensorsAnalyticsDelegate.h */; };
-		CB30C05622840EC00004061D /* SACommonUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFE922840EBF0004061D /* SACommonUtility.m */; };
-		CB30C05722840EC00004061D /* SAJSONUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFEA22840EBF0004061D /* SAJSONUtil.m */; };
 		CB30C05822840EC00004061D /* SADeviceOrientationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFEB22840EBF0004061D /* SADeviceOrientationManager.h */; };
 		CB30C05922840EC00004061D /* SAConfigOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFEC22840EBF0004061D /* SAConfigOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CB30C05A22840EC00004061D /* SAConstants+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFED22840EBF0004061D /* SAConstants+Private.h */; };
 		CB30C05C22840EC00004061D /* SALocationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFEF22840EBF0004061D /* SALocationManager.h */; };
 		CB30C05D22840EC00004061D /* SAAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFF022840EBF0004061D /* SAAlertController.m */; };
 		CB30C05E22840EC00004061D /* SAObjectSerializerConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFF122840EBF0004061D /* SAObjectSerializerConfig.h */; };
-		CB30C05F22840EC00004061D /* SAGzipUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFF222840EBF0004061D /* SAGzipUtility.h */; };
 		CB30C06022840EC00004061D /* SAAuxiliaryToolManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFF322840EBF0004061D /* SAAuxiliaryToolManager.h */; };
-		CB30C06122840EC00004061D /* SAReachability.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFF422840EBF0004061D /* SAReachability.h */; };
 		CB30C06222840EC00004061D /* SAPropertyDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFF522840EBF0004061D /* SAPropertyDescription.m */; };
 		CB30C06322840EC00004061D /* SensorsAnalyticsSDK+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFF622840EBF0004061D /* SensorsAnalyticsSDK+Private.h */; };
 		CB30C06422840EC00004061D /* SAAppExtensionDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFF722840EBF0004061D /* SAAppExtensionDataManager.m */; };
 		CB30C06522840EC00004061D /* SASwizzler.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFF822840EBF0004061D /* SASwizzler.m */; };
-		CB30C06622840EC00004061D /* SAObjectSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFF922840EBF0004061D /* SAObjectSerializer.h */; };
 		CB30C06722840EC00004061D /* SAEnumDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFFA22840EBF0004061D /* SAEnumDescription.m */; };
 		CB30C06822840EC00004061D /* SAValueTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFFB22840EBF0004061D /* SAValueTransformers.m */; };
-		CB30C06922840EC00004061D /* SALogger.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFFC22840EBF0004061D /* SALogger.m */; };
 		CB30C06B22840EC00004061D /* SAKeyChainItemWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFFE22840EBF0004061D /* SAKeyChainItemWrapper.m */; };
 		CB30C06C22840EC00004061D /* MessageQueueBySqlite.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30BFFF22840EBF0004061D /* MessageQueueBySqlite.m */; };
-		CB30C06D22840EC00004061D /* SANetwork.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00022840EBF0004061D /* SANetwork.h */; };
 		CB30C06E22840EC00004061D /* SensorsAnalyticsSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00122840EBF0004061D /* SensorsAnalyticsSDK.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		CB30C07022840EC00004061D /* SADesignerMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00322840EBF0004061D /* SADesignerMessage.h */; };
 		CB30C07122840EC00004061D /* SAObjectIdentityProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C00422840EBF0004061D /* SAObjectIdentityProvider.m */; };
 		CB30C07222840EC00004061D /* NSInvocation+SAHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C00522840EBF0004061D /* NSInvocation+SAHelpers.m */; };
-		CB30C07322840EC00004061D /* SANetwork+URLUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00622840EBF0004061D /* SANetwork+URLUtils.h */; };
-		CB30C07422840EC00004061D /* UIView+SAHelpers.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C00722840EBF0004061D /* UIView+SAHelpers.m */; };
 		CB30C07622840EC00004061D /* NSString+HashCode.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00922840EBF0004061D /* NSString+HashCode.h */; };
 		CB30C07722840EC00004061D /* SATypeDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00A22840EBF0004061D /* SATypeDescription.h */; };
-		CB30C07822840EC00004061D /* SASecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00B22840EBF0004061D /* SASecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CB30C07922840EC00004061D /* SALocationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C00C22840EBF0004061D /* SALocationManager.m */; };
 		CB30C07B22840EC00004061D /* SADeviceOrientationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C00E22840EBF0004061D /* SADeviceOrientationManager.m */; };
-		CB30C07C22840EC00004061D /* SAJSONUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C00F22840EBF0004061D /* SAJSONUtil.h */; };
 		CB30C07D22840EC00004061D /* SAConfigOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01022840EBF0004061D /* SAConfigOptions.m */; };
 		CB30C07E22840EC00004061D /* NSObject+SensorsAnalyticsDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01122840EBF0004061D /* NSObject+SensorsAnalyticsDelegate.m */; };
 		CB30C07F22840EC00004061D /* SensorsAnalyticsExceptionHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C01222840EBF0004061D /* SensorsAnalyticsExceptionHandler.h */; };
-		CB30C08022840EC00004061D /* SACommonUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C01322840EBF0004061D /* SACommonUtility.h */; };
 		CB30C08122840EC00004061D /* SASwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01422840EBF0004061D /* SASwizzle.m */; };
-		CB30C08422840EC00004061D /* SAObjectSelector.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C01722840EBF0004061D /* SAObjectSelector.h */; };
 		CB30C08522840EC00004061D /* SAConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01822840EBF0004061D /* SAConstants.m */; };
-		CB30C08622840EC00004061D /* SAAbstractDesignerMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01922840EBF0004061D /* SAAbstractDesignerMessage.m */; };
 		CB30C08722840EC00004061D /* SAClassDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01A22840EBF0004061D /* SAClassDescription.m */; };
 		CB30C08822840EC00004061D /* SASDKRemoteConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C01B22840EBF0004061D /* SASDKRemoteConfig.h */; };
 		CB30C08922840EC00004061D /* SAObjectSerializerContext.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01C22840EBF0004061D /* SAObjectSerializerContext.m */; };
 		CB30C08B22840EC00004061D /* SAEnumDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C01E22840EBF0004061D /* SAEnumDescription.h */; };
-		CB30C08C22840EC00004061D /* SAObjectSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01F22840EBF0004061D /* SAObjectSerializer.m */; };
+		CB30C08C22840EC00004061D /* SAVisualizedAutoTrackObjectSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C01F22840EBF0004061D /* SAVisualizedAutoTrackObjectSerializer.m */; };
 		CB30C08D22840EC00004061D /* SASwizzler.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C02022840EBF0004061D /* SASwizzler.h */; };
 		CB30C08E22840EC00004061D /* SAAppExtensionDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C02122840EBF0004061D /* SAAppExtensionDataManager.h */; };
-		CB30C08F22840EC00004061D /* SAHeatMapSnapshotMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C02322840EBF0004061D /* SAHeatMapSnapshotMessage.m */; };
-		CB30C09022840EC00004061D /* SAHeatMapConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C02422840EBF0004061D /* SAHeatMapConnection.h */; };
-		CB30C09122840EC00004061D /* SAAbstractHeatMapMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C02522840EBF0004061D /* SAAbstractHeatMapMessage.h */; };
-		CB30C09222840EC00004061D /* SAHeatMapConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C02622840EBF0004061D /* SAHeatMapConnection.m */; };
-		CB30C09322840EC00004061D /* SAHeatMapSnapshotMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C02722840EBF0004061D /* SAHeatMapSnapshotMessage.h */; };
-		CB30C09422840EC00004061D /* SAHeatMapMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C02822840EBF0004061D /* SAHeatMapMessage.h */; };
-		CB30C09522840EC00004061D /* SAAbstractHeatMapMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C02922840EBF0004061D /* SAAbstractHeatMapMessage.m */; };
 		CB30C09622840EC00004061D /* SAPropertyDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C02A22840EBF0004061D /* SAPropertyDescription.h */; };
 		CB30C09722840EC00004061D /* SAAuxiliaryToolManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C02B22840EBF0004061D /* SAAuxiliaryToolManager.m */; };
-		CB30C09822840EC00004061D /* SAReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C02C22840EBF0004061D /* SAReachability.m */; };
-		CB30C09922840EC00004061D /* SAGzipUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C02D22840EBF0004061D /* SAGzipUtility.m */; };
 		CB30C09A22840EC00004061D /* SensorsAnalyticsSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CB30C02E22840EBF0004061D /* SensorsAnalyticsSDK.bundle */; };
 		CB30C09B22840EC00004061D /* SAObjectSerializerConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C02F22840EBF0004061D /* SAObjectSerializerConfig.m */; };
 		CB30C09C22840EC00004061D /* SAAlertController.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03022840EBF0004061D /* SAAlertController.h */; };
 		CB30C09D22840EC00004061D /* MessageQueueBySqlite.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03122840EBF0004061D /* MessageQueueBySqlite.h */; };
 		CB30C09E22840EC00004061D /* SAKeyChainItemWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03222840EBF0004061D /* SAKeyChainItemWrapper.h */; };
-		CB30C0A022840EC00004061D /* SAVisualizedAutoTrackSnapshotMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C03522840EBF0004061D /* SAVisualizedAutoTrackSnapshotMessage.m */; };
-		CB30C0A122840EC00004061D /* SAVisualizedAutoTrackMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03622840EBF0004061D /* SAVisualizedAutoTrackMessage.h */; };
-		CB30C0A222840EC00004061D /* SAVisualizedAutoTrackConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C03722840EBF0004061D /* SAVisualizedAutoTrackConnection.m */; };
-		CB30C0A322840EC00004061D /* SAVisualizedAutoTrackAbstractMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03822840EBF0004061D /* SAVisualizedAutoTrackAbstractMessage.h */; };
-		CB30C0A422840EC00004061D /* SAVisualizedAutoTrackSnapshotMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03922840EBF0004061D /* SAVisualizedAutoTrackSnapshotMessage.h */; };
-		CB30C0A522840EC00004061D /* SAVisualizedAutoTrackAbstractMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C03A22840EBF0004061D /* SAVisualizedAutoTrackAbstractMessage.m */; };
-		CB30C0A622840EC00004061D /* SAVisualizedAutoTrackConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03B22840EBF0004061D /* SAVisualizedAutoTrackConnection.h */; };
-		CB30C0A822840EC00004061D /* SALogger.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03D22840EBF0004061D /* SALogger.h */; };
 		CB30C0A922840EC00004061D /* SAValueTransformers.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C03E22840EBF0004061D /* SAValueTransformers.h */; };
 		CB30C31322843D3A0004061D /* SensorsAnalyticsExtension.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30C31122843D3A0004061D /* SensorsAnalyticsExtension.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		CB30C32522843E380004061D /* SAAppExtensionDataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = CB30C32322843E380004061D /* SAAppExtensionDataManager.m */; };
@@ -112,19 +127,62 @@
 		CB6EBAF422855222003CFBA8 /* ca.cer1 in Resources */ = {isa = PBXBuildFile; fileRef = CB6EBAF022855222003CFBA8 /* ca.cer1 */; };
 		CB6EBAF522855222003CFBA8 /* ca.der.cer in Resources */ = {isa = PBXBuildFile; fileRef = CB6EBAF122855222003CFBA8 /* ca.der.cer */; };
 		CB6EBAF622855222003CFBA8 /* SANetworkTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB6EBAF222855222003CFBA8 /* SANetworkTests.m */; };
-		CB6EBAF92285546F003CFBA8 /* SALogger.h in Headers */ = {isa = PBXBuildFile; fileRef = CB6EBAF72285546F003CFBA8 /* SALogger.h */; };
-		CB6EBAFA2285546F003CFBA8 /* SALogger.m in Sources */ = {isa = PBXBuildFile; fileRef = CB6EBAF82285546F003CFBA8 /* SALogger.m */; };
-		CB6EBB9C22857BC0003CFBA8 /* UIGestureRecognizer+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = CB6EBB9122857BBF003CFBA8 /* UIGestureRecognizer+AutoTrack.m */; };
-		CB6EBB9D22857BC0003CFBA8 /* UIGestureRecognizer+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = CB6EBB9222857BBF003CFBA8 /* UIGestureRecognizer+AutoTrack.h */; };
-		CB6EBB9E22857BC0003CFBA8 /* UIApplication+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = CB6EBB9322857BBF003CFBA8 /* UIApplication+AutoTrack.m */; };
-		CB6EBB9F22857BC0003CFBA8 /* UIApplication+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = CB6EBB9422857BBF003CFBA8 /* UIApplication+AutoTrack.h */; };
-		CB6EBBA122857BC0003CFBA8 /* UIView+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = CB6EBB9622857BBF003CFBA8 /* UIView+AutoTrack.h */; };
-		CB6EBBA222857BC0003CFBA8 /* SAAutoTrackProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = CB6EBB9722857BC0003CFBA8 /* SAAutoTrackProperty.h */; };
-		CB6EBBA322857BC0003CFBA8 /* UIView+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = CB6EBB9822857BC0003CFBA8 /* UIView+AutoTrack.m */; };
-		CB6EBBA422857BC0003CFBA8 /* SAAutoTrackUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = CB6EBB9922857BC0003CFBA8 /* SAAutoTrackUtils.m */; };
-		CB6EBBA522857BC0003CFBA8 /* SAAutoTrackUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = CB6EBB9A22857BC0003CFBA8 /* SAAutoTrackUtils.h */; };
-		CBE4DF03228AA1CB00DDE07D /* UIViewController+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = CBE4DF01228AA1CA00DDE07D /* UIViewController+AutoTrack.h */; };
-		CBE4DF04228AA1CB00DDE07D /* UIViewController+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = CBE4DF02228AA1CB00DDE07D /* UIViewController+AutoTrack.m */; };
+		F2402D94244176B000F7B06D /* SALogMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D85244176B000F7B06D /* SALogMessage.h */; };
+		F2402D95244176B000F7B06D /* SAAbstractLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D86244176B000F7B06D /* SAAbstractLogger.h */; };
+		F2402D96244176B000F7B06D /* SALoggerPrePostFixFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F2402D87244176B000F7B06D /* SALoggerPrePostFixFormatter.m */; };
+		F2402D97244176B000F7B06D /* SAConsoleLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D88244176B000F7B06D /* SAConsoleLogger.h */; };
+		F2402D98244176B000F7B06D /* SALog.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D89244176B000F7B06D /* SALog.h */; };
+		F2402D99244176B000F7B06D /* SAFileLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F2402D8A244176B000F7B06D /* SAFileLogger.m */; };
+		F2402D9A244176B000F7B06D /* SALoggerConsoleFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = F2402D8B244176B000F7B06D /* SALoggerConsoleFormatter.m */; };
+		F2402D9B244176B000F7B06D /* SALoggerPrePostFixFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D8C244176B000F7B06D /* SALoggerPrePostFixFormatter.h */; };
+		F2402D9C244176B000F7B06D /* SAAbstractLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F2402D8D244176B000F7B06D /* SAAbstractLogger.m */; };
+		F2402D9D244176B000F7B06D /* SALogMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = F2402D8E244176B000F7B06D /* SALogMessage.m */; };
+		F2402D9E244176B000F7B06D /* SAFileLogger.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D8F244176B000F7B06D /* SAFileLogger.h */; };
+		F2402D9F244176B000F7B06D /* SALog.m in Sources */ = {isa = PBXBuildFile; fileRef = F2402D90244176B000F7B06D /* SALog.m */; };
+		F2402DA0244176B000F7B06D /* SAConsoleLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F2402D91244176B000F7B06D /* SAConsoleLogger.m */; };
+		F2402DA1244176B000F7B06D /* SALog+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D92244176B000F7B06D /* SALog+Private.h */; };
+		F2402DA2244176B000F7B06D /* SALoggerConsoleFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = F2402D93244176B000F7B06D /* SALoggerConsoleFormatter.h */; };
+		FC1AFF0123C32AB000F1B9E4 /* SALinkHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1AFEFF23C32AB000F1B9E4 /* SALinkHandler.h */; };
+		FC1AFF0223C32AB000F1B9E4 /* SALinkHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = FC1AFF0023C32AB000F1B9E4 /* SALinkHandler.m */; };
+		FC1AFF0523C3400E00F1B9E4 /* SAFileStore.h in Headers */ = {isa = PBXBuildFile; fileRef = FC1AFF0323C3400E00F1B9E4 /* SAFileStore.h */; };
+		FC1AFF0623C3400E00F1B9E4 /* SAFileStore.m in Sources */ = {isa = PBXBuildFile; fileRef = FC1AFF0423C3400E00F1B9E4 /* SAFileStore.m */; };
+		FC23719523D0519A00DDD708 /* SALinkHandlerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FC23719423D0519A00DDD708 /* SALinkHandlerTests.m */; };
+		FC3C58DA23BEEFB000D83BF4 /* SATrackTimerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FC3C58D923BEEFB000D83BF4 /* SATrackTimerTests.m */; };
+		FC5A4BBB244E976F00063624 /* SAURLUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BAF244E976F00063624 /* SAURLUtils.h */; };
+		FC5A4BBC244E976F00063624 /* SAURLUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BB0244E976F00063624 /* SAURLUtils.m */; };
+		FC5A4BBD244E976F00063624 /* SAJSONUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BB1244E976F00063624 /* SAJSONUtil.m */; };
+		FC5A4BBE244E976F00063624 /* SAGzipUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BB2244E976F00063624 /* SAGzipUtility.m */; };
+		FC5A4BBF244E976F00063624 /* SACommonUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BB3244E976F00063624 /* SACommonUtility.m */; };
+		FC5A4BC0244E976F00063624 /* SAGzipUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BB4244E976F00063624 /* SAGzipUtility.h */; };
+		FC5A4BC1244E976F00063624 /* SAWeakPropertyContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BB5244E976F00063624 /* SAWeakPropertyContainer.h */; };
+		FC5A4BC2244E976F00063624 /* SADateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BB6244E976F00063624 /* SADateFormatter.m */; };
+		FC5A4BC3244E976F00063624 /* SAWeakPropertyContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BB7244E976F00063624 /* SAWeakPropertyContainer.m */; };
+		FC5A4BC4244E976F00063624 /* SACommonUtility.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BB8244E976F00063624 /* SACommonUtility.h */; };
+		FC5A4BC5244E976F00063624 /* SADateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BB9244E976F00063624 /* SADateFormatter.h */; };
+		FC5A4BC6244E976F00063624 /* SAJSONUtil.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BBA244E976F00063624 /* SAJSONUtil.h */; };
+		FC5A4BC9244E97A600063624 /* SAValidator.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BC7244E97A600063624 /* SAValidator.h */; };
+		FC5A4BCA244E97A600063624 /* SAValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BC8244E97A600063624 /* SAValidator.m */; };
+		FC5A4BD7244E980700063624 /* UIGestureRecognizer+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BCC244E980700063624 /* UIGestureRecognizer+AutoTrack.h */; };
+		FC5A4BD8244E980700063624 /* SAAutoTrackUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BCD244E980700063624 /* SAAutoTrackUtils.h */; };
+		FC5A4BD9244E980700063624 /* UIView+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BCE244E980700063624 /* UIView+AutoTrack.h */; };
+		FC5A4BDA244E980700063624 /* UIViewController+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BCF244E980700063624 /* UIViewController+AutoTrack.m */; };
+		FC5A4BDB244E980700063624 /* SAAutoTrackProperty.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BD0244E980700063624 /* SAAutoTrackProperty.h */; };
+		FC5A4BDC244E980700063624 /* UIApplication+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BD1244E980700063624 /* UIApplication+AutoTrack.m */; };
+		FC5A4BDD244E980700063624 /* UIGestureRecognizer+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BD2244E980700063624 /* UIGestureRecognizer+AutoTrack.m */; };
+		FC5A4BDE244E980700063624 /* UIViewController+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BD3244E980700063624 /* UIViewController+AutoTrack.h */; };
+		FC5A4BDF244E980700063624 /* UIView+AutoTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BD4244E980700063624 /* UIView+AutoTrack.m */; };
+		FC5A4BE0244E980700063624 /* SAAutoTrackUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BD5244E980700063624 /* SAAutoTrackUtils.m */; };
+		FC5A4BE1244E980700063624 /* UIApplication+AutoTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BD6244E980700063624 /* UIApplication+AutoTrack.h */; };
+		FC5A4BE7244E98DC00063624 /* SAEncryptUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BE3244E98DC00063624 /* SAEncryptUtils.m */; };
+		FC5A4BE8244E98DC00063624 /* SADataEncryptBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BE4244E98DC00063624 /* SADataEncryptBuilder.h */; };
+		FC5A4BE9244E98DC00063624 /* SAEncryptUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = FC5A4BE5244E98DC00063624 /* SAEncryptUtils.h */; };
+		FC5A4BEA244E98DC00063624 /* SADataEncryptBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = FC5A4BE6244E98DC00063624 /* SADataEncryptBuilder.m */; };
+		FC5A4DEF24502ABE00063624 /* SAVisualizedAutoTrackObjectSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = CB30BFF922840EBF0004061D /* SAVisualizedAutoTrackObjectSerializer.h */; };
+		FC61B14D23B4BAD6006B4096 /* SATrackTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = FC61B14B23B4BAD6006B4096 /* SATrackTimer.h */; };
+		FC61B14E23B4BAD6006B4096 /* SATrackTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = FC61B14C23B4BAD6006B4096 /* SATrackTimer.m */; };
+		FC80AB7C242CB17A006D1D25 /* SAIdentifierTests.m in Sources */ = {isa = PBXBuildFile; fileRef = FC80AB7B242CB17A006D1D25 /* SAIdentifierTests.m */; };
+		FC906D10242DEBD900C6686D /* SAIdentifier.m in Sources */ = {isa = PBXBuildFile; fileRef = FC906D0C242DEBD800C6686D /* SAIdentifier.m */; };
+		FC906D11242DEBD900C6686D /* SAIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = FC906D0D242DEBD900C6686D /* SAIdentifier.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -138,106 +196,121 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		4D5A01F92411ECB2007E651A /* UIView+HeatMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+HeatMap.h"; sourceTree = "<group>"; };
+		4D5A01FA2411ECB2007E651A /* UIView+HeatMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+HeatMap.m"; sourceTree = "<group>"; };
+		4D5A02012411EDFA007E651A /* UIView+VisualizedAutoTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+VisualizedAutoTrack.h"; sourceTree = "<group>"; };
+		4D5A02022411EDFA007E651A /* UIView+VisualizedAutoTrack.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+VisualizedAutoTrack.m"; sourceTree = "<group>"; };
+		4D6118D8242F052100FB02E0 /* SAVisualizedViewPathProperty.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SAVisualizedViewPathProperty.h; sourceTree = "<group>"; };
+		4D650D80242B46CB006B01BF /* SAJSTouchEventView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAJSTouchEventView.h; sourceTree = "<group>"; };
+		4D650D81242B46CB006B01BF /* SAJSTouchEventView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAJSTouchEventView.m; sourceTree = "<group>"; };
 		4D6A188E22978F5B00F6B218 /* ElementViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ElementViewController.m; sourceTree = "<group>"; };
 		4D6A188F22978F5B00F6B218 /* SAAutoTrackUtilsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAutoTrackUtilsTest.m; sourceTree = "<group>"; };
 		4D6A189022978F5B00F6B218 /* ElementViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementViewController.h; sourceTree = "<group>"; };
+		4D76AEEE2364393400B4D0AF /* SAUtilsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAUtilsTest.m; sourceTree = "<group>"; };
+		4D8CE4C622E872B400829B29 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		4D9D5E2F240E4ADE00E6A9A5 /* SAVisualizedUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SAVisualizedUtils.h; sourceTree = "<group>"; };
+		4D9D5E30240E4ADE00E6A9A5 /* SAVisualizedUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedUtils.m; sourceTree = "<group>"; };
+		4DA4CB80237936BB006892D6 /* SAVisualizedAbstractMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedAbstractMessage.m; sourceTree = "<group>"; };
+		4DA4CB81237936BB006892D6 /* SAVisualizedConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedConnection.m; sourceTree = "<group>"; };
+		4DA4CB82237936BB006892D6 /* SAVisualizedConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedConnection.h; sourceTree = "<group>"; };
+		4DA4CB83237936BB006892D6 /* SAVisualizedMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedMessage.h; sourceTree = "<group>"; };
+		4DA4CB84237936BB006892D6 /* SAVisualizedSnapshotMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedSnapshotMessage.m; sourceTree = "<group>"; };
+		4DA4CB85237936BC006892D6 /* SAVisualizedSnapshotMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedSnapshotMessage.h; sourceTree = "<group>"; };
+		4DA4CB86237936BC006892D6 /* SAVisualizedAbstractMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedAbstractMessage.h; sourceTree = "<group>"; };
+		4DB14DCA2456C106002C224C /* SALogMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALogMessage.h; sourceTree = "<group>"; };
+		4DB14DCB2456C106002C224C /* SAAbstractLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAbstractLogger.h; sourceTree = "<group>"; };
+		4DB14DCC2456C106002C224C /* SALoggerPrePostFixFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALoggerPrePostFixFormatter.m; sourceTree = "<group>"; };
+		4DB14DCD2456C106002C224C /* SAConsoleLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAConsoleLogger.h; sourceTree = "<group>"; };
+		4DB14DCE2456C106002C224C /* SALog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALog.h; sourceTree = "<group>"; };
+		4DB14DCF2456C106002C224C /* SAFileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAFileLogger.m; sourceTree = "<group>"; };
+		4DB14DD02456C106002C224C /* SALoggerConsoleFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALoggerConsoleFormatter.m; sourceTree = "<group>"; };
+		4DB14DD12456C106002C224C /* SALoggerPrePostFixFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALoggerPrePostFixFormatter.h; sourceTree = "<group>"; };
+		4DB14DD22456C106002C224C /* SAAbstractLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAbstractLogger.m; sourceTree = "<group>"; };
+		4DB14DD32456C106002C224C /* SALogMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALogMessage.m; sourceTree = "<group>"; };
+		4DB14DD42456C106002C224C /* SAFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAFileLogger.h; sourceTree = "<group>"; };
+		4DB14DD52456C106002C224C /* SALog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALog.m; sourceTree = "<group>"; };
+		4DB14DD62456C106002C224C /* SAConsoleLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAConsoleLogger.m; sourceTree = "<group>"; };
+		4DB14DD72456C106002C224C /* SALog+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SALog+Private.h"; sourceTree = "<group>"; };
+		4DB14DD82456C106002C224C /* SALoggerConsoleFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALoggerConsoleFormatter.h; sourceTree = "<group>"; };
+		4DBE3C1B24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SAVisualizedObjectSerializerManger.h; sourceTree = "<group>"; };
+		4DBE3C1C24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedObjectSerializerManger.m; sourceTree = "<group>"; };
+		6523731C23EBC44000A786A2 /* SAHeatMapObjectSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAHeatMapObjectSerializer.m; sourceTree = "<group>"; };
+		6523731D23EBC44000A786A2 /* SAHeatMapObjectSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAHeatMapObjectSerializer.h; sourceTree = "<group>"; };
+		8888472E24530F9100EBA7F6 /* SAReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAReachability.m; sourceTree = "<group>"; };
+		8888472F24530F9100EBA7F6 /* SAReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAReachability.h; sourceTree = "<group>"; };
+		8888473024530F9100EBA7F6 /* SASecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SASecurityPolicy.h; sourceTree = "<group>"; };
+		8888473124530F9100EBA7F6 /* SANetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SANetwork.h; sourceTree = "<group>"; };
+		8888473224530F9100EBA7F6 /* SANetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SANetwork.m; sourceTree = "<group>"; };
+		8888473324530F9100EBA7F6 /* SASecurityPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SASecurityPolicy.m; sourceTree = "<group>"; };
+		A83129A9246E400B00A18C25 /* SAPresetPropertyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAPresetPropertyTests.m; sourceTree = "<group>"; };
+		A84FE7B6247661100090BC37 /* SAReadWriteLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SAReadWriteLock.h; path = Utils/SAReadWriteLock.h; sourceTree = "<group>"; };
+		A84FE7B7247661100090BC37 /* SAReadWriteLock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SAReadWriteLock.m; path = Utils/SAReadWriteLock.m; sourceTree = "<group>"; };
+		A86663C8249A892E0065A540 /* SAEncryptSecretKeyHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SAEncryptSecretKeyHandler.h; sourceTree = "<group>"; };
+		A86663C9249A892E0065A540 /* SAEncryptSecretKeyHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAEncryptSecretKeyHandler.m; sourceTree = "<group>"; };
+		A869D69B242F57F600069B6E /* WKWebView+SABridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WKWebView+SABridge.h"; sourceTree = "<group>"; };
+		A869D69C242F57F600069B6E /* SAScriptMessageHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAScriptMessageHandler.m; sourceTree = "<group>"; };
+		A869D69D242F57F600069B6E /* WKWebView+SABridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "WKWebView+SABridge.m"; sourceTree = "<group>"; };
+		A869D69E242F57F600069B6E /* SAScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAScriptMessageHandler.h; sourceTree = "<group>"; };
+		A8E962E9246A4373006A337D /* SAPresetProperty.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SAPresetProperty.h; sourceTree = "<group>"; };
+		A8E962EA246A4373006A337D /* SAPresetProperty.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAPresetProperty.m; sourceTree = "<group>"; };
 		CB30BD5422840CA40004061D /* SensorsAnalyticsSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SensorsAnalyticsSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CB30BFD222840EBF0004061D /* SATypeDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SATypeDescription.m; sourceTree = "<group>"; };
-		CB30BFD322840EBF0004061D /* SASecurityPolicy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SASecurityPolicy.m; sourceTree = "<group>"; };
 		CB30BFD522840EBF0004061D /* NSString+HashCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+HashCode.m"; sourceTree = "<group>"; };
-		CB30BFD622840EBF0004061D /* UIView+SAHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+SAHelpers.h"; sourceTree = "<group>"; };
-		CB30BFD722840EBF0004061D /* SANetwork+URLUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SANetwork+URLUtils.m"; sourceTree = "<group>"; };
 		CB30BFD822840EBF0004061D /* NSInvocation+SAHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSInvocation+SAHelpers.h"; sourceTree = "<group>"; };
 		CB30BFD922840EBF0004061D /* SAObjectIdentityProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAObjectIdentityProvider.h; sourceTree = "<group>"; };
-		CB30BFDB22840EBF0004061D /* SANetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SANetwork.m; sourceTree = "<group>"; };
 		CB30BFDC22840EBF0004061D /* SensorsAnalyticsSDK.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SensorsAnalyticsSDK.m; sourceTree = "<group>"; };
 		CB30BFDD22840EBF0004061D /* SAObjectSerializerContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAObjectSerializerContext.h; sourceTree = "<group>"; };
 		CB30BFDF22840EBF0004061D /* SAClassDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAClassDescription.h; sourceTree = "<group>"; };
 		CB30BFE022840EBF0004061D /* SASDKRemoteConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SASDKRemoteConfig.m; sourceTree = "<group>"; };
-		CB30BFE122840EBF0004061D /* SAAbstractDesignerMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAbstractDesignerMessage.h; sourceTree = "<group>"; };
-		CB30BFE222840EBF0004061D /* SAObjectSelector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAObjectSelector.m; sourceTree = "<group>"; };
 		CB30BFE322840EBF0004061D /* SAConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAConstants.h; sourceTree = "<group>"; };
 		CB30BFE422840EBF0004061D /* SASwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SASwizzle.h; sourceTree = "<group>"; };
 		CB30BFE722840EBF0004061D /* SensorsAnalyticsExceptionHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SensorsAnalyticsExceptionHandler.m; sourceTree = "<group>"; };
 		CB30BFE822840EBF0004061D /* NSObject+SensorsAnalyticsDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+SensorsAnalyticsDelegate.h"; sourceTree = "<group>"; };
-		CB30BFE922840EBF0004061D /* SACommonUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SACommonUtility.m; sourceTree = "<group>"; };
-		CB30BFEA22840EBF0004061D /* SAJSONUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAJSONUtil.m; sourceTree = "<group>"; };
 		CB30BFEB22840EBF0004061D /* SADeviceOrientationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SADeviceOrientationManager.h; sourceTree = "<group>"; };
 		CB30BFEC22840EBF0004061D /* SAConfigOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAConfigOptions.h; sourceTree = "<group>"; };
 		CB30BFED22840EBF0004061D /* SAConstants+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SAConstants+Private.h"; sourceTree = "<group>"; };
 		CB30BFEF22840EBF0004061D /* SALocationManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALocationManager.h; sourceTree = "<group>"; };
 		CB30BFF022840EBF0004061D /* SAAlertController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAlertController.m; sourceTree = "<group>"; };
 		CB30BFF122840EBF0004061D /* SAObjectSerializerConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAObjectSerializerConfig.h; sourceTree = "<group>"; };
-		CB30BFF222840EBF0004061D /* SAGzipUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAGzipUtility.h; sourceTree = "<group>"; };
 		CB30BFF322840EBF0004061D /* SAAuxiliaryToolManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAuxiliaryToolManager.h; sourceTree = "<group>"; };
-		CB30BFF422840EBF0004061D /* SAReachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAReachability.h; sourceTree = "<group>"; };
 		CB30BFF522840EBF0004061D /* SAPropertyDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAPropertyDescription.m; sourceTree = "<group>"; };
 		CB30BFF622840EBF0004061D /* SensorsAnalyticsSDK+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SensorsAnalyticsSDK+Private.h"; sourceTree = "<group>"; };
 		CB30BFF722840EBF0004061D /* SAAppExtensionDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAppExtensionDataManager.m; sourceTree = "<group>"; };
 		CB30BFF822840EBF0004061D /* SASwizzler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SASwizzler.m; sourceTree = "<group>"; };
-		CB30BFF922840EBF0004061D /* SAObjectSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAObjectSerializer.h; sourceTree = "<group>"; };
+		CB30BFF922840EBF0004061D /* SAVisualizedAutoTrackObjectSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedAutoTrackObjectSerializer.h; sourceTree = "<group>"; };
 		CB30BFFA22840EBF0004061D /* SAEnumDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAEnumDescription.m; sourceTree = "<group>"; };
 		CB30BFFB22840EBF0004061D /* SAValueTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAValueTransformers.m; sourceTree = "<group>"; };
-		CB30BFFC22840EBF0004061D /* SALogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALogger.m; sourceTree = "<group>"; };
 		CB30BFFE22840EBF0004061D /* SAKeyChainItemWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAKeyChainItemWrapper.m; sourceTree = "<group>"; };
 		CB30BFFF22840EBF0004061D /* MessageQueueBySqlite.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageQueueBySqlite.m; sourceTree = "<group>"; };
-		CB30C00022840EBF0004061D /* SANetwork.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SANetwork.h; sourceTree = "<group>"; };
 		CB30C00122840EBF0004061D /* SensorsAnalyticsSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SensorsAnalyticsSDK.h; sourceTree = "<group>"; };
-		CB30C00322840EBF0004061D /* SADesignerMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SADesignerMessage.h; sourceTree = "<group>"; };
 		CB30C00422840EBF0004061D /* SAObjectIdentityProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAObjectIdentityProvider.m; sourceTree = "<group>"; };
 		CB30C00522840EBF0004061D /* NSInvocation+SAHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSInvocation+SAHelpers.m"; sourceTree = "<group>"; };
-		CB30C00622840EBF0004061D /* SANetwork+URLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SANetwork+URLUtils.h"; sourceTree = "<group>"; };
-		CB30C00722840EBF0004061D /* UIView+SAHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+SAHelpers.m"; sourceTree = "<group>"; };
 		CB30C00922840EBF0004061D /* NSString+HashCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+HashCode.h"; sourceTree = "<group>"; };
 		CB30C00A22840EBF0004061D /* SATypeDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SATypeDescription.h; sourceTree = "<group>"; };
-		CB30C00B22840EBF0004061D /* SASecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SASecurityPolicy.h; sourceTree = "<group>"; };
 		CB30C00C22840EBF0004061D /* SALocationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALocationManager.m; sourceTree = "<group>"; };
 		CB30C00E22840EBF0004061D /* SADeviceOrientationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SADeviceOrientationManager.m; sourceTree = "<group>"; };
-		CB30C00F22840EBF0004061D /* SAJSONUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAJSONUtil.h; sourceTree = "<group>"; };
 		CB30C01022840EBF0004061D /* SAConfigOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAConfigOptions.m; sourceTree = "<group>"; };
 		CB30C01122840EBF0004061D /* NSObject+SensorsAnalyticsDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+SensorsAnalyticsDelegate.m"; sourceTree = "<group>"; };
 		CB30C01222840EBF0004061D /* SensorsAnalyticsExceptionHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SensorsAnalyticsExceptionHandler.h; sourceTree = "<group>"; };
-		CB30C01322840EBF0004061D /* SACommonUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SACommonUtility.h; sourceTree = "<group>"; };
 		CB30C01422840EBF0004061D /* SASwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SASwizzle.m; sourceTree = "<group>"; };
-		CB30C01722840EBF0004061D /* SAObjectSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAObjectSelector.h; sourceTree = "<group>"; };
 		CB30C01822840EBF0004061D /* SAConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAConstants.m; sourceTree = "<group>"; };
-		CB30C01922840EBF0004061D /* SAAbstractDesignerMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAbstractDesignerMessage.m; sourceTree = "<group>"; };
 		CB30C01A22840EBF0004061D /* SAClassDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAClassDescription.m; sourceTree = "<group>"; };
 		CB30C01B22840EBF0004061D /* SASDKRemoteConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SASDKRemoteConfig.h; sourceTree = "<group>"; };
 		CB30C01C22840EBF0004061D /* SAObjectSerializerContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAObjectSerializerContext.m; sourceTree = "<group>"; };
 		CB30C01E22840EBF0004061D /* SAEnumDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAEnumDescription.h; sourceTree = "<group>"; };
-		CB30C01F22840EBF0004061D /* SAObjectSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAObjectSerializer.m; sourceTree = "<group>"; };
+		CB30C01F22840EBF0004061D /* SAVisualizedAutoTrackObjectSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedAutoTrackObjectSerializer.m; sourceTree = "<group>"; };
 		CB30C02022840EBF0004061D /* SASwizzler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SASwizzler.h; sourceTree = "<group>"; };
 		CB30C02122840EBF0004061D /* SAAppExtensionDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAppExtensionDataManager.h; sourceTree = "<group>"; };
-		CB30C02322840EBF0004061D /* SAHeatMapSnapshotMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAHeatMapSnapshotMessage.m; sourceTree = "<group>"; };
-		CB30C02422840EBF0004061D /* SAHeatMapConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAHeatMapConnection.h; sourceTree = "<group>"; };
-		CB30C02522840EBF0004061D /* SAAbstractHeatMapMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAbstractHeatMapMessage.h; sourceTree = "<group>"; };
-		CB30C02622840EBF0004061D /* SAHeatMapConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAHeatMapConnection.m; sourceTree = "<group>"; };
-		CB30C02722840EBF0004061D /* SAHeatMapSnapshotMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAHeatMapSnapshotMessage.h; sourceTree = "<group>"; };
-		CB30C02822840EBF0004061D /* SAHeatMapMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAHeatMapMessage.h; sourceTree = "<group>"; };
-		CB30C02922840EBF0004061D /* SAAbstractHeatMapMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAbstractHeatMapMessage.m; sourceTree = "<group>"; };
 		CB30C02A22840EBF0004061D /* SAPropertyDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAPropertyDescription.h; sourceTree = "<group>"; };
 		CB30C02B22840EBF0004061D /* SAAuxiliaryToolManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAuxiliaryToolManager.m; sourceTree = "<group>"; };
-		CB30C02C22840EBF0004061D /* SAReachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAReachability.m; sourceTree = "<group>"; };
-		CB30C02D22840EBF0004061D /* SAGzipUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAGzipUtility.m; sourceTree = "<group>"; };
 		CB30C02E22840EBF0004061D /* SensorsAnalyticsSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = SensorsAnalyticsSDK.bundle; sourceTree = "<group>"; };
 		CB30C02F22840EBF0004061D /* SAObjectSerializerConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAObjectSerializerConfig.m; sourceTree = "<group>"; };
 		CB30C03022840EBF0004061D /* SAAlertController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAlertController.h; sourceTree = "<group>"; };
 		CB30C03122840EBF0004061D /* MessageQueueBySqlite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageQueueBySqlite.h; sourceTree = "<group>"; };
 		CB30C03222840EBF0004061D /* SAKeyChainItemWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAKeyChainItemWrapper.h; sourceTree = "<group>"; };
-		CB30C03522840EBF0004061D /* SAVisualizedAutoTrackSnapshotMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedAutoTrackSnapshotMessage.m; sourceTree = "<group>"; };
-		CB30C03622840EBF0004061D /* SAVisualizedAutoTrackMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedAutoTrackMessage.h; sourceTree = "<group>"; };
-		CB30C03722840EBF0004061D /* SAVisualizedAutoTrackConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedAutoTrackConnection.m; sourceTree = "<group>"; };
-		CB30C03822840EBF0004061D /* SAVisualizedAutoTrackAbstractMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedAutoTrackAbstractMessage.h; sourceTree = "<group>"; };
-		CB30C03922840EBF0004061D /* SAVisualizedAutoTrackSnapshotMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedAutoTrackSnapshotMessage.h; sourceTree = "<group>"; };
-		CB30C03A22840EBF0004061D /* SAVisualizedAutoTrackAbstractMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAVisualizedAutoTrackAbstractMessage.m; sourceTree = "<group>"; };
-		CB30C03B22840EBF0004061D /* SAVisualizedAutoTrackConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAVisualizedAutoTrackConnection.h; sourceTree = "<group>"; };
-		CB30C03D22840EBF0004061D /* SALogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALogger.h; sourceTree = "<group>"; };
 		CB30C03E22840EBF0004061D /* SAValueTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAValueTransformers.h; sourceTree = "<group>"; };
-		CB30C283228423D70004061D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CB30C30F22843D3A0004061D /* SensorsAnalyticsExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SensorsAnalyticsExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CB30C31122843D3A0004061D /* SensorsAnalyticsExtension.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SensorsAnalyticsExtension.h; sourceTree = "<group>"; };
-		CB30C31222843D3A0004061D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CB30C32322843E380004061D /* SAAppExtensionDataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SAAppExtensionDataManager.m; path = SensorsAnalyticsSDK/SAAppExtensionDataManager.m; sourceTree = SOURCE_ROOT; };
 		CB30C32422843E380004061D /* SAAppExtensionDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SAAppExtensionDataManager.h; path = SensorsAnalyticsSDK/SAAppExtensionDataManager.h; sourceTree = SOURCE_ROOT; };
 		CB30C32722843E730004061D /* SAApplicationStateSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAApplicationStateSerializer.h; sourceTree = "<group>"; };
@@ -249,19 +322,61 @@
 		CB6EBAF022855222003CFBA8 /* ca.cer1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ca.cer1; sourceTree = "<group>"; };
 		CB6EBAF122855222003CFBA8 /* ca.der.cer */ = {isa = PBXFileReference; lastKnownFileType = file; path = ca.der.cer; sourceTree = "<group>"; };
 		CB6EBAF222855222003CFBA8 /* SANetworkTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SANetworkTests.m; sourceTree = "<group>"; };
-		CB6EBAF72285546F003CFBA8 /* SALogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SALogger.h; path = SensorsAnalyticsSDK/SALogger.h; sourceTree = SOURCE_ROOT; };
-		CB6EBAF82285546F003CFBA8 /* SALogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SALogger.m; path = SensorsAnalyticsSDK/SALogger.m; sourceTree = SOURCE_ROOT; };
-		CB6EBB9122857BBF003CFBA8 /* UIGestureRecognizer+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIGestureRecognizer+AutoTrack.m"; sourceTree = "<group>"; };
-		CB6EBB9222857BBF003CFBA8 /* UIGestureRecognizer+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIGestureRecognizer+AutoTrack.h"; sourceTree = "<group>"; };
-		CB6EBB9322857BBF003CFBA8 /* UIApplication+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIApplication+AutoTrack.m"; sourceTree = "<group>"; };
-		CB6EBB9422857BBF003CFBA8 /* UIApplication+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIApplication+AutoTrack.h"; sourceTree = "<group>"; };
-		CB6EBB9622857BBF003CFBA8 /* UIView+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+AutoTrack.h"; sourceTree = "<group>"; };
-		CB6EBB9722857BC0003CFBA8 /* SAAutoTrackProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAutoTrackProperty.h; sourceTree = "<group>"; };
-		CB6EBB9822857BC0003CFBA8 /* UIView+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+AutoTrack.m"; sourceTree = "<group>"; };
-		CB6EBB9922857BC0003CFBA8 /* SAAutoTrackUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAutoTrackUtils.m; sourceTree = "<group>"; };
-		CB6EBB9A22857BC0003CFBA8 /* SAAutoTrackUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAutoTrackUtils.h; sourceTree = "<group>"; };
-		CBE4DF01228AA1CA00DDE07D /* UIViewController+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+AutoTrack.h"; sourceTree = "<group>"; };
-		CBE4DF02228AA1CB00DDE07D /* UIViewController+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+AutoTrack.m"; sourceTree = "<group>"; };
+		F2402D85244176B000F7B06D /* SALogMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALogMessage.h; sourceTree = "<group>"; };
+		F2402D86244176B000F7B06D /* SAAbstractLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAbstractLogger.h; sourceTree = "<group>"; };
+		F2402D87244176B000F7B06D /* SALoggerPrePostFixFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALoggerPrePostFixFormatter.m; sourceTree = "<group>"; };
+		F2402D88244176B000F7B06D /* SAConsoleLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAConsoleLogger.h; sourceTree = "<group>"; };
+		F2402D89244176B000F7B06D /* SALog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALog.h; sourceTree = "<group>"; };
+		F2402D8A244176B000F7B06D /* SAFileLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAFileLogger.m; sourceTree = "<group>"; };
+		F2402D8B244176B000F7B06D /* SALoggerConsoleFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALoggerConsoleFormatter.m; sourceTree = "<group>"; };
+		F2402D8C244176B000F7B06D /* SALoggerPrePostFixFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALoggerPrePostFixFormatter.h; sourceTree = "<group>"; };
+		F2402D8D244176B000F7B06D /* SAAbstractLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAbstractLogger.m; sourceTree = "<group>"; };
+		F2402D8E244176B000F7B06D /* SALogMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALogMessage.m; sourceTree = "<group>"; };
+		F2402D8F244176B000F7B06D /* SAFileLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAFileLogger.h; sourceTree = "<group>"; };
+		F2402D90244176B000F7B06D /* SALog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SALog.m; sourceTree = "<group>"; };
+		F2402D91244176B000F7B06D /* SAConsoleLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAConsoleLogger.m; sourceTree = "<group>"; };
+		F2402D92244176B000F7B06D /* SALog+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SALog+Private.h"; sourceTree = "<group>"; };
+		F2402D93244176B000F7B06D /* SALoggerConsoleFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SALoggerConsoleFormatter.h; sourceTree = "<group>"; };
+		FC1AFEFF23C32AB000F1B9E4 /* SALinkHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SALinkHandler.h; sourceTree = "<group>"; };
+		FC1AFF0023C32AB000F1B9E4 /* SALinkHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SALinkHandler.m; sourceTree = "<group>"; };
+		FC1AFF0323C3400E00F1B9E4 /* SAFileStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SAFileStore.h; sourceTree = "<group>"; };
+		FC1AFF0423C3400E00F1B9E4 /* SAFileStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAFileStore.m; sourceTree = "<group>"; };
+		FC23719423D0519A00DDD708 /* SALinkHandlerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SALinkHandlerTests.m; sourceTree = "<group>"; };
+		FC3C58D923BEEFB000D83BF4 /* SATrackTimerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SATrackTimerTests.m; sourceTree = "<group>"; };
+		FC5A4BAF244E976F00063624 /* SAURLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SAURLUtils.h; path = Utils/SAURLUtils.h; sourceTree = "<group>"; };
+		FC5A4BB0244E976F00063624 /* SAURLUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SAURLUtils.m; path = Utils/SAURLUtils.m; sourceTree = "<group>"; };
+		FC5A4BB1244E976F00063624 /* SAJSONUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SAJSONUtil.m; path = Utils/SAJSONUtil.m; sourceTree = "<group>"; };
+		FC5A4BB2244E976F00063624 /* SAGzipUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SAGzipUtility.m; path = Utils/SAGzipUtility.m; sourceTree = "<group>"; };
+		FC5A4BB3244E976F00063624 /* SACommonUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SACommonUtility.m; path = Utils/SACommonUtility.m; sourceTree = "<group>"; };
+		FC5A4BB4244E976F00063624 /* SAGzipUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SAGzipUtility.h; path = Utils/SAGzipUtility.h; sourceTree = "<group>"; };
+		FC5A4BB5244E976F00063624 /* SAWeakPropertyContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SAWeakPropertyContainer.h; path = Utils/SAWeakPropertyContainer.h; sourceTree = "<group>"; };
+		FC5A4BB6244E976F00063624 /* SADateFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SADateFormatter.m; path = Utils/SADateFormatter.m; sourceTree = "<group>"; };
+		FC5A4BB7244E976F00063624 /* SAWeakPropertyContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SAWeakPropertyContainer.m; path = Utils/SAWeakPropertyContainer.m; sourceTree = "<group>"; };
+		FC5A4BB8244E976F00063624 /* SACommonUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SACommonUtility.h; path = Utils/SACommonUtility.h; sourceTree = "<group>"; };
+		FC5A4BB9244E976F00063624 /* SADateFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SADateFormatter.h; path = Utils/SADateFormatter.h; sourceTree = "<group>"; };
+		FC5A4BBA244E976F00063624 /* SAJSONUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SAJSONUtil.h; path = Utils/SAJSONUtil.h; sourceTree = "<group>"; };
+		FC5A4BC7244E97A600063624 /* SAValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SAValidator.h; path = Utils/SAValidator.h; sourceTree = "<group>"; };
+		FC5A4BC8244E97A600063624 /* SAValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SAValidator.m; path = Utils/SAValidator.m; sourceTree = "<group>"; };
+		FC5A4BCC244E980700063624 /* UIGestureRecognizer+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIGestureRecognizer+AutoTrack.h"; sourceTree = "<group>"; };
+		FC5A4BCD244E980700063624 /* SAAutoTrackUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAutoTrackUtils.h; sourceTree = "<group>"; };
+		FC5A4BCE244E980700063624 /* UIView+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+AutoTrack.h"; sourceTree = "<group>"; };
+		FC5A4BCF244E980700063624 /* UIViewController+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+AutoTrack.m"; sourceTree = "<group>"; };
+		FC5A4BD0244E980700063624 /* SAAutoTrackProperty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAAutoTrackProperty.h; sourceTree = "<group>"; };
+		FC5A4BD1244E980700063624 /* UIApplication+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIApplication+AutoTrack.m"; sourceTree = "<group>"; };
+		FC5A4BD2244E980700063624 /* UIGestureRecognizer+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIGestureRecognizer+AutoTrack.m"; sourceTree = "<group>"; };
+		FC5A4BD3244E980700063624 /* UIViewController+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+AutoTrack.h"; sourceTree = "<group>"; };
+		FC5A4BD4244E980700063624 /* UIView+AutoTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIView+AutoTrack.m"; sourceTree = "<group>"; };
+		FC5A4BD5244E980700063624 /* SAAutoTrackUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAAutoTrackUtils.m; sourceTree = "<group>"; };
+		FC5A4BD6244E980700063624 /* UIApplication+AutoTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIApplication+AutoTrack.h"; sourceTree = "<group>"; };
+		FC5A4BE3244E98DC00063624 /* SAEncryptUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAEncryptUtils.m; sourceTree = "<group>"; };
+		FC5A4BE4244E98DC00063624 /* SADataEncryptBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SADataEncryptBuilder.h; sourceTree = "<group>"; };
+		FC5A4BE5244E98DC00063624 /* SAEncryptUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAEncryptUtils.h; sourceTree = "<group>"; };
+		FC5A4BE6244E98DC00063624 /* SADataEncryptBuilder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SADataEncryptBuilder.m; sourceTree = "<group>"; };
+		FC61B14B23B4BAD6006B4096 /* SATrackTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SATrackTimer.h; sourceTree = "<group>"; };
+		FC61B14C23B4BAD6006B4096 /* SATrackTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SATrackTimer.m; sourceTree = "<group>"; };
+		FC80AB7B242CB17A006D1D25 /* SAIdentifierTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SAIdentifierTests.m; sourceTree = "<group>"; };
+		FC906D0C242DEBD800C6686D /* SAIdentifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SAIdentifier.m; sourceTree = "<group>"; };
+		FC906D0D242DEBD900C6686D /* SAIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SAIdentifier.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -300,6 +415,125 @@
 			path = AutoTrack;
 			sourceTree = "<group>";
 		};
+		4D8CE4C522E872B400829B29 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				4D8CE4C622E872B400829B29 /* Security.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		4DA4CB71237935CF006892D6 /* Visualized */ = {
+			isa = PBXGroup;
+			children = (
+				4DA4CB83237936BB006892D6 /* SAVisualizedMessage.h */,
+				4DA4CB82237936BB006892D6 /* SAVisualizedConnection.h */,
+				4DA4CB81237936BB006892D6 /* SAVisualizedConnection.m */,
+				4DA4CB86237936BC006892D6 /* SAVisualizedAbstractMessage.h */,
+				4DA4CB80237936BB006892D6 /* SAVisualizedAbstractMessage.m */,
+				4DA4CB85237936BC006892D6 /* SAVisualizedSnapshotMessage.h */,
+				4DA4CB84237936BB006892D6 /* SAVisualizedSnapshotMessage.m */,
+				CB30C32722843E730004061D /* SAApplicationStateSerializer.h */,
+				CB30C32822843E730004061D /* SAApplicationStateSerializer.m */,
+				CB30BFF322840EBF0004061D /* SAAuxiliaryToolManager.h */,
+				CB30C02B22840EBF0004061D /* SAAuxiliaryToolManager.m */,
+				CB30BFDF22840EBF0004061D /* SAClassDescription.h */,
+				CB30C01A22840EBF0004061D /* SAClassDescription.m */,
+				CB30C01E22840EBF0004061D /* SAEnumDescription.h */,
+				CB30BFFA22840EBF0004061D /* SAEnumDescription.m */,
+				CB30BFD922840EBF0004061D /* SAObjectIdentityProvider.h */,
+				CB30C00422840EBF0004061D /* SAObjectIdentityProvider.m */,
+				CB30BFF122840EBF0004061D /* SAObjectSerializerConfig.h */,
+				CB30C02F22840EBF0004061D /* SAObjectSerializerConfig.m */,
+				CB30BFDD22840EBF0004061D /* SAObjectSerializerContext.h */,
+				CB30C01C22840EBF0004061D /* SAObjectSerializerContext.m */,
+				CB30C02A22840EBF0004061D /* SAPropertyDescription.h */,
+				CB30BFF522840EBF0004061D /* SAPropertyDescription.m */,
+				CB30C00A22840EBF0004061D /* SATypeDescription.h */,
+				CB30BFD222840EBF0004061D /* SATypeDescription.m */,
+				CB30C03E22840EBF0004061D /* SAValueTransformers.h */,
+				CB30BFFB22840EBF0004061D /* SAValueTransformers.m */,
+				CB30BFD822840EBF0004061D /* NSInvocation+SAHelpers.h */,
+				CB30C00522840EBF0004061D /* NSInvocation+SAHelpers.m */,
+			);
+			path = Visualized;
+			sourceTree = "<group>";
+		};
+		4DB14DC92456C106002C224C /* SALogger */ = {
+			isa = PBXGroup;
+			children = (
+				4DB14DCA2456C106002C224C /* SALogMessage.h */,
+				4DB14DCB2456C106002C224C /* SAAbstractLogger.h */,
+				4DB14DCC2456C106002C224C /* SALoggerPrePostFixFormatter.m */,
+				4DB14DCD2456C106002C224C /* SAConsoleLogger.h */,
+				4DB14DCE2456C106002C224C /* SALog.h */,
+				4DB14DCF2456C106002C224C /* SAFileLogger.m */,
+				4DB14DD02456C106002C224C /* SALoggerConsoleFormatter.m */,
+				4DB14DD12456C106002C224C /* SALoggerPrePostFixFormatter.h */,
+				4DB14DD22456C106002C224C /* SAAbstractLogger.m */,
+				4DB14DD32456C106002C224C /* SALogMessage.m */,
+				4DB14DD42456C106002C224C /* SAFileLogger.h */,
+				4DB14DD52456C106002C224C /* SALog.m */,
+				4DB14DD62456C106002C224C /* SAConsoleLogger.m */,
+				4DB14DD72456C106002C224C /* SALog+Private.h */,
+				4DB14DD82456C106002C224C /* SALoggerConsoleFormatter.h */,
+			);
+			path = SALogger;
+			sourceTree = "<group>";
+		};
+		6523731823EBC0B600A786A2 /* HeatMap */ = {
+			isa = PBXGroup;
+			children = (
+				6523731D23EBC44000A786A2 /* SAHeatMapObjectSerializer.h */,
+				6523731C23EBC44000A786A2 /* SAHeatMapObjectSerializer.m */,
+				4D5A01F92411ECB2007E651A /* UIView+HeatMap.h */,
+				4D5A01FA2411ECB2007E651A /* UIView+HeatMap.m */,
+			);
+			path = HeatMap;
+			sourceTree = "<group>";
+		};
+		6523731B23EBC0DC00A786A2 /* VisualizedAutoTrack */ = {
+			isa = PBXGroup;
+			children = (
+				CB30BFF922840EBF0004061D /* SAVisualizedAutoTrackObjectSerializer.h */,
+				CB30C01F22840EBF0004061D /* SAVisualizedAutoTrackObjectSerializer.m */,
+				4D6118D8242F052100FB02E0 /* SAVisualizedViewPathProperty.h */,
+				4D5A02012411EDFA007E651A /* UIView+VisualizedAutoTrack.h */,
+				4D5A02022411EDFA007E651A /* UIView+VisualizedAutoTrack.m */,
+				4D9D5E2F240E4ADE00E6A9A5 /* SAVisualizedUtils.h */,
+				4D9D5E30240E4ADE00E6A9A5 /* SAVisualizedUtils.m */,
+				4D650D80242B46CB006B01BF /* SAJSTouchEventView.h */,
+				4D650D81242B46CB006B01BF /* SAJSTouchEventView.m */,
+				4DBE3C1B24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.h */,
+				4DBE3C1C24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.m */,
+			);
+			path = VisualizedAutoTrack;
+			sourceTree = "<group>";
+		};
+		8888472D24530F8100EBA7F6 /* Network */ = {
+			isa = PBXGroup;
+			children = (
+				8888473124530F9100EBA7F6 /* SANetwork.h */,
+				8888473224530F9100EBA7F6 /* SANetwork.m */,
+				8888472F24530F9100EBA7F6 /* SAReachability.h */,
+				8888472E24530F9100EBA7F6 /* SAReachability.m */,
+				8888473024530F9100EBA7F6 /* SASecurityPolicy.h */,
+				8888473324530F9100EBA7F6 /* SASecurityPolicy.m */,
+			);
+			name = Network;
+			sourceTree = "<group>";
+		};
+		A869D69A242F57F600069B6E /* JSBridge */ = {
+			isa = PBXGroup;
+			children = (
+				A869D69B242F57F600069B6E /* WKWebView+SABridge.h */,
+				A869D69D242F57F600069B6E /* WKWebView+SABridge.m */,
+				A869D69E242F57F600069B6E /* SAScriptMessageHandler.h */,
+				A869D69C242F57F600069B6E /* SAScriptMessageHandler.m */,
+			);
+			path = JSBridge;
+			sourceTree = "<group>";
+		};
 		CB30BD4A22840CA40004061D = {
 			isa = PBXGroup;
 			children = (
@@ -307,6 +541,7 @@
 				CB30C31022843D3A0004061D /* SensorsAnalyticsExtension */,
 				CB6EBAE4228551EC003CFBA8 /* SensorsAnalyticsTests */,
 				CB30BD5522840CA40004061D /* Products */,
+				4D8CE4C522E872B400829B29 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -324,146 +559,73 @@
 			isa = PBXGroup;
 			children = (
 				CB30C0AB22840F1B0004061D /* Resources */,
-				CB30C02222840EBF0004061D /* HeatMap */,
-				CB30C03422840EBF0004061D /* VisualizedAutoTrack */,
-				CB6EBB7622857B4E003CFBA8 /* AutoTrack */,
-				CB30C0AE228410620004061D /* Network */,
-				CB30C00F22840EBF0004061D /* SAJSONUtil.h */,
-				CB30BFEA22840EBF0004061D /* SAJSONUtil.m */,
+				FC1AFF0723C45CA800F1B9E4 /* Utils */,
+				FCB60249242B46FC003CFA47 /* Builder */,
+				4DA4CB71237935CF006892D6 /* Visualized */,
+				6523731823EBC0B600A786A2 /* HeatMap */,
+				6523731B23EBC0DC00A786A2 /* VisualizedAutoTrack */,
+				A869D69A242F57F600069B6E /* JSBridge */,
+				FC5A4BE2244E98DC00063624 /* Encrypt */,
+				FC5A4BCB244E980700063624 /* AutoTrack */,
+				8888472D24530F8100EBA7F6 /* Network */,
+				4DB14DC92456C106002C224C /* SALogger */,
 				CB30C03122840EBF0004061D /* MessageQueueBySqlite.h */,
 				CB30BFFF22840EBF0004061D /* MessageQueueBySqlite.m */,
-				CB30BFD822840EBF0004061D /* NSInvocation+SAHelpers.h */,
-				CB30C00522840EBF0004061D /* NSInvocation+SAHelpers.m */,
 				CB30BFE822840EBF0004061D /* NSObject+SensorsAnalyticsDelegate.h */,
 				CB30C01122840EBF0004061D /* NSObject+SensorsAnalyticsDelegate.m */,
 				CB30C00922840EBF0004061D /* NSString+HashCode.h */,
 				CB30BFD522840EBF0004061D /* NSString+HashCode.m */,
-				CB30BFE122840EBF0004061D /* SAAbstractDesignerMessage.h */,
-				CB30C01922840EBF0004061D /* SAAbstractDesignerMessage.m */,
 				CB30C03022840EBF0004061D /* SAAlertController.h */,
 				CB30BFF022840EBF0004061D /* SAAlertController.m */,
 				CB30C02122840EBF0004061D /* SAAppExtensionDataManager.h */,
 				CB30BFF722840EBF0004061D /* SAAppExtensionDataManager.m */,
-				CB30C32722843E730004061D /* SAApplicationStateSerializer.h */,
-				CB30C32822843E730004061D /* SAApplicationStateSerializer.m */,
-				CB30BFF322840EBF0004061D /* SAAuxiliaryToolManager.h */,
-				CB30C02B22840EBF0004061D /* SAAuxiliaryToolManager.m */,
-				CB30BFDF22840EBF0004061D /* SAClassDescription.h */,
-				CB30C01A22840EBF0004061D /* SAClassDescription.m */,
-				CB30C01322840EBF0004061D /* SACommonUtility.h */,
-				CB30BFE922840EBF0004061D /* SACommonUtility.m */,
 				CB30BFEC22840EBF0004061D /* SAConfigOptions.h */,
 				CB30C01022840EBF0004061D /* SAConfigOptions.m */,
 				CB30BFE322840EBF0004061D /* SAConstants.h */,
 				CB30C01822840EBF0004061D /* SAConstants.m */,
 				CB30BFED22840EBF0004061D /* SAConstants+Private.h */,
-				CB30C00322840EBF0004061D /* SADesignerMessage.h */,
 				CB30BFEB22840EBF0004061D /* SADeviceOrientationManager.h */,
 				CB30C00E22840EBF0004061D /* SADeviceOrientationManager.m */,
-				CB30C01E22840EBF0004061D /* SAEnumDescription.h */,
-				CB30BFFA22840EBF0004061D /* SAEnumDescription.m */,
-				CB30BFF222840EBF0004061D /* SAGzipUtility.h */,
-				CB30C02D22840EBF0004061D /* SAGzipUtility.m */,
 				CB30C03222840EBF0004061D /* SAKeyChainItemWrapper.h */,
 				CB30BFFE22840EBF0004061D /* SAKeyChainItemWrapper.m */,
 				CB30BFEF22840EBF0004061D /* SALocationManager.h */,
 				CB30C00C22840EBF0004061D /* SALocationManager.m */,
-				CB30C03D22840EBF0004061D /* SALogger.h */,
-				CB30BFFC22840EBF0004061D /* SALogger.m */,
-				CB30BFD922840EBF0004061D /* SAObjectIdentityProvider.h */,
-				CB30C00422840EBF0004061D /* SAObjectIdentityProvider.m */,
-				CB30C01722840EBF0004061D /* SAObjectSelector.h */,
-				CB30BFE222840EBF0004061D /* SAObjectSelector.m */,
-				CB30BFF922840EBF0004061D /* SAObjectSerializer.h */,
-				CB30C01F22840EBF0004061D /* SAObjectSerializer.m */,
-				CB30BFF122840EBF0004061D /* SAObjectSerializerConfig.h */,
-				CB30C02F22840EBF0004061D /* SAObjectSerializerConfig.m */,
-				CB30BFDD22840EBF0004061D /* SAObjectSerializerContext.h */,
-				CB30C01C22840EBF0004061D /* SAObjectSerializerContext.m */,
-				CB30C02A22840EBF0004061D /* SAPropertyDescription.h */,
-				CB30BFF522840EBF0004061D /* SAPropertyDescription.m */,
-				CB30BFF422840EBF0004061D /* SAReachability.h */,
-				CB30C02C22840EBF0004061D /* SAReachability.m */,
 				CB30C01B22840EBF0004061D /* SASDKRemoteConfig.h */,
 				CB30BFE022840EBF0004061D /* SASDKRemoteConfig.m */,
 				CB30BFE422840EBF0004061D /* SASwizzle.h */,
 				CB30C01422840EBF0004061D /* SASwizzle.m */,
 				CB30C02022840EBF0004061D /* SASwizzler.h */,
 				CB30BFF822840EBF0004061D /* SASwizzler.m */,
-				CB30C00A22840EBF0004061D /* SATypeDescription.h */,
-				CB30BFD222840EBF0004061D /* SATypeDescription.m */,
-				CB30C03E22840EBF0004061D /* SAValueTransformers.h */,
-				CB30BFFB22840EBF0004061D /* SAValueTransformers.m */,
 				CB30C01222840EBF0004061D /* SensorsAnalyticsExceptionHandler.h */,
 				CB30BFE722840EBF0004061D /* SensorsAnalyticsExceptionHandler.m */,
 				CB30C00122840EBF0004061D /* SensorsAnalyticsSDK.h */,
 				CB30BFDC22840EBF0004061D /* SensorsAnalyticsSDK.m */,
 				CB30BFF622840EBF0004061D /* SensorsAnalyticsSDK+Private.h */,
-				CB30BFD622840EBF0004061D /* UIView+SAHelpers.h */,
-				CB30C00722840EBF0004061D /* UIView+SAHelpers.m */,
+				FC1AFEFF23C32AB000F1B9E4 /* SALinkHandler.h */,
+				FC1AFF0023C32AB000F1B9E4 /* SALinkHandler.m */,
+				FC1AFF0323C3400E00F1B9E4 /* SAFileStore.h */,
+				FC1AFF0423C3400E00F1B9E4 /* SAFileStore.m */,
+				FC61B14B23B4BAD6006B4096 /* SATrackTimer.h */,
+				FC61B14C23B4BAD6006B4096 /* SATrackTimer.m */,
 			);
 			path = SensorsAnalyticsSDK;
 			sourceTree = "<group>";
 		};
-		CB30C02222840EBF0004061D /* HeatMap */ = {
-			isa = PBXGroup;
-			children = (
-				CB30C02322840EBF0004061D /* SAHeatMapSnapshotMessage.m */,
-				CB30C02422840EBF0004061D /* SAHeatMapConnection.h */,
-				CB30C02522840EBF0004061D /* SAAbstractHeatMapMessage.h */,
-				CB30C02622840EBF0004061D /* SAHeatMapConnection.m */,
-				CB30C02722840EBF0004061D /* SAHeatMapSnapshotMessage.h */,
-				CB30C02822840EBF0004061D /* SAHeatMapMessage.h */,
-				CB30C02922840EBF0004061D /* SAAbstractHeatMapMessage.m */,
-			);
-			path = HeatMap;
-			sourceTree = "<group>";
-		};
-		CB30C03422840EBF0004061D /* VisualizedAutoTrack */ = {
-			isa = PBXGroup;
-			children = (
-				CB30C03522840EBF0004061D /* SAVisualizedAutoTrackSnapshotMessage.m */,
-				CB30C03622840EBF0004061D /* SAVisualizedAutoTrackMessage.h */,
-				CB30C03722840EBF0004061D /* SAVisualizedAutoTrackConnection.m */,
-				CB30C03822840EBF0004061D /* SAVisualizedAutoTrackAbstractMessage.h */,
-				CB30C03922840EBF0004061D /* SAVisualizedAutoTrackSnapshotMessage.h */,
-				CB30C03A22840EBF0004061D /* SAVisualizedAutoTrackAbstractMessage.m */,
-				CB30C03B22840EBF0004061D /* SAVisualizedAutoTrackConnection.h */,
-			);
-			path = VisualizedAutoTrack;
-			sourceTree = "<group>";
-		};
 		CB30C0AB22840F1B0004061D /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				CB30C283228423D70004061D /* Info.plist */,
 				CB30C02E22840EBF0004061D /* SensorsAnalyticsSDK.bundle */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
 		};
-		CB30C0AE228410620004061D /* Network */ = {
-			isa = PBXGroup;
-			children = (
-				CB30C00022840EBF0004061D /* SANetwork.h */,
-				CB30BFDB22840EBF0004061D /* SANetwork.m */,
-				CB30C00622840EBF0004061D /* SANetwork+URLUtils.h */,
-				CB30BFD722840EBF0004061D /* SANetwork+URLUtils.m */,
-				CB30C00B22840EBF0004061D /* SASecurityPolicy.h */,
-				CB30BFD322840EBF0004061D /* SASecurityPolicy.m */,
-			);
-			name = Network;
-			sourceTree = "<group>";
-		};
 		CB30C31022843D3A0004061D /* SensorsAnalyticsExtension */ = {
 			isa = PBXGroup;
 			children = (
-				CB6EBAF72285546F003CFBA8 /* SALogger.h */,
-				CB6EBAF82285546F003CFBA8 /* SALogger.m */,
+				F2402D84244176B000F7B06D /* SALogger */,
 				CB30C32422843E380004061D /* SAAppExtensionDataManager.h */,
 				CB30C32322843E380004061D /* SAAppExtensionDataManager.m */,
 				CB30C31122843D3A0004061D /* SensorsAnalyticsExtension.h */,
-				CB30C31222843D3A0004061D /* Info.plist */,
 			);
 			path = SensorsAnalyticsExtension;
 			sourceTree = "<group>";
@@ -474,7 +636,12 @@
 				4D6A188D22978F5B00F6B218 /* AutoTrack */,
 				CB6EBAEE22855222003CFBA8 /* Resources */,
 				CB6EBAF222855222003CFBA8 /* SANetworkTests.m */,
+				FC23719423D0519A00DDD708 /* SALinkHandlerTests.m */,
+				FC3C58D923BEEFB000D83BF4 /* SATrackTimerTests.m */,
+				FC80AB7B242CB17A006D1D25 /* SAIdentifierTests.m */,
 				CB6EBAE5228551EC003CFBA8 /* SensorsAnalyticsTests.m */,
+				A83129A9246E400B00A18C25 /* SAPresetPropertyTests.m */,
+				4D76AEEE2364393400B4D0AF /* SAUtilsTest.m */,
 				CB6EBAE7228551EC003CFBA8 /* Info.plist */,
 			);
 			path = SensorsAnalyticsTests;
@@ -490,22 +657,92 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
-		CB6EBB7622857B4E003CFBA8 /* AutoTrack */ = {
+		F2402D84244176B000F7B06D /* SALogger */ = {
+			isa = PBXGroup;
+			children = (
+				F2402D86244176B000F7B06D /* SAAbstractLogger.h */,
+				F2402D8D244176B000F7B06D /* SAAbstractLogger.m */,
+				F2402D88244176B000F7B06D /* SAConsoleLogger.h */,
+				F2402D91244176B000F7B06D /* SAConsoleLogger.m */,
+				F2402D8F244176B000F7B06D /* SAFileLogger.h */,
+				F2402D8A244176B000F7B06D /* SAFileLogger.m */,
+				F2402D89244176B000F7B06D /* SALog.h */,
+				F2402D90244176B000F7B06D /* SALog.m */,
+				F2402D92244176B000F7B06D /* SALog+Private.h */,
+				F2402D93244176B000F7B06D /* SALoggerConsoleFormatter.h */,
+				F2402D8B244176B000F7B06D /* SALoggerConsoleFormatter.m */,
+				F2402D8C244176B000F7B06D /* SALoggerPrePostFixFormatter.h */,
+				F2402D87244176B000F7B06D /* SALoggerPrePostFixFormatter.m */,
+				F2402D85244176B000F7B06D /* SALogMessage.h */,
+				F2402D8E244176B000F7B06D /* SALogMessage.m */,
+			);
+			name = SALogger;
+			path = SensorsAnalyticsSDK/SALogger;
+			sourceTree = SOURCE_ROOT;
+		};
+		FC1AFF0723C45CA800F1B9E4 /* Utils */ = {
+			isa = PBXGroup;
+			children = (
+				FC5A4BC7244E97A600063624 /* SAValidator.h */,
+				FC5A4BC8244E97A600063624 /* SAValidator.m */,
+				FC5A4BB8244E976F00063624 /* SACommonUtility.h */,
+				FC5A4BB3244E976F00063624 /* SACommonUtility.m */,
+				FC5A4BB9244E976F00063624 /* SADateFormatter.h */,
+				FC5A4BB6244E976F00063624 /* SADateFormatter.m */,
+				FC5A4BB4244E976F00063624 /* SAGzipUtility.h */,
+				FC5A4BB2244E976F00063624 /* SAGzipUtility.m */,
+				FC5A4BBA244E976F00063624 /* SAJSONUtil.h */,
+				FC5A4BB1244E976F00063624 /* SAJSONUtil.m */,
+				FC5A4BAF244E976F00063624 /* SAURLUtils.h */,
+				FC5A4BB0244E976F00063624 /* SAURLUtils.m */,
+				FC5A4BB5244E976F00063624 /* SAWeakPropertyContainer.h */,
+				FC5A4BB7244E976F00063624 /* SAWeakPropertyContainer.m */,
+				A84FE7B6247661100090BC37 /* SAReadWriteLock.h */,
+				A84FE7B7247661100090BC37 /* SAReadWriteLock.m */,
+			);
+			name = Utils;
+			sourceTree = "<group>";
+		};
+		FC5A4BCB244E980700063624 /* AutoTrack */ = {
+			isa = PBXGroup;
+			children = (
+				FC5A4BD0244E980700063624 /* SAAutoTrackProperty.h */,
+				FC5A4BCD244E980700063624 /* SAAutoTrackUtils.h */,
+				FC5A4BD5244E980700063624 /* SAAutoTrackUtils.m */,
+				FC5A4BCE244E980700063624 /* UIView+AutoTrack.h */,
+				FC5A4BD4244E980700063624 /* UIView+AutoTrack.m */,
+				FC5A4BD3244E980700063624 /* UIViewController+AutoTrack.h */,
+				FC5A4BCF244E980700063624 /* UIViewController+AutoTrack.m */,
+				FC5A4BD6244E980700063624 /* UIApplication+AutoTrack.h */,
+				FC5A4BD1244E980700063624 /* UIApplication+AutoTrack.m */,
+				FC5A4BCC244E980700063624 /* UIGestureRecognizer+AutoTrack.h */,
+				FC5A4BD2244E980700063624 /* UIGestureRecognizer+AutoTrack.m */,
+			);
+			path = AutoTrack;
+			sourceTree = "<group>";
+		};
+		FC5A4BE2244E98DC00063624 /* Encrypt */ = {
+			isa = PBXGroup;
+			children = (
+				FC5A4BE5244E98DC00063624 /* SAEncryptUtils.h */,
+				FC5A4BE3244E98DC00063624 /* SAEncryptUtils.m */,
+				FC5A4BE4244E98DC00063624 /* SADataEncryptBuilder.h */,
+				FC5A4BE6244E98DC00063624 /* SADataEncryptBuilder.m */,
+				A86663C8249A892E0065A540 /* SAEncryptSecretKeyHandler.h */,
+				A86663C9249A892E0065A540 /* SAEncryptSecretKeyHandler.m */,
+			);
+			path = Encrypt;
+			sourceTree = "<group>";
+		};
+		FCB60249242B46FC003CFA47 /* Builder */ = {
 			isa = PBXGroup;
 			children = (
-				CB6EBB9722857BC0003CFBA8 /* SAAutoTrackProperty.h */,
-				CB6EBB9A22857BC0003CFBA8 /* SAAutoTrackUtils.h */,
-				CB6EBB9922857BC0003CFBA8 /* SAAutoTrackUtils.m */,
-				CBE4DF01228AA1CA00DDE07D /* UIViewController+AutoTrack.h */,
-				CBE4DF02228AA1CB00DDE07D /* UIViewController+AutoTrack.m */,
-				CB6EBB9422857BBF003CFBA8 /* UIApplication+AutoTrack.h */,
-				CB6EBB9322857BBF003CFBA8 /* UIApplication+AutoTrack.m */,
-				CB6EBB9222857BBF003CFBA8 /* UIGestureRecognizer+AutoTrack.h */,
-				CB6EBB9122857BBF003CFBA8 /* UIGestureRecognizer+AutoTrack.m */,
-				CB6EBB9622857BBF003CFBA8 /* UIView+AutoTrack.h */,
-				CB6EBB9822857BC0003CFBA8 /* UIView+AutoTrack.m */,
+				FC906D0D242DEBD900C6686D /* SAIdentifier.h */,
+				FC906D0C242DEBD800C6686D /* SAIdentifier.m */,
+				A8E962E9246A4373006A337D /* SAPresetProperty.h */,
+				A8E962EA246A4373006A337D /* SAPresetProperty.m */,
 			);
-			name = AutoTrack;
+			path = Builder;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -515,61 +752,81 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4DB14DDA2456C107002C224C /* SAAbstractLogger.h in Headers */,
+				4D9D5E31240E4ADE00E6A9A5 /* SAVisualizedUtils.h in Headers */,
+				FC5A4BD9244E980700063624 /* UIView+AutoTrack.h in Headers */,
+				4DB14DDD2456C107002C224C /* SALog.h in Headers */,
+				8888473624530F9100EBA7F6 /* SASecurityPolicy.h in Headers */,
+				FC5A4BC9244E97A600063624 /* SAValidator.h in Headers */,
+				4DA4CB8C237936BC006892D6 /* SAVisualizedSnapshotMessage.h in Headers */,
+				FC5A4DEF24502ABE00063624 /* SAVisualizedAutoTrackObjectSerializer.h in Headers */,
+				FC5A4BE9244E98DC00063624 /* SAEncryptUtils.h in Headers */,
 				CB30C06E22840EC00004061D /* SensorsAnalyticsSDK.h in Headers */,
+				FC5A4BE1244E980700063624 /* UIApplication+AutoTrack.h in Headers */,
+				FC61B14D23B4BAD6006B4096 /* SATrackTimer.h in Headers */,
 				CB30C05922840EC00004061D /* SAConfigOptions.h in Headers */,
-				CB30C07822840EC00004061D /* SASecurityPolicy.h in Headers */,
-				CB6EBBA522857BC0003CFBA8 /* SAAutoTrackUtils.h in Headers */,
+				FC5A4BC0244E976F00063624 /* SAGzipUtility.h in Headers */,
+				4DA4CB8A237936BC006892D6 /* SAVisualizedMessage.h in Headers */,
+				4DA4CB89237936BC006892D6 /* SAVisualizedConnection.h in Headers */,
+				A869D6A2242F57F600069B6E /* SAScriptMessageHandler.h in Headers */,
 				CB30C05022840EC00004061D /* SAConstants.h in Headers */,
 				CB30C08E22840EC00004061D /* SAAppExtensionDataManager.h in Headers */,
+				4DA4CB8D237936BC006892D6 /* SAVisualizedAbstractMessage.h in Headers */,
 				CB30C04622840EC00004061D /* SAObjectIdentityProvider.h in Headers */,
+				4D6118D9242F052100FB02E0 /* SAVisualizedViewPathProperty.h in Headers */,
 				CB30C05122840EC00004061D /* SASwizzle.h in Headers */,
+				4DB14DD92456C107002C224C /* SALogMessage.h in Headers */,
 				CB30C05A22840EC00004061D /* SAConstants+Private.h in Headers */,
 				CB30C07622840EC00004061D /* NSString+HashCode.h in Headers */,
-				CB30C06622840EC00004061D /* SAObjectSerializer.h in Headers */,
-				CB30C07C22840EC00004061D /* SAJSONUtil.h in Headers */,
-				CB30C09022840EC00004061D /* SAHeatMapConnection.h in Headers */,
-				CB30C05F22840EC00004061D /* SAGzipUtility.h in Headers */,
-				CB30C0A822840EC00004061D /* SALogger.h in Headers */,
-				CB30C0A422840EC00004061D /* SAVisualizedAutoTrackSnapshotMessage.h in Headers */,
+				A869D69F242F57F600069B6E /* WKWebView+SABridge.h in Headers */,
+				FC5A4BD7244E980700063624 /* UIGestureRecognizer+AutoTrack.h in Headers */,
+				FC5A4BC5244E976F00063624 /* SADateFormatter.h in Headers */,
+				FC1AFF0523C3400E00F1B9E4 /* SAFileStore.h in Headers */,
+				FC5A4BD8244E980700063624 /* SAAutoTrackUtils.h in Headers */,
+				4D5A01FB2411ECB2007E651A /* UIView+HeatMap.h in Headers */,
 				CB30C04522840EC00004061D /* NSInvocation+SAHelpers.h in Headers */,
 				CB30C09E22840EC00004061D /* SAKeyChainItemWrapper.h in Headers */,
-				CB30C09422840EC00004061D /* SAHeatMapMessage.h in Headers */,
-				CB6EBB9F22857BC0003CFBA8 /* UIApplication+AutoTrack.h in Headers */,
-				CB30C0A322840EC00004061D /* SAVisualizedAutoTrackAbstractMessage.h in Headers */,
 				CB30C05C22840EC00004061D /* SALocationManager.h in Headers */,
-				CB30C06D22840EC00004061D /* SANetwork.h in Headers */,
+				FC5A4BE8244E98DC00063624 /* SADataEncryptBuilder.h in Headers */,
+				FC5A4BBB244E976F00063624 /* SAURLUtils.h in Headers */,
+				FC5A4BDB244E980700063624 /* SAAutoTrackProperty.h in Headers */,
 				CB30C32922843E740004061D /* SAApplicationStateSerializer.h in Headers */,
 				CB30C08D22840EC00004061D /* SASwizzler.h in Headers */,
-				CBE4DF03228AA1CB00DDE07D /* UIViewController+AutoTrack.h in Headers */,
-				CB30C07022840EC00004061D /* SADesignerMessage.h in Headers */,
+				4D650D82242B46CB006B01BF /* SAJSTouchEventView.h in Headers */,
 				CB30C07722840EC00004061D /* SATypeDescription.h in Headers */,
-				CB30C08422840EC00004061D /* SAObjectSelector.h in Headers */,
 				CB30C09622840EC00004061D /* SAPropertyDescription.h in Headers */,
-				CB6EBBA222857BC0003CFBA8 /* SAAutoTrackProperty.h in Headers */,
-				CB30C0A122840EC00004061D /* SAVisualizedAutoTrackMessage.h in Headers */,
-				CB30C06122840EC00004061D /* SAReachability.h in Headers */,
+				A8E962EB246A4373006A337D /* SAPresetProperty.h in Headers */,
 				CB30C09D22840EC00004061D /* MessageQueueBySqlite.h in Headers */,
 				CB30C05E22840EC00004061D /* SAObjectSerializerConfig.h in Headers */,
+				8888473724530F9100EBA7F6 /* SANetwork.h in Headers */,
+				4DB14DDC2456C107002C224C /* SAConsoleLogger.h in Headers */,
+				FC5A4BC6244E976F00063624 /* SAJSONUtil.h in Headers */,
 				CB30C08B22840EC00004061D /* SAEnumDescription.h in Headers */,
+				FC906D11242DEBD900C6686D /* SAIdentifier.h in Headers */,
+				FC5A4BDE244E980700063624 /* UIViewController+AutoTrack.h in Headers */,
+				A84FE7B8247661110090BC37 /* SAReadWriteLock.h in Headers */,
 				CB30C05822840EC00004061D /* SADeviceOrientationManager.h in Headers */,
+				8888473524530F9100EBA7F6 /* SAReachability.h in Headers */,
 				CB30C04A22840EC00004061D /* SAObjectSerializerContext.h in Headers */,
-				CB30C0A622840EC00004061D /* SAVisualizedAutoTrackConnection.h in Headers */,
-				CB30C09322840EC00004061D /* SAHeatMapSnapshotMessage.h in Headers */,
+				4DB14DE72456C107002C224C /* SALoggerConsoleFormatter.h in Headers */,
 				CB30C08822840EC00004061D /* SASDKRemoteConfig.h in Headers */,
-				CB6EBBA122857BC0003CFBA8 /* UIView+AutoTrack.h in Headers */,
 				CB30C07F22840EC00004061D /* SensorsAnalyticsExceptionHandler.h in Headers */,
-				CB30C08022840EC00004061D /* SACommonUtility.h in Headers */,
-				CB30C07322840EC00004061D /* SANetwork+URLUtils.h in Headers */,
+				FC1AFF0123C32AB000F1B9E4 /* SALinkHandler.h in Headers */,
+				4DB14DE02456C107002C224C /* SALoggerPrePostFixFormatter.h in Headers */,
+				6523731F23EBC44000A786A2 /* SAHeatMapObjectSerializer.h in Headers */,
 				CB30C04C22840EC00004061D /* SAClassDescription.h in Headers */,
+				FC5A4BC4244E976F00063624 /* SACommonUtility.h in Headers */,
 				CB30C0A922840EC00004061D /* SAValueTransformers.h in Headers */,
-				CB30C04322840EC00004061D /* UIView+SAHelpers.h in Headers */,
 				CB30C05522840EC00004061D /* NSObject+SensorsAnalyticsDelegate.h in Headers */,
-				CB30C09122840EC00004061D /* SAAbstractHeatMapMessage.h in Headers */,
 				CB30C09C22840EC00004061D /* SAAlertController.h in Headers */,
-				CB30C04E22840EC00004061D /* SAAbstractDesignerMessage.h in Headers */,
+				4DB14DE32456C107002C224C /* SAFileLogger.h in Headers */,
+				4D5A02032411EDFA007E651A /* UIView+VisualizedAutoTrack.h in Headers */,
+				A86663CA249A892E0065A540 /* SAEncryptSecretKeyHandler.h in Headers */,
 				CB30C06322840EC00004061D /* SensorsAnalyticsSDK+Private.h in Headers */,
 				CB30C06022840EC00004061D /* SAAuxiliaryToolManager.h in Headers */,
-				CB6EBB9D22857BC0003CFBA8 /* UIGestureRecognizer+AutoTrack.h in Headers */,
+				FC5A4BC1244E976F00063624 /* SAWeakPropertyContainer.h in Headers */,
+				4DB14DE62456C107002C224C /* SALog+Private.h in Headers */,
+				4DBE3C1D24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -577,9 +834,16 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CB6EBAF92285546F003CFBA8 /* SALogger.h in Headers */,
+				F2402DA1244176B000F7B06D /* SALog+Private.h in Headers */,
+				F2402D9E244176B000F7B06D /* SAFileLogger.h in Headers */,
+				F2402D95244176B000F7B06D /* SAAbstractLogger.h in Headers */,
+				F2402D9B244176B000F7B06D /* SALoggerPrePostFixFormatter.h in Headers */,
 				CB30C32622843E380004061D /* SAAppExtensionDataManager.h in Headers */,
 				CB30C31322843D3A0004061D /* SensorsAnalyticsExtension.h in Headers */,
+				F2402D98244176B000F7B06D /* SALog.h in Headers */,
+				F2402D94244176B000F7B06D /* SALogMessage.h in Headers */,
+				F2402D97244176B000F7B06D /* SAConsoleLogger.h in Headers */,
+				F2402DA2244176B000F7B06D /* SALoggerConsoleFormatter.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -646,12 +910,14 @@
 		CB30BD4B22840CA40004061D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				CLASSPREFIX = SA;
 				LastSwiftUpdateCheck = 1020;
 				LastUpgradeCheck = 1020;
-				ORGANIZATIONNAME = SensorsData;
+				ORGANIZATIONNAME = "Sensors Data Co., Ltd";
 				TargetAttributes = {
 					CB30BD5322840CA40004061D = {
 						CreatedOnToolsVersion = 10.2.1;
+						LastSwiftMigration = 1130;
 					};
 					CB30C30E22843D3A0004061D = {
 						CreatedOnToolsVersion = 10.2.1;
@@ -714,55 +980,75 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CB30C04422840EC00004061D /* SANetwork+URLUtils.m in Sources */,
-				CB30C09922840EC00004061D /* SAGzipUtility.m in Sources */,
+				A869D6A1242F57F600069B6E /* WKWebView+SABridge.m in Sources */,
+				FC1AFF0623C3400E00F1B9E4 /* SAFileStore.m in Sources */,
 				CB30C06822840EC00004061D /* SAValueTransformers.m in Sources */,
+				4DA4CB88237936BC006892D6 /* SAVisualizedConnection.m in Sources */,
+				FC906D10242DEBD900C6686D /* SAIdentifier.m in Sources */,
 				CB30C32A22843E740004061D /* SAApplicationStateSerializer.m in Sources */,
-				CB6EBBA322857BC0003CFBA8 /* UIView+AutoTrack.m in Sources */,
+				FC1AFF0223C32AB000F1B9E4 /* SALinkHandler.m in Sources */,
 				CB30C03F22840EC00004061D /* SATypeDescription.m in Sources */,
 				CB30C04922840EC00004061D /* SensorsAnalyticsSDK.m in Sources */,
+				4DA4CB8B237936BC006892D6 /* SAVisualizedSnapshotMessage.m in Sources */,
 				CB30C07222840EC00004061D /* NSInvocation+SAHelpers.m in Sources */,
-				CB30C08F22840EC00004061D /* SAHeatMapSnapshotMessage.m in Sources */,
-				CB30C09522840EC00004061D /* SAAbstractHeatMapMessage.m in Sources */,
 				CB30C07922840EC00004061D /* SALocationManager.m in Sources */,
 				CB30C09B22840EC00004061D /* SAObjectSerializerConfig.m in Sources */,
+				FC5A4BDA244E980700063624 /* UIViewController+AutoTrack.m in Sources */,
+				8888473824530F9100EBA7F6 /* SANetwork.m in Sources */,
 				CB30C07122840EC00004061D /* SAObjectIdentityProvider.m in Sources */,
 				CB30C08922840EC00004061D /* SAObjectSerializerContext.m in Sources */,
+				FC5A4BBC244E976F00063624 /* SAURLUtils.m in Sources */,
+				FC5A4BC2244E976F00063624 /* SADateFormatter.m in Sources */,
+				4D9D5E32240E4ADE00E6A9A5 /* SAVisualizedUtils.m in Sources */,
+				4DB14DE42456C107002C224C /* SALog.m in Sources */,
 				CB30C07E22840EC00004061D /* NSObject+SensorsAnalyticsDelegate.m in Sources */,
+				A8E962EC246A4373006A337D /* SAPresetProperty.m in Sources */,
 				CB30C08522840EC00004061D /* SAConstants.m in Sources */,
 				CB30C06522840EC00004061D /* SASwizzler.m in Sources */,
 				CB30C04222840EC00004061D /* NSString+HashCode.m in Sources */,
+				FC5A4BDF244E980700063624 /* UIView+AutoTrack.m in Sources */,
+				FC5A4BEA244E98DC00063624 /* SADataEncryptBuilder.m in Sources */,
+				6523731E23EBC44000A786A2 /* SAHeatMapObjectSerializer.m in Sources */,
+				4DB14DE22456C107002C224C /* SALogMessage.m in Sources */,
+				4D5A01FC2411ECB2007E651A /* UIView+HeatMap.m in Sources */,
+				4DB14DE52456C107002C224C /* SAConsoleLogger.m in Sources */,
+				4DB14DDF2456C107002C224C /* SALoggerConsoleFormatter.m in Sources */,
 				CB30C06B22840EC00004061D /* SAKeyChainItemWrapper.m in Sources */,
 				CB30C07B22840EC00004061D /* SADeviceOrientationManager.m in Sources */,
-				CB30C0A222840EC00004061D /* SAVisualizedAutoTrackConnection.m in Sources */,
+				FC61B14E23B4BAD6006B4096 /* SATrackTimer.m in Sources */,
+				A86663CB249A892E0065A540 /* SAEncryptSecretKeyHandler.m in Sources */,
+				4DB14DDB2456C107002C224C /* SALoggerPrePostFixFormatter.m in Sources */,
+				4DB14DDE2456C107002C224C /* SAFileLogger.m in Sources */,
 				CB30C07D22840EC00004061D /* SAConfigOptions.m in Sources */,
-				CB30C05722840EC00004061D /* SAJSONUtil.m in Sources */,
-				CB30C04822840EC00004061D /* SANetwork.m in Sources */,
 				CB30C08122840EC00004061D /* SASwizzle.m in Sources */,
-				CB30C06922840EC00004061D /* SALogger.m in Sources */,
-				CB6EBBA422857BC0003CFBA8 /* SAAutoTrackUtils.m in Sources */,
+				8888473424530F9100EBA7F6 /* SAReachability.m in Sources */,
+				FC5A4BDC244E980700063624 /* UIApplication+AutoTrack.m in Sources */,
+				FC5A4BE7244E98DC00063624 /* SAEncryptUtils.m in Sources */,
 				CB30C08722840EC00004061D /* SAClassDescription.m in Sources */,
+				4D650D83242B46CB006B01BF /* SAJSTouchEventView.m in Sources */,
+				4DB14DE12456C107002C224C /* SAAbstractLogger.m in Sources */,
 				CB30C06222840EC00004061D /* SAPropertyDescription.m in Sources */,
-				CB30C05622840EC00004061D /* SACommonUtility.m in Sources */,
-				CB30C09222840EC00004061D /* SAHeatMapConnection.m in Sources */,
-				CB6EBB9C22857BC0003CFBA8 /* UIGestureRecognizer+AutoTrack.m in Sources */,
-				CB30C08622840EC00004061D /* SAAbstractDesignerMessage.m in Sources */,
-				CB30C08C22840EC00004061D /* SAObjectSerializer.m in Sources */,
-				CBE4DF04228AA1CB00DDE07D /* UIViewController+AutoTrack.m in Sources */,
+				A869D6A0242F57F600069B6E /* SAScriptMessageHandler.m in Sources */,
+				FC5A4BC3244E976F00063624 /* SAWeakPropertyContainer.m in Sources */,
+				CB30C08C22840EC00004061D /* SAVisualizedAutoTrackObjectSerializer.m in Sources */,
+				FC5A4BBF244E976F00063624 /* SACommonUtility.m in Sources */,
+				8888473924530F9100EBA7F6 /* SASecurityPolicy.m in Sources */,
+				4D5A02042411EDFA007E651A /* UIView+VisualizedAutoTrack.m in Sources */,
+				4DBE3C1E24519D5000D4AC51 /* SAVisualizedObjectSerializerManger.m in Sources */,
+				FC5A4BCA244E97A600063624 /* SAValidator.m in Sources */,
 				CB30C04D22840EC00004061D /* SASDKRemoteConfig.m in Sources */,
 				CB30C05422840EC00004061D /* SensorsAnalyticsExceptionHandler.m in Sources */,
-				CB30C04022840EC00004061D /* SASecurityPolicy.m in Sources */,
-				CB30C09822840EC00004061D /* SAReachability.m in Sources */,
-				CB30C0A522840EC00004061D /* SAVisualizedAutoTrackAbstractMessage.m in Sources */,
+				A84FE7B9247661110090BC37 /* SAReadWriteLock.m in Sources */,
 				CB30C09722840EC00004061D /* SAAuxiliaryToolManager.m in Sources */,
-				CB30C0A022840EC00004061D /* SAVisualizedAutoTrackSnapshotMessage.m in Sources */,
-				CB30C07422840EC00004061D /* UIView+SAHelpers.m in Sources */,
 				CB30C06422840EC00004061D /* SAAppExtensionDataManager.m in Sources */,
+				FC5A4BE0244E980700063624 /* SAAutoTrackUtils.m in Sources */,
 				CB30C06722840EC00004061D /* SAEnumDescription.m in Sources */,
-				CB6EBB9E22857BC0003CFBA8 /* UIApplication+AutoTrack.m in Sources */,
+				FC5A4BBD244E976F00063624 /* SAJSONUtil.m in Sources */,
 				CB30C05D22840EC00004061D /* SAAlertController.m in Sources */,
+				4DA4CB87237936BC006892D6 /* SAVisualizedAbstractMessage.m in Sources */,
+				FC5A4BDD244E980700063624 /* UIGestureRecognizer+AutoTrack.m in Sources */,
+				FC5A4BBE244E976F00063624 /* SAGzipUtility.m in Sources */,
 				CB30C06C22840EC00004061D /* MessageQueueBySqlite.m in Sources */,
-				CB30C04F22840EC00004061D /* SAObjectSelector.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -770,8 +1056,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F2402D9D244176B000F7B06D /* SALogMessage.m in Sources */,
+				F2402D9A244176B000F7B06D /* SALoggerConsoleFormatter.m in Sources */,
+				F2402D96244176B000F7B06D /* SALoggerPrePostFixFormatter.m in Sources */,
+				F2402DA0244176B000F7B06D /* SAConsoleLogger.m in Sources */,
+				F2402D99244176B000F7B06D /* SAFileLogger.m in Sources */,
+				F2402D9F244176B000F7B06D /* SALog.m in Sources */,
 				CB30C32522843E380004061D /* SAAppExtensionDataManager.m in Sources */,
-				CB6EBAFA2285546F003CFBA8 /* SALogger.m in Sources */,
+				F2402D9C244176B000F7B06D /* SAAbstractLogger.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -779,9 +1071,14 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A83129AA246E400B00A18C25 /* SAPresetPropertyTests.m in Sources */,
 				4D6A189222978F5B00F6B218 /* SAAutoTrackUtilsTest.m in Sources */,
 				CB6EBAF622855222003CFBA8 /* SANetworkTests.m in Sources */,
+				FC80AB7C242CB17A006D1D25 /* SAIdentifierTests.m in Sources */,
+				4D76AEEF2364393400B4D0AF /* SAUtilsTest.m in Sources */,
 				CB6EBAE6228551EC003CFBA8 /* SensorsAnalyticsTests.m in Sources */,
+				FC23719523D0519A00DDD708 /* SALinkHandlerTests.m in Sources */,
+				FC3C58DA23BEEFB000D83BF4 /* SATrackTimerTests.m in Sources */,
 				4D6A189122978F5B00F6B218 /* ElementViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -849,7 +1146,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -905,7 +1202,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -918,14 +1215,18 @@
 		CB30BD5D22840CA40004061D /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 75FYWDWHL5;
+				DEVELOPMENT_TEAM = VBGTEN3BX8;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "$(SRCROOT)/SensorsAnalyticsSDK/Info.plist";
+				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
+				GENERATE_MASTER_OBJECT_FILE = YES;
+				INFOPLIST_FILE = "$(SRCROOT)/SupportingFiles/SensorsAnalyticsSDK-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -936,7 +1237,11 @@
 				MODULEMAP_FILE = "";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.sensorsdata.SensorsAnalyticsSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -944,14 +1249,17 @@
 		CB30BD5E22840CA40004061D /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "";
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = 75FYWDWHL5;
+				DEVELOPMENT_TEAM = VBGTEN3BX8;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "$(SRCROOT)/SensorsAnalyticsSDK/Info.plist";
+				GENERATE_MASTER_OBJECT_FILE = YES;
+				INFOPLIST_FILE = "$(SRCROOT)/SupportingFiles/SensorsAnalyticsSDK-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -962,7 +1270,10 @@
 				MODULEMAP_FILE = "";
 				PRODUCT_BUNDLE_IDENTIFIER = cn.sensorsdata.SensorsAnalyticsSDK;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "";
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -979,7 +1290,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = "$(SRCROOT)/SensorsAnalyticsExtension/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/SupportingFiles/SensorsAnalyticsExtension-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1008,7 +1319,7 @@
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = "$(SRCROOT)/SensorsAnalyticsExtension/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/SupportingFiles/SensorsAnalyticsExtension-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/SensorsAnalyticsSDK/SAAutoTrackProperty.h b/SensorsAnalyticsSDK/AutoTrack/SAAutoTrackProperty.h
similarity index 73%
rename from SensorsAnalyticsSDK/SAAutoTrackProperty.h
rename to SensorsAnalyticsSDK/AutoTrack/SAAutoTrackProperty.h
index 8d2e3cbb..2cd9c13a 100644
--- a/SensorsAnalyticsSDK/SAAutoTrackProperty.h
+++ b/SensorsAnalyticsSDK/AutoTrack/SAAutoTrackProperty.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/4/23.
-//  Copyright © 2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -34,7 +34,8 @@
 @property (nonatomic, copy, readonly) NSString *sensorsdata_elementType;
 @property (nonatomic, copy, readonly) NSString *sensorsdata_elementContent;
 @property (nonatomic, copy, readonly) NSString *sensorsdata_elementId;
-/// 只在 UISegmentedControl 中返回选中的 index，其他类型返回 nil
+
+/// 元素位置，UISegmentedControl 中返回选中的 index，
 @property (nonatomic, copy, readonly) NSString *sensorsdata_elementPosition;
 
 /// 获取 view 所在的 viewController，或者当前的 viewController
@@ -45,11 +46,24 @@
 @protocol SAAutoTrackCellProperty <SAAutoTrackViewProperty>
 - (NSString *)sensorsdata_elementPositionWithIndexPath:(NSIndexPath *)indexPath;
 - (NSString *)sensorsdata_itemPathWithIndexPath:(NSIndexPath *)indexPath;
+
+- (NSString *)sensorsdata_similarPathWithIndexPath:(NSIndexPath *)indexPath;
+/// 遍历查找 cell 所在的 indexPath
+@property (nonatomic, strong, readonly) NSIndexPath *sensorsdata_IndexPath;
 @end
 
 
 
 #pragma mark -
 @protocol SAAutoTrackViewPathProperty <NSObject>
+
+/// $AppClick 某个元素的相对路径，拼接 $element_path，用于可视化全埋点
 @property (nonatomic, copy, readonly) NSString *sensorsdata_itemPath;
+
+/// $AppClick 某个元素的相对路径，拼接 $element_selector，用于点击图
+@property (nonatomic, copy, readonly) NSString *sensorsdata_heatMapPath;
+
+@optional
+/// 元素相似路径，可能包含 [-]
+@property (nonatomic, copy, readonly) NSString *sensorsdata_similarPath;
 @end
diff --git a/SensorsAnalyticsSDK/SAAutoTrackUtils.h b/SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.h
similarity index 82%
rename from SensorsAnalyticsSDK/SAAutoTrackUtils.h
rename to SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.h
index a7626b5c..91f0e4e1 100644
--- a/SensorsAnalyticsSDK/SAAutoTrackUtils.h
+++ b/SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/4/22.
-//  Copyright © 2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -49,6 +49,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (UIViewController *)findSuperViewControllerByView:(UIView *)view;
 
+/// 是否为弹框
++ (BOOL)isAlertForResponder:(UIResponder *)responder;
+
+/// 是否为弹框点击
++ (BOOL)isAlertClickForView:(UIView *)view;
 @end
 
 #pragma mark -
@@ -110,12 +115,20 @@ NS_ASSUME_NONNULL_BEGIN
 + (nullable NSString *)viewIdentifierForView:(UIView *)view;
 
 /**
- 通过响应链找到 viewPath
+通过响应链找到 对象的点击图路径
+
+@param responder 响应链中的对象，可以是 UIView 或者 UIViewController
+@return 路径
+*/
++ (NSString *)itemHeatMapPathForResponder:(UIResponder *)responder;
+
+/**
+ 通过响应链找到 对象的序号
 
  @param responder 响应链中的对象，可以是 UIView 或者 UIViewController
  @return 路径
  */
-+ (NSString *)itemPathForResponder:(UIResponder *)responder;
++ (NSInteger )itemIndexForResponder:(UIResponder *)responder;
 
 /**
  找到 view 的路径数组
@@ -134,6 +147,15 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (nullable NSString *)viewPathForView:(UIView *)view atViewController:(UIViewController *)viewController;
 
+/**
+获取 view 的模糊路径
+
+@param view 需要获取路径的 view
+@param viewController view 所在的 viewController
+@param shouldSimilarPath 是否需要取相似路径
+@return 路径字符串
+*/
++ (NSString *)viewSimilarPathForView:(UIView *)view atViewController:(UIViewController *)viewController shouldSimilarPath:(BOOL)shouldSimilarPath;
 @end
 
 #pragma mark -
diff --git a/SensorsAnalyticsSDK/SAAutoTrackUtils.m b/SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.m
similarity index 59%
rename from SensorsAnalyticsSDK/SAAutoTrackUtils.m
rename to SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.m
index 19f6464e..7feedf7d 100644
--- a/SensorsAnalyticsSDK/SAAutoTrackUtils.m
+++ b/SensorsAnalyticsSDK/AutoTrack/SAAutoTrackUtils.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by MC on 2019/4/22.
-//  Copyright © 2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -24,10 +24,13 @@
 
 #import "SAAutoTrackUtils.h"
 #import "SAConstants+Private.h"
+#import "SACommonUtility.h"
 #import "SensorsAnalyticsSDK.h"
-#import "UIView+SAHelpers.h"
+#import "UIView+HeatMap.h"
 #import "UIView+AutoTrack.h"
-#import "SALogger.h"
+#import "SALog.h"
+#import "SAAlertController.h"
+#import "SAValidator.h"
 
 @implementation SAAutoTrackUtils
 
@@ -70,30 +73,55 @@ + (UIViewController *)findSuperViewControllerByView:(UIView *)view {
 + (UIViewController *)currentViewController {
     __block UIViewController *currentViewController = nil;
     void (^ block)(void) = ^{
-        UIViewController *rootViewController = UIApplication.sharedApplication.delegate.window.rootViewController;
+        UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController;
         currentViewController = [SAAutoTrackUtils findCurrentViewControllerFromRootViewController:rootViewController isRoot:YES];
     };
 
-    if (dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL) == dispatch_queue_get_label(dispatch_get_main_queue())) {
-        block();
-    } else {
-        dispatch_sync(dispatch_get_main_queue(), block);
-    }
-
+    [SACommonUtility performBlockOnMainThread:block];
     return currentViewController;
 }
 
 + (UIViewController *)findCurrentViewControllerFromRootViewController:(UIViewController *)viewController isRoot:(BOOL)isRoot {
-    UIViewController *currentViewController = nil;
-    if (viewController.presentedViewController) {
+    __block UIViewController *currentViewController = viewController;
+    if (viewController.presentedViewController && ![viewController.presentedViewController isKindOfClass:UIAlertController.class]) {
         viewController = [self findCurrentViewControllerFromRootViewController:viewController.presentedViewController isRoot:NO];
     }
 
     if ([viewController isKindOfClass:[UITabBarController class]]) {
-        currentViewController = [self findCurrentViewControllerFromRootViewController:[(UITabBarController *)viewController selectedViewController] isRoot:NO];
-    } else if ([viewController isKindOfClass:[UINavigationController class]]) {
-        // 根视图为UINavigationController
-        currentViewController = [self findCurrentViewControllerFromRootViewController:[(UINavigationController *)viewController visibleViewController] isRoot:NO];
+        return [self findCurrentViewControllerFromRootViewController:[(UITabBarController *)viewController selectedViewController] isRoot:NO];
+    }
+    if ([viewController isKindOfClass:[UINavigationController class]]) {
+        // 根视图为 UINavigationController
+        UIViewController *topViewController = [(UINavigationController *)viewController topViewController];
+        return [self findCurrentViewControllerFromRootViewController:topViewController isRoot:NO];
+    }
+
+    if (viewController.childViewControllers.count > 0) {
+        if (viewController.childViewControllers.count == 1 && isRoot) {
+            return [self findCurrentViewControllerFromRootViewController:viewController.childViewControllers.firstObject isRoot:NO];
+        } else {
+            //从最上层遍历（逆序），查找正在显示的 UITabBarController 或 UINavigationController 类型的
+            // 是否包含 UINavigationController 或 UITabBarController 类全屏显示的 controller
+            __block BOOL isContainController = NO;
+            [viewController.childViewControllers enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(__kindof UIViewController *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
+                // 判断 obj.view 是否加载，如果尚未加载，调用 obj.view 会触发 viewDidLoad，可能影响客户业务
+                if (obj.isViewLoaded) {
+                    CGPoint point = [obj.view convertPoint:CGPointMake(0, 0) toView:nil];
+                   // 正在全屏显示
+                    BOOL isFullScreenShow = !obj.view.hidden && obj.view.alpha > 0 && CGPointEqualToPoint(point, CGPointMake(0, 0));
+                   // 判断类型
+                    BOOL isStopFindController = [obj isKindOfClass:UINavigationController.class] || [obj isKindOfClass:UITabBarController.class];
+                    if (isFullScreenShow && isStopFindController) {
+                        currentViewController = [self findCurrentViewControllerFromRootViewController:obj isRoot:NO];
+                        *stop = YES;
+                        isContainController = YES;
+                    }
+                }
+            }];
+            if (!isContainController) {
+                return viewController;
+            }
+        }
     } else if ([viewController respondsToSelector:NSSelectorFromString(@"contentViewController")]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
@@ -102,14 +130,40 @@ + (UIViewController *)findCurrentViewControllerFromRootViewController:(UIViewCon
         if (tempViewController) {
             currentViewController = [self findCurrentViewControllerFromRootViewController:tempViewController isRoot:NO];
         }
-    } else if (viewController.childViewControllers.count == 1 && isRoot) {
-        currentViewController = [self findCurrentViewControllerFromRootViewController:viewController.childViewControllers.firstObject isRoot:NO];
-    } else {
-        currentViewController = viewController;
-    }
+    } 
     return currentViewController;
 }
 
++ (BOOL)isAlertForResponder:(UIResponder *)responder {
+    do {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        BOOL isUIAlertView = [responder isKindOfClass:UIAlertView.class];
+        BOOL isUIActionSheet = [responder isKindOfClass:UIActionSheet.class];
+#pragma clang diagnostic pop
+
+        BOOL isUIAlertController = [responder isKindOfClass:UIAlertController.class];
+
+        if ([[responder nextResponder] isKindOfClass:SAAlertController.class]) {
+            return NO;
+        }
+        if (isUIAlertController || isUIAlertView || isUIActionSheet) {
+            return YES;
+        }
+    } while ((responder = [responder nextResponder]));
+    return NO;
+}
+
+/// 是否为弹框点击
++ (BOOL)isAlertClickForView:(UIView *)view {
+ #ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+        if ([NSStringFromClass(view.class) isEqualToString:@"_UIInterfaceActionCustomViewRepresentationView"] || [NSStringFromClass(view.class) isEqualToString:@"_UIAlertControllerCollectionViewCell"]) { // 标记弹框
+            return YES;
+        }
+#endif
+     return NO;
+}
+
 @end
 
 #pragma mark -
@@ -119,6 +173,15 @@ @implementation SAAutoTrackUtils (Property)
     NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
     properties[SA_EVENT_PROPERTY_SCREEN_NAME] = viewController.sensorsdata_screenName;
     properties[SA_EVENT_PROPERTY_TITLE] = viewController.sensorsdata_title;
+    
+    if ([viewController conformsToProtocol:@protocol(SAAutoTracker)] &&
+        [viewController respondsToSelector:@selector(getTrackProperties)]) {
+        NSDictionary *trackProperties = [(UIViewController<SAAutoTracker> *)viewController getTrackProperties];
+        if ([SAValidator isValidDictionary:trackProperties]) {
+            [properties addEntriesFromDictionary:trackProperties];
+        }
+    }
+
     return [properties copy];
 }
 
@@ -135,25 +198,26 @@ @implementation SAAutoTrackUtils (Property)
 }
 
 + (NSMutableDictionary<NSString *, NSString *> *)propertiesWithAutoTrackObject:(id<SAAutoTrackViewProperty>)object viewController:(nullable UIViewController<SAAutoTrackViewControllerProperty> *)viewController isCodeTrack:(BOOL)isCodeTrack {
-    if (!isCodeTrack && object.sensorsdata_isIgnored) {
+    if (![object respondsToSelector:@selector(sensorsdata_isIgnored)] || (!isCodeTrack && object.sensorsdata_isIgnored)) {
         return nil;
     }
+
     NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
     // ViewID
     properties[SA_EVENT_PROPERTY_ELEMENT_ID] = object.sensorsdata_elementId;
-
+    
     viewController = viewController ? : object.sensorsdata_viewController;
     if (!isCodeTrack && viewController.sensorsdata_isIgnored) {
         return nil;
     }
-
+    
     NSDictionary *dic = [self propertiesWithViewController:viewController];
     [properties addEntriesFromDictionary:dic];
-
+    
     properties[SA_EVENT_PROPERTY_ELEMENT_TYPE] = object.sensorsdata_elementType;
     properties[SA_EVENT_PROPERTY_ELEMENT_CONTENT] = object.sensorsdata_elementContent;
     properties[SA_EVENT_PROPERTY_ELEMENT_POSITION] = object.sensorsdata_elementPosition;
-
+    
     UIView *view = (UIView *)object;
     //View Properties
     if ([object isKindOfClass:UIView.class]) {
@@ -161,11 +225,12 @@ @implementation SAAutoTrackUtils (Property)
     } else {
         return properties;
     }
-
+    
     NSString *viewPath = [self viewPathForView:view atViewController:viewController];
-    if (viewPath) {
-        properties[SA_EVENT_PROPERTY_ELEMENT_SELECTOR] = viewPath;
-    }
+    properties[SA_EVENT_PROPERTY_ELEMENT_SELECTOR] = viewPath;
+    
+    NSString *viewSimilarPath = [self viewSimilarPathForView:view atViewController:viewController shouldSimilarPath:YES];
+    properties[SA_EVENT_PROPERTY_ELEMENT_PATH] = viewSimilarPath;
 
     return properties;
 }
@@ -175,6 +240,15 @@ @implementation SAAutoTrackUtils (Property)
 #pragma mark -
 @implementation SAAutoTrackUtils (ViewPath)
 
++ (BOOL)isIgnoredVisualizedAutoTrackForViewController:(UIViewController *)viewController {
+    if (!viewController) {
+        return NO;
+    }
+    SensorsAnalyticsSDK *sa = [SensorsAnalyticsSDK sharedInstance];
+    BOOL isEnableVisualizedAutoTrack = [sa isVisualizedAutoTrackEnabled] && [sa isVisualizedAutoTrackViewController:viewController];
+    return !isEnableVisualizedAutoTrack;
+}
+
 + (BOOL)isIgnoredViewPathForViewController:(UIViewController *)viewController {
     SensorsAnalyticsSDK *sa = [SensorsAnalyticsSDK sharedInstance];
 
@@ -186,7 +260,7 @@ + (BOOL)isIgnoredViewPathForViewController:(UIViewController *)viewController {
 + (NSArray<NSString *> *)viewPathsForViewController:(UIViewController<SAAutoTrackViewPathProperty> *)viewController {
     NSMutableArray *viewPaths = [NSMutableArray array];
     do {
-        [viewPaths addObject:viewController.sensorsdata_itemPath];
+        [viewPaths addObject:viewController.sensorsdata_heatMapPath];
         viewController = (UIViewController<SAAutoTrackViewPathProperty> *)viewController.parentViewController;
     } while (viewController);
 
@@ -199,11 +273,14 @@ + (BOOL)isIgnoredViewPathForViewController:(UIViewController *)viewController {
 
 + (NSArray<NSString *> *)viewPathsForView:(UIView<SAAutoTrackViewPathProperty> *)view {
     NSMutableArray *viewPathArray = [NSMutableArray array];
-    do {
-        [viewPathArray addObject:view.sensorsdata_itemPath];
+    do { // 遍历 view 层级 路径
+        if (view.sensorsdata_heatMapPath) {
+            [viewPathArray addObject:view.sensorsdata_heatMapPath];
+        }
     } while ((view = (id)view.nextResponder) && [view isKindOfClass:UIView.class] && ![view isKindOfClass:UIWindow.class]);
 
     if ([view isKindOfClass:UIViewController.class] && [view conformsToProtocol:@protocol(SAAutoTrackViewPathProperty)]) {
+        // 遍历 controller 层 路径
         [viewPathArray addObjectsFromArray:[self viewPathsForViewController:(UIViewController<SAAutoTrackViewPathProperty> *)view]];
     }
     return viewPathArray;
@@ -216,21 +293,61 @@ + (NSString *)viewPathForView:(UIView *)view atViewController:(UIViewController
     NSArray *viewPaths = [[[self viewPathsForView:view] reverseObjectEnumerator] allObjects];
     NSString *viewPath = [viewPaths componentsJoinedByString:@"/"];
 
-    NSRange range = [viewPath rangeOfString:@"UITableViewWrapperView/"];
-    if (range.location != NSNotFound) {
-        viewPath = [viewPath stringByReplacingCharactersInRange:range withString:@""];
+    return viewPath;
+}
+
+/// 获取模糊路径
++ (NSString *)viewSimilarPathForView:(UIView *)view atViewController:(UIViewController *)viewController shouldSimilarPath:(BOOL)shouldSimilarPath {
+    if ([self isIgnoredVisualizedAutoTrackForViewController:viewController]) {
+        return nil;
+    }
+
+    NSMutableArray *viewPathArray = [NSMutableArray array];
+    BOOL isContainSimilarPath = NO;
+
+    do {
+        if (isContainSimilarPath || !shouldSimilarPath) { // 防止 cell 嵌套，被拼上多个 [-]
+            if (view.sensorsdata_itemPath) {
+                [viewPathArray addObject:view.sensorsdata_itemPath];
+            }
+        } else {
+            NSString *currentSimilarPath = view.sensorsdata_similarPath;
+            if (currentSimilarPath) {
+                [viewPathArray addObject:currentSimilarPath];
+                if ([currentSimilarPath rangeOfString:@"[-]"].location != NSNotFound) {
+                    isContainSimilarPath = YES;
+                }
+            }
+        }
+    } while ((view = (id)view.nextResponder) && [view isKindOfClass:UIView.class]);
+
+    if ([view isKindOfClass:UIAlertController.class]) {
+        UIViewController<SAAutoTrackViewPathProperty> *viewController = (UIViewController<SAAutoTrackViewPathProperty> *)view;
+        [viewPathArray addObject:viewController.sensorsdata_itemPath];
     }
 
+    NSString *viewPath = [[[viewPathArray reverseObjectEnumerator] allObjects] componentsJoinedByString:@"/"];
+
     return viewPath;
 }
 
-+ (NSString *)itemPathForResponder:(UIResponder *)responder {
++ (NSInteger)itemIndexForResponder:(UIResponder *)responder {
     NSString *classString = NSStringFromClass(responder.class);
-
     NSArray *subResponder = nil;
     if ([responder isKindOfClass:UIView.class]) {
         UIResponder *next = [responder nextResponder];
-        if ([next isKindOfClass:UIView.class]) {
+        if ([next isKindOfClass:UISegmentedControl.class]) {
+            // UISegmentedControl 点击之后，subviews 顺序会变化，需要根据坐标排序才能匹配正确
+            UISegmentedControl *segmentedControl = (UISegmentedControl *)next;
+            NSArray <UIView *> *subViews = segmentedControl.subviews;
+            subResponder = [subViews sortedArrayUsingComparator:^NSComparisonResult (UIView *obj1, UIView *obj2) {
+                if (obj1.frame.origin.x > obj2.frame.origin.x) {
+                    return NSOrderedDescending;
+                } else {
+                    return NSOrderedAscending;
+                }
+            }];
+        } else if ([next isKindOfClass:UIView.class]) {
             subResponder = [(UIView *)next subviews];
         }
     } else if ([responder isKindOfClass:UIViewController.class]) {
@@ -247,7 +364,11 @@ + (NSString *)itemPathForResponder:(UIResponder *)responder {
             index = count - 1;
         }
     }
-    return count <= 1 ? classString : [NSString stringWithFormat:@"%@[%ld]", classString, (long)index];
+    // 单个 UIViewController 拼接路径，不需要序号
+    if ([responder isKindOfClass:UIViewController.class] && ![responder isKindOfClass:UIAlertController.class] && count == 1) {
+        index = -1;
+    }
+    return index;
 }
 
 + (NSString *)viewIdentifierForView:(UIView *)view {
@@ -275,6 +396,32 @@ + (NSString *)viewIdentifierForView:(UIView *)view {
     return [NSString stringWithFormat:@"%@[(%@)]", NSStringFromClass([view class]), viewVarString];
 }
 
++ (NSString *)itemHeatMapPathForResponder:(UIResponder *)responder {
+    NSString *classString = NSStringFromClass(responder.class);
+
+    NSArray *subResponder = nil;
+    if ([responder isKindOfClass:UIView.class]) {
+        UIResponder *next = [responder nextResponder];
+        if ([next isKindOfClass:UIView.class]) {
+            subResponder = [(UIView *)next subviews];
+        }
+    } else if ([responder isKindOfClass:UIViewController.class]) {
+        subResponder = [(UIViewController *)responder parentViewController].childViewControllers;
+    }
+
+    NSInteger count = 0;
+    NSInteger index = -1;
+    for (UIResponder *res in subResponder) {
+        if ([classString isEqualToString:NSStringFromClass(res.class)]) {
+            count++;
+        }
+        if (res == responder) {
+            index = count - 1;
+        }
+    }
+    return count <= 1 ? classString : [NSString stringWithFormat:@"%@[%ld]", classString, (long)index];
+}
+
 @end
 
 
@@ -282,7 +429,7 @@ + (NSString *)viewIdentifierForView:(UIView *)view {
 @implementation SAAutoTrackUtils (IndexPath)
 
 + (NSMutableDictionary<NSString *, NSString *> *)propertiesWithAutoTrackObject:(UIScrollView<SAAutoTrackViewProperty> *)object didSelectedAtIndexPath:(NSIndexPath *)indexPath {
-    if (object.sensorsdata_isIgnored) {
+    if (![object respondsToSelector:@selector(sensorsdata_isIgnored)] || object.sensorsdata_isIgnored) {
         return nil;
     }
     NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
@@ -327,11 +474,12 @@ @implementation SAAutoTrackUtils (IndexPath)
         [properties addEntriesFromDictionary:propDict];
     }
 
-    NSString *viewPath = [self viewPathForView:((UIView *)cell).superview atViewController:viewController];
-    if (viewPath) {
-        properties[SA_EVENT_PROPERTY_ELEMENT_SELECTOR] = [NSString stringWithFormat:@"%@/%@[%ld][%ld]", viewPath, NSStringFromClass(cell.class), (long)indexPath.section, (long)indexPath.row];
-    }
-
+    NSString *viewPath = [self viewPathForView:((UIView *)cell) atViewController:viewController];
+    properties[SA_EVENT_PROPERTY_ELEMENT_SELECTOR] = viewPath;
+    
+    NSString *viewSimilarPath = [self viewSimilarPathForView:(UIView *)cell atViewController:viewController shouldSimilarPath:YES];
+    properties[SA_EVENT_PROPERTY_ELEMENT_PATH] = viewSimilarPath;
+    
     return properties;
 }
 
@@ -351,7 +499,7 @@ + (NSDictionary *)propertiesWithAutoTrackDelegate:(UIScrollView *)scrollView did
             }
         }
     } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
     }
     NSAssert(!properties || [properties isKindOfClass:[NSDictionary class]], @"You must return a dictionary object ❌");
     return properties;
diff --git a/SensorsAnalyticsSDK/UIApplication+AutoTrack.h b/SensorsAnalyticsSDK/AutoTrack/UIApplication+AutoTrack.h
similarity index 93%
rename from SensorsAnalyticsSDK/UIApplication+AutoTrack.h
rename to SensorsAnalyticsSDK/AutoTrack/UIApplication+AutoTrack.h
index 1d3103f3..5aae842c 100644
--- a/SensorsAnalyticsSDK/UIApplication+AutoTrack.h
+++ b/SensorsAnalyticsSDK/AutoTrack/UIApplication+AutoTrack.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 17/3/22.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/UIApplication+AutoTrack.m b/SensorsAnalyticsSDK/AutoTrack/UIApplication+AutoTrack.m
similarity index 65%
rename from SensorsAnalyticsSDK/UIApplication+AutoTrack.m
rename to SensorsAnalyticsSDK/AutoTrack/UIApplication+AutoTrack.m
index ec4ef179..0ebeb601 100644
--- a/SensorsAnalyticsSDK/UIApplication+AutoTrack.m
+++ b/SensorsAnalyticsSDK/AutoTrack/UIApplication+AutoTrack.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 17/3/22.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -22,11 +22,9 @@
 #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 "SALogger.h"
+#import "SALog.h"
 #import "SensorsAnalyticsSDK.h"
-#import "UIView+SAHelpers.h"
 #import "UIView+AutoTrack.h"
 #import "SAConstants+Private.h"
 #import "SensorsAnalyticsSDK+Private.h"
@@ -37,25 +35,19 @@ @implementation UIApplication (AutoTrack)
 
 - (BOOL)sa_sendAction:(SEL)action to:(id)to from:(id)from forEvent:(UIEvent *)event {
 
+    BOOL ret = YES;
+
+    // 针对 tab 切换，采集切换后的页面信息，先执行系统 sendAction 完成页面切换
+    BOOL isTabBar = [to isKindOfClass:UITabBar.class] || [to isKindOfClass:UITabBarController.class];
     /*
      默认先执行 AutoTrack
      如果先执行原点击处理逻辑，可能已经发生页面 push 或者 pop，导致获取当前 ViewController 不正确
      可以通过 UIView 扩展属性 sensorsAnalyticsAutoTrackAfterSendAction，来配置 AutoTrack 是发生在原点击处理函数之前还是之后
      */
+    BOOL sensorsAnalyticsAutoTrackAfterSendAction = [from isKindOfClass:[UIView class]] && [(UIView *)from sensorsAnalyticsAutoTrackAfterSendAction];
+    BOOL autoTrackAfterSendAction = isTabBar || sensorsAnalyticsAutoTrackAfterSendAction;
 
-    BOOL ret = YES;
-    BOOL sensorsAnalyticsAutoTrackAfterSendAction = NO;
-
-    @try {
-        if ([from isKindOfClass:[UIView class]] && [(UIView *)from sensorsAnalyticsAutoTrackAfterSendAction]) {
-            sensorsAnalyticsAutoTrackAfterSendAction = YES;
-        }
-    } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
-        sensorsAnalyticsAutoTrackAfterSendAction = NO;
-    }
-
-    if (sensorsAnalyticsAutoTrackAfterSendAction) {
+    if (autoTrackAfterSendAction) {
         ret = [self sa_sendAction:action to:to from:from forEvent:event];
     }
 
@@ -71,37 +63,24 @@ - (BOOL)sa_sendAction:(SEL)action to:(id)to from:(id)from forEvent:(UIEvent *)ev
             [self sa_track:action to:to from:from forEvent:event];
 //        }
     } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
     }
 
-    if (!sensorsAnalyticsAutoTrackAfterSendAction) {
+    if (!autoTrackAfterSendAction) {
         ret = [self sa_sendAction:action to:to from:from forEvent:event];
     }
 
     return ret;
 }
 
-- (void)sa_track:(SEL)action to:(id)to from:(id)from forEvent:(UIEvent *)event {
-    // ViewType 被忽略
-#if (defined SENSORS_ANALYTICS_ENABLE_NO_PUBLICK_APIS)
-    if ([from isKindOfClass:NSClassFromString(@"UITabBarButton")]) {
-        return;
-    } else if ([from isKindOfClass:NSClassFromString(@"UINavigationButton")] && [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[UIBarButtonItem class]]) {
-        return;
-    } else
-#else
-    if ([to isKindOfClass:[UITabBar class]]) {
-        return;
-    } else
-#endif
-    if (![from conformsToProtocol:@protocol(SAAutoTrackViewProperty)] && ![to isKindOfClass:[UITabBarController class]]) {
+- (void)sa_track:(SEL)action to:(id)to from:(NSObject *)from forEvent:(UIEvent *)event {
+   // 过滤多余点击事件，因为当 from 为 UITabBarItem，event 为 nil， 采集下次类型为 button 的事件。
+    if ([from isKindOfClass:UITabBarItem.class] || [from isKindOfClass:UIBarButtonItem.class]) {
         return;
     }
-
-    BOOL isTabBar = [from isKindOfClass:[UITabBarItem class]] && [to isKindOfClass:[UITabBarController class]];
-
+    
     NSObject<SAAutoTrackViewProperty> *object = (NSObject<SAAutoTrackViewProperty> *)from;
-    NSMutableDictionary *properties = [SAAutoTrackUtils propertiesWithAutoTrackObject:object viewController:isTabBar ? (UITabBarController *)to : nil];
+    NSMutableDictionary *properties = [SAAutoTrackUtils propertiesWithAutoTrackObject:object viewController: nil];
     if (!properties) {
         return;
     }
@@ -109,21 +88,15 @@ - (void)sa_track:(SEL)action to:(id)to from:(id)from forEvent:(UIEvent *)event {
     if ([object isKindOfClass:[UISwitch class]] ||
         [object isKindOfClass:[UIStepper class]] ||
         [object isKindOfClass:[UISegmentedControl class]] ||
-        [object isKindOfClass:[UITabBarItem class]]) {
+        [object isKindOfClass:[UIPageControl class]]) {
         [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
         return;
     }
 
     if ([event isKindOfClass:[UIEvent class]] && event.type == UIEventTypeTouches && [[[event allTouches] anyObject] phase] == UITouchPhaseEnded) {
-#if (defined SENSORS_ANALYTICS_ENABLE_NO_PUBLICK_APIS)
-        if ([from isKindOfClass:NSClassFromString(@"UINavigationButton")]) {
-            properties[SA_EVENT_PROPERTY_ELEMENT_TYPE] = @"UIBarButtonItem";
-        }
-#endif
         [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
         return;
     }
-
 }
 
 @end
diff --git a/SensorsAnalyticsSDK/UIGestureRecognizer+AutoTrack.h b/SensorsAnalyticsSDK/AutoTrack/UIGestureRecognizer+AutoTrack.h
similarity index 94%
rename from SensorsAnalyticsSDK/UIGestureRecognizer+AutoTrack.h
rename to SensorsAnalyticsSDK/AutoTrack/UIGestureRecognizer+AutoTrack.h
index cb7873f5..036b3f28 100644
--- a/SensorsAnalyticsSDK/UIGestureRecognizer+AutoTrack.h
+++ b/SensorsAnalyticsSDK/AutoTrack/UIGestureRecognizer+AutoTrack.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2018/10/25.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/UIGestureRecognizer+AutoTrack.m b/SensorsAnalyticsSDK/AutoTrack/UIGestureRecognizer+AutoTrack.m
similarity index 58%
rename from SensorsAnalyticsSDK/UIGestureRecognizer+AutoTrack.m
rename to SensorsAnalyticsSDK/AutoTrack/UIGestureRecognizer+AutoTrack.m
index 0c904035..c0e5fafd 100644
--- a/SensorsAnalyticsSDK/UIGestureRecognizer+AutoTrack.m
+++ b/SensorsAnalyticsSDK/AutoTrack/UIGestureRecognizer+AutoTrack.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2018/10/25.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@
 #import "SensorsAnalyticsSDK.h"
 #import "UIView+AutoTrack.h"
 #import "SAAutoTrackUtils.h"
-#import "SALogger.h"
+#import "SALog.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SAConstants+Private.h"
 #import <objc/runtime.h>
@@ -37,21 +37,64 @@ @implementation UIGestureRecognizer (AutoTrack)
 
 - (void)trackGestureRecognizerAppClick:(UIGestureRecognizer *)gesture {
     @try {
+        // 手势处于 Ended 状态
+        if (gesture.state != UIGestureRecognizerStateEnded) {
+            return;
+        }
+        
         UIView *view = gesture.view;
+        // iOS10 及以上 _UIAlertControllerInterfaceActionGroupView
+        // iOS 9 及以下 _UIAlertControllerView
+        if ([SAAutoTrackUtils isAlertForResponder:view]) {
+            UIView *touchView = [self searchGestureTouchView:gesture];
+            if (touchView) {
+                view = touchView;
+            }
+        }
+
+        // 是否点击弹框选项
+        BOOL isAlterType = [SAAutoTrackUtils isAlertClickForView:view];
         // 暂定只采集 UILabel 和 UIImageView
-        BOOL isTrackClass = [view isKindOfClass:UILabel.class] || [view isKindOfClass:UIImageView.class];
+        BOOL isTrackClass = [view isKindOfClass:UILabel.class] || [view isKindOfClass:UIImageView.class] || isAlterType;
         BOOL isIgnored = ![view conformsToProtocol:@protocol(SAAutoTrackViewProperty)] || view.sensorsdata_isIgnored;
         if (!isTrackClass || isIgnored) {
             return;
         }
-
         NSDictionary *properties = [SAAutoTrackUtils propertiesWithAutoTrackObject:view];
         if (properties) {
             [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
         }
     } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
+    }
+}
+
+// 查找弹框手势选择所在的 view
+- (UIView *)searchGestureTouchView:(UIGestureRecognizer *)gesture {
+    UIView *gestureView = gesture.view;
+    CGPoint point = [gesture locationInView:gestureView];
+
+    UIView *view = [gestureView.subviews lastObject];
+    UIView *sequeceView = [view.subviews lastObject];
+    UIView *reparatableVequeceView = [sequeceView.subviews firstObject];
+    UIView *stackView = [reparatableVequeceView.subviews firstObject];
+
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+    if ([NSStringFromClass(gestureView.class) isEqualToString:@"_UIAlertControllerView"]) {
+        // iOS9 上，为 UICollectionView
+        stackView = [reparatableVequeceView.subviews lastObject];
+    }
+#endif
+    
+    for (UIView *subView in stackView.subviews) {
+        CGRect rect = [subView convertRect:subView.bounds toView:gestureView];
+        if (CGRectContainsPoint(rect, point)) { // 找到 _UIAlertControllerActionView，及 UIAlertController 响应点击的 view
+            // subView 类型为 _UIInterfaceActionCustomViewRepresentationView
+            // iOS9 上为 _UIAlertControllerCollectionViewCell
+            return subView;
+        }
     }
+    return nil;
 }
 
 @end
diff --git a/SensorsAnalyticsSDK/UIView+AutoTrack.h b/SensorsAnalyticsSDK/AutoTrack/UIView+AutoTrack.h
similarity index 83%
rename from SensorsAnalyticsSDK/UIView+AutoTrack.h
rename to SensorsAnalyticsSDK/AutoTrack/UIView+AutoTrack.h
index 2872f993..2a9395bd 100644
--- a/SensorsAnalyticsSDK/UIView+AutoTrack.h
+++ b/SensorsAnalyticsSDK/AutoTrack/UIView+AutoTrack.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/6/11.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -35,9 +35,6 @@
 @interface UITextView (AutoTrack) <SAAutoTrackViewProperty>
 @end
 
-@interface UITabBar (AutoTrack) <SAAutoTrackViewProperty>
-@end
-
 @interface UISearchBar (AutoTrack) <SAAutoTrackViewProperty>
 @end
 
@@ -46,6 +43,9 @@
 
 #pragma mark - UIControl
 
+@interface UIControl (AutoTrack) <SAAutoTrackViewProperty>
+@end
+
 @interface UIButton (AutoTrack) <SAAutoTrackViewProperty>
 @end
 
@@ -58,13 +58,13 @@
 @interface UISegmentedControl (AutoTrack) <SAAutoTrackViewProperty>
 @end
 
-#pragma mark - UITabBarItem
-@interface UITabBarItem (AutoTrack) <SAAutoTrackViewProperty>
+
+@interface UIPageControl (AutoTrack) <SAAutoTrackViewProperty>
 @end
 
 #pragma mark - Cell
-@interface UITableViewCell (AutoTrack) <SAAutoTrackCellProperty>
+@interface UITableViewCell (AutoTrack) <SAAutoTrackCellProperty, SAAutoTrackViewPathProperty>
 @end
 
-@interface UICollectionViewCell (AutoTrack) <SAAutoTrackCellProperty>
+@interface UICollectionViewCell (AutoTrack) <SAAutoTrackCellProperty, SAAutoTrackViewPathProperty>
 @end
diff --git a/SensorsAnalyticsSDK/AutoTrack/UIView+AutoTrack.m b/SensorsAnalyticsSDK/AutoTrack/UIView+AutoTrack.m
new file mode 100644
index 00000000..4fd16f4e
--- /dev/null
+++ b/SensorsAnalyticsSDK/AutoTrack/UIView+AutoTrack.m
@@ -0,0 +1,502 @@
+//
+//  UIView+sa_autoTrack.m
+//  SensorsAnalyticsSDK
+//
+//  Created by 向作为 on 2018/6/11.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAAutoTrackUtils.h"
+#import "SensorsAnalyticsSDK.h"
+
+#pragma mark - UIView
+
+@implementation UIView (AutoTrack)
+
+- (BOOL)sensorsdata_isIgnored {
+    if (self.isHidden || self.sensorsAnalyticsIgnoreView) {
+        return YES;
+    }
+    
+    BOOL isAutoTrackEnabled = [[SensorsAnalyticsSDK sharedInstance] isAutoTrackEnabled];
+    BOOL isAutoTrackEventTypeIgnored = [[SensorsAnalyticsSDK sharedInstance] isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppClick];
+    BOOL isViewTypeIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[self class]];
+    return !isAutoTrackEnabled || isAutoTrackEventTypeIgnored || isViewTypeIgnored;
+}
+
+- (NSString *)sensorsdata_elementType {
+
+    // 采集弹框类型（UIAlertController、UIActionSheet、UIAlertView）
+    if ([SAAutoTrackUtils isAlertForResponder:self]) {
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+        UIWindow *window = self.window;
+        if ([NSStringFromClass(window.class) isEqualToString:@"_UIAlertControllerShimPresenterWindow"]) {
+            CGFloat actionHeight = self.bounds.size.height;
+            if (actionHeight > 50) {
+                return NSStringFromClass(UIActionSheet.class);
+            } else {
+                return NSStringFromClass(UIAlertView.class);
+            }
+        } else {
+            return NSStringFromClass(UIAlertController.class);
+        }
+#else
+        return NSStringFromClass(UIAlertController.class);
+#endif
+    }
+    return NSStringFromClass(self.class);
+}
+
+- (NSString *)sensorsdata_elementContent {
+    NSMutableString *elementContent = [NSMutableString string];
+
+    if ([self isKindOfClass:NSClassFromString(@"RTLabel")]) {   // RTLabel:https://github.com/honcheng/RTLabel
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+        if ([self respondsToSelector:NSSelectorFromString(@"text")]) {
+            NSString *title = [self performSelector:NSSelectorFromString(@"text")];
+            if (title.length > 0) {
+                [elementContent appendString:title];
+            }
+        }
+    } else if ([self isKindOfClass:NSClassFromString(@"YYLabel")]) {    // RTLabel:https://github.com/ibireme/YYKit
+        if ([self respondsToSelector:NSSelectorFromString(@"text")]) {
+            NSString *title = [self performSelector:NSSelectorFromString(@"text")];
+            if (title.length > 0) {
+                [elementContent appendString:title];
+            }
+        }
+#pragma clang diagnostic pop
+    } else if ([self isKindOfClass:NSClassFromString(@"RCTView")]) { // RCTView RN 元素，https://reactnative.dev
+        NSString *content = [self.accessibilityLabel stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+        if (content.length > 0) {
+            [elementContent appendString:content];
+        }
+    } else {
+        NSMutableArray<NSString *> *elementContentArray = [NSMutableArray array];
+        for (UIView *subview in self.subviews) {
+            // 忽略隐藏控件
+            if (subview.isHidden || subview.sensorsAnalyticsIgnoreView) {
+                continue;
+            }
+            NSString *temp = subview.sensorsdata_elementContent;
+            if (temp.length > 0) {
+                [elementContentArray addObject:temp];
+            }
+        }
+        if (elementContentArray.count > 0) {
+            [elementContent appendString:[elementContentArray componentsJoinedByString:@"-"]];
+        }
+    }
+
+    return elementContent.length == 0 ? nil : [elementContent copy];
+}
+
+- (NSString *)sensorsdata_elementPosition {
+    UIView *superview = self.superview;
+    if (superview && superview.sensorsdata_elementPosition) {
+        return superview.sensorsdata_elementPosition;
+    }
+    return nil;
+}
+
+- (NSString *)sensorsdata_elementId {
+    return self.sensorsAnalyticsViewID;
+}
+
+- (UIViewController *)sensorsdata_viewController {
+    UIViewController *viewController = [SAAutoTrackUtils findNextViewControllerByResponder:self];
+
+    // 获取当前 controller 作为 screen_name
+    if ([viewController isKindOfClass:UINavigationController.class] || [viewController isKindOfClass:UIAlertController.class]) {
+        viewController = [SAAutoTrackUtils currentViewController];
+    }
+    return viewController;
+}
+
+- (NSString *)sensorsdata_itemPath {
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+    /* 忽略路径
+     UITableViewWrapperView 为 iOS11 以下 UITableView 与 cell 之间的 view
+     */
+    if ([NSStringFromClass(self.class) isEqualToString:@"UITableViewWrapperView"]) {
+        return nil;
+    }
+#endif
+
+    NSInteger index = [SAAutoTrackUtils itemIndexForResponder:self];
+    NSString *className = NSStringFromClass(self.class);
+    return index < 0 ? className : [NSString stringWithFormat:@"%@[%ld]", className, (long)index];
+}
+
+- (NSString *)sensorsdata_similarPath {
+    // 是否支持限定元素位置功能
+    BOOL isCell = [self isKindOfClass:UITableViewCell.class] || [self isKindOfClass:UICollectionViewCell.class];
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+    BOOL isItem = [NSStringFromClass(self.class) isEqualToString:@"UITabBarButton"] || [NSStringFromClass(self.class) isEqualToString:@"UISegment"];
+#else
+    BOOL isItem = NO;
+#endif
+
+    BOOL enableSupportSimilarPath = isCell || isItem;
+    if (self.sensorsdata_elementPosition && enableSupportSimilarPath) {
+        NSString *similarPath = [NSString stringWithFormat:@"%@[-]",NSStringFromClass(self.class)];
+        return similarPath;
+    } else {
+        return self.sensorsdata_itemPath;
+    }
+}
+
+- (NSString *)sensorsdata_heatMapPath {
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+        /* 忽略路径
+         UITableViewWrapperView 为 iOS11 以下 UITableView 与 cell 之间的 view
+         */
+        if ([NSStringFromClass(self.class) isEqualToString:@"UITableViewWrapperView"]) {
+            return nil;
+        }
+#endif
+
+    NSString *identifier = [SAAutoTrackUtils viewIdentifierForView:self];
+    if (identifier) {
+        return identifier;
+    }
+    return [SAAutoTrackUtils itemHeatMapPathForResponder:self];
+}
+
+@end
+
+@implementation UILabel (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+    return self.text ?: super.sensorsdata_elementContent;
+}
+
+@end
+
+@implementation UIImageView (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+#ifndef SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UIIMAGE_IMAGENAME
+    NSString *imageName = self.image.sensorsAnalyticsImageName;
+    if (imageName.length > 0) {
+        return [NSString stringWithFormat:@"%@", imageName];
+    }
+#endif
+    return super.sensorsdata_elementContent;
+}
+
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+- (NSString *)sensorsdata_elementPosition {
+    if ([NSStringFromClass(self.class) isEqualToString:@"UISegment"]) {
+        NSInteger index = [SAAutoTrackUtils itemIndexForResponder:self];
+        return index >= 0 ? [NSString stringWithFormat:@"%ld",(long)index] : [super sensorsdata_elementPosition];
+    }
+    return [super sensorsdata_elementPosition];
+}
+#endif
+
+@end
+
+@implementation UITextView (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+    return self.text ?: super.sensorsdata_elementContent;
+}
+
+@end
+
+@implementation UISearchBar (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+    return self.text;
+}
+
+@end
+
+@implementation UITableViewHeaderFooterView (AutoTrack)
+
+- (NSString *)sensorsdata_itemPath {
+    UITableView *tableView = (UITableView *)self.superview;
+
+    while (![tableView isKindOfClass:UITableView.class]) {
+        tableView = (UITableView *)tableView.superview;
+        if (!tableView) {
+            return super.sensorsdata_itemPath;
+        }
+    }
+    for (NSInteger i = 0; i < tableView.numberOfSections; i++) {
+        if (self == [tableView headerViewForSection:i]) {
+            return [NSString stringWithFormat:@"[SectionHeader][%ld]", (long)i];
+        }
+        if (self == [tableView footerViewForSection:i]) {
+            return [NSString stringWithFormat:@"[SectionFooter][%ld]", (long)i];
+        }
+    }
+    return super.sensorsdata_itemPath;
+}
+
+- (NSString *)sensorsdata_heatMapPath {
+    UIView *currentTableView = self.superview;
+    while (![currentTableView isKindOfClass:UITableView.class]) {
+        currentTableView = currentTableView.superview;
+        if (!currentTableView) {
+            return super.sensorsdata_heatMapPath;
+        }
+    }
+
+    UITableView *tableView = (UITableView *)currentTableView;
+    for (NSInteger i = 0; i < tableView.numberOfSections; i++) {
+        if (self == [tableView headerViewForSection:i]) {
+            return [NSString stringWithFormat:@"[SectionHeader][%ld]", (long)i];
+        }
+        if (self == [tableView footerViewForSection:i]) {
+            return [NSString stringWithFormat:@"[SectionFooter][%ld]", (long)i];
+        }
+    }
+    return super.sensorsdata_heatMapPath;
+}
+
+@end
+
+#pragma mark - UIControl
+
+@implementation UIControl (AutoTrack)
+
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+- (BOOL)sensorsdata_isIgnored {
+    // 忽略 UITabBarItem
+    BOOL ignoredUITabBarItem = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:UITabBarItem.class] && [NSStringFromClass(self.class) isEqualToString:@"UITabBarButton"];
+
+    // 忽略 UIBarButtonItem
+    BOOL ignoredUIBarButtonItem = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:UIBarButtonItem.class] && ([NSStringFromClass(self.class) isEqualToString:@"UINavigationButton"] || [NSStringFromClass(self.class) isEqualToString:@"_UIButtonBarButton"]);
+
+    return super.sensorsdata_isIgnored || ignoredUITabBarItem || ignoredUIBarButtonItem;
+}
+
+- (NSString *)sensorsdata_elementType {
+    // UIBarButtonItem
+    if (([NSStringFromClass(self.class) isEqualToString:@"UINavigationButton"] || [NSStringFromClass(self.class) isEqualToString:@"_UIButtonBarButton"])) {
+        return @"UIBarButtonItem";
+    }
+
+    // UITabBarItem
+    if ([NSStringFromClass(self.class) isEqualToString:@"UITabBarButton"]) {
+        return @"UITabBarItem";
+    }
+    return NSStringFromClass(self.class);
+}
+
+
+- (NSString *)sensorsdata_elementPosition {
+    // UITabBarItem
+    if ([NSStringFromClass(self.class) isEqualToString:@"UITabBarButton"]) {
+        NSInteger index = [SAAutoTrackUtils itemIndexForResponder:self];
+        return [NSString stringWithFormat:@"%ld", (long)index];
+    }
+
+    return super.sensorsdata_elementPosition;
+}
+#endif
+
+@end
+
+@implementation UIButton (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+    NSString *text = self.titleLabel.text;
+    if (!text) {
+        text = super.sensorsdata_elementContent;
+    }
+    return text;
+}
+
+@end
+
+@implementation UISwitch (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+    return self.on ? @"checked" : @"unchecked";
+}
+
+@end
+
+@implementation UIStepper (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+    return [NSString stringWithFormat:@"%g", self.value];
+}
+
+@end
+
+@implementation UISegmentedControl (AutoTrack)
+
+- (BOOL)sensorsdata_isIgnored {
+    return super.sensorsdata_isIgnored || self.selectedSegmentIndex == UISegmentedControlNoSegment;
+}
+
+- (NSString *)sensorsdata_elementContent {
+    return  self.selectedSegmentIndex == UISegmentedControlNoSegment ? [super sensorsdata_elementContent] : [self titleForSegmentAtIndex:self.selectedSegmentIndex];
+}
+
+- (NSString *)sensorsdata_elementPosition {
+    return self.selectedSegmentIndex == UISegmentedControlNoSegment ? [super sensorsdata_elementPosition] : [NSString stringWithFormat: @"%ld", (long)self.selectedSegmentIndex];
+}
+
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+- (NSString *)sensorsdata_itemPath {
+    // 支持单个 UISegment 创建事件。UISegment 是 UIImageView 的私有子类，表示UISegmentedControl 单个选项的显示区域
+    NSString *subPath = [NSString stringWithFormat:@"%@[%ld]", @"UISegment", (long)self.selectedSegmentIndex];
+    return [NSString stringWithFormat:@"%@/%@", super.sensorsdata_itemPath, subPath];
+}
+
+- (NSString *)sensorsdata_similarPath {
+    NSString *subPath = [NSString stringWithFormat:@"%@[-]", @"UISegment"];
+    return [NSString stringWithFormat:@"%@/%@", super.sensorsdata_itemPath, subPath];
+}
+
+- (NSString *)sensorsdata_heatMapPath {
+    NSString *subPath = [NSString stringWithFormat:@"%@[%ld]", @"UISegment", (long)self.selectedSegmentIndex];
+    return [NSString stringWithFormat:@"%@/%@", super.sensorsdata_heatMapPath, subPath];
+}
+#endif
+
+@end
+
+@implementation UIPageControl (AutoTrack)
+
+- (NSString *)sensorsdata_elementContent {
+    return [NSString stringWithFormat:@"%ld", (long)self.currentPage];
+}
+
+@end
+
+@implementation UISlider (AutoTrack)
+
+- (BOOL)sensorsdata_isIgnored {
+    return self.tracking || super.sensorsdata_isIgnored;
+}
+
+- (NSString *)sensorsdata_elementContent {
+    return [NSString stringWithFormat:@"%f", self.value];
+}
+
+@end
+
+#pragma mark - Cell
+
+@implementation UITableViewCell (AutoTrack)
+
+- (NSIndexPath *)sensorsdata_IndexPath {
+    UITableView *tableView = (UITableView *)[self superview];
+    do {
+        if ([tableView isKindOfClass:UITableView.class]) {
+            NSIndexPath *indexPath = [tableView indexPathForCell:self];
+            return indexPath;
+        }
+    } while ((tableView = (UITableView *)[tableView superview]));
+    return nil;
+}
+
+- (NSString *)sensorsdata_itemPath {
+    if (self.sensorsdata_IndexPath) {
+        return [self sensorsdata_itemPathWithIndexPath:self.sensorsdata_IndexPath];
+    }
+    return [super sensorsdata_itemPath];
+}
+
+- (NSString *)sensorsdata_similarPath {
+    if (self.sensorsdata_IndexPath) {
+        return [self sensorsdata_similarPathWithIndexPath:self.sensorsdata_IndexPath];
+    } else {
+        return self.sensorsdata_itemPath;
+    }
+}
+
+- (NSString *)sensorsdata_heatMapPath {
+    if (self.sensorsdata_IndexPath) {
+        return [self sensorsdata_itemPathWithIndexPath:self.sensorsdata_IndexPath];
+    }
+    return [super sensorsdata_heatMapPath];
+}
+                
+- (NSString *)sensorsdata_elementPositionWithIndexPath:(NSIndexPath *)indexPath {
+    return [NSString stringWithFormat: @"%ld:%ld", (long)indexPath.section, (long)indexPath.row];
+}
+
+- (NSString *)sensorsdata_itemPathWithIndexPath:(NSIndexPath *)indexPath {
+    return [NSString stringWithFormat:@"%@[%ld][%ld]", NSStringFromClass(self.class), (long)indexPath.section, (long)indexPath.row];
+}
+
+- (NSString *)sensorsdata_similarPathWithIndexPath:(NSIndexPath *)indexPath {
+    return [NSString stringWithFormat:@"%@[%ld][-]", NSStringFromClass(self.class), (long)indexPath.section];
+}
+
+@end
+
+@implementation UICollectionViewCell (AutoTrack)
+
+- (NSIndexPath *)sensorsdata_IndexPath {
+    UICollectionView *collectionView = (UICollectionView *)[self superview];
+    if ([collectionView isKindOfClass:UICollectionView.class]) {
+        NSIndexPath *indexPath = [collectionView indexPathForCell:self];
+        return indexPath;
+    }
+    return nil;
+}
+
+- (NSString *)sensorsdata_itemPath {
+    if (self.sensorsdata_IndexPath) {
+        return [self sensorsdata_itemPathWithIndexPath:self.sensorsdata_IndexPath];
+    }
+    return [super sensorsdata_itemPath];
+}
+
+- (NSString *)sensorsdata_similarPath {
+    if (self.sensorsdata_IndexPath) {
+        return [self sensorsdata_similarPathWithIndexPath:self.sensorsdata_IndexPath];
+    } else {
+        return super.sensorsdata_similarPath;
+    }
+}
+
+- (NSString *)sensorsdata_heatMapPath {
+    if (self.sensorsdata_IndexPath) {
+        return [self sensorsdata_itemPathWithIndexPath:self.sensorsdata_IndexPath];
+    }
+    return [super sensorsdata_heatMapPath];
+}
+
+- (NSString *)sensorsdata_elementPositionWithIndexPath:(NSIndexPath *)indexPath {
+    return [NSString stringWithFormat: @"%ld:%ld", (long)indexPath.section, (long)indexPath.item];
+}
+
+- (NSString *)sensorsdata_itemPathWithIndexPath:(NSIndexPath *)indexPath {
+    return [NSString stringWithFormat:@"%@[%ld][%ld]", NSStringFromClass(self.class), (long)indexPath.section, (long)indexPath.item];
+}
+
+- (NSString *)sensorsdata_similarPathWithIndexPath:(NSIndexPath *)indexPath {
+    if ([SAAutoTrackUtils isAlertClickForView:self]) {
+        return [self sensorsdata_itemPathWithIndexPath:indexPath];
+    }
+    return [NSString stringWithFormat:@"%@[%ld][-]", NSStringFromClass(self.class), (long)indexPath.section];
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/UIViewController+AutoTrack.h b/SensorsAnalyticsSDK/AutoTrack/UIViewController+AutoTrack.h
similarity index 92%
rename from SensorsAnalyticsSDK/UIViewController+AutoTrack.h
rename to SensorsAnalyticsSDK/AutoTrack/UIViewController+AutoTrack.h
index ccbfdec0..d8d42419 100644
--- a/SensorsAnalyticsSDK/UIViewController+AutoTrack.h
+++ b/SensorsAnalyticsSDK/AutoTrack/UIViewController+AutoTrack.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/10/18.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/UIViewController+AutoTrack.m b/SensorsAnalyticsSDK/AutoTrack/UIViewController+AutoTrack.m
similarity index 71%
rename from SensorsAnalyticsSDK/UIViewController+AutoTrack.m
rename to SensorsAnalyticsSDK/AutoTrack/UIViewController+AutoTrack.m
index e842cd8c..6245baf4 100644
--- a/SensorsAnalyticsSDK/UIViewController+AutoTrack.m
+++ b/SensorsAnalyticsSDK/AutoTrack/UIViewController+AutoTrack.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/10/18.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -26,7 +26,8 @@
 #import "UIViewController+AutoTrack.h"
 #import "SensorsAnalyticsSDK.h"
 #import "SAConstants+Private.h"
-#import "SALogger.h"
+#import "SACommonUtility.h"
+#import "SALog.h"
 #import "SASwizzler.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "UIView+AutoTrack.h"
@@ -43,11 +44,16 @@ - (NSString *)sensorsdata_screenName {
 }
 
 - (NSString *)sensorsdata_title {
-    NSString *titleViewContent = self.navigationItem.titleView.sensorsdata_elementContent;
+    __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;
     }
-    NSString *controllerTitle = self.navigationItem.title;
+
     if (controllerTitle.length > 0) {
         return controllerTitle;
     }
@@ -55,13 +61,26 @@ - (NSString *)sensorsdata_title {
 }
 
 - (NSString *)sensorsdata_itemPath {
-    return [SAAutoTrackUtils itemPathForResponder:self];
+    NSInteger index = [SAAutoTrackUtils itemIndexForResponder:self];
+    NSString *classString = NSStringFromClass(self.class);
+   
+    return index < 0 ? classString : [NSString stringWithFormat:@"%@[%ld]", classString, (long)index];
+}
+
+- (NSString *)sensorsdata_similarPath {
+    return self.sensorsdata_itemPath;
+}
+
+- (NSString *)sensorsdata_heatMapPath {
+    return [SAAutoTrackUtils itemHeatMapPathForResponder:self];
 }
 
 - (void)sa_autotrack_viewDidAppear:(BOOL)animated {
     @try {
-        
-        if ([[SensorsAnalyticsSDK sharedInstance] isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppViewScreen] == NO) {
+
+        SensorsAnalyticsSDK *instance = [SensorsAnalyticsSDK sharedInstance];
+
+        if (![instance isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppViewScreen] && instance.previousTrackViewController != self) {
 #ifndef SENSORS_ANALYTICS_ENABLE_AUTOTRACK_CHILD_VIEWSCREEN
             UIViewController *viewController = (UIViewController *)self;
             if (![viewController.parentViewController isKindOfClass:[UIViewController class]] ||
@@ -69,14 +88,20 @@ - (void)sa_autotrack_viewDidAppear:(BOOL)animated {
                 [viewController.parentViewController isKindOfClass:[UINavigationController class]] ||
                 [viewController.parentViewController isKindOfClass:[UIPageViewController class]] ||
                 [viewController.parentViewController isKindOfClass:[UISplitViewController class]]) {
-                [[SensorsAnalyticsSDK sharedInstance] autoTrackViewScreen: viewController];
+                [instance autoTrackViewScreen:viewController];
             }
 #else
-            [[SensorsAnalyticsSDK sharedInstance] autoTrackViewScreen:self];
+            [instance autoTrackViewScreen:self];
 #endif
         }
+
+        if (instance.previousTrackViewController != self && UIApplication.sharedApplication.keyWindow == self.view.window) {
+            // 全埋点中，忽略由于侧滑返回时多次触发的页面浏览事件
+            instance.previousTrackViewController = self;
+        }
+
 #ifndef SENSORS_ANALYTICS_ENABLE_AUTOTRACK_DIDSELECTROW
-        if ([SensorsAnalyticsSDK.sharedInstance isAutoTrackEventTypeIgnored: SensorsAnalyticsEventTypeAppClick] == NO) {
+        if (![instance isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppClick]) {
             //UITableView
 #ifndef SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UITABLEVIEW
             void (^tableViewBlock)(id, SEL, id, id) = ^(id view, SEL command, UITableView *tableView, NSIndexPath *indexPath) {
@@ -86,8 +111,7 @@ - (void)sa_autotrack_viewDidAppear:(BOOL)animated {
                 }
                 NSDictionary *dic = [SAAutoTrackUtils propertiesWithAutoTrackDelegate:tableView didSelectedAtIndexPath:indexPath];
                 [properties addEntriesFromDictionary:dic];
-
-                [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
+                [instance track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
             };
             if ([self respondsToSelector:@selector(tableView:didSelectRowAtIndexPath:)]) {
                 [SASwizzler swizzleSelector:@selector(tableView:didSelectRowAtIndexPath:) onClass:self.class withBlock:tableViewBlock named:[NSString stringWithFormat:@"%@_%@", NSStringFromClass(self.class), @"UITableView_AutoTrack"]];
@@ -104,7 +128,7 @@ - (void)sa_autotrack_viewDidAppear:(BOOL)animated {
                 NSDictionary *dic = [SAAutoTrackUtils propertiesWithAutoTrackDelegate:collectionView didSelectedAtIndexPath:indexPath];
                 [properties addEntriesFromDictionary:dic];
 
-                [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
+                [instance track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
             };
             if ([self respondsToSelector:@selector(collectionView:didSelectItemAtIndexPath:)]) {
                 [SASwizzler swizzleSelector:@selector(collectionView:didSelectItemAtIndexPath:) onClass:self.class withBlock:collectionViewBlock named:[NSString stringWithFormat:@"%@_%@", NSStringFromClass(self.class), @"UICollectionView_AutoTrack"]];
@@ -113,7 +137,7 @@ - (void)sa_autotrack_viewDidAppear:(BOOL)animated {
         }
 #endif
     } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
     }
     [self sa_autotrack_viewDidAppear:animated];
 }
diff --git a/SensorsAnalyticsSDK/Builder/SAIdentifier.h b/SensorsAnalyticsSDK/Builder/SAIdentifier.h
new file mode 100644
index 00000000..3516a6e9
--- /dev/null
+++ b/SensorsAnalyticsSDK/Builder/SAIdentifier.h
@@ -0,0 +1,97 @@
+//
+// SAIdentifier.h
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/2/17.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAIdentifier : NSObject
+
+/// 用户的登录 Id
+@property (nonatomic, copy, readonly) NSString *loginId;
+
+/// 匿名 Id（设备 Id）：IDFA -> IDFV -> UUID
+@property (nonatomic, copy, readonly) NSString *anonymousId;
+
+/// 唯一用户标识：loginId -> 设备 Id
+@property (nonatomic, copy, readonly) NSString *distinctId;
+
+/// Login 或 identify 操作前的 anonymousId
+@property (nonatomic, copy, readonly) NSString *originalId;
+
+/**
+ 初始化方法
+
+ @param queue 一个全局队列
+ @return 初始化对象
+ */
+- (instancetype)initWithQueue:(dispatch_queue_t)queue;
+
+/**
+ 自定义匿名 Id（设备 Id）
+
+ @param anonymousId 匿名 Id（设备 Id）
+ @return 自定义匿名 ID 结果
+
+ */
+- (BOOL)identify:(NSString *)anonymousId;
+
+/**
+ 重置匿名 Id
+ */
+- (void)resetAnonymousId;
+
+/**
+检查传入的 loginId 合法性
+
+ @param loginId 设置的 loginId
+ @return 合法性结果
+*/
+- (BOOL)isValidLoginId:(NSString *)loginId;
+
+/**
+ 通过登录接口设置 loginId
+
+ @param loginId 新的 loginId
+ */
+- (void)login:(NSString *)loginId;
+
+/**
+ 通过退出登录接口删除本地的 loginId
+ */
+- (void)logout;
+
+/**
+ 获取设备的 IDFA
+
+ @return idfa
+ */
++ (NSString *)idfa;
+
+/**
+ 生成匿名 Id（设备 Id）：IDFA -> IDFV -> UUID
+
+ @return 匿名 Id（设备 Id）
+ */
++ (NSString *)uniqueHardwareId;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Builder/SAIdentifier.m b/SensorsAnalyticsSDK/Builder/SAIdentifier.m
new file mode 100644
index 00000000..8d2b55eb
--- /dev/null
+++ b/SensorsAnalyticsSDK/Builder/SAIdentifier.m
@@ -0,0 +1,242 @@
+//
+// SAIdentifier.m
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/2/17.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <UIKit/UIKit.h>
+#import "SAIdentifier.h"
+#import "SAConstants+Private.h"
+#import "SAFileStore.h"
+#import "SAValidator.h"
+#import "SALog.h"
+
+#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
+    #import "SAKeyChainItemWrapper.h"
+#endif
+
+@interface SAIdentifier ()
+
+@property (nonatomic, strong) dispatch_queue_t queue;
+
+@property (nonatomic, copy, readwrite) NSString *loginId;
+@property (nonatomic, copy, readwrite) NSString *originalId;
+@property (nonatomic, copy, readwrite) NSString *anonymousId;
+
+@end
+
+@implementation SAIdentifier
+
+#pragma mark - Life Cycle
+
+- (instancetype)initWithQueue:(dispatch_queue_t)queue {
+    self = [super init];
+    if (self) {
+        _queue = queue;
+        dispatch_async(_queue, ^{
+            self.anonymousId = [self unarchiveAnonymousId];
+            self.loginId = [SAFileStore unarchiveWithFileName:SA_EVENT_LOGIN_ID];
+        });
+    }
+    return self;
+}
+
+#pragma mark - Public Methods
+
+- (BOOL)identify:(NSString *)anonymousId {
+    if (![SAValidator isValidString:anonymousId]) {
+        SALogError(@"%@ anonymousId:%@ is invalid parameter for identify", self, anonymousId);
+        return NO;
+    }
+
+    if ([anonymousId length] > 255) {
+        SALogWarn(@"%@ anonymousId:%@ is beyond the maximum length 255", self, anonymousId);
+    }
+
+    // 同步任务获取匿名 ID
+    NSString *originalId = self.anonymousId;
+
+    // 异步任务设置匿名 ID
+    dispatch_async(self.queue, ^{
+        self.originalId = originalId;
+        self.anonymousId = anonymousId;
+        [self archiveAnonymousId:anonymousId];
+    });
+    return YES;
+}
+
+- (void)archiveAnonymousId:(NSString *)anonymousId {
+    [SAFileStore archiveWithFileName:SA_EVENT_DISTINCT_ID value:anonymousId];
+#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
+    [SAKeyChainItemWrapper saveUdid:anonymousId];
+#endif
+}
+
+- (void)resetAnonymousId {
+    dispatch_async(self.queue, ^{
+        NSString *anonymousId = [SAIdentifier uniqueHardwareId];
+        self.anonymousId = anonymousId;
+        [self archiveAnonymousId:anonymousId];
+    });
+}
+
+- (BOOL)isValidLoginId:(NSString *)loginId {
+    if (![SAValidator isValidString:loginId]) {
+        SALogError(@"%@ loginId:%@ is invalid parameter for login", self, loginId);
+        return NO;
+    }
+
+    if ([loginId length] > 255) {
+        SALogError(@"%@ loginId:%@ is beyond the maximum length 255", self, loginId);
+        return NO;
+    }
+
+    if ([loginId isEqualToString:self.loginId]) {
+        return NO;
+    }
+
+    // 为了避免将匿名 ID 作为 LoginID 传入
+    if ([loginId isEqualToString:self.anonymousId]) {
+        return NO;
+    }
+
+    return YES;
+}
+
+- (void)login:(NSString *)loginId {
+    dispatch_async(self.queue, ^{
+        self.loginId = loginId;
+        self.originalId = self.anonymousId;
+        [SAFileStore archiveWithFileName:SA_EVENT_LOGIN_ID value:loginId];
+    });
+}
+
+- (void)logout {
+    dispatch_async(self.queue, ^{
+        self.loginId = nil;
+        [SAFileStore archiveWithFileName:SA_EVENT_LOGIN_ID value:nil];
+    });
+}
+
++ (NSString *)idfa {
+    NSString *idfa = nil;
+    // 宏 SENSORS_ANALYTICS_IDFA 定义时，优先使用IDFA
+    Class ASIdentifierManagerClass = NSClassFromString(@"ASIdentifierManager");
+    if (ASIdentifierManagerClass) {
+        SEL sharedManagerSelector = NSSelectorFromString(@"sharedManager");
+        id sharedManager = ((id (*)(id, SEL))[ASIdentifierManagerClass methodForSelector:sharedManagerSelector])(ASIdentifierManagerClass, sharedManagerSelector);
+        SEL advertisingIdentifierSelector = NSSelectorFromString(@"advertisingIdentifier");
+        NSUUID *uuid = ((NSUUID * (*)(id, SEL))[sharedManager methodForSelector:advertisingIdentifierSelector])(sharedManager, advertisingIdentifierSelector);
+        idfa = [uuid UUIDString];
+        // 在 iOS 10.0 以后，当用户开启限制广告跟踪，advertisingIdentifier 的值将是全零
+        // 00000000-0000-0000-0000-000000000000
+        if ([idfa hasPrefix:@"00000000"]) {
+            return nil;
+        }
+    }
+    return idfa;
+}
+
++ (NSString *)uniqueHardwareId {
+    NSString *distinctId = [self idfa];
+
+    // 没有IDFA，则使用IDFV
+    if (!distinctId) {
+        distinctId = [UIDevice currentDevice].identifierForVendor.UUIDString;
+    }
+
+    // 没有IDFV，则使用UUID
+    if (!distinctId) {
+        SALogDebug(@"%@ error getting device identifier: falling back to uuid", self);
+        distinctId = [NSUUID UUID].UUIDString;
+    }
+    return distinctId;
+}
+
+#pragma mark – Private Methods
+
+- (NSString *)unarchiveAnonymousId {
+    NSString *anonymousId = [SAFileStore unarchiveWithFileName:SA_EVENT_DISTINCT_ID];
+
+#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
+    NSString *distinctIdInKeychain = [SAKeyChainItemWrapper saUdid];
+    if (distinctIdInKeychain.length > 0) {
+        if (![anonymousId isEqualToString:distinctIdInKeychain]) {
+            // 保存 Archiver
+            [SAFileStore archiveWithFileName:SA_EVENT_DISTINCT_ID value:distinctIdInKeychain];
+        }
+        anonymousId = distinctIdInKeychain;
+    } else {
+#endif
+        if (anonymousId.length == 0) {
+            anonymousId = [SAIdentifier uniqueHardwareId];
+            [self archiveAnonymousId:anonymousId];
+        } else {
+#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
+            //保存 KeyChain
+            [SAKeyChainItemWrapper saveUdid:anonymousId];
+        }
+#endif
+    }
+    return anonymousId;
+}
+
+#pragma mark – Getters and Setters
+- (NSString *)loginId {
+    __block NSString *loginId;
+    sensorsdata_dispatch_safe_sync(self.queue, ^{
+        loginId = _loginId;
+    });
+    return loginId;
+}
+
+- (NSString *)originalId {
+    __block NSString *originalId;
+    sensorsdata_dispatch_safe_sync(self.queue, ^{
+        originalId = _originalId;
+    });
+    return originalId;
+}
+
+- (NSString *)anonymousId {
+    __block NSString *anonymousId;
+    sensorsdata_dispatch_safe_sync(self.queue, ^{
+        if (!_anonymousId) {
+            [self resetAnonymousId];
+        }
+        anonymousId = _anonymousId;
+    });
+    return anonymousId;
+}
+
+- (NSString *)distinctId {
+    __block NSString *distinctId = nil;
+    dispatch_block_t block = ^{
+        distinctId = self.loginId;
+        if (distinctId.length == 0) {
+            distinctId = self.anonymousId;
+        }
+    };
+    sensorsdata_dispatch_safe_sync(self.queue, block);
+    return distinctId;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/Builder/SAPresetProperty.h b/SensorsAnalyticsSDK/Builder/SAPresetProperty.h
new file mode 100644
index 00000000..fee07977
--- /dev/null
+++ b/SensorsAnalyticsSDK/Builder/SAPresetProperty.h
@@ -0,0 +1,112 @@
+//
+// SAPresetProperty.h
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/5/12.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
+@class SADeviceOrientationConfig;
+#endif
+
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_GPS
+@class SAGPSLocationConfig;
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const SAEventPresetPropertyDeviceID;
+
+/// SDK 类型
+extern NSString * const SAEventPresetPropertyLib;
+/// SDK 方法
+extern NSString * const SAEventPresetPropertyLibMethod;
+/// SDK 版本
+extern NSString * const SAEventPresetPropertyLibVersion;
+/// SDK 调用栈
+extern NSString * const SAEventPresetPropertyLibDetail;
+/// 应用版本
+extern NSString * const SAEventPresetPropertyAppVersion;
+
+extern NSString * const SAEventPresetPropertyNetworkType;
+extern NSString * const SAEventPresetPropertyWifi;
+/// 是否首日
+extern NSString * const SAEventPresetPropertyIsFirstDay;
+
+#pragma mark -
+@interface SAPresetProperty : NSObject
+
+@property (nonatomic, strong, readonly) NSMutableDictionary *automaticProperties;
+@property (nonatomic, copy, readonly) NSString *appVersion;
+@property (nonatomic, copy, readonly) NSString *deviceID;
+
+/**
+ 初始化方法
+ 
+ @param queue 一个全局队列
+ @param libVersion SDK 版本
+ 
+ @return 初始化对象
+ */
+- (instancetype)initWithQueue:(dispatch_queue_t)queue libVersion:(NSString *)libVersion NS_DESIGNATED_INITIALIZER;
+
+/// 禁用 init 初始化
+- (instancetype)init NS_UNAVAILABLE;
+
+/// 禁用 new 初始化
++ (instancetype)new NS_UNAVAILABLE;
+
+/**
+获取 lib 相关属性
+
+@param method SDK 方法
+
+@return lib 相关属性
+*/
+- (NSMutableDictionary *)libPropertiesWithMethod:(NSString *)method;
+
+/// 是否为首日
+- (BOOL)isFirstDay;
+
+/// 当前的网络属性
+- (NSDictionary *)currentNetworkProperties;
+
+/// 当前的预置属性
+- (NSDictionary *)currentPresetProperties;
+
+/**
+ track 类型特有的预置属性
+
+ @param isLaunchedPassively 是否是被动启动
+ @param orientationConfig 方向信息
+ @param locationConfig 位置信息
+
+ @return 当前的预置属性
+*/
+- (NSDictionary *)presetPropertiesOfTrackType:(BOOL)isLaunchedPassively
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
+                            orientationConfig:(SADeviceOrientationConfig *)orientationConfig
+#endif
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_GPS
+                               locationConfig:(SAGPSLocationConfig *)locationConfig
+#endif
+;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Builder/SAPresetProperty.m b/SensorsAnalyticsSDK/Builder/SAPresetProperty.m
new file mode 100644
index 00000000..4a27c828
--- /dev/null
+++ b/SensorsAnalyticsSDK/Builder/SAPresetProperty.m
@@ -0,0 +1,331 @@
+//
+// SAPresetProperty.m
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/5/12.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#error This file must be compiled with ARC. Either turn on ARC for the project or use -fobjc-arc flag on this file.
+#endif
+
+#include <sys/sysctl.h>
+#import <CoreTelephony/CTCarrier.h>
+#import <CoreTelephony/CTTelephonyNetworkInfo.h>
+
+#import "SAPresetProperty.h"
+#import "SAConstants+Private.h"
+#import "SAIdentifier.h"
+#import "SensorsAnalyticsSDK+Private.h"
+#import "SACommonUtility.h"
+#import "SALog.h"
+#import "SAFileStore.h"
+#import "SADateFormatter.h"
+#import "SADeviceOrientationManager.h"
+#import "SALocationManager.h"
+#import "SAValidator.h"
+
+//中国运营商 mcc 标识
+static NSString* const SACarrierChinaMCC = @"460";
+
+#pragma mark - device
+/// 设备 ID
+NSString * const SAEventPresetPropertyDeviceID = @"$device_id";
+/// 运营商
+static NSString * const SAEventPresetPropertyCarrier = @"$carrier";
+/// 型号
+static NSString * const SAEventPresetPropertyModel = @"$model";
+/// 生产商
+static NSString * const SAEventPresetPropertyManufacturer = @"$manufacturer";
+/// 屏幕高
+static NSString * const SAEventPresetPropertyScreenHeight = @"$screen_height";
+/// 屏幕宽
+static NSString * const SAEventPresetPropertyScreenWidth = @"$screen_width";
+
+#pragma mark - os
+/// 系统
+static NSString * const SAEventPresetPropertyOS = @"$os";
+/// 系统版本
+static NSString * const SAEventPresetPropertyOSVersion = @"$os_version";
+
+#pragma mark - app
+/// 应用版本
+NSString * const SAEventPresetPropertyAppVersion = @"$app_version";
+/// 应用 ID
+static NSString * const SAEventPresetPropertyAppID = @"$app_id";
+/// 时区偏移量
+static NSString * const SAEventPresetPropertyTimezoneOffset = @"$timezone_offset";
+
+#pragma mark - state
+/// 网络类型
+NSString * const SAEventPresetPropertyNetworkType = @"$network_type";
+/// 是否 WI-FI
+NSString * const SAEventPresetPropertyWifi = @"$wifi";
+/// 是否首日
+NSString * const SAEventPresetPropertyIsFirstDay = @"$is_first_day";
+/// 应用程序状态
+static NSString * const SAEventPresetPropertyAppState = @"$app_state";
+
+#pragma mark - lib
+/// SDK 类型
+NSString * const SAEventPresetPropertyLib = @"$lib";
+/// SDK 方法
+NSString * const SAEventPresetPropertyLibMethod = @"$lib_method";
+/// SDK 版本
+NSString * const SAEventPresetPropertyLibVersion = @"$lib_version";
+/// SDK 版本
+NSString * const SAEventPresetPropertyLibDetail = @"$lib_detail";
+
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
+static NSString * const SAEventPresetPropertyScreenOrientation = @"$screen_orientation";
+#endif
+
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_GPS
+static NSString * const SAEventPresetPropertyLatitude = @"$latitude";
+static NSString * const SAEventPresetPropertyLongitude = @"$longitude";
+#endif
+
+#pragma mark -
+
+@interface SAPresetProperty ()
+
+@property (nonatomic, strong) dispatch_queue_t queue;
+@property (nonatomic, strong) NSMutableDictionary *automaticProperties;
+@property (nonatomic, copy) NSString *firstDay;
+@property (nonatomic, copy) NSString *libVersion;
+
+@end
+
+@implementation SAPresetProperty
+
+#pragma mark - Life Cycle
+
+- (instancetype)initWithQueue:(dispatch_queue_t)queue libVersion:(NSString *)libVersion {
+    self = [super init];
+    if (self) {
+        _queue = queue;
+        
+        dispatch_async(self.queue, ^{
+            self.libVersion = libVersion;
+            [self unarchiveFirstDay];
+        });
+    }
+    return self;
+}
+
+#pragma mark – Public Methods
+
+- (NSMutableDictionary *)libPropertiesWithMethod:(NSString *)method {
+    NSMutableDictionary *libProperties = [NSMutableDictionary dictionary];
+    libProperties[SAEventPresetPropertyLib] = self.automaticProperties[SAEventPresetPropertyLib];
+    libProperties[SAEventPresetPropertyLibVersion] = self.automaticProperties[SAEventPresetPropertyLibVersion];
+    libProperties[SAEventPresetPropertyAppVersion] = self.automaticProperties[SAEventPresetPropertyAppVersion];
+    if ([SAValidator isValidString:method]) {
+        libProperties[SAEventPresetPropertyLibMethod] = method;
+    }
+    return libProperties;
+}
+
+- (BOOL)isFirstDay {
+    __block BOOL isFirstDay = NO;
+    sensorsdata_dispatch_safe_sync(self.queue, ^{
+        NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:@"yyyy-MM-dd"];
+        NSString *current = [dateFormatter stringFromDate:[NSDate date]];
+        isFirstDay = [self.firstDay isEqualToString:current];
+    });
+    return isFirstDay;
+}
+
+- (NSDictionary *)currentNetworkProperties {
+    NSString *networkType = [SACommonUtility currentNetworkStatus];
+
+    NSMutableDictionary *networkProperties = [NSMutableDictionary dictionary];
+    networkProperties[SAEventPresetPropertyNetworkType] = networkType;
+    networkProperties[SAEventPresetPropertyWifi] = @([networkType isEqualToString:@"WIFI"]);
+    return networkProperties;
+}
+
+- (NSDictionary *)currentPresetProperties {
+    NSMutableDictionary *presetProperties = [NSMutableDictionary dictionary];
+    [presetProperties addEntriesFromDictionary:self.automaticProperties];
+    [presetProperties addEntriesFromDictionary:[self currentNetworkProperties]];
+    presetProperties[SAEventPresetPropertyIsFirstDay] = @([self isFirstDay]);
+    return presetProperties;
+}
+
+- (NSString *)appVersion {
+    return self.automaticProperties[SAEventPresetPropertyAppVersion];
+}
+
+- (NSString *)deviceID {
+    return self.automaticProperties[SAEventPresetPropertyDeviceID];
+}
+
+- (NSDictionary *)presetPropertiesOfTrackType:(BOOL)isLaunchedPassively
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
+                            orientationConfig:(SADeviceOrientationConfig *)orientationConfig
+#endif
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_GPS
+                               locationConfig:(SAGPSLocationConfig *)locationConfig
+#endif
+{
+    NSMutableDictionary *presetPropertiesOfTrackType = [NSMutableDictionary dictionary];
+    // 是否首日访问
+    presetPropertiesOfTrackType[SAEventPresetPropertyIsFirstDay] = @([self isFirstDay]);
+    // 是否被动启动
+    if (isLaunchedPassively) {
+        presetPropertiesOfTrackType[SAEventPresetPropertyAppState] = @"background";
+    }
+    // 采集设备方向
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
+    if (orientationConfig.enableTrackScreenOrientation && [SAValidator isValidString:orientationConfig.deviceOrientation]) {
+        presetPropertiesOfTrackType[SAEventPresetPropertyScreenOrientation] = orientationConfig.deviceOrientation;
+    }
+#endif
+    // 采集地理位置信息
+#ifndef SENSORS_ANALYTICS_DISABLE_TRACK_GPS
+    if (locationConfig.enableGPSLocation && CLLocationCoordinate2DIsValid(locationConfig.coordinate)) {
+        NSInteger latitude = locationConfig.coordinate.latitude * pow(10, 6);
+        NSInteger longitude = locationConfig.coordinate.longitude * pow(10, 6);
+        presetPropertiesOfTrackType[SAEventPresetPropertyLatitude] = @(latitude);
+        presetPropertiesOfTrackType[SAEventPresetPropertyLongitude] = @(longitude);
+    }
+#endif
+    
+    return presetPropertiesOfTrackType;
+}
+
+#pragma mark – Private Methods
+
+- (void)unarchiveFirstDay {
+    self.firstDay = [SAFileStore unarchiveWithFileName:@"first_day"];
+    if (!self.firstDay) {
+        NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:@"yyyy-MM-dd"];
+        self.firstDay = [dateFormatter stringFromDate:[NSDate date]];
+        [SAFileStore archiveWithFileName:@"first_day" value:self.firstDay];
+    }
+}
+
++ (NSString *)deviceModel {
+    NSString *results = nil;
+    @try {
+        size_t size;
+        sysctlbyname("hw.machine", NULL, &size, NULL, 0);
+        char answer[size];
+        sysctlbyname("hw.machine", answer, &size, NULL, 0);
+        results = @(answer);
+    } @catch (NSException *exception) {
+        SALogError(@"%@: %@", self, exception);
+    }
+    return results;
+}
+
++ (NSString *)carrierName {
+    NSString *carrierName = nil;
+    @try {
+        CTTelephonyNetworkInfo *telephonyInfo = [[CTTelephonyNetworkInfo alloc] init];
+        CTCarrier *carrier = nil;
+        
+#ifdef __IPHONE_12_0
+        if (@available(iOS 12.1, *)) {
+            // 排序
+            NSArray *carrierKeysArray = [telephonyInfo.serviceSubscriberCellularProviders.allKeys sortedArrayUsingSelector:@selector(compare:)];
+            carrier = telephonyInfo.serviceSubscriberCellularProviders[carrierKeysArray.firstObject];
+            if (!carrier.mobileNetworkCode) {
+                carrier = telephonyInfo.serviceSubscriberCellularProviders[carrierKeysArray.lastObject];
+            }
+        }
+#endif
+        if (!carrier) {
+            carrier = telephonyInfo.subscriberCellularProvider;
+        }
+        if (carrier != nil) {
+            NSString *networkCode = [carrier mobileNetworkCode];
+            NSString *countryCode = [carrier mobileCountryCode];
+            
+            //中国运营商
+            if (countryCode && [countryCode isEqualToString:SACarrierChinaMCC] && networkCode) {
+                //中国移动
+                if ([networkCode isEqualToString:@"00"] || [networkCode isEqualToString:@"02"] || [networkCode isEqualToString:@"07"] || [networkCode isEqualToString:@"08"]) {
+                    carrierName= @"中国移动";
+                }
+                //中国联通
+                if ([networkCode isEqualToString:@"01"] || [networkCode isEqualToString:@"06"] || [networkCode isEqualToString:@"09"]) {
+                    carrierName= @"中国联通";
+                }
+                //中国电信
+                if ([networkCode isEqualToString:@"03"] || [networkCode isEqualToString:@"05"] || [networkCode isEqualToString:@"11"]) {
+                    carrierName= @"中国电信";
+                }
+                //中国卫通
+                if ([networkCode isEqualToString:@"04"]) {
+                    carrierName= @"中国卫通";
+                }
+                //中国铁通
+                if ([networkCode isEqualToString:@"20"]) {
+                    carrierName= @"中国铁通";
+                }
+            } else if (countryCode && networkCode) { //国外运营商解析
+                //加载当前 bundle
+                NSBundle *sensorsBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[SensorsAnalyticsSDK class]] pathForResource:@"SensorsAnalyticsSDK" ofType:@"bundle"]];
+                //文件路径
+                NSString *jsonPath = [sensorsBundle pathForResource:@"sa_mcc_mnc_mini.json" ofType:nil];
+                NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
+                if (jsonData) {
+                    NSDictionary *dicAllMcc =  [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableLeaves error:nil];
+                    if (dicAllMcc) {
+                        NSString *mccMncKey = [NSString stringWithFormat:@"%@%@", countryCode, networkCode];
+                        carrierName = dicAllMcc[mccMncKey];
+                    }
+                }
+            }
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@: %@", self, exception);
+    }
+    return carrierName;
+}
+
+#pragma mark – Getters and Setters
+
+- (NSMutableDictionary *)automaticProperties {
+    sensorsdata_dispatch_safe_sync(self.queue, ^{
+        if (!_automaticProperties) {
+            _automaticProperties = [NSMutableDictionary dictionary];
+#ifndef SENSORS_ANALYTICS_DISABLE_AUTOTRACK_DEVICEID
+            _automaticProperties[SAEventPresetPropertyDeviceID] = [SAIdentifier uniqueHardwareId];
+#endif
+            _automaticProperties[SAEventPresetPropertyCarrier] = [SAPresetProperty carrierName];
+            _automaticProperties[SAEventPresetPropertyModel] = [SAPresetProperty deviceModel];
+            _automaticProperties[SAEventPresetPropertyManufacturer] = @"Apple";
+            CGSize size = [UIScreen mainScreen].bounds.size;
+            _automaticProperties[SAEventPresetPropertyScreenHeight] = @((NSInteger)size.height);
+            _automaticProperties[SAEventPresetPropertyScreenWidth] = @((NSInteger)size.width);
+            _automaticProperties[SAEventPresetPropertyOS] = @"iOS";
+            _automaticProperties[SAEventPresetPropertyOSVersion] = [[UIDevice currentDevice] systemVersion];
+            _automaticProperties[SAEventPresetPropertyAppID] = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
+            _automaticProperties[SAEventPresetPropertyAppVersion] = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
+            _automaticProperties[SAEventPresetPropertyLib] = @"iOS";
+            _automaticProperties[SAEventPresetPropertyLibVersion] = self.libVersion;
+            // 计算时区偏移（保持和 JS 获取时区偏移的计算结果一致，这里首先获取分钟数，然后取反）
+            NSInteger minutesOffsetGMT = - ([[NSTimeZone defaultTimeZone] secondsFromGMT] / 60);
+            _automaticProperties[SAEventPresetPropertyTimezoneOffset] = @(minutesOffsetGMT);
+        }
+    });
+    return _automaticProperties;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/Encrypt/SADataEncryptBuilder.h b/SensorsAnalyticsSDK/Encrypt/SADataEncryptBuilder.h
new file mode 100644
index 00000000..9f5efe2c
--- /dev/null
+++ b/SensorsAnalyticsSDK/Encrypt/SADataEncryptBuilder.h
@@ -0,0 +1,54 @@
+//
+// SADataEncryptBuilder.h
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2019/7/23.
+// Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+#import <Foundation/Foundation.h>
+#import "SAConfigOptions.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SADataEncryptBuilder : NSObject
+
+/**
+ 指定初始化方法，设置 RSA 公钥
+
+ @param secretKey 公钥配置
+ @return 配置对象
+ */
+- (instancetype)initWithRSAPublicKey:(nonnull SASecretKey *)secretKey NS_DESIGNATED_INITIALIZER;
+
+/// 禁用 init 初始化
+- (instancetype)init NS_UNAVAILABLE;
+
+/// 禁用 new 初始化
++ (instancetype)new NS_UNAVAILABLE;
+
+/// 设置公钥
+- (void)updateRSAPublicSecretKey:(nonnull SASecretKey *)secretKey;
+
+/// 加密数据
+- (nullable NSDictionary *)encryptionJSONObject:(id)obj;
+
+/// 构造加密的数据结构
+- (void)buildFlushEncryptionDataWithRecords:(NSArray *)recordArray
+                                 completion:(void (^)(BOOL isContentEncrypted, NSArray *contentArray))completion;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Encrypt/SADataEncryptBuilder.m b/SensorsAnalyticsSDK/Encrypt/SADataEncryptBuilder.m
new file mode 100644
index 00000000..90923edb
--- /dev/null
+++ b/SensorsAnalyticsSDK/Encrypt/SADataEncryptBuilder.m
@@ -0,0 +1,167 @@
+//
+// SADataEncryptBuilder.m
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2019/7/23.
+// Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SADataEncryptBuilder.h"
+#import "SAEncryptUtils.h"
+#import "SAGzipUtility.h"
+#import "SAJSONUtil.h"
+#import "SALog.h"
+#import "SAValidator.h"
+
+@interface SADataEncryptBuilder()
+
+@property(nonatomic,strong) SAJSONUtil *jsonUtil;
+/// RSA 公钥配置
+@property(nonatomic, strong) SASecretKey *rsaSecretKey;
+
+///AES 秘钥
+@property(nonatomic, copy) NSData *aesSecretDataKey;
+/// RSA 加密后 AES 秘钥
+@property(nonatomic, copy) NSString *rsaEncryptAESKey;
+@end
+
+
+@implementation SADataEncryptBuilder
+
+#pragma mark - initializ
+- (instancetype)initWithRSAPublicKey:(SASecretKey *)secretKey {
+    self = [super init];
+    if (self) {
+        _jsonUtil = [[SAJSONUtil alloc] init];
+        [self updateRSAPublicSecretKey:secretKey];
+    }
+    return self;
+}
+
+- (void)updateRSAPublicSecretKey:(nonnull SASecretKey *)secretKey {
+    if (secretKey.key.length > 0 && ![secretKey.key isEqualToString:self.rsaSecretKey.key]) {
+        self.rsaSecretKey = secretKey;
+        
+        //对秘钥 RSA 加密
+        NSData *rsaEncryptData = [SAEncryptUtils RSAEncryptData:self.aesSecretDataKey publicKey:self.rsaSecretKey.key];
+        self.rsaEncryptAESKey = [rsaEncryptData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
+    }
+}
+
+-(NSData *)aesSecretDataKey {
+    if (!_aesSecretDataKey) {
+        _aesSecretDataKey = [SAEncryptUtils random16ByteData];
+    }
+    return _aesSecretDataKey;
+}
+
+- (NSString *)rsaEncryptAESKey {
+    if (!_rsaEncryptAESKey && self.rsaSecretKey.key.length > 0) {
+        //对秘钥 RSA 加密
+        NSData *rsaEncryptData = [SAEncryptUtils RSAEncryptData:self.aesSecretDataKey publicKey:self.rsaSecretKey.key];
+        _rsaEncryptAESKey = [rsaEncryptData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
+    }
+    return _rsaEncryptAESKey;
+}
+
+- (nullable NSDictionary *)encryptionJSONObject:(id)obj {
+    if (!self.rsaSecretKey || !self.rsaEncryptAESKey) {
+        SALogDebug(@"Enable encryption but the secret key is nil!");
+        return nil;
+    }
+
+    NSData *jsonData = [self.jsonUtil JSONSerializeObject:obj];
+    NSString *encodingString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    NSData *encodingData = [encodingString dataUsingEncoding:NSUTF8StringEncoding];
+    //使用 gzip 进行压缩
+    NSData *zippedData = [SAGzipUtility gzipData:encodingData];
+
+    //AES128 加密
+    NSString *encryptString = [SAEncryptUtils AES128EncryptData:zippedData AESKey:self.aesSecretDataKey];
+    if (!encryptString) {
+        return nil;
+    }
+    //封装加密的数据结构
+    NSMutableDictionary *secretObj = [NSMutableDictionary dictionary];
+    secretObj[@"pkv"] = @(self.rsaSecretKey.version);
+    secretObj[@"ekey"] = self.rsaEncryptAESKey;
+    secretObj[@"payload"] = encryptString;
+    return [NSDictionary dictionaryWithDictionary:secretObj];
+}
+
+- (void)buildFlushEncryptionDataWithRecords:(NSArray *)recordArray
+                                 completion:(void (^)(BOOL isContentEncrypted, NSArray *contentArray))completion {
+    /***** 构造加密数据结构 *****/
+    // 存储明文数据
+    NSMutableArray *unencryptedArray = [NSMutableArray array];
+    // 存储密文数据
+    NSMutableArray *encryptedArray = [NSMutableArray array];
+    
+    // 根据加密数据中相同的 ekey 进行合并
+    NSMutableArray *encryptedDicArray = [NSMutableArray array];
+    NSMutableArray *allKeys = [NSMutableArray arrayWithCapacity:recordArray.count];
+    [recordArray enumerateObjectsUsingBlock:^(id  _Nonnull json, NSUInteger idx, BOOL * _Nonnull stop) {
+        NSData *jsonData = [json dataUsingEncoding:NSUTF8StringEncoding];
+        if (!jsonData) {
+            return;
+        }
+        
+        NSMutableDictionary *jsonDic = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:nil];
+        if (!jsonDic) {
+            return;
+        }
+        
+        if (!jsonDic[@"ekey"]) {
+            // 构造未加密数据
+            [unencryptedArray addObject:json];
+            return;
+        }
+        
+        NSInteger index = [allKeys indexOfObject:jsonDic[@"ekey"]];
+        if (index == NSNotFound) {
+            [allKeys addObject:jsonDic[@"ekey"]];
+            jsonDic[@"payloads"] = [NSMutableArray arrayWithObject:jsonDic[@"payload"]];
+            jsonDic[@"payload"] = nil;
+            [encryptedDicArray addObject:jsonDic];
+            return;
+        }
+        NSMutableDictionary *contentDic = encryptedDicArray[index];
+        [(NSMutableArray *)contentDic[@"payloads"] addObject:jsonDic[@"payload"]];
+    }];
+    
+    // 构造加密数据
+    [encryptedDicArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        NSData *encrypData = [self.jsonUtil JSONSerializeObject:obj];
+        NSString *encrypString = [[NSString alloc] initWithData:encrypData encoding:NSUTF8StringEncoding];
+        if ([SAValidator isValidString:encrypString]) {
+            [encryptedArray addObject:encrypString];
+        }
+    }];
+    
+    if (encryptedArray.count > 0) {
+        // 优先使用密文
+        completion(YES, encryptedArray);
+    } else {
+        // 没有密文则使用明文
+        completion(NO, unencryptedArray);
+    }
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/Encrypt/SAEncryptSecretKeyHandler.h b/SensorsAnalyticsSDK/Encrypt/SAEncryptSecretKeyHandler.h
new file mode 100644
index 00000000..cbfab81b
--- /dev/null
+++ b/SensorsAnalyticsSDK/Encrypt/SAEncryptSecretKeyHandler.h
@@ -0,0 +1,53 @@
+//
+// SAEncryptSecretKeyHandler.h
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/6/18.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+@class SASecretKey;
+@class SAConfigOptions;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAEncryptSecretKeyHandler : NSObject
+
+/// 根据 ConfigOptions 初始化密钥管理类
+/// @param configOptions SDK 初始化的 configOptions
+- (instancetype)initWithConfigOptions:(SAConfigOptions *)configOptions NS_DESIGNATED_INITIALIZER;
+
+/// 禁用 init 初始化
+- (instancetype)init NS_UNAVAILABLE;
+
+/// 禁用 new 初始化
++ (instancetype)new NS_UNAVAILABLE;
+
+/// 保存公钥
+/// @param secretKey 需要保存的公钥
+- (void)saveSecretKey:(SASecretKey *)secretKey;
+
+/// 获取公钥
+- (SASecretKey *)loadSecretKey;
+
+/// 校验加密公钥
+/// @param url 打开本 App 的回调 url
+- (void)checkSecretKeyURL:(NSURL *)url;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Encrypt/SAEncryptSecretKeyHandler.m b/SensorsAnalyticsSDK/Encrypt/SAEncryptSecretKeyHandler.m
new file mode 100644
index 00000000..9ea15255
--- /dev/null
+++ b/SensorsAnalyticsSDK/Encrypt/SAEncryptSecretKeyHandler.m
@@ -0,0 +1,131 @@
+//
+// SAEncryptSecretKeyHandler.m
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/6/18.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAEncryptSecretKeyHandler.h"
+#import "SAConfigOptions.h"
+#import "SAFileStore.h"
+#import "SALog.h"
+#import "SAURLUtils.h"
+#import "SAValidator.h"
+#import "SAAlertController.h"
+
+static NSString * const SAEncryptSecretKey = @"SAEncryptSecretKey";
+
+@interface SAEncryptSecretKeyHandler ()
+
+/// SDK初始化时的 ConfigOptions
+@property (nonatomic, copy) SAConfigOptions *configOptions;
+
+@end
+
+@implementation SAEncryptSecretKeyHandler
+
+- (instancetype)initWithConfigOptions:(SAConfigOptions *)configOptions {
+    self = [super init];
+    if (self) {
+        self.configOptions = configOptions;
+    }
+    return self;
+}
+
+- (void)saveSecretKey:(SASecretKey *)secretKey {
+    if (!secretKey) {
+        return;
+    }
+    
+    if (self.configOptions.saveSecretKey) {
+        // 通过用户的回调保存公钥
+        self.configOptions.saveSecretKey(secretKey);
+        
+        [SAFileStore archiveWithFileName:SAEncryptSecretKey value:nil];
+        
+        SALogDebug(@"Save secret key by saveSecretKey callback, pkv : %ld, public_key : %@", (long)secretKey.version, secretKey.key);
+    } else {
+        // 存储到本地
+        NSData *secretKeyData = [NSKeyedArchiver archivedDataWithRootObject:secretKey];
+        [SAFileStore archiveWithFileName:SAEncryptSecretKey value:secretKeyData];
+        
+        SALogDebug(@"Save secret key by localSecretKey, pkv : %ld, public_key : %@", (long)secretKey.version, secretKey.key);
+    }
+}
+
+- (SASecretKey *)loadSecretKey {
+    SASecretKey *secretKey = nil;
+    
+    if (self.configOptions.loadSecretKey) {
+        // 通过用户的回调获取公钥
+        secretKey = self.configOptions.loadSecretKey();
+        
+        if (secretKey) {
+            SALogDebug(@"Load secret key from loadSecretKey callback, pkv : %ld, public_key : %@", (long)secretKey.version, secretKey.key);
+        } else {
+            SALogDebug(@"Load secret key from loadSecretKey callback failed!");
+        }
+    } else {
+        // 通过本地获取公钥
+        id secretKeyData = [SAFileStore unarchiveWithFileName:SAEncryptSecretKey];
+        secretKey = [NSKeyedUnarchiver unarchiveObjectWithData:secretKeyData];
+        
+        if (secretKey) {
+            SALogDebug(@"Load secret key from localSecretKey, pkv : %ld, public_key : %@", (long)secretKey.version, secretKey.key);
+        } else {
+            SALogDebug(@"Load secret key from localSecretKey failed!");
+        }
+    }
+    
+    return secretKey;
+}
+
+- (void)checkSecretKeyURL:(NSURL *)url {
+    NSString *message = @"当前 App 未开启加密，请开启加密后再试";
+    
+    if (self.configOptions.enableEncrypt) {
+        NSDictionary *paramDic = [SAURLUtils queryItemsWithURL:url];
+        NSString *urlVersion = paramDic[@"v"];
+        NSString *urlKey = paramDic[@"key"];
+        
+        if ([SAValidator isValidString:urlVersion] && [SAValidator isValidString:urlKey]) {
+            SASecretKey *secretKey = [self loadSecretKey];
+            NSString *loadVersion = [@(secretKey.version) stringValue];
+            // url 中的 key 为 encode 之后的
+            NSString *loadKey = [secretKey.key stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet alphanumericCharacterSet]];
+            
+            if ([loadVersion isEqualToString:urlVersion] && [loadKey isEqualToString:urlKey]) {
+                message = @"密钥验证通过，所选密钥与 App 端密钥相同";
+            } else if (![SAValidator isValidString:loadKey]) {
+                message = @"密钥验证不通过，App 端密钥为空";
+            } else {
+                message = [NSString stringWithFormat:@"密钥验证不通过，所选密钥与 App 端密钥不相同。所选密钥版本:%@，App 端密钥版本:%@", urlVersion, loadVersion];
+            }
+        } else {
+            message = @"密钥验证不通过，所选密钥无效";
+        }
+    }
+    
+    SAAlertController *alertController = [[SAAlertController alloc] initWithTitle:nil message:message preferredStyle:SAAlertControllerStyleAlert];
+    [alertController addActionWithTitle:@"确认" style:SAAlertActionStyleDefault handler:nil];
+    [alertController show];
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/Encrypt/SAEncryptUtils.h b/SensorsAnalyticsSDK/Encrypt/SAEncryptUtils.h
new file mode 100644
index 00000000..506741e8
--- /dev/null
+++ b/SensorsAnalyticsSDK/Encrypt/SAEncryptUtils.h
@@ -0,0 +1,56 @@
+//
+//  SAEncryptUtils.h
+//  SensorsAnalyticsSDK
+//
+//  Created by 储强盛 on 2018/10/31.
+//  Copyright © 2018 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAEncryptUtils : NSObject
+
+/**
+ RSA 公钥加密
+
+ @param data 待加密数据
+ @param pubKey 公钥
+ @return 加密后数据
+ */
++ (nullable NSData *)RSAEncryptData:(NSData *)data publicKey:(NSString *)pubKey;
+
+#pragma mark - AES
+
+/**
+ 随机生成 16 字节秘钥
+ @return 秘钥 Byte 数据
+ */
++ (NSData *)random16ByteData;
+
+/**
+ AES 128 加密
+
+ @param data 待加密数据
+ @param keyData 秘钥
+ @return 加密并 base64 字符
+ */
++ (nullable NSString *)AES128EncryptData:(NSData *)data AESKey:(NSData *)keyData;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
diff --git a/SensorsAnalyticsSDK/Encrypt/SAEncryptUtils.m b/SensorsAnalyticsSDK/Encrypt/SAEncryptUtils.m
new file mode 100644
index 00000000..b62f04d1
--- /dev/null
+++ b/SensorsAnalyticsSDK/Encrypt/SAEncryptUtils.m
@@ -0,0 +1,416 @@
+//
+//  SAEncryptUtils.m
+//  SensorsAnalyticsSDK
+//
+//  Created by 储强盛 on 2018/10/31.
+//  Copyright © 2018 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAEncryptUtils.h"
+#import <Security/Security.h>
+#import <CommonCrypto/CommonCryptor.h>
+#import <UIKit/UIKit.h>
+#import "SALog.h"
+
+@implementation SAEncryptUtils
+
+static NSString *base64_encode_data(NSData *data) {
+    data = [data base64EncodedDataWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
+    NSString *ret = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    return ret;
+}
+
+static NSData *base64_decode(NSString *str) {
+    NSData *data = [[NSData alloc] initWithBase64EncodedString:str options:NSDataBase64DecodingIgnoreUnknownCharacters];
+    return data;
+}
+
+#pragma mark - RSA
+/**
+ 公钥加密
+ return base64 encoded string
+ @param originString 原数据
+ @param pubKey 公钥
+ @return 加密后数据
+ */
++ (NSString *)RSAEncryptString:(NSString *)originString publicKey:(NSString *)pubKey {
+    NSData *data = [SAEncryptUtils RSAEncryptData:[originString dataUsingEncoding:NSUTF8StringEncoding] publicKey:pubKey];
+    NSString *ret = base64_encode_data(data);
+    return ret;
+}
+
++ (nullable NSData *)RSAEncryptData:(NSData *)data publicKey:(NSString *)pubKey {
+    if (!data || !pubKey) {
+        return nil;
+    }
+    SecKeyRef keyRef = [SAEncryptUtils addPublicKey:pubKey];
+    if (!keyRef) {
+        SALogError(@"initialize Public SecKeyRef Fail");
+        return nil;
+    }
+    return [SAEncryptUtils RSAEncryptData:data withKeyRef:keyRef];
+}
+
+/**
+ 私钥解密
+ @param string 加密后数据
+ @param privKey 私钥
+ @return 解密数据
+ */
++ (NSString *)RSADecryptString:(NSString *)string privateKey:(NSString *)privKey {
+    NSData *data = [[NSData alloc] initWithBase64EncodedString:string options:NSDataBase64DecodingIgnoreUnknownCharacters];
+    data = [SAEncryptUtils RSADecryptData:data privateKey:privKey];
+    NSString *ret = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+    return ret;
+}
+
++ (NSData *)RSADecryptData:(NSData *)data privateKey:(NSString *)privKey {
+    if (!data || !privKey) {
+        return nil;
+    }
+    SecKeyRef keyRef = [SAEncryptUtils addPrivateKey:privKey];
+    if (!keyRef) {
+        SALogError(@"initialize Private SecKeyRef Fail");
+        return nil;
+    }
+    return [SAEncryptUtils RSADecryptData:data withKeyRef:keyRef];
+}
+
++ (NSData *)stripPublicKeyHeader:(NSData *)d_key {
+    // Skip ASN.1 public key header
+    if (d_key == nil) return(nil);
+    
+    unsigned long len = [d_key length];
+    if (!len) return(nil);
+    
+    unsigned char *c_key = (unsigned char *)[d_key bytes];
+    unsigned int  idx     = 0;
+    
+    if (c_key[idx++] != 0x30) return(nil);
+    
+    if (c_key[idx] > 0x80) idx += c_key[idx] - 0x80 + 1;
+    else idx++;
+    
+    // PKCS #1 rsaEncryption szOID_RSA_RSA
+    static unsigned char seqiod[] =
+    { 0x30,   0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+        0x01, 0x05, 0x00 };
+    if (memcmp(&c_key[idx], seqiod, 15)) return(nil);
+    
+    idx += 15;
+    
+    if (c_key[idx++] != 0x03) return(nil);
+    
+    if (c_key[idx] > 0x80) idx += c_key[idx] - 0x80 + 1;
+    else idx++;
+    
+    if (c_key[idx++] != '\0') return(nil);
+    
+    // Now make a new NSData from this buffer
+    return([NSData dataWithBytes:&c_key[idx] length:len - idx]);
+}
+
++ (NSData *)stripPrivateKeyHeader:(NSData *)d_key {
+    // Skip ASN.1 private key header
+    if (d_key == nil) return(nil);
+    
+    unsigned long len = [d_key length];
+    if (!len) return(nil);
+    
+    unsigned char *c_key = (unsigned char *)[d_key bytes];
+    unsigned int  idx     = 22; //magic byte at offset 22
+    
+    if (0x04 != c_key[idx++]) return nil;
+    
+    //calculate length of the key
+    unsigned int c_len = c_key[idx++];
+    int det = c_len & 0x80;
+    if (!det) {
+        c_len = c_len & 0x7f;
+    } else {
+        int byteCount = c_len & 0x7f;
+        if (byteCount + idx > len) {
+            //rsa length field longer than buffer
+            return nil;
+        }
+        unsigned int accum = 0;
+        unsigned char *ptr = &c_key[idx];
+        idx += byteCount;
+        while (byteCount) {
+            accum = (accum << 8) + *ptr;
+            ptr++;
+            byteCount--;
+        }
+        c_len = accum;
+    }
+    // Now make a new NSData from this buffer
+    return [d_key subdataWithRange:NSMakeRange(idx, c_len)];
+}
+
++ (SecKeyRef)addPublicKey:(NSString *)key {
+    key = [key stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+    key = [key stringByReplacingOccurrencesOfString:@"\n" withString:@""];
+    key = [key stringByReplacingOccurrencesOfString:@"\t" withString:@""];
+    key = [key stringByReplacingOccurrencesOfString:@" "  withString:@""];
+    
+    // This will be base64 encoded, decode it.
+    NSData *data = base64_decode(key);
+    data = [SAEncryptUtils stripPublicKeyHeader:data];
+    if (!data) {
+        return nil;
+    }
+    
+    //a tag to read/write keychain storage
+    NSString *tag = @"RSAUtil_PubKey";
+    NSData *d_tag = [NSData dataWithBytes:[tag UTF8String] length:[tag length]];
+    
+    // Delete any old lingering key with the same tag
+    NSMutableDictionary *publicKey = [[NSMutableDictionary alloc] init];
+    [publicKey setObject:(__bridge id) kSecClassKey forKey:(__bridge id)kSecClass];
+    [publicKey setObject:(__bridge id) kSecAttrKeyTypeRSA forKey:(__bridge id)kSecAttrKeyType];
+    [publicKey setObject:d_tag forKey:(__bridge id)kSecAttrApplicationTag];
+    SecItemDelete((__bridge CFDictionaryRef)publicKey);
+    
+    // Add persistent version of the key to system keychain
+    [publicKey setObject:data forKey:(__bridge id)kSecValueData];
+    [publicKey setObject:(__bridge id) kSecAttrKeyClassPublic forKey:(__bridge id)
+     kSecAttrKeyClass];
+    [publicKey setObject:[NSNumber numberWithBool:YES] forKey:(__bridge id)
+     kSecReturnPersistentRef];
+    
+    CFTypeRef persistKey = nil;
+    OSStatus status = SecItemAdd((__bridge CFDictionaryRef)publicKey, &persistKey);
+    if (persistKey != nil) {
+        CFRelease(persistKey);
+    }
+    if ((status != noErr) && (status != errSecDuplicateItem)) {
+        return nil;
+    }
+    
+    [publicKey removeObjectForKey:(__bridge id)kSecValueData];
+    [publicKey removeObjectForKey:(__bridge id)kSecReturnPersistentRef];
+    [publicKey setObject:[NSNumber numberWithBool:YES] forKey:(__bridge id)kSecReturnRef];
+    [publicKey setObject:(__bridge id) kSecAttrKeyTypeRSA forKey:(__bridge id)kSecAttrKeyType];
+    
+    // Now fetch the SecKeyRef version of the key
+    SecKeyRef keyRef = nil;
+    status = SecItemCopyMatching((__bridge CFDictionaryRef)publicKey, (CFTypeRef *)&keyRef);
+    if (status != noErr) {
+        return nil;
+    }
+    return keyRef;
+}
+
++ (SecKeyRef)addPrivateKey:(NSString *)key {
+
+    key = [key stringByReplacingOccurrencesOfString:@"\r" withString:@""];
+    key = [key stringByReplacingOccurrencesOfString:@"\n" withString:@""];
+    key = [key stringByReplacingOccurrencesOfString:@"\t" withString:@""];
+    key = [key stringByReplacingOccurrencesOfString:@" "  withString:@""];
+    
+    // This will be base64 encoded, decode it.
+    NSData *data = base64_decode(key);
+    data = [SAEncryptUtils stripPrivateKeyHeader:data];
+    if (!data) {
+        return nil;
+    }
+    
+    //a tag to read/write keychain storage
+    NSString *tag = @"RSAUtil_PrivKey";
+    NSData *d_tag = [NSData dataWithBytes:[tag UTF8String] length:[tag length]];
+    
+    // Delete any old lingering key with the same tag
+    NSMutableDictionary *privateKey = [[NSMutableDictionary alloc] init];
+    [privateKey setObject:(__bridge id) kSecClassKey forKey:(__bridge id)kSecClass];
+    [privateKey setObject:(__bridge id) kSecAttrKeyTypeRSA forKey:(__bridge id)kSecAttrKeyType];
+    [privateKey setObject:d_tag forKey:(__bridge id)kSecAttrApplicationTag];
+    SecItemDelete((__bridge CFDictionaryRef)privateKey);
+    
+    // Add persistent version of the key to system keychain
+    [privateKey setObject:data forKey:(__bridge id)kSecValueData];
+    [privateKey setObject:(__bridge id) kSecAttrKeyClassPrivate forKey:(__bridge id)
+     kSecAttrKeyClass];
+    [privateKey setObject:[NSNumber numberWithBool:YES] forKey:(__bridge id)
+     kSecReturnPersistentRef];
+    
+    CFTypeRef persistKey = nil;
+    OSStatus status = SecItemAdd((__bridge CFDictionaryRef)privateKey, &persistKey);
+    if (persistKey != nil) {
+        CFRelease(persistKey);
+    }
+    if ((status != noErr) && (status != errSecDuplicateItem)) {
+        return nil;
+    }
+    
+    [privateKey removeObjectForKey:(__bridge id)kSecValueData];
+    [privateKey removeObjectForKey:(__bridge id)kSecReturnPersistentRef];
+    [privateKey setObject:[NSNumber numberWithBool:YES] forKey:(__bridge id)kSecReturnRef];
+    [privateKey setObject:(__bridge id) kSecAttrKeyTypeRSA forKey:(__bridge id)kSecAttrKeyType];
+    
+    // Now fetch the SecKeyRef version of the key
+    SecKeyRef keyRef = nil;
+    status = SecItemCopyMatching((__bridge CFDictionaryRef)privateKey, (CFTypeRef *)&keyRef);
+    if (status != noErr) {
+        return nil;
+    }
+    return keyRef;
+}
+
+/** Encryption & Decryption with RSA private key */
++ (NSData *)RSAEncryptData:(NSData *)data withKeyRef:(SecKeyRef) keyRef {
+    
+    const uint8_t *srcbuf = (const uint8_t *)[data bytes];
+    size_t srclen = (size_t)data.length;
+    
+    size_t block_size = SecKeyGetBlockSize(keyRef) * sizeof(uint8_t);
+    void *outbuf = malloc(block_size);
+    size_t src_block_size = block_size - 11;
+    
+    NSMutableData *ret = [[NSMutableData alloc] init];
+    for(int idx=0; idx<srclen; idx+=src_block_size) {
+        size_t data_len = srclen - idx;
+        if (data_len > src_block_size) {
+            data_len = src_block_size;
+        }
+        
+        size_t outlen = block_size;
+        OSStatus status = noErr;
+        
+        status = SecKeyEncrypt(keyRef,
+                               kSecPaddingPKCS1,
+                               srcbuf + idx,
+                               data_len,
+                               outbuf,
+                               &outlen
+                               );
+        if (status != 0) {
+            SALogError(@"SecKeyEncrypt fail. Error Code: %d", status);
+            ret = nil;
+            break;
+        }else{
+            [ret appendBytes:outbuf length:outlen];
+        }
+    }
+    free(outbuf);
+    CFRelease(keyRef);
+    return ret;
+}
+
++ (NSData *)RSADecryptData:(NSData *)data withKeyRef:(SecKeyRef) keyRef {
+    const uint8_t *srcbuf = (const uint8_t *)[data bytes];
+    size_t srclen = (size_t)data.length;
+    
+    size_t block_size = SecKeyGetBlockSize(keyRef) * sizeof(uint8_t);
+    UInt8 *outbuf = malloc(block_size);
+    size_t src_block_size = block_size;
+    
+    NSMutableData *ret = [[NSMutableData alloc] init];
+    for(int idx=0; idx<srclen; idx+=src_block_size) {
+        size_t data_len = srclen - idx;
+        if (data_len > src_block_size) {
+            data_len = src_block_size;
+        }
+        
+        size_t outlen = block_size;
+        OSStatus status = noErr;
+        status = SecKeyDecrypt(keyRef,
+                               kSecPaddingNone,
+                               srcbuf + idx,
+                               data_len,
+                               outbuf,
+                               &outlen
+                               );
+        if (status != 0) {
+            SALogError(@"SecKeyEncrypt fail. Error Code: %d", (int)status);
+            ret = nil;
+            break;
+        } else {
+            //the actual decrypted data is in the middle, locate it!
+            int idxFirstZero = -1;
+            int idxNextZero = (int)outlen;
+            for ( int i = 0; i < outlen; i++ ) {
+                if ( outbuf[i] == 0 ) {
+                    if ( idxFirstZero < 0 ) {
+                        idxFirstZero = i;
+                    } else {
+                        idxNextZero = i;
+                        break;
+                    }
+                }
+            }
+            [ret appendBytes:&outbuf[idxFirstZero+1] length:idxNextZero-idxFirstZero-1];
+        }
+    }
+    
+    free(outbuf);
+    CFRelease(keyRef);
+    return ret;
+}
+
+#pragma mark - AES
+/**
+ 随机生成 16 字节秘钥
+ @return 秘钥 Byte 数据
+ */
++ (NSData *)random16ByteData {
+    unsigned char buf[16];
+    arc4random_buf(buf, sizeof(buf));
+    NSData *data = [NSData dataWithBytes:buf length:sizeof(buf)];
+    return data;
+}
+
+/**
+ AES128加密
+ */
++ (nullable NSString *)AES128EncryptData:(NSData *)data AESKey:(NSData *)keyData {
+    
+    NSUInteger dataLength = [data length];
+    size_t bufferSize = dataLength + kCCBlockSizeAES128;
+    void *buffer = malloc(bufferSize);
+    
+    unsigned char buf[16];
+    arc4random_buf(buf, sizeof(buf));
+    NSData *ivData = [NSData dataWithBytes:buf length:sizeof(buf)];
+
+    size_t numBytesEncrypted = 0;
+    CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt, kCCAlgorithmAES128,
+                                          kCCOptionPKCS7Padding,
+                                          [keyData bytes], kCCBlockSizeAES128,
+                                          [ivData bytes],
+                                          [data bytes], dataLength,
+                                          buffer, bufferSize,
+                                          &numBytesEncrypted);
+    if (cryptStatus == kCCSuccess) {
+        NSData *encryptData = [NSData dataWithBytes:buffer length:numBytesEncrypted];
+        NSMutableData *ivEncryptData = [NSMutableData dataWithData:ivData];
+        [ivEncryptData appendData:encryptData];
+        
+        free(buffer);
+        
+        NSString *encryptString = base64_encode_data(ivEncryptData);
+        return encryptString;
+    } else {
+        free(buffer);
+        SALogError(@"AES128EncryptData fail,Error Code: %d",(int)cryptStatus);
+    }
+    return nil;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/HeatMap/SAAbstractHeatMapMessage.h b/SensorsAnalyticsSDK/HeatMap/SAAbstractHeatMapMessage.h
deleted file mode 100644
index eccff2bf..00000000
--- a/SensorsAnalyticsSDK/HeatMap/SAAbstractHeatMapMessage.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  SAAbstractHeatMapMessage.h
-//  SensorsAnalyticsSDK
-//
-//  Created by 王灼洲 on 8/1/17.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-
-#import "SAHeatMapMessage.h"
-
-@interface SAAbstractHeatMapMessage : NSObject <SAHeatMapMessage>
-
-@property (nonatomic, copy, readonly) NSString *type;
-
-+ (instancetype)messageWithType:(NSString *)type payload:(NSDictionary *)payload;
-
-- (instancetype)initWithType:(NSString *)type;
-- (instancetype)initWithType:(NSString *)type payload:(NSDictionary *)payload;
-
-- (void)setPayloadObject:(id)object forKey:(NSString *)key;
-- (id)payloadObjectForKey:(NSString *)key;
-- (NSDictionary *)payload;
-
-- (NSData *)JSONData:(BOOL)useGzip featuerCode:(NSString *)fetureCode;
-
-@end
diff --git a/SensorsAnalyticsSDK/HeatMap/SAAbstractHeatMapMessage.m b/SensorsAnalyticsSDK/HeatMap/SAAbstractHeatMapMessage.m
deleted file mode 100644
index 0c6f7c93..00000000
--- a/SensorsAnalyticsSDK/HeatMap/SAAbstractHeatMapMessage.m
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-//  SAAbstractHeatMapMessage.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 王灼洲 on 8/1/17.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 "SAGzipUtility.h"
-#import "SAAbstractHeatMapMessage.h"
-#import "SensorsAnalyticsSDK.h"
-#import "SALogger.h"
-
-@interface SAAbstractHeatMapMessage ()
-
-@property (nonatomic, copy, readwrite) NSString *type;
-
-@end
-
-@implementation SAAbstractHeatMapMessage {
-    NSMutableDictionary *_payload;
-}
-
-+ (instancetype)messageWithType:(NSString *)type payload:(NSDictionary *)payload {
-    return [[self alloc] initWithType:type payload:payload];
-}
-
-- (instancetype)initWithType:(NSString *)type {
-    return [self initWithType:type payload:@{}];
-}
-
-- (instancetype)initWithType:(NSString *)type payload:(NSDictionary *)payload {
-    self = [super init];
-    if (self) {
-        _type = type;
-        _payload = [payload mutableCopy];
-    }
-
-    return self;
-}
-
-- (void)setPayloadObject:(id)object forKey:(NSString *)key {
-    _payload[key] = object ?: [NSNull null];
-}
-
-- (id)payloadObjectForKey:(NSString *)key {
-    id object = _payload[key];
-    return [object isEqual:[NSNull null]] ? nil : object;
-}
-
-- (NSDictionary *)payload {
-    return [_payload copy];
-}
-
-- (NSData *)JSONData:(BOOL)useGzip featuerCode:(NSString *)featureCode {
-    NSMutableDictionary *jsonObject = [[NSMutableDictionary alloc] init];
-    [jsonObject setObject:_type forKey:@"type"];
-    [jsonObject setObject:@"iOS" forKey:@"os"];
-    @try {
-        UIViewController *viewController = [[SensorsAnalyticsSDK sharedInstance] currentViewController];
-        if (viewController) {
-            [jsonObject setObject:NSStringFromClass([viewController class]) forKey:@"screen_name"];
-        }
-    } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
-    }
-    [jsonObject setObject:[[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"] forKey:@"app_version"];
-    [jsonObject setObject:featureCode forKey:@"feature_code"];
-    if (useGzip) {
-        // 如果使用 GZip 压缩
-        NSError *error = nil;
-        
-        // 1. 序列化 Payload
-        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[_payload copy] options:0 error:&error];
-        NSString * jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-
-        // 2. 使用 GZip 进行压缩
-        NSData *zippedData = [SAGzipUtility gzipData:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
-
-        // 3. Base64 Encode
-        NSString *b64String = [zippedData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
-
-        [jsonObject setValue:b64String forKey:@"gzip_payload"];
-    } else {
-        [jsonObject setValue:[_payload copy] forKey:@"payload"];
-    }
-
-    NSError *error = nil;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonObject options:0 error:&error];
-    if (jsonData == nil && error) {
-        SAError(@"Failed to serialize test designer message: %@", error);
-    }
-
-    return jsonData;
-}
-
-- (NSOperation *)responseCommandWithConnection:(SAHeatMapConnection *)connection {
-    return nil;
-}
-
-- (NSString *)debugDescription {
-    return [NSString stringWithFormat:@"<%@:%p type='%@'>", NSStringFromClass([self class]), (__bridge void *)self, self.type];
-}
-
-@end
diff --git a/SensorsAnalyticsSDK/HeatMap/SAHeatMapConnection.h b/SensorsAnalyticsSDK/HeatMap/SAHeatMapConnection.h
deleted file mode 100644
index 504e7a79..00000000
--- a/SensorsAnalyticsSDK/HeatMap/SAHeatMapConnection.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  SAHeatMapConnection.h
-//  SensorsAnalyticsSDK
-//
-//  Created by 王灼洲 on 8/1/17.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-
-@protocol SAHeatMapMessage;
-
-@interface SAHeatMapConnection : NSObject
-
-@property (nonatomic, readonly) BOOL connected;
-@property (nonatomic, assign) BOOL useGzip;
-
-- (instancetype)initWithURL:(NSURL *)url;
-- (void)setSessionObject:(id)object forKey:(NSString *)key;
-- (id)sessionObjectForKey:(NSString *)key;
-- (void)sendMessage:(id<SAHeatMapMessage>)message;
-- (void)startConnectionWithFeatureCode:(NSString *)featureCode url:(NSString *)urlStr;
-- (void)close;
-
-@end
diff --git a/SensorsAnalyticsSDK/HeatMap/SAHeatMapConnection.m b/SensorsAnalyticsSDK/HeatMap/SAHeatMapConnection.m
deleted file mode 100644
index bef56f93..00000000
--- a/SensorsAnalyticsSDK/HeatMap/SAHeatMapConnection.m
+++ /dev/null
@@ -1,183 +0,0 @@
-//
-//  SAHeatMapConnection.m,
-//  SensorsAnalyticsSDK
-//
-//  Created by 王灼洲 on 8/1/17.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 "SAHeatMapConnection.h"
-#import "SAHeatMapMessage.h"
-#import "SAHeatMapSnapshotMessage.h"
-#import "SALogger.h"
-#import "SensorsAnalyticsSDK+Private.h"
-
-@interface SAHeatMapConnection ()
-
-@end
-
-@implementation SAHeatMapConnection {
-    BOOL _connected;
-
-    NSURL *_url;
-    NSDictionary *_typeToMessageClassMap;
-    NSOperationQueue *_commandQueue;
-    UIView *_recordingView;
-    NSTimer *timer;
-    id<SAHeatMapMessage> _designerMessage;
-    NSString *_featureCode;
-    NSString *_postUrl;
-}
-
-- (instancetype)initWithURL:(NSURL *)url {
-    self = [super init];
-    if (self) {
-        _typeToMessageClassMap = @{
-            SAHeatMapSnapshotRequestMessageType : [SAHeatMapSnapshotRequestMessage class],
-        };
-        _connected = NO;
-        _useGzip = YES;
-        _url = url;
-
-        _commandQueue = [[NSOperationQueue alloc] init];
-        _commandQueue.maxConcurrentOperationCount = 1;
-        _commandQueue.suspended = YES;
-    }
-
-    return self;
-}
-
-- (void)close {
-    if (timer) {
-        [timer invalidate];
-        timer = nil;
-    }
-}
-
-- (void)dealloc {
-    [self close];
-}
-
-- (void)setSessionObject:(id)object forKey:(NSString *)key {
-    NSParameterAssert(key != nil);
-}
-
-- (id)sessionObjectForKey:(NSString *)key {
-    NSParameterAssert(key != nil);
-    return key;
-}
-
-- (void)sendMessage:(id<SAHeatMapMessage>)message {
-    if (_connected) {
-        if (_featureCode == nil || _postUrl == nil) {
-            return;
-        }
-        NSString *jsonString = [[NSString alloc] initWithData:[message JSONData:_useGzip featuerCode:_featureCode] encoding:NSUTF8StringEncoding];
-        NSURL *URL = [NSURL URLWithString:_postUrl];
-        NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
-        [request setHTTPMethod:@"POST"];
-        [request setValue:@"text/plain" forHTTPHeaderField:@"Content-Type"];
-        [request setHTTPBody:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
-        NSURLSessionDataTask *task = [[SensorsAnalyticsSDK sharedInstance].network dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSHTTPURLResponse * _Nullable response, NSError * _Nullable error) {
-            NSString *urlResponseContent = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-            if (response.statusCode == 200) {
-                NSData *jsonData = [urlResponseContent dataUsingEncoding:NSUTF8StringEncoding];
-                NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:nil];
-                int delay = [[dict objectForKey:@"delay"] intValue];
-                if (delay < 0) {
-                    [self close];
-                }
-            }
-        }];
-        [task resume];
-
-    } else {
-        SADebug(@"Not sending message as we are not connected: %@", [message debugDescription]);
-    }
-}
-
-- (id <SAHeatMapMessage>)designerMessageForMessage:(id)message {
-    NSParameterAssert([message isKindOfClass:[NSString class]] || [message isKindOfClass:[NSData class]]);
-
-    id <SAHeatMapMessage> designerMessage = nil;
-
-    NSData *jsonData = [message isKindOfClass:[NSString class]] ? [(NSString *)message dataUsingEncoding:NSUTF8StringEncoding] : message;
-   // SADebug(@"%@ VTrack received message: %@", self, [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]);
-    
-    NSError *error = nil;
-    id jsonObject = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
-    if ([jsonObject isKindOfClass:[NSDictionary class]]) {
-        NSDictionary *messageDictionary = (NSDictionary *)jsonObject;
-        NSString *type = messageDictionary[@"type"];
-        NSDictionary *payload = messageDictionary[@"payload"];
-
-        designerMessage = [_typeToMessageClassMap[type] messageWithType:type payload:payload];
-    } else {
-        SAError(@"Badly formed socket message expected JSON dictionary: %@", error);
-    }
-
-    return designerMessage;
-}
-
-#pragma mark -  Methods
-
-- (void)startHeatMapTimer:(id)message withFeatureCode:(NSString *)featureCode withUrl:(NSString *)postUrl {
-    _featureCode = featureCode;
-    _postUrl =  (__bridge_transfer NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(NULL, (__bridge CFStringRef)postUrl, CFSTR(""),  CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding));
-    _designerMessage = [self designerMessageForMessage:message];
-
-    if (timer) {
-        [timer invalidate];
-        timer = nil;
-    }
-
-    timer = [NSTimer scheduledTimerWithTimeInterval:1
-                                     target:self
-                                   selector:@selector(handleMessage)
-                                   userInfo:nil
-                                    repeats:YES];
-}
-
-- (void)handleMessage {
-    if (_designerMessage) {
-        NSOperation *commandOperation = [_designerMessage responseCommandWithConnection:self];
-        if (commandOperation) {
-            [_commandQueue addOperation:commandOperation];
-        }
-    }
-}
-
-- (void)startConnectionWithFeatureCode:(NSString *)featureCode url:(NSString *)postUrl {
-    
-    NSBundle *sensorsBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[SensorsAnalyticsSDK class]] pathForResource:@"SensorsAnalyticsSDK" ofType:@"bundle"]];
-    //文件路径
-    NSString *jsonPath = [sensorsBundle pathForResource:@"sa_headmap_path.json" ofType:nil];
-    NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    _commandQueue.suspended = NO;
-    if (!self->_connected) {
-        self->_connected = YES;
-        [self startHeatMapTimer:jsonString withFeatureCode:featureCode withUrl:postUrl];
-    } else {
-        [self startHeatMapTimer:jsonString withFeatureCode:featureCode withUrl:postUrl];
-    }
-}
-
-@end
-
diff --git a/SensorsAnalyticsSDK/SAObjectSerializer.h b/SensorsAnalyticsSDK/HeatMap/SAHeatMapObjectSerializer.h
similarity index 89%
rename from SensorsAnalyticsSDK/SAObjectSerializer.h
rename to SensorsAnalyticsSDK/HeatMap/SAHeatMapObjectSerializer.h
index ff8391d9..f3919933 100644
--- a/SensorsAnalyticsSDK/SAObjectSerializer.h
+++ b/SensorsAnalyticsSDK/HeatMap/SAHeatMapObjectSerializer.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 @class SAObjectSerializerConfig;
 @class SAObjectIdentityProvider;
 
-@interface SAObjectSerializer : NSObject
+@interface SAHeatMapObjectSerializer : NSObject
 
 - (instancetype)initWithConfiguration:(SAObjectSerializerConfig *)configuration
                objectIdentityProvider:(SAObjectIdentityProvider *)objectIdentityProvider;
diff --git a/SensorsAnalyticsSDK/SAObjectSerializer.m b/SensorsAnalyticsSDK/HeatMap/SAHeatMapObjectSerializer.m
similarity index 67%
rename from SensorsAnalyticsSDK/SAObjectSerializer.m
rename to SensorsAnalyticsSDK/HeatMap/SAHeatMapObjectSerializer.m
index d4b0bca7..a65cec1e 100644
--- a/SensorsAnalyticsSDK/SAObjectSerializer.m
+++ b/SensorsAnalyticsSDK/HeatMap/SAHeatMapObjectSerializer.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -28,19 +28,19 @@
 #import "NSInvocation+SAHelpers.h"
 #import "SAClassDescription.h"
 #import "SAEnumDescription.h"
-#import "SALogger.h"
+#import "SALog.h"
 #import "SAObjectIdentityProvider.h"
-#import "SAObjectSerializer.h"
+#import "SAHeatMapObjectSerializer.h"
 #import "SAObjectSerializerConfig.h"
 #import "SAObjectSerializerContext.h"
 #import "SAPropertyDescription.h"
-#import "UIView+SAHelpers.h"
+#import "UIView+HeatMap.h"
 
-@interface SAObjectSerializer ()
+@interface SAHeatMapObjectSerializer ()
 
 @end
 
-@implementation SAObjectSerializer {
+@implementation SAHeatMapObjectSerializer {
     SAObjectSerializerConfig *_configuration;
     SAObjectIdentityProvider *_objectIdentityProvider;
 }
@@ -52,26 +52,26 @@ - (instancetype)initWithConfiguration:(SAObjectSerializerConfig *)configuration
         _configuration = configuration;
         _objectIdentityProvider = objectIdentityProvider;
     }
-
+    
     return self;
 }
 
 - (NSDictionary *)serializedObjectsWithRootObject:(id)rootObject {
     NSParameterAssert(rootObject != nil);
-
+    
     SAObjectSerializerContext *context = [[SAObjectSerializerContext alloc] initWithRootObject:rootObject];
-
+    
     @try {
         while ([context hasUnvisitedObjects]) {
             [self visitObject:[context dequeueUnvisitedObject] withContext:context];
         }
     } @catch (NSException *e) {
-        SAError(@"Failed to serialize objects: %@", e);
+        SALogError(@"Failed to serialize objects: %@", e);
     }
     
     return @{
-            @"objects" : [context allSerializedObjects],
-            @"rootObject": [_objectIdentityProvider identifierForObject:rootObject]
+        @"objects" : [context allSerializedObjects],
+        @"rootObject": [_objectIdentityProvider identifierForObject:rootObject]
     };
 }
 
@@ -93,18 +93,10 @@ - (void)visitObject:(NSObject *)object withContext:(SAObjectSerializerContext *)
         }
     }
     
-    NSMutableArray *delegateMethods = [NSMutableArray array];
     id delegate;
     SEL delegateSelector = NSSelectorFromString(@"delegate");
     if ([object respondsToSelector:delegateSelector]) {
         delegate = ((id (*)(id, SEL))[object methodForSelector:delegateSelector])(object, delegateSelector);
-        if (classDescription && [[classDescription delegateInfos] count] > 0 && [object respondsToSelector:delegateSelector]) {
-            for (SADelegateInfo *delegateInfo in [classDescription delegateInfos]) {
-                if ([delegate respondsToSelector:NSSelectorFromString(delegateInfo.selectorName)]) {
-                    [delegateMethods addObject:delegateInfo.selectorName];
-                }
-            }
-        }
     }
     
     NSDictionary *serializedObject = @{@"id": [_objectIdentityProvider identifierForObject:object],
@@ -112,108 +104,59 @@ - (void)visitObject:(NSObject *)object withContext:(SAObjectSerializerContext *)
                                        @"properties": propertyValues,
                                        @"delegate": @{
                                                // BlockKit 等库使用 NSProxy 作 delegate 转发可能重写了 - (Class)class。
-                                               @"class": delegate ? [NSString stringWithFormat:@"%@",[delegate class]] : @"",
-                                               @"selectors": delegateMethods}};
+                                               @"class": delegate ? [NSString stringWithFormat:@"%@",[delegate class]] : @""}};
     
     [context addSerializedObject:serializedObject];
 }
 
 - (NSArray *)classHierarchyArrayForObject:(NSObject *)object {
     NSMutableArray *classHierarchy = [[NSMutableArray alloc] init];
-
+    
     Class aClass = [object class];
-    while (aClass)
-    {
+    while (aClass) {
         [classHierarchy addObject:NSStringFromClass(aClass)];
         aClass = [aClass superclass];
     }
-
+    
     return [classHierarchy copy];
 }
 
 - (NSArray *)allValuesForType:(NSString *)typeName {
     NSParameterAssert(typeName != nil);
-
+    
     SATypeDescription *typeDescription = [_configuration typeWithName:typeName];
     if ([typeDescription isKindOfClass:[SAEnumDescription class]]) {
         SAEnumDescription *enumDescription = (SAEnumDescription *)typeDescription;
         return [enumDescription allValues];
     }
-
+    
     return @[];
 }
 
 - (NSArray *)parameterVariationsForPropertySelector:(SAPropertySelectorDescription *)selectorDescription {
-    NSAssert([selectorDescription.parameters count] <= 1, @"Currently only support selectors that take 0 to 1 arguments.");
-
+    //    NSAssert([selectorDescription.parameters count] <= 1, @"Currently only support selectors that take 0 to 1 arguments.");
+    
     NSMutableArray *variations = [[NSMutableArray alloc] init];
-
-    // TODO: write an algorithm that generates all the variations of parameter combinations.
-    if ([selectorDescription.parameters count] > 0) {
-        SAPropertySelectorParameterDescription *parameterDescription = (selectorDescription.parameters)[0];
-        for (id value in [self allValuesForType:parameterDescription.type]) {
-            [variations addObject:@[ value ]];
-        }
-    } else {
-        // An empty array of parameters (for methods that have no parameters).
-        [variations addObject:@[]];
-    }
-
+    
+    [variations addObject:@[]];
+    //    }
+    
     return [variations copy];
 }
 
-- (id)instanceVariableValueForObject:(id)object
-                 propertyDescription:(SAPropertyDescription *)propertyDescription {
-    NSParameterAssert(object != nil);
-    NSParameterAssert(propertyDescription != nil);
-
-    Ivar ivar = class_getInstanceVariable([object class], [propertyDescription.name UTF8String]);
-    if (ivar) {
-        const char *objCType = ivar_getTypeEncoding(ivar);
-
-        ptrdiff_t ivarOffset = ivar_getOffset(ivar);
-        const void *objectBaseAddress = (__bridge const void *)object;
-        const void *ivarAddress = (((const uint8_t *)objectBaseAddress) + ivarOffset);
-
-        switch (objCType[0])
-        {
-            case _C_ID:       return object_getIvar(object, ivar);
-            case _C_CHR:      return @(*((char *)ivarAddress));
-            case _C_UCHR:     return @(*((unsigned char *)ivarAddress));
-            case _C_SHT:      return @(*((short *)ivarAddress));
-            case _C_USHT:     return @(*((unsigned short *)ivarAddress));
-            case _C_INT:      return @(*((int *)ivarAddress));
-            case _C_UINT:     return @(*((unsigned int *)ivarAddress));
-            case _C_LNG:      return @(*((long *)ivarAddress));
-            case _C_ULNG:     return @(*((unsigned long *)ivarAddress));
-            case _C_LNG_LNG:  return @(*((long long *)ivarAddress));
-            case _C_ULNG_LNG: return @(*((unsigned long long *)ivarAddress));
-            case _C_FLT:      return @(*((float *)ivarAddress));
-            case _C_DBL:      return @(*((double *)ivarAddress));
-            case _C_BOOL:     return @(*((_Bool *)ivarAddress));
-            case _C_SEL:      return NSStringFromSelector(*((SEL*)ivarAddress));
-            default:
-                NSAssert(NO, @"Currently unsupported return type!");
-                break;
-        }
-    }
-
-    return nil;
-}
-
 - (NSInvocation *)invocationForObject:(id)object
               withSelectorDescription:(SAPropertySelectorDescription *)selectorDescription {
-    NSUInteger __unused parameterCount = [selectorDescription.parameters count];
-
+    NSUInteger __unused parameterCount = 0;
+    
     SEL aSelector = NSSelectorFromString(selectorDescription.selectorName);
     NSAssert(aSelector != nil, @"Expected non-nil selector!");
-
+    
     NSMethodSignature *methodSignature = [object methodSignatureForSelector:aSelector];
     NSInvocation *invocation = nil;
-
+    
     if (methodSignature) {
         NSAssert([methodSignature numberOfArguments] == (parameterCount + 2), @"Unexpected number of arguments!");
-
+        
         invocation = [NSInvocation invocationWithMethodSignature:methodSignature];
         invocation.selector = aSelector;
     }
@@ -222,30 +165,26 @@ - (NSInvocation *)invocationForObject:(id)object
 
 - (id)propertyValue:(id)propertyValue
 propertyDescription:(SAPropertyDescription *)propertyDescription
-            context:(SAObjectSerializerContext *)context {
+            context: (SAObjectSerializerContext *)context {
     if (propertyValue != nil) {
         if ([context isVisitedObject:propertyValue]) {
             return [_objectIdentityProvider identifierForObject:propertyValue];
-        }
-        else if ([self isNestedObjectType:propertyDescription.type])
-        {
+        } else if ([self isNestedObjectType:propertyDescription.type]) {
             [context enqueueUnvisitedObject:propertyValue];
             return [_objectIdentityProvider identifierForObject:propertyValue];
-        }
-        else if ([propertyValue isKindOfClass:[NSArray class]] || [propertyValue isKindOfClass:[NSSet class]])
-        {
+        } else if ([propertyValue isKindOfClass:[NSArray class]] || [propertyValue isKindOfClass:[NSSet class]]) {
             NSMutableArray *arrayOfIdentifiers = [[NSMutableArray alloc] init];
             for (id value in propertyValue) {
                 if ([context isVisitedObject:value] == NO) {
                     [context enqueueUnvisitedObject:value];
                 }
-
+                
                 [arrayOfIdentifiers addObject:[_objectIdentityProvider identifierForObject:value]];
             }
             propertyValue = [arrayOfIdentifiers copy];
         }
     }
-
+    
     return [propertyDescription.valueTransformer transformedValue:propertyValue];
 }
 
@@ -253,14 +192,14 @@ - (id)propertyValueForObject:(NSObject *)object
      withPropertyDescription:(SAPropertyDescription *)propertyDescription
                      context:(SAObjectSerializerContext *)context {
     NSMutableArray *values = [[NSMutableArray alloc] init];
-
-
+    
+    
     SAPropertySelectorDescription *selectorDescription = propertyDescription.getSelectorDescription;
-
+    
     if (propertyDescription.useKeyValueCoding) {
         // the "fast" (also also simple) path is to use KVC
         id valueForKey = [object valueForKey:selectorDescription.selectorName];
-
+        
         if ([object isKindOfClass:[UICollectionView class]]) {
             NSString *name = propertyDescription.name;
             if ([name isEqualToString:@"subviews"]) {
@@ -279,40 +218,28 @@ - (id)propertyValueForObject:(NSObject *)object
                     valueForKey = [result copy];
                     //valueForKey =  [[valueForKey reverseObjectEnumerator] allObjects];
                 } @catch (NSException *exception) {
-
+                    
                 }
             }
         }
-
+        
         if ([object isKindOfClass:[UITableView class]] || [object isKindOfClass:[UICollectionView class]]) {
             NSString *name = propertyDescription.name;
             if ([name isEqualToString:@"subviews"]) {
                 valueForKey =  [[valueForKey reverseObjectEnumerator] allObjects];
             }
         }
-
+        
         id value = [self propertyValue:valueForKey
                    propertyDescription:propertyDescription
                                context:context];
-
-        NSDictionary *valueDictionary = @{
-                @"value" : (value ?: [NSNull null])
-        };
-
-        [values addObject:valueDictionary];
-    } else if (propertyDescription.useInstanceVariableAccess) {
-        id valueForIvar = [self instanceVariableValueForObject:object propertyDescription:propertyDescription];
-
-        id value = [self propertyValue:valueForIvar
-                   propertyDescription:propertyDescription
-                               context:context];
-
+        
         NSDictionary *valueDictionary = @{
             @"value" : (value ?: [NSNull null])
         };
-
+        
         [values addObject:valueDictionary];
-    } else {
+    }  else {
         // the "slow" NSInvocation path. Required in order to invoke methods that take parameters.
         NSInvocation *invocation = [self invocationForObject:object withSelectorDescription:selectorDescription];
         if (invocation) {
@@ -327,18 +254,17 @@ - (id)propertyValueForObject:(NSObject *)object
                 id value = [self propertyValue:returnValue
                            propertyDescription:propertyDescription
                                        context:context];
-
+                
                 NSDictionary *valueDictionary = @{
-                                                  @"where": @{ @"parameters" : parameters },
-                                                  @"value": (value ?: [NSNull null])
-                                                  };
+                    @"where": @{ @"parameters" : parameters },
+                    @"value": (value ?: [NSNull null])
+                };
                 
                 [values addObject:valueDictionary];
             }
         }
     }
     
-
     return @{@"values": values};
 }
 
@@ -348,17 +274,17 @@ - (BOOL)isNestedObjectType:(NSString *)typeName {
 
 - (SAClassDescription *)classDescriptionForObject:(NSObject *)object {
     NSParameterAssert(object != nil);
-
+    
     Class aClass = [object class];
     while (aClass != nil) {
         SAClassDescription *classDescription = [_configuration classWithName:NSStringFromClass(aClass)];
         if (classDescription) {
             return classDescription;
         }
-
+        
         aClass = [aClass superclass];
     }
-
+    
     return nil;
 }
 
diff --git a/SensorsAnalyticsSDK/UIView+SAHelpers.h b/SensorsAnalyticsSDK/HeatMap/UIView+HeatMap.h
similarity index 79%
rename from SensorsAnalyticsSDK/UIView+SAHelpers.h
rename to SensorsAnalyticsSDK/HeatMap/UIView+HeatMap.h
index 75ba6685..dbcb2429 100644
--- a/SensorsAnalyticsSDK/UIView+SAHelpers.h
+++ b/SensorsAnalyticsSDK/HeatMap/UIView+HeatMap.h
@@ -1,4 +1,4 @@
-//  UIView+SAHelpers.h
+//  UIView+HeatMap.h
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
@@ -20,7 +20,8 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-@interface UIView (SAHelpers)
+
+@interface UIView (HeatMap)
 
 - (UIImage *)sa_snapshotImage;
 - (UIImage *)sa_snapshotForBlur;
@@ -33,18 +34,18 @@
 
 @end
 
-@interface UITableViewCell (SAHelpers)
+
+
+@interface UITableViewCell (HeatMap)
 - (NSString *)sa_indexPath;
 @end
 
-@interface UICollectionViewCell (SAHelpers)
+@interface UICollectionViewCell (HeatMap)
 - (NSString *)sa_indexPath;
 @end
 
-@interface UISegmentedControl (SAHelpers)
-- (NSArray *)sa_subviewsFixed;
-@end
 
-@interface UITableViewHeaderFooterView (SAHelpers)
+@interface UITableViewHeaderFooterView (HeatMap)
 - (NSString *)sa_section;
 @end
+
diff --git a/SensorsAnalyticsSDK/UIView+SAHelpers.m b/SensorsAnalyticsSDK/HeatMap/UIView+HeatMap.m
similarity index 77%
rename from SensorsAnalyticsSDK/UIView+SAHelpers.m
rename to SensorsAnalyticsSDK/HeatMap/UIView+HeatMap.m
index 8d49e16b..a8cc721e 100755
--- a/SensorsAnalyticsSDK/UIView+SAHelpers.m
+++ b/SensorsAnalyticsSDK/HeatMap/UIView+HeatMap.m
@@ -1,4 +1,4 @@
-//  SUIView+SAHelpers.m
+//  SUIView+HeatMap.m
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
@@ -25,13 +25,13 @@
 #import <QuartzCore/QuartzCore.h>
 #import <CommonCrypto/CommonDigest.h>
 #import "SensorsAnalyticsSDK.h"
-#import "UIView+SAHelpers.h"
-#import "SALogger.h"
+#import "UIView+HeatMap.h"
+#import "UIView+AutoTrack.h"
 
 // NB If you add any more fingerprint methods, increment this.
 #define SA_FINGERPRINT_VERSION 1
 
-@implementation UIView (SAHelpers)
+@implementation UIView (HeatMap)
 
 - (int)jjf_fingerprintVersion {
     return SA_FINGERPRINT_VERSION;
@@ -61,7 +61,7 @@ - (UIImage *)sa_snapshotImage {
 #else
     [self.layer renderInContext:UIGraphicsGetCurrentContext()];
 #endif
-
+    
     UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
     
@@ -100,6 +100,7 @@ - (NSArray *)sa_targetActions {
     return [targetActions copy];
 }
 
+// 在 controller 上的成员变量
 - (NSString *)sa_controllerVariable {
     if (![self isKindOfClass:[UIControl class]]) {
         return nil;
@@ -180,7 +181,7 @@ - (NSString *)sa_text {
     }
     return text;
 }
-        
+
 static NSString* sa_encryptHelper(id input) {
     NSString *SALT = @"dbba253e672cc94bee5da560040b47b1";
     NSMutableString *encryptedStuff = nil;
@@ -217,83 +218,43 @@ - (NSArray *)jjf_varSetD {
     return encryptedActions;
 }
 
+// 获取内容
 - (NSString *)jjf_varE {
     return sa_encryptHelper([self sa_text]);
+    
 }
 
 @end
-@implementation UITableViewCell (SAHelpers)
+
+
+
+@implementation UITableViewCell (HeatMap)
+
 - (NSString *)sa_indexPath {
-    UITableView *tableView = (UITableView *)[self superview];
-    if([tableView isKindOfClass:NSClassFromString(@"UITableViewWrapperView")]) {
-        tableView = (UITableView *)[tableView superview];
-    }
-    if ([tableView isKindOfClass:UITableView.class]) {
-        NSIndexPath *indexPath = [tableView indexPathForCell:self];
-        NSString *pathString = [[NSString alloc] initWithFormat:@"[%ld][%ld]", (long)indexPath.section, (long)indexPath.row];
-        return pathString;
+    if (self.sensorsdata_IndexPath) {
+        return [[NSString alloc] initWithFormat:@"[%ld][%ld]", (long)self.sensorsdata_IndexPath.section, (long)self.sensorsdata_IndexPath.row];
     }
     return @"";
 }
 
-@end
-@implementation UICollectionViewCell (SAHelpers)
-- (NSString *)sa_indexPath {
-    UICollectionView *collectionView = (UICollectionView *)[self superview];
-    if([collectionView isKindOfClass:UICollectionView.class] == NO) return @"";
-    NSIndexPath *indexPath = [collectionView indexPathForCell:self];
-    NSString *pathString = [[NSString alloc] initWithFormat:@"[%ld][%ld]", (long)indexPath.section, (long)indexPath.item];
-    return pathString;
-}
 
 @end
+@implementation UICollectionViewCell (HeatMap)
 
-@implementation UISegmentedControl (SAHelpers)
-- (NSArray *)sa_subviewsFixed {
-    NSArray *segments = [self valueForKey:@"segments"];
-    return segments;
+- (NSString *)sa_indexPath {
+    if (self.sensorsdata_IndexPath) {
+        return [[NSString alloc] initWithFormat:@"[%ld][%ld]", (long)self.sensorsdata_IndexPath.section, (long)self.sensorsdata_IndexPath.item];
+    }
+    return @"";
 }
+
 @end
 
-@implementation UITableViewHeaderFooterView (SAHelpers)
-- (NSString *)sa_section {
-    UITableView *tableView = (UITableView *)[self superview];
-    if([tableView isKindOfClass:NSClassFromString(@"UITableViewWrapperView")]) {
-        tableView = (UITableView *)[tableView superview];
-    }
-    if ([tableView isKindOfClass:UITableView.class]) {
-        NSInteger sectionCount = tableView.numberOfSections;
-        NSInteger sa_section = -1;
-        UITableViewHeaderFooterView *headerFooterView = nil;
-        BOOL isHeader = YES;
-        for (int i = 0; i<sectionCount; i++) {
-            headerFooterView = [tableView headerViewForSection:i];
-            if (headerFooterView == self) {
-                isHeader = YES;
-                sa_section = i;
-                break;
-            }
-            headerFooterView = [tableView footerViewForSection:i];
-            if (headerFooterView == self) {
-                sa_section = i;
-                isHeader = NO;
-                break;
-            }
-        }
 
-        if (sa_section == -1) {
-            return @"";
-        }
 
-        NSString *desc = nil;
-        if (isHeader) {
-            desc = @"SectionHeader";
-        } else {
-            desc = @"SectionFooter";
-        }
-        NSString *pathString = [[NSString alloc] initWithFormat:@"[%@][%ld]", desc, (long)sa_section];
-        return pathString;
-    }
-    return @"";
+@implementation UITableViewHeaderFooterView (HeatMap)
+- (NSString *)sa_section {
+    // 修改页面结构采集逻辑，使得和 $element_selector 采集相同
+    return self.sensorsdata_heatMapPath;
 }
 @end
diff --git a/SensorsAnalyticsSDK/JSBridge/SAScriptMessageHandler.h b/SensorsAnalyticsSDK/JSBridge/SAScriptMessageHandler.h
new file mode 100644
index 00000000..e4ce7fa2
--- /dev/null
+++ b/SensorsAnalyticsSDK/JSBridge/SAScriptMessageHandler.h
@@ -0,0 +1,33 @@
+//
+// SAScriptMessageHandler.h
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/3/18.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAScriptMessageHandler : NSObject <WKScriptMessageHandler>
+
++ (instancetype)sharedInstance;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/JSBridge/SAScriptMessageHandler.m b/SensorsAnalyticsSDK/JSBridge/SAScriptMessageHandler.m
new file mode 100644
index 00000000..7c5f8d72
--- /dev/null
+++ b/SensorsAnalyticsSDK/JSBridge/SAScriptMessageHandler.m
@@ -0,0 +1,102 @@
+//
+// SAScriptMessageHandler.m
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/3/18.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAScriptMessageHandler.h"
+#import "SALog.h"
+#import "SensorsAnalyticsSDK+Private.h"
+#import "SAConstants+Private.h"
+#import "SAVisualizedObjectSerializerManger.h"
+
+
+@interface SAScriptMessageHandler ()
+
+@end
+
+@implementation SAScriptMessageHandler
+
+#pragma mark - Life Cycle
+
++ (instancetype)sharedInstance {
+    static SAScriptMessageHandler *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[SAScriptMessageHandler alloc] init];
+    });
+    return sharedInstance;
+}
+
+#pragma mark - Delegate
+
+// Invoked when a script message is received from a webpage
+- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
+    if (![message.name isEqualToString:SA_SCRIPT_MESSAGE_HANDLER_NAME]) {
+        return;
+    }
+
+    if (![message.body isKindOfClass:[NSString class]]) {
+        SALogError(@"Message body is not kind of 'NSString' from JS SDK");
+        return;
+    }
+
+    @try {
+        NSString *body = message.body;
+        NSData *messageData = [body dataUsingEncoding:NSUTF8StringEncoding];
+        if (!messageData) {
+            SALogError(@"Message body is invalid from JS SDK");
+            return;
+        }
+
+        NSDictionary *messageDic = [NSJSONSerialization JSONObjectWithData:messageData options:0 error:nil];
+        if (![messageDic isKindOfClass:[NSDictionary class]]) {
+            SALogError(@"Message body is formatted failure from JS SDK");
+            return;
+        }
+
+        NSString *callType = messageDic[@"callType"];
+        if ([callType isEqualToString:@"app_h5_track"]) {
+            // H5 发送事件
+            NSDictionary *trackMessageDic = messageDic[@"data"];
+            if (![trackMessageDic isKindOfClass:[NSDictionary class]]) {
+                SALogError(@"Data of message body is not kind of 'NSDictionary' from JS SDK");
+                return;
+            }
+
+            NSData *trackMessageData = [NSJSONSerialization dataWithJSONObject:trackMessageDic options:0 error:nil];
+            NSString *trackMessageString = [[NSString alloc] initWithData:trackMessageData encoding:NSUTF8StringEncoding];
+            [[SensorsAnalyticsSDK sharedInstance] trackFromH5WithEvent:trackMessageString];
+        } else if ([callType isEqualToString:@"visualized_track"] || [callType isEqualToString:@"app_alert"] || [callType isEqualToString:@"page_info"]) {
+            /* 缓存 H5 页面信息
+             visualized_track：H5 可点击元素数据，数组；
+             app_alert：H5 弹框信息，提示配置错误信息；
+             page_info：H5 页面信息，包括 url 和 title
+             */
+            WKWebView *webView = message.webView;
+            [[SAVisualizedObjectSerializerManger sharedInstance] saveVisualizedWebPageInfoWithWebView:webView webPageInfo: messageDic];
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@ error: %@", self, exception);
+    }
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/JSBridge/WKWebView+SABridge.h b/SensorsAnalyticsSDK/JSBridge/WKWebView+SABridge.h
new file mode 100644
index 00000000..73681888
--- /dev/null
+++ b/SensorsAnalyticsSDK/JSBridge/WKWebView+SABridge.h
@@ -0,0 +1,37 @@
+//
+// WKWebView+SABridge.h
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/3/21.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface WKWebView (SABridge)
+
+- (WKNavigation *)sensorsdata_loadRequest:(NSURLRequest *)request;
+
+- (WKNavigation *)sensorsdata_loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL;
+
+- (WKNavigation *)sensorsdata_loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL;
+
+- (WKNavigation *)sensorsdata_loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/JSBridge/WKWebView+SABridge.m b/SensorsAnalyticsSDK/JSBridge/WKWebView+SABridge.m
new file mode 100644
index 00000000..db124afb
--- /dev/null
+++ b/SensorsAnalyticsSDK/JSBridge/WKWebView+SABridge.m
@@ -0,0 +1,55 @@
+//
+// WKWebView+SABridge.m
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/3/21.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "WKWebView+SABridge.h"
+#import "SensorsAnalyticsSDK+Private.h"
+#import "SAVisualizedObjectSerializerManger.h"
+
+@implementation WKWebView (SABridge)
+
+- (WKNavigation *)sensorsdata_loadRequest:(NSURLRequest *)request {
+    [[SensorsAnalyticsSDK sharedInstance] addScriptMessageHandlerWithWebView:self];
+    
+    return [self sensorsdata_loadRequest:request];
+}
+
+- (WKNavigation *)sensorsdata_loadHTMLString:(NSString *)string baseURL:(NSURL *)baseURL {
+    [[SensorsAnalyticsSDK sharedInstance] addScriptMessageHandlerWithWebView:self];
+    
+    return [self sensorsdata_loadHTMLString:string baseURL:baseURL];
+}
+
+- (WKNavigation *)sensorsdata_loadFileURL:(NSURL *)URL allowingReadAccessToURL:(NSURL *)readAccessURL {
+    [[SensorsAnalyticsSDK sharedInstance] addScriptMessageHandlerWithWebView:self];
+    
+    return [self sensorsdata_loadFileURL:URL allowingReadAccessToURL:readAccessURL];
+}
+
+- (WKNavigation *)sensorsdata_loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL {
+    [[SensorsAnalyticsSDK sharedInstance] addScriptMessageHandlerWithWebView:self];
+    
+    return [self sensorsdata_loadData:data MIMEType:MIMEType characterEncodingName:characterEncodingName baseURL:baseURL];
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/MessageQueueBySqlite.h b/SensorsAnalyticsSDK/MessageQueueBySqlite.h
index 4a6ce793..2ca88418 100644
--- a/SensorsAnalyticsSDK/MessageQueueBySqlite.h
+++ b/SensorsAnalyticsSDK/MessageQueueBySqlite.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 曹犟 on 15/7/7.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@
  *
  *  @param obj 添加的对象
  */
-- (void)addObejct:(id)obj withType:(NSString *)type;
+- (void)addObject:(id)obj withType:(NSString *)type;
 
 /**
  *  @abstract
@@ -53,7 +53,7 @@
  *
  *  @return 获取的记录所在的数组
  */
-- (NSArray *) getFirstRecords:(NSUInteger)recordSize withType:(NSString *)type ;
+- (NSArray *)getFirstRecords:(NSUInteger)recordSize withType:(NSString *)type;
 
 
 /**
@@ -64,7 +64,7 @@
  *
  *  @return 删除是否成功
  */
-- (BOOL) removeFirstRecords:(NSUInteger)recordSize withType:(NSString *)type ;
+- (BOOL)removeFirstRecords:(NSUInteger)recordSize withType:(NSString *)type;
 
 /**
  *  @abstract
@@ -90,5 +90,4 @@
  */
 - (BOOL) vacuum;
 
-
 @end
diff --git a/SensorsAnalyticsSDK/MessageQueueBySqlite.m b/SensorsAnalyticsSDK/MessageQueueBySqlite.m
index 2193475e..07712868 100644
--- a/SensorsAnalyticsSDK/MessageQueueBySqlite.m
+++ b/SensorsAnalyticsSDK/MessageQueueBySqlite.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 曹犟 on 15/7/7.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -26,27 +26,32 @@
 
 #import "SAJSONUtil.h"
 #import "MessageQueueBySqlite.h"
-#import "SALogger.h"
+#import "SALog.h"
 #import "SensorsAnalyticsSDK.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SAConstants+Private.h"
-#define MAX_MESSAGE_SIZE 10000   // 最多缓存10000条
+
+static const UInt64 kMessageCachesMaxSize = 10000; // 内存缓存时的最大缓存条数
+static const NSUInteger kRemoveFirstRecordsDefaultCount = 100; // 超过最大缓存条数时默认的删除条数
+
+@interface MessageQueueBySqlite ()
+
+@property (nonatomic, copy) NSString *filePath;
+/// store data in memory
+@property (nonatomic, strong) NSMutableArray<NSString *> *messageCaches;
+/// is the database init or not
+@property (nonatomic, assign) BOOL isDatabaseInitialized;
+
+@end
 
 @implementation MessageQueueBySqlite {
     sqlite3 *_database;
     SAJSONUtil *_jsonUtil;
-    NSInteger _messageCount;
+    NSInteger _dbMessageCount;
     CFMutableDictionaryRef _dbStmtCache;
 }
 
-- (void)closeDatabase {
-    if (_dbStmtCache) CFRelease(_dbStmtCache);
-    _dbStmtCache = NULL;
-
-    sqlite3_close(_database);
-    sqlite3_shutdown();
-    SADebug(@"%@ close database", self);
-}
+#pragma mark - Life Cycle
 
 - (void)dealloc {
     [self closeDatabase];
@@ -54,53 +59,227 @@ - (void)dealloc {
 
 - (id)initWithFilePath:(NSString *)filePath {
     self = [super init];
-    _jsonUtil = [[SAJSONUtil alloc] init];
-    if (sqlite3_initialize() != SQLITE_OK) {
-        SAError(@"failed to initialize SQLite.");
-        return nil;
+    if (self) {
+        _jsonUtil = [[SAJSONUtil alloc] init];
+        self.filePath = filePath;
+        
+        [self initializeDatabase];
+        [self createStmtCache];
+        [self openDatabase];
     }
-    if (sqlite3_open_v2([filePath UTF8String], &_database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL) == SQLITE_OK) {
-        // 创建一个缓存表
-        NSString *_sql = @"create table if not exists dataCache (id INTEGER PRIMARY KEY AUTOINCREMENT, type TEXT, content TEXT)";
-        char *errorMsg;
-        if (sqlite3_exec(_database, [_sql UTF8String], NULL, NULL, &errorMsg) == SQLITE_OK) {
-            SADebug(@"Create dataCache Success.");
-        } else {
-            SAError(@"Create dataCache Failure %s", errorMsg);
-            return nil;
-        }
-        CFDictionaryKeyCallBacks keyCallbacks = kCFCopyStringDictionaryKeyCallBacks;
-        CFDictionaryValueCallBacks valueCallbacks = { 0 };
-        _dbStmtCache = CFDictionaryCreateMutable(CFAllocatorGetDefault(), 0, &keyCallbacks, &valueCallbacks);
+    return self;
+}
 
-        _messageCount = [self sqliteCount];
+- (void)initializeDatabase {
+    self.isDatabaseInitialized = (sqlite3_initialize() == SQLITE_OK);
+    
+    if (self.isDatabaseInitialized) {
+        SALogDebug(@"Success to initialize SQLite.");
+    } else {
+        SALogError(@"Failed to initialize SQLite.");
+    }
+}
 
-        SADebug(@"SQLites is opened. current count is %ul", _messageCount);
+- (void)createStmtCache {
+    CFDictionaryKeyCallBacks keyCallbacks = kCFCopyStringDictionaryKeyCallBacks;
+    CFDictionaryValueCallBacks valueCallbacks = { 0 };
+    _dbStmtCache = CFDictionaryCreateMutable(CFAllocatorGetDefault(), 0, &keyCallbacks, &valueCallbacks);
+}
+
+- (BOOL)openDatabase {
+    if (_database) {
+        return YES;
+    }
+    
+    if (!self.isDatabaseInitialized) {
+        // 如果初始化失败，不再尝试打开数据库
+        return NO;
+    }
+    
+    int result = sqlite3_open_v2([self.filePath UTF8String], &_database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
+    if ((result == SQLITE_OK) && [self createTable]) {
+        SALogDebug(@"Success to open SQLite db.");
+        
+        return YES;
     } else {
-        if (_dbStmtCache) CFRelease(_dbStmtCache);
-        _dbStmtCache = NULL;
+        _database = NULL;
+        SALogError(@"Failed to open SQLite db.");
+        
+        return NO;
+    }
+}
 
-        SAError(@"failed to open SQLite db.");
-        return nil;
+- (BOOL)createTable {
+    NSString *sql = @"create table if not exists dataCache (id INTEGER PRIMARY KEY AUTOINCREMENT, type TEXT, content TEXT)";
+    if ([self databaseExecute:sql]) {
+        _dbMessageCount = [self sqliteCount];
+        SALogDebug(@"Create dataCache table success, current count is %lu", _dbMessageCount);
+        
+        return YES;
+    } else {
+        SALogError(@"Create dataCache table fail.");
+        
+        return NO;
     }
-    return self;
 }
 
-- (void)addObejct:(id)obj withType:(NSString *)type {
+#pragma mark - Public Methods
+
+- (void)addObject:(id)obj withType:(NSString *)type {
+    if (!obj || ![type isKindOfClass:[NSString class]]) {
+        SALogError(@"%@ input parameter is invalid for addObject", self);
+        return;
+    }
+    
+    if ([self databaseCheck]) {
+        [self addObjectToDatabase:obj withType:type isFromCache:NO];
+    } else {
+        [self addObjectToCache:obj];
+    }
+}
+
+- (NSArray *)getFirstRecords:(NSUInteger)recordSize withType:(NSString *)type {
+    if (recordSize == 0) {
+        return @[];
+    }
+    
+    if ([self databaseCheck]) {
+        return [self fetchFirstRecordsFromDatabase:recordSize];
+    }
+    
+    return [self fetchFirstRecordsFromCache:recordSize];
+}
+
+- (void)deleteAll {
+    [self.messageCaches removeAllObjects];
+    
+    if ([self databaseCheck]) {
+        NSString *sql = @"DELETE FROM dataCache";
+        if (![self databaseExecute:sql]) {
+            SALogError(@"Failed to delete record");
+        }
+        
+        _dbMessageCount = [self sqliteCount];
+    } else {
+        SALogError(@"Failed to delete record because the database failed to open");
+    }
+}
+
+- (BOOL)removeFirstRecords:(NSUInteger)recordSize withType:(NSString *)type {
+    if (recordSize == 0) {
+        return YES;
+    }
+    
+    // 删除时不尝试打开数据库，因为可能会导致 getFirstRecords 和 removeFirstRecords 不一致
+    if (_database) {
+        return [self removeFirstRecordsFromDatabase:recordSize];
+    }
+    
+    [self removeFirstRecordsFromCache:recordSize];
+    return YES;
+}
+
+- (NSInteger)count {
+    return _dbMessageCount + self.messageCaches.count;
+}
+
+- (BOOL)vacuum {
+#ifdef SENSORS_ANALYTICS_ENABLE_VACUUM
+    @try {
+        if (![self databaseCheck]) {
+            SALogError(@"Failed to VACUUM record because the database failed to open");
+            return NO;
+        }
+        
+        NSString *sql = @"VACUUM";
+        if (![self databaseExecute:sql]) {
+            SALogError(@"Failed to VACUUM record");
+            return NO;
+        }
+        return YES;
+    } @catch (NSException *exception) {
+        return NO;
+    }
+#else
+    return YES;
+#endif
+}
+
+#pragma mark - Private Methods
+
+- (BOOL)databaseExecute:(NSString *)sql {
+    if (sql.length == 0) return NO;
+    if (!_database) return NO;
+    
+    @try {
+        char *error = NULL;
+        int result = sqlite3_exec(_database, sql.UTF8String, NULL, NULL, &error);
+        if (error) {
+            SALogError(@"%@ database execute sql:%@ error (%d): %s", self, sql, result, error);
+            sqlite3_free(error);
+        }
+        
+        return result == SQLITE_OK;
+    } @catch (NSException *exception) {
+        SALogError(@"%@ database execute sql:%@ exception: %@", self, sql, exception);
+        return NO;
+    }
+}
+
+- (void)addObjectToCache:(id)obj {
+    if (!obj) {
+        SALogError(@"%@ input parameter is invalid for addObjectToCache", self);
+        return;
+    }
+    
+    // 数据缓存到内存中，如果最大缓存条数大于 10000，可能导致内存占用过大
+    if (self.messageCaches.count >= kMessageCachesMaxSize) {
+        SALogWarn(@"AddObjectToCache touch MAX_MESSAGE_SIZE:10000, try to delete some old events");
+        [self removeFirstRecordsFromCache:kRemoveFirstRecordsDefaultCount];
+    }
+    
+    @try {
+        NSString *jsonString = [self buildJSONStringWithObject:obj];
+        if (jsonString.length > 0) {
+            // 能够转成 json 字符串
+            [self.messageCaches addObject:jsonString];
+            SALogDebug(@"insert dataCache into memory success, current count is %lu", self.messageCaches.count);
+        } else {
+            // 不能转成 json 字符串
+            SALogError(@"insert dataCache into memory error");
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@ error: %@", self, exception);
+    }
+}
+
+- (void)addObjectToDatabase:(id)obj withType:(NSString *)type isFromCache:(BOOL)isFromCache {
+    if (!obj || ![type isKindOfClass:[NSString class]]) {
+        SALogError(@"%@ input parameter is invalid for addObjectToDatabase", self);
+        return;
+    }
+    
     UInt64 maxCacheSize = [SensorsAnalyticsSDK sharedInstance].configOptions.maxCacheSize;
-    if (_messageCount >= maxCacheSize) {
-        SAError(@"touch MAX_MESSAGE_SIZE:%d, try to delete some old events", maxCacheSize);
-        BOOL ret = [self removeFirstRecords:100 withType:@"Post"];
+    if (_dbMessageCount >= maxCacheSize) {
+        SALogWarn(@"AddObjectToDatabase touch MAX_MESSAGE_SIZE:%llu, try to delete some old events", maxCacheSize);
+        BOOL ret = [self removeFirstRecordsFromDatabase:kRemoveFirstRecordsDefaultCount];
         if (ret) {
-            _messageCount = [self sqliteCount];
+            _dbMessageCount = [self sqliteCount];
         } else {
-            SAError(@"touch MAX_MESSAGE_SIZE:%d, try to delete some old events FAILED", maxCacheSize);
+            SALogError(@"AddObjectToDatabase touch MAX_MESSAGE_SIZE:%llu, try to delete some old events FAILED", maxCacheSize);
             return;
         }
     }
-    NSData *jsonData = [_jsonUtil JSONSerializeObject:obj];
-    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-
+    
+    NSString *jsonString = nil;
+    if (isFromCache) {
+        // 数据从缓存中来，已经是处理成 NSString 的结果，不需要再次进行处理
+        jsonString = obj;
+    } else {
+        // 数据从外部进来，需要进行处理
+        jsonString = [self buildJSONStringWithObject:obj];
+    }
+    
     NSString *query = @"INSERT INTO dataCache(type, content) values(?, ?)";
     sqlite3_stmt *insertStatement = [self dbCacheStmt:query];
     int rc;
@@ -109,109 +288,196 @@ - (void)addObejct:(id)obj withType:(NSString *)type {
         @try {
             sqlite3_bind_text(insertStatement, 2, [jsonString UTF8String], -1, SQLITE_TRANSIENT);
         } @catch (NSException *exception) {
-            SAError(@"Found NON UTF8 String, ignore");
+            SALogError(@"Found NON UTF8 String, ignore");
             return;
         }
         rc = sqlite3_step(insertStatement);
         if (rc != SQLITE_DONE) {
-            SAError(@"insert into dataCache fail, rc is %d", rc);
+            SALogError(@"insert into dataCache table of sqlite fail, rc is %d", rc);
         } else {
-            _messageCount++;
-            SADebug(@"insert into dataCache success, current count is %lu", _messageCount);
+            _dbMessageCount++;
+            SALogDebug(@"insert into dataCache table of sqlite success, current count is %lu", _dbMessageCount);
         }
     } else {
-        SAError(@"insert into dataCache error");
+        SALogError(@"insert into dataCache table of sqlite error");
     }
 }
 
-- (NSArray *)getFirstRecords:(NSUInteger)recordSize withType:(NSString *)type {
-    if (_messageCount == 0) {
+- (NSString *)buildJSONStringWithObject:(id)obj {
+    if ([SensorsAnalyticsSDK sharedInstance].configOptions.enableEncrypt) {
+        obj = [[SensorsAnalyticsSDK sharedInstance].encryptBuilder encryptionJSONObject:obj] ?: obj;
+    }
+    NSData *jsonData = [_jsonUtil JSONSerializeObject:obj];
+    return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+}
+
+- (NSArray *)fetchFirstRecordsFromCache:(NSUInteger)recordSize {
+    if ((self.messageCaches.count == 0) || (recordSize == 0)) {
         return @[];
     }
+    
+    NSUInteger actualRecordSize = MIN(recordSize, self.messageCaches.count);
+    NSArray<NSString *> *firstRecords = [self.messageCaches subarrayWithRange:NSMakeRange(0, actualRecordSize)];
+    
     NSMutableArray *contentArray = [[NSMutableArray alloc] init];
-    NSString *query = [NSString stringWithFormat:@"SELECT id,content FROM dataCache ORDER BY id ASC LIMIT %lu", (unsigned long)recordSize];
+    
+    for (NSString *record in firstRecords) {
+        @try {
+            __weak typeof(self) weakSelf = self;
+            NSString *handledRecord = [self addFlushTimeToRecord:record withDeleteBlock:^{
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                
+                [strongSelf.messageCaches removeObject:record];
+            }];
+            
+            if (handledRecord.length > 0) {
+                [contentArray addObject:handledRecord];
+            }
+        } @catch (NSException *exception) {
+            SALogError(@"%@ error: %@", self, exception);
+        }
+    }
+    
+    return [NSArray arrayWithArray:contentArray];
+}
 
+- (NSArray *)fetchFirstRecordsFromDatabase:(NSUInteger)recordSize {
+    if ((_dbMessageCount == 0) || (recordSize == 0)) {
+        return @[];
+    }
+    
+    NSString *query = [NSString stringWithFormat:@"SELECT id,content FROM dataCache ORDER BY id ASC LIMIT %lu", (unsigned long)recordSize];
     sqlite3_stmt *stmt = [self dbCacheStmt:query];
-    if (stmt) {
-        while (sqlite3_step(stmt) == SQLITE_ROW) {
-            @try {
-                char *jsonChar = (char *)sqlite3_column_text(stmt, 1);
-                if (!jsonChar) {
-                    SAError(@"Failed to query column_text, error:%s", sqlite3_errmsg(_database));
-                    return nil;
-                }
-                NSData *jsonData = [[NSString stringWithUTF8String:jsonChar] dataUsingEncoding:NSUTF8StringEncoding];
-                NSError *err;
-                NSMutableDictionary *eventDict = [NSJSONSerialization JSONObjectWithData:jsonData
-                                                                                 options:NSJSONReadingMutableContainers
-                                                                                   error:&err];
-                if (!err && eventDict) {
-                    UInt64 time = [[NSDate date] timeIntervalSince1970] * 1000;
-                    [eventDict setValue:@(time) forKey:SA_EVENT_FLUSH_TIME];
-                    [contentArray addObject:[[NSString alloc] initWithData:[_jsonUtil JSONSerializeObject:eventDict] encoding:NSUTF8StringEncoding]];
-                } else {
-                    char *idChar = (char *)sqlite3_column_text(stmt, 0);
-                    NSInteger index = [[NSString stringWithUTF8String:idChar] integerValue];
-                    [self deleteRecordWithId:index];
-                }
-            } @catch (NSException *exception) {
-                SAError(@"Found NON UTF8 String, ignore");
+    if (!stmt) {
+        SALogError(@"Failed to prepare statement, error:%s", sqlite3_errmsg(_database));
+        return nil;
+    }
+    
+    NSMutableArray *contentArray = [[NSMutableArray alloc] init];
+    while (sqlite3_step(stmt) == SQLITE_ROW) {
+        @try {
+            char *jsonChar = (char *)sqlite3_column_text(stmt, 1);
+            if (!jsonChar) {
+                SALogError(@"Failed to query column_text, error:%s", sqlite3_errmsg(_database));
+                return nil;
             }
+            
+            __weak typeof(self) weakSelf = self;
+            NSString *handledRecord = [self addFlushTimeToRecord:[NSString stringWithUTF8String:jsonChar] withDeleteBlock:^{
+                __strong typeof(weakSelf) strongSelf = weakSelf;
+                
+                char *idChar = (char *)sqlite3_column_text(stmt, 0);
+                NSInteger idIndex = [[NSString stringWithUTF8String:idChar] integerValue];
+                [strongSelf deleteDatabaseRecordWithId:idIndex];
+            }];
+            
+            if (handledRecord.length > 0) {
+                [contentArray addObject:handledRecord];
+            }
+        } @catch (NSException *exception) {
+            SALogError(@"Found NON UTF8 String, ignore");
         }
-    } else {
-        SAError(@"Failed to prepare statement, error:%s", sqlite3_errmsg(_database));
-        return nil;
     }
+    
     return [NSArray arrayWithArray:contentArray];
 }
 
-///删除某条数据
-- (BOOL)deleteRecordWithId:(NSInteger)index {
-    NSString *queryDelete = [NSString stringWithFormat:@"DELETE FROM dataCache WHERE id = %ld", (long)index];
+- (NSString *)addFlushTimeToRecord:(NSString *)record withDeleteBlock:(void (^)(void))deleteBlock {
+    NSData *jsonData = [record dataUsingEncoding:NSUTF8StringEncoding];
+    if (!jsonData) {
+        deleteBlock();
+        return nil;
+    }
+    
+    NSError *err;
+    NSMutableDictionary *eventDict = [NSJSONSerialization JSONObjectWithData:jsonData
+                                                                     options:NSJSONReadingMutableContainers
+                                                                       error:&err];
+    if (err || !eventDict) {
+        // 删除内容为空的数据
+        deleteBlock();
+        return nil;
+    }
+    
+    BOOL isEnableEncrypt = [SensorsAnalyticsSDK sharedInstance].configOptions.enableEncrypt;
+    if (isEnableEncrypt && ![eventDict.allKeys containsObject:@"ekey"]) {
+        // 缓存数据未加密，再加密
+        NSDictionary *encryptDic = [[SensorsAnalyticsSDK sharedInstance].encryptBuilder encryptionJSONObject:eventDict];
+        if (encryptDic) {
+            eventDict = [encryptDic mutableCopy];
+        }
+    }
+    
+    UInt64 time = [[NSDate date] timeIntervalSince1970] * 1000;
+    // 后台设计如此，根据是否开启加密传入不同的 flush time 名字
+    eventDict[isEnableEncrypt ? @"flush_time" : @"_flush_time"] = @(time);
+    
+    return [[NSString alloc] initWithData:[_jsonUtil JSONSerializeObject:eventDict] encoding:NSUTF8StringEncoding];
+}
 
-    char *errDeleteMsg;
-    if (sqlite3_exec(_database, [queryDelete UTF8String], NULL, NULL, &errDeleteMsg) == SQLITE_OK) {
-        _messageCount--;
+/// 从数据库中删除某条数据
+- (BOOL)deleteDatabaseRecordWithId:(NSInteger)index {
+    NSString *sql = [NSString stringWithFormat:@"DELETE FROM dataCache WHERE id = %ld", (long)index];
+    if ([self databaseExecute:sql]) {
+        _dbMessageCount--;
         return YES;
     } else {
-        SAError(@"Failed to delete record msg=%s", errDeleteMsg);
+        SALogError(@"Failed to delete record");
         return NO;
     }
 }
 
-- (void)deleteAll {
-    NSString *query = @"DELETE FROM dataCache";
-    char *errMsg;
-    @try {
-        if (sqlite3_exec(_database, [query UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) {
-            SAError(@"Failed to delete record msg=%s", errMsg);
-        }
-    } @catch (NSException *exception) {
-        SAError(@"Failed to delete record exception=%@", exception);
+- (void)removeFirstRecordsFromCache:(NSUInteger)recordSize {
+    if ((self.messageCaches.count == 0) || (recordSize == 0)) {
+        return;
     }
-
-    _messageCount = [self sqliteCount];
+    
+    NSUInteger actualRemoveSize = MIN(recordSize, self.messageCaches.count);
+    [self.messageCaches removeObjectsInRange:NSMakeRange(0, actualRemoveSize)];
 }
 
-- (BOOL)removeFirstRecords:(NSUInteger)recordSize withType:(NSString *)type {
-    NSUInteger removeSize = MIN(recordSize, _messageCount);
-    NSString *query = [NSString stringWithFormat:@"DELETE FROM dataCache WHERE id IN (SELECT id FROM dataCache ORDER BY id ASC LIMIT %lu);", (unsigned long)removeSize];
-    char *errMsg;
-    @try {
-        if (sqlite3_exec(_database, [query UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) {
-            SAError(@"Failed to delete record msg=%s", errMsg);
-            return NO;
-        }
-    } @catch (NSException *exception) {
-        SAError(@"Failed to delete record exception=%@", exception);
+- (BOOL)removeFirstRecordsFromDatabase:(NSUInteger)recordSize {
+    if ((_dbMessageCount == 0) || (recordSize == 0)) {
+        return YES;
+    }
+    
+    NSUInteger removeSize = MIN(recordSize, _dbMessageCount);
+    NSString *sql = [NSString stringWithFormat:@"DELETE FROM dataCache WHERE id IN (SELECT id FROM dataCache ORDER BY id ASC LIMIT %lu);", (unsigned long)removeSize];
+    if (![self databaseExecute:sql]) {
+        SALogError(@"Failed to delete record from database");
         return NO;
     }
-    _messageCount = [self sqliteCount];
+    
+    _dbMessageCount = [self sqliteCount];
     return YES;
 }
 
-- (NSInteger)count {
-    return _messageCount;
+- (void)closeDatabase {
+    if (_dbStmtCache) CFRelease(_dbStmtCache);
+    _dbStmtCache = NULL;
+
+    sqlite3_close(_database);
+    sqlite3_shutdown();
+    SALogDebug(@"%@ close database", self);
+}
+
+- (BOOL)databaseCheck {
+    if (![self openDatabase]) {
+        return NO;
+    }
+    
+    // 数据库打开成功，将内存中的数据读入数据库中
+    if (self.messageCaches.count > 0) {
+        for (id obj in self.messageCaches) {
+            
+            // 目前 add object 的 type 都是 Post
+            [self addObjectToDatabase:obj withType:@"Post" isFromCache:YES];
+        }
+        
+        [self.messageCaches removeAllObjects];
+    }
+    
+    return YES;
 }
 
 - (NSInteger)sqliteCount {
@@ -222,36 +488,18 @@ - (NSInteger)sqliteCount {
         while (sqlite3_step(statement) == SQLITE_ROW)
             count = sqlite3_column_int(statement, 0);
     } else {
-        SAError(@"Failed to prepare statement");
+        SALogError(@"Failed to prepare statement");
     }
     return count;
 }
 
-- (BOOL)vacuum {
-#ifdef SENSORS_ANALYTICS_ENABLE_VACUUM
-    @try {
-        NSString *query = @"VACUUM";
-        char *errMsg;
-        if (sqlite3_exec(_database, [query UTF8String], NULL, NULL, &errMsg) != SQLITE_OK) {
-            SAError(@"Failed to delete record msg=%s", errMsg);
-            return NO;
-        }
-        return YES;
-    } @catch (NSException *exception) {
-        return NO;
-    }
-#else
-    return YES;
-#endif
-}
-
 - (sqlite3_stmt *)dbCacheStmt:(NSString *)sql {
     if (sql.length == 0 || !_dbStmtCache) return NULL;
     sqlite3_stmt *stmt = (sqlite3_stmt *)CFDictionaryGetValue(_dbStmtCache, (__bridge const void *)(sql));
     if (!stmt) {
         int result = sqlite3_prepare_v2(_database, sql.UTF8String, -1, &stmt, NULL);
         if (result != SQLITE_OK) {
-            SAError(@"%s line:%d sqlite stmt prepare error (%d): %s", __FUNCTION__, __LINE__, result, sqlite3_errmsg(_database));
+            SALogError(@"sqlite stmt prepare error (%d): %s", result, sqlite3_errmsg(_database));
             return NULL;
         }
         CFDictionarySetValue(_dbStmtCache, (__bridge const void *)(sql), stmt);
@@ -261,4 +509,13 @@ - (sqlite3_stmt *)dbCacheStmt:(NSString *)sql {
     return stmt;
 }
 
+#pragma mark - Getters and Setters
+
+- (NSMutableArray<NSString *> *)messageCaches {
+    if (!_messageCaches) {
+        _messageCaches = [NSMutableArray array];
+    }
+    return _messageCaches;
+}
+
 @end
diff --git a/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.h b/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.h
index e4012271..c08f74bd 100644
--- a/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.h
+++ b/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/8/8.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.m b/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.m
index 21d93e6a..7a17aab3 100644
--- a/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.m
+++ b/SensorsAnalyticsSDK/NSObject+SensorsAnalyticsDelegate.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/8/8.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ static void sa_tablViewDidSelectRowAtIndexPath(id self, SEL _cmd, id tableView,
         return;
     }
     [properties addEntriesFromDictionary:[SAAutoTrackUtils propertiesWithAutoTrackDelegate:tableView didSelectedAtIndexPath:indexPath]];
-   [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
+    [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
 }
 
 static void sa_collectionViewDidSelectItemAtIndexPath(id self, SEL _cmd, id collectionView, id indexPath) {
diff --git a/SensorsAnalyticsSDK/NSString+HashCode.h b/SensorsAnalyticsSDK/NSString+HashCode.h
index 6e027dbe..4a9328b4 100644
--- a/SensorsAnalyticsSDK/NSString+HashCode.h
+++ b/SensorsAnalyticsSDK/NSString+HashCode.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/7/6.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/NSString+HashCode.m b/SensorsAnalyticsSDK/NSString+HashCode.m
index 19bfdf86..cf1fb7ad 100644
--- a/SensorsAnalyticsSDK/NSString+HashCode.m
+++ b/SensorsAnalyticsSDK/NSString+HashCode.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/7/6.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -33,7 +33,8 @@ - (int)sensorsdata_hashCode {
         NSString *s = [self substringWithRange:NSMakeRange(i, 1)];
         char *unicode = (char *)[s cStringUsingEncoding:NSUnicodeStringEncoding];
         int charactorUnicode = 0;
-        size_t length = strlen(unicode);
+
+        size_t length = strnlen(unicode, 4);
         for (int n = 0; n < length; n ++) {
             charactorUnicode += (int)((unicode[n] & 0xff) << (n * sizeof(char) * 8));
         }
diff --git a/SensorsAnalyticsSDK/SAAbstractDesignerMessage.h b/SensorsAnalyticsSDK/SAAbstractDesignerMessage.h
deleted file mode 100644
index 3c2411d3..00000000
--- a/SensorsAnalyticsSDK/SAAbstractDesignerMessage.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-//  SAAbstractDesignerMessage.h
-//  SensorsAnalyticsSDK
-//
-//  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-
-#import "SADesignerMessage.h"
-
-@interface SAAbstractDesignerMessage : NSObject <SADesignerMessage>
-
-@property (nonatomic, copy, readonly) NSString *type;
-
-+ (instancetype)messageWithType:(NSString *)type payload:(NSDictionary *)payload;
-
-- (instancetype)initWithType:(NSString *)type;
-- (instancetype)initWithType:(NSString *)type payload:(NSDictionary *)payload;
-
-- (void)setPayloadObject:(id)object forKey:(NSString *)key;
-- (id)payloadObjectForKey:(NSString *)key;
-- (NSDictionary *)payload;
-
-- (NSData *)JSONData:(BOOL)useGzip;
-
-@end
diff --git a/SensorsAnalyticsSDK/SAAbstractDesignerMessage.m b/SensorsAnalyticsSDK/SAAbstractDesignerMessage.m
deleted file mode 100644
index 48865b29..00000000
--- a/SensorsAnalyticsSDK/SAAbstractDesignerMessage.m
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-//  SAAbstractDesignerMessage.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 "SAGzipUtility.h"
-#import "SAAbstractDesignerMessage.h"
-#import "SALogger.h"
-
-@interface SAAbstractDesignerMessage ()
-
-@property (nonatomic, copy, readwrite) NSString *type;
-
-@end
-
-@implementation SAAbstractDesignerMessage {
-    NSMutableDictionary *_payload;
-}
-
-+ (instancetype)messageWithType:(NSString *)type payload:(NSDictionary *)payload {
-    return [[self alloc] initWithType:type payload:payload];
-}
-
-- (instancetype)initWithType:(NSString *)type {
-    return [self initWithType:type payload:@{}];
-}
-
-- (instancetype)initWithType:(NSString *)type payload:(NSDictionary *)payload {
-    self = [super init];
-    if (self) {
-        _type = type;
-        _payload = [payload mutableCopy];
-    }
-
-    return self;
-}
-
-- (void)setPayloadObject:(id)object forKey:(NSString *)key {
-    _payload[key] = object ?: [NSNull null];
-}
-
-- (id)payloadObjectForKey:(NSString *)key {
-    id object = _payload[key];
-    return [object isEqual:[NSNull null]] ? nil : object;
-}
-
-- (NSDictionary *)payload {
-    return [_payload copy];
-}
-
-- (NSData *)JSONData:(BOOL)useGzip {
-    NSMutableDictionary *jsonObject = [[NSMutableDictionary alloc] init];
-    
-    [jsonObject setObject:_type forKey:@"type"];
-
-    if (useGzip) {
-        // 如果使用 GZip 压缩
-        NSError *error = nil;
-        
-        // 1. 序列化 Payload
-        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[_payload copy] options:0 error:&error];
-        NSString * jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-
-        // 2. 使用 GZip 进行压缩
-        NSData *zippedData = [SAGzipUtility gzipData:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
-
-        // 3. Base64 Encode
-        NSString *b64String = [zippedData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
-
-        [jsonObject setValue:b64String forKey:@"gzip_payload"];
-    } else {
-        [jsonObject setValue:[_payload copy] forKey:@"payload"];
-    }
-
-    NSError *error = nil;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonObject options:0 error:&error];
-    if (jsonData == nil && error) {
-        SAError(@"Failed to serialize test designer message: %@", error);
-    }
-
-    return jsonData;
-}
-
-- (NSOperation *)responseCommandWithConnection:(SADesignerConnection *)connection {
-    return nil;
-}
-
-- (NSString *)debugDescription {
-    return [NSString stringWithFormat:@"<%@:%p type='%@'>", NSStringFromClass([self class]), (__bridge void *)self, self.type];
-}
-
-@end
diff --git a/SensorsAnalyticsSDK/SAAlertController.h b/SensorsAnalyticsSDK/SAAlertController.h
index 2a30fc3e..fd8891b9 100644
--- a/SensorsAnalyticsSDK/SAAlertController.h
+++ b/SensorsAnalyticsSDK/SAAlertController.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2019/3/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAAlertController.m b/SensorsAnalyticsSDK/SAAlertController.m
index 937c04ca..53eea5f3 100644
--- a/SensorsAnalyticsSDK/SAAlertController.m
+++ b/SensorsAnalyticsSDK/SAAlertController.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2019/3/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -64,7 +64,7 @@ - (instancetype)initWithTitle:(nullable NSString *)title message:(nullable NSStr
         _actions = [NSMutableArray arrayWithCapacity:4];
         
         if (NSClassFromString(@"UIAlertController")) {
-            UIWindow *alertWindow = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+            UIWindow *alertWindow = [self currentAlertWindow];
             alertWindow.windowLevel = UIWindowLevelAlert + 1;
             alertWindow.rootViewController = self;
             alertWindow.hidden = NO;
@@ -208,6 +208,24 @@ - (void)showActionSheet {
     [sheet showInView:self.alertWindow];
 }
 
+- (UIWindow *)currentAlertWindow {
+#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 130000)
+    if (@available(iOS 13.0, *)) {
+        __block UIWindowScene *scene = nil;
+        [[UIApplication sharedApplication].connectedScenes.allObjects enumerateObjectsUsingBlock:^(UIScene * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            if ([obj isKindOfClass:[UIWindowScene class]]) {
+                scene = (UIWindowScene *)obj;
+                *stop = YES;
+            }
+        }];
+        if (scene) {
+            return [[UIWindow alloc] initWithWindowScene:scene];
+        }
+    }
+#endif
+    return [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+}
+
 #pragma mark - UIAlertViewDelegate
 - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex {
     for (SAAlertAction *action in self.actions) {
diff --git a/SensorsAnalyticsSDK/SAAppExtensionDataManager.h b/SensorsAnalyticsSDK/SAAppExtensionDataManager.h
index 11a4bcfd..cd849887 100644
--- a/SensorsAnalyticsSDK/SAAppExtensionDataManager.h
+++ b/SensorsAnalyticsSDK/SAAppExtensionDataManager.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/1/18.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAAppExtensionDataManager.m b/SensorsAnalyticsSDK/SAAppExtensionDataManager.m
index 422f25fe..5e22ee54 100644
--- a/SensorsAnalyticsSDK/SAAppExtensionDataManager.m
+++ b/SensorsAnalyticsSDK/SAAppExtensionDataManager.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/1/18.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 
 #import "SAAppExtensionDataManager.h"
-#import "SALogger.h"
+#import "SALog.h"
 void *SAAppExtensionQueueTag = &SAAppExtensionQueueTag;
 
 @interface SAAppExtensionDataManager() {
@@ -107,7 +107,7 @@ - (NSUInteger)fileDataCountForGroupIdentifier:(NSString *)groupIdentifier {
             return 0;
         }
         
-        __block NSInteger count = 0;
+        __block NSUInteger count = 0;
         dispatch_block_t block = ^() {
             NSString *path = [self filePathForApplicationGroupIdentifier:groupIdentifier];
             NSArray *array = [[NSMutableArray alloc] initWithContentsOfFile:path];
@@ -170,7 +170,7 @@ - (BOOL)writeEvent:(NSString *)eventName properties:(NSDictionary *)properties g
             if(![[NSFileManager defaultManager] fileExistsAtPath:path]) {
                 BOOL success = [[NSFileManager defaultManager] createFileAtPath:path contents:nil attributes:nil];
                 if (success) {
-                    SALog(@"create plist file success!!!!!!! APPEXtension...");
+                    SALogDebug(@"create plist file success!!!!!!! APPEXtension...");
                 }
             }
             NSMutableArray *array = [[NSMutableArray alloc] initWithContentsOfFile:path];
diff --git a/SensorsAnalyticsSDK/SAApplicationStateSerializer.m b/SensorsAnalyticsSDK/SAApplicationStateSerializer.m
deleted file mode 100644
index 4d765cd0..00000000
--- a/SensorsAnalyticsSDK/SAApplicationStateSerializer.m
+++ /dev/null
@@ -1,94 +0,0 @@
-//
-//  SAApplicationStateSerializer.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 <QuartzCore/QuartzCore.h>
-#import "SAApplicationStateSerializer.h"
-#import "SAClassDescription.h"
-#import "SALogger.h"
-#import "SAObjectIdentityProvider.h"
-#import "SAObjectSerializer.h"
-#import "SAObjectSerializerConfig.h"
-
-@implementation SAApplicationStateSerializer {
-    SAObjectSerializer *_serializer;
-    UIApplication *_application;
-}
-
-- (instancetype)initWithApplication:(UIApplication *)application
-                      configuration:(SAObjectSerializerConfig *)configuration
-             objectIdentityProvider:(SAObjectIdentityProvider *)objectIdentityProvider {
-    NSParameterAssert(application != nil);
-    NSParameterAssert(configuration != nil);
-    
-    self = [super init];
-    if (self) {
-        _application = application;
-        _serializer = [[SAObjectSerializer alloc] initWithConfiguration:configuration objectIdentityProvider:objectIdentityProvider];
-    }
-    
-    return self;
-}
-
-- (UIImage *)screenshotImageForWindow:(UIWindow *)window {
-    UIImage *image = nil;
-    
-    UIWindow *mainWindow = [self uiMainWindow:window];
-    if (mainWindow && !CGRectEqualToRect(mainWindow.frame, CGRectZero)) {
-        UIGraphicsBeginImageContextWithOptions(mainWindow.bounds.size, YES, mainWindow.screen.scale);
-#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 70000
-        if ([mainWindow respondsToSelector:@selector(drawViewHierarchyInRect:afterScreenUpdates:)]) {
-            if ([mainWindow drawViewHierarchyInRect:mainWindow.bounds afterScreenUpdates:NO] == NO) {
-                SAError(@"Unable to get complete screenshot for window at index: %d.", (int)index);
-            }
-        } else {
-            [mainWindow.layer renderInContext:UIGraphicsGetCurrentContext()];
-        }
-#else
-        [mainWindow.layer renderInContext:UIGraphicsGetCurrentContext()];
-#endif
-        image = UIGraphicsGetImageFromCurrentImageContext();
-        UIGraphicsEndImageContext();
-    }
-    
-    return image;
-}
-
-- (UIWindow *)uiMainWindow:(UIWindow *)window {
-    if (window != nil) {
-        return window;
-    }
-    return _application.windows[0];
-}
-
-- (NSDictionary *)objectHierarchyForWindow:(UIWindow *)window {
-    UIWindow *mainWindow = [self uiMainWindow:window];
-    if (mainWindow) {
-        return [_serializer serializedObjectsWithRootObject:mainWindow];
-    }
-    
-    return @{};
-}
-
-@end
diff --git a/SensorsAnalyticsSDK/SAAuxiliaryToolManager.h b/SensorsAnalyticsSDK/SAAuxiliaryToolManager.h
deleted file mode 100644
index 2497b22d..00000000
--- a/SensorsAnalyticsSDK/SAAuxiliaryToolManager.h
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-//  SAAuxiliaryToolManager.h
-//  SensorsAnalyticsSDK
-//
-//  Created by 向作为 on 2018/9/7.
-//  Copyright © 2015－2018 Sensors Data Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "SAVisualizedAutoTrackConnection.h"
-#import "SAHeatMapConnection.h"
-NS_ASSUME_NONNULL_BEGIN
-
-@interface SAAuxiliaryToolManager : NSObject
-+ (instancetype)sharedInstance;
-
-- (BOOL)canHandleURL:(NSURL *)url;
-- (BOOL)handleURL:(NSURL *)url  isWifi:(BOOL)isWifi;
-
-
-- (BOOL)isHeatMapURL:(NSURL *)url;
-- (BOOL)isVisualizedAutoTrackURL:(NSURL *)url;
-- (BOOL)isDebugModeURL:(NSURL *)url;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SAAuxiliaryToolManager.m b/SensorsAnalyticsSDK/SAAuxiliaryToolManager.m
deleted file mode 100644
index 970668f2..00000000
--- a/SensorsAnalyticsSDK/SAAuxiliaryToolManager.m
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-//  SAAuxiliaryToolManager.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 向作为 on 2018/9/7.
-//  Copyright © 2015－2018 Sensors Data Inc. All rights reserved.
-//
-
-#if ! __has_feature(objc_arc)
-#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 "SAAuxiliaryToolManager.h"
-#import "SensorsAnalyticsSDK.h"
-#import "SALogger.h"
-#import "SAAlertController.h"
-
-@interface SAAuxiliaryToolManager()
-@property (nonatomic, strong) SAVisualizedAutoTrackConnection *visualizedAutoTrackConnection;
-@property (nonatomic, strong) SAHeatMapConnection *heatMapConnection;
-@property (nonatomic, copy) NSString *postUrl;
-@property (nonatomic, copy) NSString *featureCode;
-@property (nonatomic, strong) NSURL *originalURL;
-@end
-@implementation SAAuxiliaryToolManager
-+ (instancetype)sharedInstance {
-    static SAAuxiliaryToolManager *sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [[SAAuxiliaryToolManager alloc] init];
-    });
-    return sharedInstance;
-}
-
-- (BOOL)canHandleURL:(NSURL *)URL {
-    return [self isHeatMapURL:URL] || [self isVisualizedAutoTrackURL:URL] || [self isDebugModeURL:URL];
-}
-
-- (BOOL)handleURL:(NSURL *)URL isWifi:(BOOL)isWifi {
-    if ([self canHandleURL:URL] == NO) {
-        return NO;
-    }
-    NSString *featureCode = nil;
-    NSString *postURLStr = nil;
-    [self getFeatureCode:&featureCode postURL:&postURLStr URL:URL];
-    if (featureCode != nil && postURLStr != nil) {
-        [self showOpenDialogWithURL:URL featureCode:featureCode postURL:postURLStr isWifi:isWifi ];
-        return YES;
-    } else { //feature_code  url 参数错误
-        [self showParameterError:@"ERROR" message:@"参数错误"];
-        return NO;
-    }
-    return NO;
-}
-
-- (void)showOpenDialogWithURL:(NSURL *)URL featureCode:(NSString *)featureCode postURL:(NSString *)postURL isWifi:(BOOL)isWifi {
-    self.featureCode = featureCode;
-    self.postUrl = postURL;
-    self.originalURL = URL;
-    NSString *alertTitle = @"提示";
-    NSString *alertMessage = [self alertMessageWithURL:URL isWifi:isWifi];
-    
-    SAAlertController *alertController = [[SAAlertController alloc] initWithTitle:alertTitle message:alertMessage preferredStyle:SAAlertControllerStyleAlert];
-    
-    [alertController addActionWithTitle:@"取消" style:SAAlertActionStyleCancel handler:^(SAAlertAction * _Nonnull action) {
-        [self.visualizedAutoTrackConnection close];
-        [self.heatMapConnection close];
-        self.visualizedAutoTrackConnection = nil;
-        self.heatMapConnection = nil;
-    }];
-    
-    [alertController addActionWithTitle:@"继续" style:SAAlertActionStyleDefault handler:^(SAAlertAction * _Nonnull action) {
-        SADebug(@"Confirmed to open HeatMap ...");
-        // start
-        if ([self isHeatMapURL:URL]) {
-            self.heatMapConnection = [[SAHeatMapConnection alloc] initWithURL:nil];
-            [self.heatMapConnection startConnectionWithFeatureCode:featureCode url:postURL];
-        } else if ([self isVisualizedAutoTrackURL:URL]) {
-            self.visualizedAutoTrackConnection = [[SAVisualizedAutoTrackConnection alloc] initWithURL:nil];
-            [self.visualizedAutoTrackConnection startConnectionWithFeatureCode:featureCode url:postURL];
-        }
-    }];
-    
-    [alertController show];
-}
-
-- (NSString *)alertMessageWithURL:(NSURL *)URL isWifi:(BOOL)isWifi {
-    NSString *alertMessage = nil;
-    if ([self isHeatMapURL:URL]) {
-        alertMessage = @"正在连接 App 点击分析";
-    } else if ([self isVisualizedAutoTrackURL:URL]) {
-        alertMessage = @"正在连接 App 可视化全埋点";
-    }
-    if (!isWifi && alertMessage) {
-        alertMessage = [alertMessage stringByAppendingString: @"，建议在 WiFi 环境下使用"];
-    }
-    return alertMessage;
-}
-
-- (BOOL)isHeatMapURL:(NSURL *)url {
-    return [url.host isEqualToString:@"heatmap"];
-}
-
-- (BOOL)isVisualizedAutoTrackURL:(NSURL *)url {
-    return [url.host isEqualToString:@"visualized"];
-}
-
-- (BOOL)isDebugModeURL:(NSURL *)url {
-     return [url.host isEqualToString:@"debugmode"];
-}
-
-- (void)getFeatureCode:(NSString **)featureCode postURL:(NSString **)postURL URL:(NSURL *)url {
-    @try {
-        NSString *query = [url query];
-        if (query != nil) {
-            NSArray *subArray = [query componentsSeparatedByString:@"&"];
-            NSMutableDictionary *tempDic = [[NSMutableDictionary alloc] init];
-            if (subArray) {
-                for (int j = 0 ; j < subArray.count; j++) {
-                    //在通过=拆分键和值
-                    NSArray *dicArray = [subArray[j] componentsSeparatedByString:@"="];
-                    //给字典加入元素
-                    [tempDic setObject:dicArray[1] forKey:dicArray[0]];
-                }
-                *featureCode = [tempDic objectForKey:@"feature_code"];
-                *postURL = [tempDic objectForKey:@"url"];
-            }
-        }
-    } @catch (NSException *exception) {
-        
-    } @finally {
-        
-    }
-}
-- (void)showParameterError:(NSString *)alertTitle message:(NSString *)alertMessage {
-        SAAlertController *alertController = [[SAAlertController alloc] initWithTitle:alertTitle message:alertMessage preferredStyle:SAAlertControllerStyleAlert];
-        [alertController addActionWithTitle:@"OK" style:SAAlertActionStyleDefault handler:^(SAAlertAction * _Nonnull action) {
-            
-        }];
-        
-        [alertController show];
-
-}
-@end
diff --git a/SensorsAnalyticsSDK/SACommonUtility.m b/SensorsAnalyticsSDK/SACommonUtility.m
deleted file mode 100644
index 0203924e..00000000
--- a/SensorsAnalyticsSDK/SACommonUtility.m
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-//  SACommonUtility.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 储强盛 on 2018/7/26.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 "SACommonUtility.h"
-
-@implementation SACommonUtility
-
-
-///按字节截取指定长度字符，包括汉字
-+ (NSString *)subByteString:(NSString *)string byteLength:(NSInteger )length {
-    
-    NSStringEncoding enc = CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingUTF8);
-    NSData* data = [string dataUsingEncoding:enc];
-    
-    NSData *subData = [data subdataWithRange:NSMakeRange(0, length)];
-    NSString*txt=[[NSString alloc] initWithData:subData encoding:enc];
-    
-     //utf8 汉字占三个字节，表情占四个字节，可能截取失败
-    NSInteger index = 1;
-    while (index <= 3 && !txt) {
-        if (length > index) {
-            subData = [data subdataWithRange:NSMakeRange(0, length - index)];
-            txt = [[NSString alloc] initWithData:subData encoding:enc];
-        }
-        index ++;
-    }
-    
-    if (!txt) {
-        return string;
-    }
-    return txt;
-}
-@end
diff --git a/SensorsAnalyticsSDK/SAConfigOptions.h b/SensorsAnalyticsSDK/SAConfigOptions.h
index 47aef340..5feae29c 100644
--- a/SensorsAnalyticsSDK/SAConfigOptions.h
+++ b/SensorsAnalyticsSDK/SAConfigOptions.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2019/4/8.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@
 #import <Foundation/Foundation.h>
 #import "SAConstants.h"
 
+@class SASecretKey;
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -55,6 +57,9 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic) SensorsAnalyticsAutoTrackEventType autoTrackEventType;
 
+/// 是否开启 WKWebView 的 H5 打通功能，该功能默认是关闭的
+@property (nonatomic) BOOL enableJavaScriptBridge;
+
 /// 是否自动收集 App Crash 日志，该功能默认是关闭的
 @property (nonatomic) BOOL enableTrackAppCrash;
 
@@ -96,6 +101,14 @@ NS_ASSUME_NONNULL_BEGIN
 /// 设置本地缓存最多事件条数，默认为 10000 条事件
 @property (nonatomic) NSInteger maxCacheSize;
 
+/// 开启 log 打印
+@property (nonatomic, assign) BOOL enableLog;
+
+/// 开启点击图
+@property (nonatomic, assign) BOOL enableHeatMap;
+
+/// 开启可视化全埋点
+@property (nonatomic, assign) BOOL enableVisualizedAutoTrack;
 #pragma mark - 请求远程配置策略
 /// 请求远程配置地址，默认从 serverURL 解析
 @property (nonatomic, copy) NSString *remoteConfigURL;
@@ -109,6 +122,39 @@ NS_ASSUME_NONNULL_BEGIN
 /// 最大间隔时长，单位：小时，默认 48
 @property (nonatomic, assign) NSInteger maxRequestHourInterval;
 
+/// DeepLink 中解析出来的参数是否需要保存到本地
+@property (nonatomic, assign) BOOL enableSaveDeepLinkInfo;
+
+/// DeepLink 中用户自定义来源渠道属性 key 值，可传多个。
+@property (nonatomic, copy) NSArray<NSString *> *sourceChannels;
+
+/// 是否在手动埋点事件中自动添加渠道匹配信息
+@property (nonatomic, assign) BOOL enableAutoAddChannelCallbackEvent;
+
+/// 是否开启加密
+@property (nonatomic, assign) BOOL enableEncrypt;
+
+/// 存储公钥的回调
+@property (nonatomic, copy) void (^saveSecretKey)(SASecretKey * _Nonnull secretKey);
+
+/// 获取公钥的回调
+@property (nonatomic, copy) SASecretKey * _Nonnull (^loadSecretKey)(void);
+
+/// 是否开启多渠道匹配，开启后调用 profile_set,不开启则调用 profile_set_once
+@property (nonatomic, assign) BOOL enableMultipleChannelMatch;
+
+@end
+
+
+/// RSA 公钥秘钥信息
+@interface SASecretKey : NSObject <NSCoding>
+
+/// 秘钥版本
+@property(nonatomic, assign) NSInteger version;
+
+/// 秘钥值
+@property(nonatomic, copy) NSString *key;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SAConfigOptions.m b/SensorsAnalyticsSDK/SAConfigOptions.m
index d64c2d66..c38ac237 100644
--- a/SensorsAnalyticsSDK/SAConfigOptions.m
+++ b/SensorsAnalyticsSDK/SAConfigOptions.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2019/4/8.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -56,16 +56,30 @@ - (id)copyWithZone:(nullable NSZone *)zone {
     options.launchOptions = self.launchOptions;
 
     options.autoTrackEventType = self.autoTrackEventType;
+    options.enableJavaScriptBridge = self.enableJavaScriptBridge;
     options.enableTrackAppCrash = self.enableTrackAppCrash;
     options.flushInterval = self.flushInterval;
     options.flushBulkSize = self.flushBulkSize;
     options.maxCacheSize = self.maxCacheSize;
-
+    options.enableSaveDeepLinkInfo = self.enableSaveDeepLinkInfo;
+    options.sourceChannels = self.sourceChannels;
     options.remoteConfigURL = self.remoteConfigURL;
+
     options.disableRandomTimeRequestRemoteConfig = self.disableRandomTimeRequestRemoteConfig;
     
     options.minRequestHourInterval = self.minRequestHourInterval;
     options.maxRequestHourInterval = self.maxRequestHourInterval;
+    options.enableLog = self.enableLog;
+    options.enableHeatMap = self.enableHeatMap;
+    options.enableVisualizedAutoTrack = self.enableVisualizedAutoTrack;
+    options.enableAutoAddChannelCallbackEvent = self.enableAutoAddChannelCallbackEvent;
+    
+    options.enableEncrypt = self.enableEncrypt;
+    options.saveSecretKey = self.saveSecretKey;
+    options.loadSecretKey = self.loadSecretKey;
+    
+    options.enableMultipleChannelMatch = self.enableMultipleChannelMatch;
+    
     return options;
 }
 
@@ -96,3 +110,23 @@ - (void)setMaxRequestHourInterval:(NSInteger)maxRequestHourInterval {
 }
 
 @end
+
+
+@implementation SASecretKey
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+    [coder encodeInteger:self.version forKey:@"version"];
+    [coder encodeObject:self.key forKey:@"key"];
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder {
+    self = [super init];
+    if (self) {
+        self.version = [coder decodeIntegerForKey:@"version"];
+        self.key = [coder decodeObjectForKey:@"key"];
+    }
+    return self;
+}
+
+@end
+
diff --git a/SensorsAnalyticsSDK/SAConstants+Private.h b/SensorsAnalyticsSDK/SAConstants+Private.h
index dbe30d57..1a8f0bc4 100644
--- a/SensorsAnalyticsSDK/SAConstants+Private.h
+++ b/SensorsAnalyticsSDK/SAConstants+Private.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2019/4/8.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 extern NSString * const SA_EVENT_TIME;
 extern NSString * const SA_EVENT_TRACK_ID;
 extern NSString * const SA_EVENT_NAME;
-extern NSString * const SA_EVENT_FLUSH_TIME;
 extern NSString * const SA_EVENT_DISTINCT_ID;
 extern NSString * const SA_EVENT_PROPERTIES;
 extern NSString * const SA_EVENT_TYPE;
@@ -34,6 +33,8 @@ extern NSString * const SA_EVENT_LIB;
 extern NSString * const SA_EVENT_PROJECT;
 extern NSString * const SA_EVENT_TOKEN;
 extern NSString * const SA_EVENT_HYBRID_H5;
+extern NSString * const SA_EVENT_LOGIN_ID;
+extern NSString * const SA_EVENT_ANONYMOUS_ID;
 
 #pragma mark - Item
 extern NSString * const SA_EVENT_ITEM_TYPE;
@@ -56,10 +57,12 @@ extern NSString * const SA_EVENT_NAME_APP_START_PASSIVELY;
 
 extern NSString * const SA_EVENT_NAME_APP_SIGN_UP;
 
+extern NSString * const SA_EVENT_NAME_APP_CRASHED;
+
 #pragma mark--app install property
 extern NSString * const SA_EVENT_PROPERTY_APP_INSTALL_SOURCE;
 extern NSString * const SA_EVENT_PROPERTY_APP_INSTALL_DISABLE_CALLBACK;
-extern NSString * const SA_EVENT_PROPERTY_APP_INSTALL_USER_AGENT;
+extern NSString * const SA_EVENT_PROPERTY_APP_USER_AGENT;
 extern NSString * const SA_EVENT_PROPERTY_APP_INSTALL_FIRST_VISIT_TIME;
 
 #pragma mark--autoTrack property
@@ -76,44 +79,18 @@ extern NSString * const SA_EVENT_PROPERTY_SCREEN_NAME;
 extern NSString * const SA_EVENT_PROPERTY_TITLE;
 extern NSString * const SA_EVENT_PROPERTY_ELEMENT_POSITION;
 extern NSString * const SA_EVENT_PROPERTY_ELEMENT_SELECTOR;
+extern NSString * const SA_EVENT_PROPERTY_ELEMENT_PATH;
 extern NSString * const SA_EVENT_PROPERTY_ELEMENT_CONTENT;
 extern NSString * const SA_EVENT_PROPERTY_ELEMENT_TYPE;
+extern NSString * const SA_EVENT_PROPERTY_CHANNEL_INFO;
+extern NSString * const SA_EVENT_PROPERTY_CHANNEL_CALLBACK_EVENT;
 
 #pragma mark--common property
-//常规参数
-extern NSString * const SA_EVENT_COMMON_PROPERTY_LIB;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_LIB_VERSION;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_LIB_DETAIL;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_LIB_METHOD;
-
-extern NSString * const SA_EVENT_COMMON_PROPERTY_APP_VERSION;
-
-extern NSString * const SA_EVENT_COMMON_PROPERTY_MODEL;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_MANUFACTURER;
-
-extern NSString * const SA_EVENT_COMMON_PROPERTY_OS;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_OS_VERSION;
-
-extern NSString * const SA_EVENT_COMMON_PROPERTY_SCREEN_HEIGHT;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_SCREEN_WIDTH;
-
-extern NSString * const SA_EVENT_COMMON_PROPERTY_NETWORK_TYPE;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_WIFI;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_CARRIER;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_DEVICE_ID;
-extern NSString * const SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY;
-
-
 //可选参数
-extern NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_LATITUDE;
-extern NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_LONGITUDE;
-extern NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_SCREEN_ORIENTATION;
-extern NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_APP_STATE;
-
 extern NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT;
 extern NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN;
 extern NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME;
-extern long const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT;
+extern long long const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT;
 
 #pragma mark--profile
 extern NSString * const SA_PROFILE_SET;
@@ -130,10 +107,21 @@ extern NSString * const SA_HAS_LAUNCHED_ONCE;
 extern NSString * const SA_HAS_TRACK_INSTALLATION;
 extern NSString * const SA_HAS_TRACK_INSTALLATION_DISABLE_CALLBACK;
 
+#pragma mark - bridge name
+extern NSString * const SA_SCRIPT_MESSAGE_HANDLER_NAME;
 
-#pragma mark - safe sync
-void sensorsdata_dispatch_main_safe_sync(DISPATCH_NOESCAPE dispatch_block_t block);
+#pragma mark - reserved property list
+NSSet* sensorsdata_reserved_properties(void);
 
+#pragma mark - safe sync
 BOOL sensorsdata_is_same_queue(dispatch_queue_t queue);
 
 void sensorsdata_dispatch_safe_sync(dispatch_queue_t queue,DISPATCH_NOESCAPE dispatch_block_t block);
+
+
+#pragma mark - SF related
+extern NSString *const SA_TRACK_EVENT_NOTIFICATION;
+extern NSString *const SA_TRACK_LOGIN_NOTIFICATION;
+extern NSString *const SA_TRACK_LOGOUT_NOTIFICATION;
+extern NSString *const SA_TRACK_IDENTIFY_NOTIFICATION;
+extern NSString *const SA_TRACK_RESETANONYMOUSID_NOTIFICATION;
diff --git a/SensorsAnalyticsSDK/SAConstants.h b/SensorsAnalyticsSDK/SAConstants.h
index a4b02641..92f5b45c 100644
--- a/SensorsAnalyticsSDK/SAConstants.h
+++ b/SensorsAnalyticsSDK/SAConstants.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/8/9.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAConstants.m b/SensorsAnalyticsSDK/SAConstants.m
index 50bbc6b4..77cb8151 100644
--- a/SensorsAnalyticsSDK/SAConstants.m
+++ b/SensorsAnalyticsSDK/SAConstants.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/8/9.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -30,7 +30,6 @@
 NSString * const SA_EVENT_TIME = @"time";
 NSString * const SA_EVENT_TRACK_ID = @"_track_id";
 NSString * const SA_EVENT_NAME = @"event";
-NSString * const SA_EVENT_FLUSH_TIME = @"_flush_time";
 NSString * const SA_EVENT_DISTINCT_ID = @"distinct_id";
 NSString * const SA_EVENT_PROPERTIES = @"properties";
 NSString * const SA_EVENT_TYPE = @"type";
@@ -38,6 +37,8 @@
 NSString * const SA_EVENT_PROJECT = @"project";
 NSString * const SA_EVENT_TOKEN = @"token";
 NSString * const SA_EVENT_HYBRID_H5 = @"_hybrid_h5";
+NSString * const SA_EVENT_LOGIN_ID = @"login_id";
+NSString * const SA_EVENT_ANONYMOUS_ID = @"anonymous_id";
 
 #pragma mark - Item
 NSString * const SA_EVENT_ITEM_TYPE = @"item_type";
@@ -59,10 +60,12 @@
 
 NSString * const SA_EVENT_NAME_APP_SIGN_UP = @"$SignUp";
 
+NSString * const SA_EVENT_NAME_APP_CRASHED = @"AppCrashed";
+
 #pragma mark - app install property
 NSString * const SA_EVENT_PROPERTY_APP_INSTALL_SOURCE = @"$ios_install_source";
 NSString * const SA_EVENT_PROPERTY_APP_INSTALL_DISABLE_CALLBACK = @"$ios_install_disable_callback";
-NSString * const SA_EVENT_PROPERTY_APP_INSTALL_USER_AGENT = @"$user_agent";
+NSString * const SA_EVENT_PROPERTY_APP_USER_AGENT = @"$user_agent";
 NSString * const SA_EVENT_PROPERTY_APP_INSTALL_FIRST_VISIT_TIME = @"$first_visit_time";
 #pragma mark - autoTrack property
 // App 首次启动
@@ -78,40 +81,19 @@
 NSString * const SA_EVENT_PROPERTY_TITLE = @"$title";
 NSString * const SA_EVENT_PROPERTY_ELEMENT_POSITION = @"$element_position";
 NSString * const SA_EVENT_PROPERTY_ELEMENT_SELECTOR = @"$element_selector";
+// 模糊路径
+NSString * const SA_EVENT_PROPERTY_ELEMENT_PATH = @"$element_path";
 NSString * const SA_EVENT_PROPERTY_ELEMENT_CONTENT = @"$element_content";
 NSString * const SA_EVENT_PROPERTY_ELEMENT_TYPE = @"$element_type";
+NSString * const SA_EVENT_PROPERTY_CHANNEL_INFO = @"$channel_device_info";
+NSString * const SA_EVENT_PROPERTY_CHANNEL_CALLBACK_EVENT = @"$is_channel_callback_event";
 
 #pragma mark - common property
-NSString * const SA_EVENT_COMMON_PROPERTY_LIB = @"$lib";
-NSString * const SA_EVENT_COMMON_PROPERTY_LIB_VERSION = @"$lib_version";
-NSString * const SA_EVENT_COMMON_PROPERTY_LIB_DETAIL = @"$lib_detail";
-NSString * const SA_EVENT_COMMON_PROPERTY_LIB_METHOD = @"$lib_method";
-
-NSString * const SA_EVENT_COMMON_PROPERTY_APP_VERSION = @"$app_version";
-NSString * const SA_EVENT_COMMON_PROPERTY_MODEL =@"$model";
-NSString * const SA_EVENT_COMMON_PROPERTY_MANUFACTURER = @"$manufacturer";
-NSString * const SA_EVENT_COMMON_PROPERTY_OS = @"$os";
-NSString * const SA_EVENT_COMMON_PROPERTY_OS_VERSION = @"$os_version";
-NSString * const SA_EVENT_COMMON_PROPERTY_SCREEN_HEIGHT = @"$screen_height";
-NSString * const SA_EVENT_COMMON_PROPERTY_SCREEN_WIDTH = @"$screen_width";
-NSString * const SA_EVENT_COMMON_PROPERTY_NETWORK_TYPE = @"$network_type";
-NSString * const SA_EVENT_COMMON_PROPERTY_WIFI = @"$wifi";
-NSString * const SA_EVENT_COMMON_PROPERTY_CARRIER = @"$carrier";
-NSString * const SA_EVENT_COMMON_PROPERTY_DEVICE_ID = @"$device_id";
-NSString * const SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY = @"$is_first_day";
-
-
-NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_LATITUDE = @"$latitude";
-NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_LONGITUDE = @"$longitude";
-NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_SCREEN_ORIENTATION = @"$screen_orientation";
-
-NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_APP_STATE = @"$app_state";
-
 NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT = @"$project";
 NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN = @"$token";
 NSString * const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME = @"$time";
 //神策成立时间，2015-05-15 10:24:00.000，某些时间戳判断（毫秒）
-long const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT = 1431656640000;
+long long const SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT = 1431656640000;
 
 #pragma mark - profile
 NSString * const SA_PROFILE_SET = @"profile_set";
@@ -130,9 +112,11 @@
 NSString * const SA_HAS_TRACK_INSTALLATION = @"HasTrackInstallation";
 NSString * const SA_HAS_TRACK_INSTALLATION_DISABLE_CALLBACK = @"HasTrackInstallationWithDisableCallback";
 
+#pragma mark - bridge name
+NSString * const SA_SCRIPT_MESSAGE_HANDLER_NAME = @"sensorsdataNativeTracker";
 
-void sensorsdata_dispatch_main_safe_sync(DISPATCH_NOESCAPE dispatch_block_t block) {
-    sensorsdata_dispatch_safe_sync(dispatch_get_main_queue(),block);
+NSSet* sensorsdata_reserved_properties() {
+    return [NSSet setWithObjects:@"date", @"datetime", @"distinct_id", @"event", @"events", @"first_id", @"id", @"original_id", @"properties", @"second_id", @"time", @"user_id", @"users", nil];
 }
 
 BOOL sensorsdata_is_same_queue(dispatch_queue_t queue) {
@@ -146,3 +130,11 @@ void sensorsdata_dispatch_safe_sync(dispatch_queue_t queue,DISPATCH_NOESCAPE dis
         dispatch_sync(queue, block);
     }
 }
+
+
+#pragma mark - SF related
+NSString *const SA_TRACK_EVENT_NOTIFICATION = @"SensorsAnalyticsTrackEventNotification";
+NSString *const SA_TRACK_LOGIN_NOTIFICATION = @"SensorsAnalyticsTrackLoginNotification";
+NSString *const SA_TRACK_LOGOUT_NOTIFICATION = @"SensorsAnalyticsTrackLogoutNotification";
+NSString *const SA_TRACK_IDENTIFY_NOTIFICATION = @"SensorsAnalyticsTrackIdentifyNotification";
+NSString *const SA_TRACK_RESETANONYMOUSID_NOTIFICATION = @"SensorsAnalyticsTrackResetAnonymousIdNotification";
diff --git a/SensorsAnalyticsSDK/SADeviceOrientationManager.h b/SensorsAnalyticsSDK/SADeviceOrientationManager.h
index 5f288765..151a42cc 100644
--- a/SensorsAnalyticsSDK/SADeviceOrientationManager.h
+++ b/SensorsAnalyticsSDK/SADeviceOrientationManager.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/5/21.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SADeviceOrientationManager.m b/SensorsAnalyticsSDK/SADeviceOrientationManager.m
index 9999118b..eb25e7a5 100644
--- a/SensorsAnalyticsSDK/SADeviceOrientationManager.m
+++ b/SensorsAnalyticsSDK/SADeviceOrientationManager.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/5/21.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 
 #ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
 
-#import "SALogger.h"
+#import "SALog.h"
 #import "SADeviceOrientationManager.h"
 
 static NSTimeInterval  kSADefaultDeviceMotionUpdateInterval = 0.5;
@@ -52,7 +52,7 @@ - (instancetype)init {
             self.updateQueue = [[NSOperationQueue alloc] init];
             self.updateQueue.name = @"com.sensorsdata.analytics.deviceMotionUpdatesQueue";
         } @catch (NSException *e) {
-             SAError(@"%@: %@", self, e);
+             SALogError(@"%@: %@", self, e);
             return nil;
         }
     }
@@ -67,7 +67,7 @@ - (void) startDeviceMotionUpdates {
             }];
         }
     } @catch (NSException *e) {
-        SAError(@"%@: %@", self, e);
+        SALogError(@"%@: %@", self, e);
     }
 }
 
@@ -77,7 +77,7 @@ - (void)stopDeviceMotionUpdates {
             [self.cmmotionManager stopDeviceMotionUpdates];
         }
     } @catch (NSException *e) {
-        SAError(@"%@: %@", self, e);
+        SALogError(@"%@: %@", self, e);
     }
 }
 
@@ -99,7 +99,7 @@ - (void)handleDeviceMotion:(CMDeviceMotion *)deviceMotion {
             }
         }
     } @catch (NSException * e) {
-        SAError(@"%@: %@", self, e);
+        SALogError(@"%@: %@", self, e);
     }
 }
 
@@ -112,7 +112,7 @@ - (void)dealloc {
         self.cmmotionManager = nil;
         self.deviceOrientationBlock = nil;
     } @catch (NSException *e) {
-        SAError(@"%@: %@", self, e);
+        SALogError(@"%@: %@", self, e);
     }
 }
 
diff --git a/SensorsAnalyticsSDK/SAFileStore.h b/SensorsAnalyticsSDK/SAFileStore.h
new file mode 100644
index 00000000..d7f7cf2d
--- /dev/null
+++ b/SensorsAnalyticsSDK/SAFileStore.h
@@ -0,0 +1,62 @@
+//
+// SAFileStore.h
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2020/1/6.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAFileStore : NSObject
+
+/**
+ @abstract
+ 文件本地存储
+
+ @param fileName 本地存储文件名
+ @param value 本地存储文件内容
+
+ @return 存储结果
+*/
++ (BOOL)archiveWithFileName:(NSString *)fileName value:(nullable id)value;
+
+/**
+ @abstract
+ 获取本地存储的文件内容
+
+ @param fileName 本地存储文件名
+ @return 本地存储文件内容
+*/
++ (nullable id)unarchiveWithFileName:(NSString *)fileName;
+
+/**
+ @abstract
+ 获取文件路径
+
+ @param fileName 文件名
+ @return 文件全路径
+*/
++ (NSString *)filePath:(NSString *)fileName;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SAFileStore.m b/SensorsAnalyticsSDK/SAFileStore.m
new file mode 100644
index 00000000..43a7bc0f
--- /dev/null
+++ b/SensorsAnalyticsSDK/SAFileStore.m
@@ -0,0 +1,81 @@
+//
+// SAFileStore.m
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2020/1/6.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAFileStore.h"
+#import "SALog.h"
+
+@implementation SAFileStore
+
+#pragma mark - archive file
++ (BOOL)archiveWithFileName:(NSString *)fileName value:(nullable id)value {
+    if (!fileName) {
+        SALogError(@"key should not be nil for file store");
+        return NO;
+    }
+    NSString *filePath = [SAFileStore filePath:fileName];
+    /* 为filePath文件设置保护等级 */
+    NSDictionary *protection = [NSDictionary dictionaryWithObject:NSFileProtectionComplete
+                                                           forKey:NSFileProtectionKey];
+    [[NSFileManager defaultManager] setAttributes:protection
+                                     ofItemAtPath:filePath
+                                            error:nil];
+    if (![NSKeyedArchiver archiveRootObject:value toFile:filePath]) {
+        SALogError(@"%@ unable to archive %@", self, fileName);
+        return NO;
+    }
+    SALogDebug(@"%@ archived %@", self, fileName);
+    return YES;
+}
+
+#pragma mark - unarchive file
++ (id)unarchiveWithFileName:(NSString *)fileName {
+    if (!fileName) {
+        SALogError(@"key should not be nil for file store");
+        return nil;
+    }
+    NSString *filePath = [SAFileStore filePath:fileName];
+    return [SAFileStore unarchiveFromFile:filePath];
+}
+
++ (id)unarchiveFromFile:(NSString *)filePath {
+    id unarchivedData = nil;
+    @try {
+        unarchivedData = [NSKeyedUnarchiver unarchiveObjectWithFile:filePath];
+    } @catch (NSException *exception) {
+        SALogError(@"%@ unable to unarchive data in %@, starting fresh", self, filePath);
+        unarchivedData = nil;
+    }
+    return unarchivedData;
+}
+
+#pragma mark - file path
++ (NSString *)filePath:(NSString *)key {
+    NSString *filename = [NSString stringWithFormat:@"sensorsanalytics-%@.plist", key];
+    NSString *filepath = [[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) lastObject]
+            stringByAppendingPathComponent:filename];
+    SALogDebug(@"filepath for %@ is %@", key, filepath);
+    return filepath;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SAKeyChainItemWrapper.h b/SensorsAnalyticsSDK/SAKeyChainItemWrapper.h
index bd47c062..a986a200 100644
--- a/SensorsAnalyticsSDK/SAKeyChainItemWrapper.h
+++ b/SensorsAnalyticsSDK/SAKeyChainItemWrapper.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/3/26.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAKeyChainItemWrapper.m b/SensorsAnalyticsSDK/SAKeyChainItemWrapper.m
index e14ec269..a3d798a6 100644
--- a/SensorsAnalyticsSDK/SAKeyChainItemWrapper.m
+++ b/SensorsAnalyticsSDK/SAKeyChainItemWrapper.m
@@ -4,7 +4,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/3/26.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 #endif
 
 
-#import "SALogger.h"
+#import "SALog.h"
 #import "SAKeyChainItemWrapper.h"
 NSString * const kSAService = @"com.sensorsdata.analytics.udid";
 NSString * const kSAUdidAccount = @"com.sensorsdata.analytics.udid";
@@ -97,7 +97,7 @@ + (BOOL)saveOrUpdatePassword:(NSString *)password account:(NSString *)account se
             @try {
                 [query setObject:(__bridge id) kSecAttrAccessibleAfterFirstUnlock forKey:(__bridge id)kSecAttrAccessible];
             } @catch (NSException *e) {
-                SAError(@"%@", e);
+                SALogError(@"%@", e);
             }
         }
 
@@ -147,7 +147,7 @@ + (BOOL)saveOrUpdatePassword:(NSString *)password account:(NSString *)account se
             // An implicit assumption is that you can only update a single item at a time.
             OSStatus  result = SecItemUpdate((__bridge CFDictionaryRef)updateItem, (__bridge CFDictionaryRef)tempCheck);
             NSAssert( result == noErr || result == errSecDuplicateItem, @"Couldn't update the Keychain Item." );
-            SALog(@"SecItemUpdate result = %d", result);
+            SALogDebug(@"SecItemUpdate result = %d", result);
         } else if(status == errSecItemNotFound) {
             [query setObject:[password dataUsingEncoding:NSUTF8StringEncoding] forKey:(__bridge id)kSecValueData];
             [query removeObjectForKey:(__bridge id)kSecMatchLimit ];
@@ -160,17 +160,17 @@ + (BOOL)saveOrUpdatePassword:(NSString *)password account:(NSString *)account se
                 @try {
                     [query removeObjectForKey:(__bridge id)kSecAttrAccessible];
                 } @catch (NSException *e) {
-                    SAError(@"%@", e);
+                    SALogError(@"%@", e);
                 }
             }
 
             status= SecItemAdd((__bridge CFDictionaryRef)query, &queryResults);
             NSAssert( status == noErr || status == errSecDuplicateItem, @"Couldn't add the Keychain Item." );
-            SALog(@"SecItemAdd result = %d", status);
+            SALogDebug(@"SecItemAdd result = %d", status);
         }
         return (status == errSecSuccess);
     } @catch (NSException *e) {
-        SALog(@"%@", e);
+        SALogError(@"%@", e);
         return NO;
     }
 }
@@ -191,7 +191,7 @@ + (NSDictionary *)fetchPasswordWithAccount:(NSString *)account service:(NSString
             @try {
                 [query setObject:(__bridge id) kSecAttrAccessibleAfterFirstUnlock forKey:(__bridge id)kSecAttrAccessible];
             } @catch (NSException *e) {
-                SAError(@"%@", e);
+                SALogError(@"%@", e);
             }
         }
         
@@ -222,7 +222,7 @@ + (NSDictionary *)fetchPasswordWithAccount:(NSString *)account service:(NSString
         }
         return mutResultDict;
     } @catch (NSException *e) {
-        SALog(@"%@", e);
+        SALogError(@"%@", e);
         return nil;
     }
 }
@@ -245,7 +245,7 @@ + (BOOL)deletePasswordWithAccount:(NSString *)account service:(NSString *)servic
         OSStatus status = SecItemDelete((__bridge  CFDictionaryRef)  searchQuery);
         return (status == errSecSuccess);
     } @catch (NSException *e) {
-        SALog(@"%@", e);
+        SALogError(@"%@", e);
         return NO;
     }
 }
diff --git a/SensorsAnalyticsSDK/SALinkHandler.h b/SensorsAnalyticsSDK/SALinkHandler.h
new file mode 100644
index 00000000..5afe371d
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALinkHandler.h
@@ -0,0 +1,83 @@
+//
+// SALinkHandler.h
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2020/1/6.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <Foundation/Foundation.h>
+#import "SAConfigOptions.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SALinkHandler : NSObject
+
+/**
+@abstract
+ 根据 ConfigOptions 初始化 Handler
+
+ @param configOptions SDK 初始化的 configOptions
+ @return Handler 对象
+*/
+- (instancetype)initWithConfigOptions:(SAConfigOptions *)configOptions;
+
+/**
+@abstract
+ 判断当前 URL 是否需要解析来源渠道信息
+
+ @param url 被解析的 URL 对象
+ @return 是否需要被解析
+*/
+- (BOOL)canHandleURL:(NSURL *)url;
+
+/**
+ @abstract
+ 解析当前 URL 中的来源渠道信息
+
+ @param url 被解析的 URL 对象
+*/
+- (void)handleDeepLink:(NSURL *)url;
+
+/**
+ @abstract
+ 最新的来源渠道信息
+
+ @return latest utms 属性
+ */
+- (nullable NSDictionary *)latestUtmProperties;
+
+/**
+ @abstract
+ 当前 DeepLink 启动时的来源渠道信息
+
+ @return utms  属性
+ */
+- (NSDictionary *)utmProperties;
+
+/**
+@abstract
+清除本次 DeepLink 解析到的 utm 信息
+
+*/
+- (void)clearUtmProperties;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALinkHandler.m b/SensorsAnalyticsSDK/SALinkHandler.m
new file mode 100644
index 00000000..b42c88fe
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALinkHandler.m
@@ -0,0 +1,234 @@
+//
+// SALinkHandler.m
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2020/1/6.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SALinkHandler.h"
+#import "SensorsAnalyticsSDK+Private.h"
+#import "SAConstants+Private.h"
+#import "SAURLUtils.h"
+#import "SAFileStore.h"
+#import "SALog.h"
+
+@interface SALinkHandler ()
+
+/// 包含 SDK 预置属性和用户自定义属性
+@property (nonatomic, strong) NSMutableDictionary *utms;
+@property (nonatomic, copy) NSDictionary *latestUtms;
+/// 预置属性列表
+@property (nonatomic, copy) NSSet *presetUtms;
+/// 过滤后的用户自定义属性
+@property (nonatomic, copy) NSSet *sourceChannels;
+
+/// SDK初始化时的 ConfigOptions
+@property (nonatomic, strong) SAConfigOptions *configOptions;
+
+@end
+
+static NSString *const kLocalUtmsFileName = @"latest_utms";
+
+@implementation SALinkHandler
+
+- (instancetype)initWithConfigOptions:(SAConfigOptions *)configOptions {
+    self = [super init];
+    if (self) {
+        _configOptions = configOptions;
+        // 设置需要解析的预置属性名
+        _presetUtms = [NSSet setWithObjects:@"utm_campaign", @"utm_content", @"utm_medium", @"utm_source", @"utm_term", nil];
+        _utms = [NSMutableDictionary dictionary];
+
+        [self handleSourceChannnels];
+        [self loadLocalInfo];
+        [self handleLaunchOptions:_configOptions.launchOptions];
+    }
+    return self;
+}
+
+- (void)handleSourceChannnels {
+    NSSet *reservedPropertyName = sensorsdata_reserved_properties();
+    NSMutableSet *set = [[NSMutableSet alloc] init];
+    // 将用户自定义属性中与 SDK 保留字段相同的字段过滤掉
+    for (NSString *name in _configOptions.sourceChannels) {
+        if (![reservedPropertyName containsObject:name]) {
+            [set addObject:name];
+        } else {
+            // 这里只做 LOG 提醒
+            SALogError(@"deeplink source channel property [%@] is invalid!!!", name);
+        }
+    }
+    _sourceChannels = set;
+}
+
+- (void)loadLocalInfo {
+    if (!_configOptions.enableSaveDeepLinkInfo) {
+        [SAFileStore archiveWithFileName:kLocalUtmsFileName value:@{}];
+        return;
+    }
+
+    NSDictionary *local = [SAFileStore unarchiveWithFileName:kLocalUtmsFileName];
+    if (!local) {
+        return;
+    }
+
+    NSMutableDictionary *latest = [NSMutableDictionary dictionary];
+    for (NSString *name in _presetUtms) {
+        NSString *newName = [NSString stringWithFormat:@"$latest_%@", name];
+        if (local[newName]) {
+            latest[newName] = local[newName];
+        }
+    }
+    // 升级版本时 sourceChannels 可能会发生变化，过滤掉本次 sourceChannels 中已不包含的字段
+    for (NSString *name in _sourceChannels) {
+        NSString *newName = [NSString stringWithFormat:@"_latest_%@", name];
+        if (local[newName]) {
+            latest[newName] = local[newName];
+        }
+    }
+    _latestUtms = latest;
+}
+
+#pragma mark - utm properties
+- (nullable NSDictionary *)latestUtmProperties {
+    return [_latestUtms copy];
+}
+
+- (NSDictionary *)utmProperties {
+    return [_utms copy];
+}
+
+- (void)clearUtmProperties {
+    [_utms removeAllObjects];
+}
+
+#pragma mark - save latest utms in local file
+- (void)updateLocalLatestUtms {
+    if (!_configOptions.enableSaveDeepLinkInfo) {
+        return;
+    }
+    NSDictionary *value = _latestUtms ?: [NSDictionary dictionary];
+    [SAFileStore archiveWithFileName:kLocalUtmsFileName value:value];
+}
+
+#pragma mark - parse utms
+- (BOOL)canHandleURL:(NSURL *)url {
+    if (![url isKindOfClass:NSURL.class]) {
+        return NO;
+    }
+    NSDictionary *queryItems = [SAURLUtils queryItemsWithURL:url];
+    for (NSString *key in _presetUtms) {
+        if (queryItems[key]) {
+            return YES;
+        }
+    }
+    for (NSString *key in _sourceChannels) {
+        if (queryItems[key]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+// 解析冷启动来源渠道信息
+- (void)handleLaunchOptions:(NSDictionary *)launchOptions {
+    if (![launchOptions isKindOfClass:NSDictionary.class]) {
+        return;
+    }
+    NSURL *url;
+    if ([launchOptions.allKeys containsObject:UIApplicationLaunchOptionsURLKey]) {
+        //通过 SchemeLink 唤起 App
+        url = launchOptions[UIApplicationLaunchOptionsURLKey];
+    }
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
+    else if (@available(iOS 8.0, *)) {
+        NSDictionary *userActivityDictionary = launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
+        NSString *type = userActivityDictionary[UIApplicationLaunchOptionsUserActivityTypeKey];
+        if ([type isEqualToString:NSUserActivityTypeBrowsingWeb]) {
+            //通过 UniversalLink 唤起 App
+            NSUserActivity *userActivity = userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"];
+            url = userActivity.webpageURL;
+        }
+    }
+#endif
+    if (![self canHandleURL:url]) {
+        return;
+    }
+    [self handleDeepLink:url];
+}
+
+- (void)handleDeepLink:(NSURL *)url {
+    if (![url isKindOfClass:NSURL.class]) {
+        return;
+    }
+    NSDictionary *queryItems = [SAURLUtils queryItemsWithURL:url];
+    [self parseUtmsWithDictionary:queryItems];
+}
+
+//解析渠道信息字段
+- (void)parseUtmsWithDictionary:(NSDictionary *)dictionary {
+    if (![dictionary isKindOfClass:NSDictionary.class]) {
+        return;
+    }
+    [self clearUtmProperties];
+
+    NSMutableDictionary *latest = [NSMutableDictionary dictionary];
+    BOOL coverLastInfo = NO;
+    for (NSString *name in _presetUtms) {
+        NSString *value = [dictionary[name] stringByRemovingPercentEncoding];
+        // 字典中只要当前 name 的值存在（不论值是否为空字符串），就需要将上次的 latest utms 覆盖
+        if (value) {
+            coverLastInfo = YES;
+        }
+
+        // 只有字典中 name 对应的值不为空字符串时才需要添加到 latest utms 中
+        // 即只有对应渠道消息有内容时才需要加到埋点数据中
+        if (value.length > 0) {
+            NSString *utmKey = [NSString stringWithFormat:@"$%@", name];
+            _utms[utmKey] = value;
+            NSString *latestKey = [NSString stringWithFormat:@"$latest_%@", name];
+            latest[latestKey] = value;
+        }
+    }
+
+    for (NSString *name in _sourceChannels) {
+        NSString *value = [dictionary[name] stringByRemovingPercentEncoding];
+        // 字典中只要当前 name 的值存在（不论值是否为空字符串），就需要将上次的 latest utms 覆盖
+        if (value) {
+            coverLastInfo = YES;
+        }
+        // 只有字典中 name 对应的值不为空字符串时才需要添加到 latest utms 中
+        // 即只有对应渠道消息有内容时才需要加到埋点数据中
+        if (value.length > 0) {
+            _utms[name] = value;
+            NSString *latestKey = [NSString stringWithFormat:@"_latest_%@", name];
+            latest[latestKey] = value;
+        }
+    }
+
+    // latest utms 字段在 App 销毁前一直保存在内存中
+    // 当 coverLastInfo 为 YES 时，表示本次渠道信息解析中有相关渠道参数字段（不论参数内容是否为空）
+    if (coverLastInfo) {
+        _latestUtms = latest;
+        [self updateLocalLatestUtms];
+    }
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SALocationManager.h b/SensorsAnalyticsSDK/SALocationManager.h
index 84d43162..7de69879 100644
--- a/SensorsAnalyticsSDK/SALocationManager.h
+++ b/SensorsAnalyticsSDK/SALocationManager.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/5/7.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SALocationManager.m b/SensorsAnalyticsSDK/SALocationManager.m
index dea42729..02c10204 100644
--- a/SensorsAnalyticsSDK/SALocationManager.m
+++ b/SensorsAnalyticsSDK/SALocationManager.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/5/7.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
 #ifndef SENSORS_ANALYTICS_DISABLE_TRACK_GPS
 
 #import "SALocationManager.h"
-#import "SALogger.h"
+#import "SALog.h"
 #define kSADefaultDistanceFilter 100.0
 #define kSADefaultDesiredAccuracy kCLLocationAccuracyHundredMeters
 @implementation SAGPSLocationConfig
@@ -59,7 +59,7 @@ - (void)startUpdatingLocation {
     @try {
         //判断当前设备定位服务是否打开
         if (![CLLocationManager locationServicesEnabled]) {
-            SALog(@"设备尚未打开定位服务");
+            SALogWarn(@"设备尚未打开定位服务");
             return;
         }
         if (@available(iOS 8.0, *)) {
@@ -70,7 +70,7 @@ - (void)startUpdatingLocation {
             _isUpdatingLocation = YES;
         }
     }@catch (NSException *e) {
-        SAError(@"%@ error: %@", self, e);
+        SALogError(@"%@ error: %@", self, e);
     }
 }
 
@@ -81,7 +81,7 @@ - (void)stopUpdatingLocation {
             _isUpdatingLocation = NO;
         }
     }@catch (NSException *e) {
-       SAError(@"%@ error: %@", self, e);
+       SALogError(@"%@ error: %@", self, e);
     }
 }
 
@@ -92,7 +92,7 @@ - (void)locationManager:(CLLocationManager *)manager
             self.updateLocationBlock(locations.lastObject, nil);
         }
     }@catch (NSException * e) {
-         SAError(@"%@ error: %@", self, e);
+         SALogError(@"%@ error: %@", self, e);
     }
 }
 
@@ -103,7 +103,7 @@ - (void)locationManager:(CLLocationManager *)manager
             self.updateLocationBlock(nil, error);
         }
     }@catch (NSException * e) {
-         SAError(@"%@ error: %@", self, e);
+         SALogError(@"%@ error: %@", self, e);
     }
 }
 
diff --git a/SensorsAnalyticsSDK/SALogger.h b/SensorsAnalyticsSDK/SALogger.h
deleted file mode 100644
index 8a955ebe..00000000
--- a/SensorsAnalyticsSDK/SALogger.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-//  SALogger.h
-//  SensorsAnalyticsSDK
-//
-//  Created by 曹犟 on 15/7/6.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#import <UIKit/UIKit.h>
-#ifndef __SensorsAnalyticsSDK__SALogger__
-#define __SensorsAnalyticsSDK__SALogger__
-
-#define SALogLevel(lvl,fmt,...)\
-[SALogger log : YES                                      \
-level : lvl                                                  \
-file : __FILE__                                            \
-function : __PRETTY_FUNCTION__                       \
-line : __LINE__                                           \
-format : (fmt), ## __VA_ARGS__]
-
-#define SALog(fmt,...)\
-SALogLevel(SALoggerLevelInfo,(fmt), ## __VA_ARGS__)
-
-#define SAError SALog
-#define SADebug SALog
-
-#endif/* defined(__SensorsAnalyticsSDK__SALogger__) */
-typedef NS_ENUM(NSUInteger, SALoggerLevel) {
-    SALoggerLevelInfo = 1,
-    SALoggerLevelWarning,
-    SALoggerLevelError,
-};
-
-@interface SALogger : NSObject
-#ifdef UIKIT_DEFINE_AS_PROPERTIES
-@property (class , readonly, strong) SALogger *sharedInstance;
-#else
-+ (SALogger *)sharedInstance;
-#endif
-+ (BOOL)isLoggerEnabled;
-+ (void)enableLog:(BOOL)enableLog;
-+ (void)log:(BOOL)asynchronous
-      level:(NSInteger)level
-       file:(const char *)file
-   function:(const char *)function
-       line:(NSUInteger)line
-     format:(NSString *)format, ... ;
-@end
diff --git a/SensorsAnalyticsSDK/SALogger.m b/SensorsAnalyticsSDK/SALogger.m
deleted file mode 100644
index ae62250c..00000000
--- a/SensorsAnalyticsSDK/SALogger.m
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-//  SALogger.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 向作为 on 2018/3/28.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 <Foundation/Foundation.h>
-#import "SALogger.h"
-
-#pragma mark -
-@interface NSString (Unicode)
-@property (nonatomic, copy, readonly) NSString *sensorsdata_unicodeString;
-@end
-
-@implementation NSString (Unicode)
-
-- (NSString *)sensorsdata_unicodeString {
-    if ([self rangeOfString:@"\[uU][A-Fa-f0-9]{4}" options:NSRegularExpressionSearch].location == NSNotFound) {
-        return self;
-    }
-    NSMutableString *mutableString = [NSMutableString stringWithString:self];
-    [mutableString replaceOccurrencesOfString:@"\\u" withString:@"\\U" options:0 range:NSMakeRange(0, self.length)];
-    [mutableString replaceOccurrencesOfString:@"\"" withString:@"\\\"" options:0 range:NSMakeRange(0, self.length)];
-    [mutableString insertString:@"\"" atIndex:0];
-    [mutableString appendString:@"\""];
-    NSData *data = [mutableString dataUsingEncoding:NSUTF8StringEncoding];
-    
-    NSError *error = nil;
-    NSPropertyListFormat format = NSPropertyListOpenStepFormat;
-    NSString *formatString = [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:&format error:&error];
-    return error ? self : [formatString stringByReplacingOccurrencesOfString:@"\\r\\n" withString:@"\n"];
-}
-
-@end
-
-
-#pragma mark - SALogger
-static BOOL __enableLog__ ;
-static dispatch_queue_t __logQueue__ ;
-@implementation SALogger
-+ (void)initialize {
-    __enableLog__ = NO;
-    __logQueue__ = dispatch_queue_create("com.sensorsdata.analytics.log", DISPATCH_QUEUE_SERIAL);
-}
-
-+ (BOOL)isLoggerEnabled {
-    __block BOOL enable = NO;
-    dispatch_sync(__logQueue__, ^{
-        enable = __enableLog__;
-    });
-    return enable;
-}
-
-+ (void)enableLog:(BOOL)enableLog {
-    dispatch_async(__logQueue__, ^{
-        __enableLog__ = enableLog;
-    });
-}
-
-+ (instancetype)sharedInstance {
-    static id sharedInstance = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        sharedInstance = [[self alloc] init];
-    });
-    return sharedInstance;
-}
-
-+ (void)log:(BOOL)asynchronous
-      level:(NSInteger)level
-       file:(const char *)file
-   function:(const char *)function
-       line:(NSUInteger)line
-     format:(NSString *)format, ... {
-    if (![SALogger isLoggerEnabled]) {
-        return;
-    }
-    
-    //iOS 10.x 有可能触发 [[NSString alloc] initWithFormat:format arguments:args]  crash ，不在启用 Log
-    NSInteger systemVersion = UIDevice.currentDevice.systemVersion.integerValue;
-    if (systemVersion == 10) {
-        return;
-    }
-    @try {
-        va_list args;
-        va_start(args, format);
-        NSString *message = [[NSString alloc] initWithFormat:format arguments:args];
-        [self.sharedInstance log:asynchronous message:message level:level file:file function:function line:line];
-        va_end(args);
-    } @catch(NSException *e) {
-       
-    }
-}
-
-- (void)log:(BOOL)asynchronous
-    message:(NSString *)message
-      level:(NSInteger)level
-       file:(const char *)file
-   function:(const char *)function
-       line:(NSUInteger)line {
-    @try {
-        NSString *logMessage = [[NSString alloc] initWithFormat:@"[SALog][%@]  %s [line %lu]    %s %@", [self descriptionForLevel:level], function, (unsigned long)line, [@"" UTF8String], message.sensorsdata_unicodeString];
-        NSLog(@"%@", logMessage);
-    } @catch(NSException *e) {
-       
-    }
-}
-
-- (NSString *)descriptionForLevel:(SALoggerLevel)level {
-    NSString *desc = nil;
-    switch (level) {
-        case SALoggerLevelInfo:
-            desc = @"INFO";
-            break;
-        case SALoggerLevelWarning:
-            desc = @"WARN";
-            break;
-        case SALoggerLevelError:
-            desc = @"ERROR";
-            break;
-        default:
-            desc = @"UNKNOW";
-            break;
-    }
-    return desc;
-}
-
-- (void)dealloc {
-    
-}
-
-@end
diff --git a/SensorsAnalyticsSDK/SALogger/SAAbstractLogger.h b/SensorsAnalyticsSDK/SALogger/SAAbstractLogger.h
new file mode 100644
index 00000000..a2a2a36a
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SAAbstractLogger.h
@@ -0,0 +1,48 @@
+//
+//  SAAbstractLogger.h
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import "SALogMessage.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SALogger <NSObject>
+
+@required
+- (void)logMessage:(SALogMessage *)logMessage;
+
+@end
+
+
+@protocol SALogMessageFormatter <NSObject>
+
+@required
+- (NSString *)formattedLogMessage:(SALogMessage *)logMessage;
+
+@end
+
+@interface SAAbstractLogger : NSObject <SALogger>
+
+@property (nonatomic, assign) BOOL enableLog;
+@property (nonatomic, strong) dispatch_queue_t loggerQueue;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALogger/SAAbstractLogger.m b/SensorsAnalyticsSDK/SALogger/SAAbstractLogger.m
new file mode 100644
index 00000000..1f03d057
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SAAbstractLogger.m
@@ -0,0 +1,30 @@
+//
+//  SAAbstractLogger.m
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "SAAbstractLogger.h"
+#import <pthread.h>
+
+@implementation SAAbstractLogger
+
+- (void)logMessage:(nonnull SALogMessage *)logMessage {
+    // base implementation
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/HeatMap/SAHeatMapMessage.h b/SensorsAnalyticsSDK/SALogger/SAConsoleLogger.h
similarity index 54%
rename from SensorsAnalyticsSDK/HeatMap/SAHeatMapMessage.h
rename to SensorsAnalyticsSDK/SALogger/SAConsoleLogger.h
index 609a61aa..7994542d 100644
--- a/SensorsAnalyticsSDK/HeatMap/SAHeatMapMessage.h
+++ b/SensorsAnalyticsSDK/SALogger/SAConsoleLogger.h
@@ -1,9 +1,9 @@
 //
-//  SAHeatMapMessage.h
-//  SensorsAnalyticsSDK
+//  SAConsoleLogger.h
+//  Logger
 //
-//  Created by 王灼洲 on 8/1/17.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -19,18 +19,14 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "SAAbstractLogger.h"
 
-@class SAHeatMapConnection;
+NS_ASSUME_NONNULL_BEGIN
 
-@protocol SAHeatMapMessage <NSObject>
+@interface SAConsoleLogger : SAAbstractLogger
 
-@property (nonatomic, copy, readonly) NSString *type;
-
-- (void)setPayloadObject:(id)object forKey:(NSString *)key;
-- (id)payloadObjectForKey:(NSString *)key;
-
-- (NSData *)JSONData:(BOOL)useGzip featuerCode:(NSString *)fetureCode;
-
-- (NSOperation *)responseCommandWithConnection:(SAHeatMapConnection *)connection;
+@property (nonatomic, assign) NSUInteger maxStackSize;
 
 @end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALogger/SAConsoleLogger.m b/SensorsAnalyticsSDK/SALogger/SAConsoleLogger.m
new file mode 100644
index 00000000..5c8f5754
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SAConsoleLogger.m
@@ -0,0 +1,102 @@
+//
+//  SAConsoleLogger.m
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "SAConsoleLogger.h"
+#import "SALoggerConsoleFormatter.h"
+#import <sys/uio.h>
+
+
+@interface NSString (Unicode)
+@property (nonatomic, copy, readonly) NSString *sensorsdata_unicodeString;
+@end
+
+@implementation NSString (Unicode)
+
+- (NSString *)sensorsdata_unicodeString {
+    if ([self rangeOfString:@"\[uU][A-Fa-f0-9]{4}" options:NSRegularExpressionSearch].location == NSNotFound) {
+        return self;
+    }
+    NSMutableString *mutableString = [NSMutableString stringWithString:self];
+    [mutableString replaceOccurrencesOfString:@"\\u" withString:@"\\U" options:0 range:NSMakeRange(0, self.length)];
+    [mutableString replaceOccurrencesOfString:@"\"" withString:@"\\\"" options:0 range:NSMakeRange(0, self.length)];
+    [mutableString insertString:@"\"" atIndex:0];
+    [mutableString appendString:@"\""];
+    NSData *data = [mutableString dataUsingEncoding:NSUTF8StringEncoding];
+    
+    NSError *error = nil;
+    NSPropertyListFormat format = NSPropertyListOpenStepFormat;
+    NSString *formatString = [NSPropertyListSerialization propertyListWithData:data options:NSPropertyListImmutable format:&format error:&error];
+    return error ? self : [formatString stringByReplacingOccurrencesOfString:@"\\r\\n" withString:@"\n"];
+}
+
+@end
+
+@implementation SAConsoleLogger
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        _maxStackSize = 1024 * 4;
+        self.loggerQueue = dispatch_queue_create("cn.sensorsdata.SAConsoleLoggerSerialQueue", DISPATCH_QUEUE_SERIAL);
+    }
+    return self;
+}
+
+- (void)logMessage:(SALogMessage *)logMessage {
+    if (!self.enableLog) {
+        return;
+    }
+    [super logMessage:logMessage];
+    
+    SALoggerConsoleFormatter *formatter = [[SALoggerConsoleFormatter alloc] init];
+    NSString *message = [formatter formattedLogMessage:logMessage].sensorsdata_unicodeString;
+    NSUInteger messageLength = [message lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+    BOOL useStack = messageLength < _maxStackSize;
+    char messageStack[useStack ? (messageLength + 1) : 1];
+    char *msg = useStack ? messageStack : (char *)calloc(messageLength + 1, sizeof(char));
+    
+    if (msg == NULL) {
+        return;
+    }
+    
+    BOOL canBeConvertedToEncoding = [message getCString:msg maxLength:(messageLength + 1) encoding:NSUTF8StringEncoding];
+    
+    if (!canBeConvertedToEncoding) {
+        // free memory if not use stack
+        if (!useStack) {
+            free(msg);
+        }
+        return;
+    }
+    
+    struct iovec dataBuffer[1];
+    dataBuffer[0].iov_base = msg;
+    dataBuffer[0].iov_len = messageLength;
+    writev(STDERR_FILENO, dataBuffer, 1);
+    
+    // free memory if not use stack
+    if (!useStack) {
+        free(msg);
+    }
+    
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SALogger/SAFileLogger.h b/SensorsAnalyticsSDK/SALogger/SAFileLogger.h
new file mode 100644
index 00000000..6e482cc2
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SAFileLogger.h
@@ -0,0 +1,32 @@
+//
+//  SAFileLogger.h
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import "SAAbstractLogger.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAFileLogger : SAAbstractLogger
+
+@property (nonatomic, assign) SALogLevel fileLogLevel;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALogger/SAFileLogger.m b/SensorsAnalyticsSDK/SALogger/SAFileLogger.m
new file mode 100644
index 00000000..c145128e
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SAFileLogger.m
@@ -0,0 +1,111 @@
+//
+//  SAFileLogger.m
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "SAFileLogger.h"
+#import "SALoggerConsoleFormatter.h"
+
+@interface SAFileLogger ()
+
+@property (nonatomic, copy) NSString *logFilePath;
+@property (nonatomic, strong) NSFileHandle *fileHandle;
+@property (nonatomic, strong) SALoggerConsoleFormatter *formatter;
+
+@end
+
+@implementation SAFileLogger
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        _fileLogLevel = SALogLevelVerbose;
+    }
+    return self;
+}
+
+- (void)logMessage:(SALogMessage *)logMessage {
+    if (!self.enableLog) {
+        return;
+    }
+    [super logMessage:logMessage];
+    if (logMessage.level > self.fileLogLevel) {
+        return;
+    }
+    [self writeLogMessage:logMessage];
+}
+
+- (NSString *)logFilePath {
+    if (!_logFilePath) {
+        _logFilePath = [self currentlogFile];
+    }
+    return _logFilePath;
+}
+
+- (NSFileHandle *)fileHandle {
+    if (!_fileHandle) {
+        _fileHandle = [NSFileHandle fileHandleForWritingAtPath:self.logFilePath];
+    }
+    return _fileHandle;
+}
+
+- (SALoggerConsoleFormatter *)formatter {
+    if (!_formatter) {
+        _formatter = [[SALoggerConsoleFormatter alloc] init];
+    }
+    return _formatter;
+}
+
+- (nullable NSString *)currentlogFile {
+    NSFileManager *manager = [NSFileManager defaultManager];
+    NSString *path = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
+    NSString *logfilePath = [path stringByAppendingPathComponent:@"SALog/SALog.log"];
+    BOOL fileExists = [manager fileExistsAtPath:logfilePath];
+    if (fileExists) {
+        return logfilePath;
+    }
+    NSError *error;
+    BOOL directoryCreated = [manager createDirectoryAtPath:[logfilePath stringByDeletingLastPathComponent] withIntermediateDirectories:YES attributes:nil error:&error];
+    if (!directoryCreated) {
+        NSLog(@"SAFileLogger file directory created failed");
+        return nil;
+    }
+    BOOL fileCreated = [[NSFileManager defaultManager] createFileAtPath:logfilePath contents:nil attributes:nil];
+    if (!fileCreated) {
+        NSLog(@"SAFileLogger file created failed");
+        return nil;
+    }
+    return logfilePath;
+}
+
+- (void)writeLogMessage:(SALogMessage *)logMessage {
+    if (!self.fileHandle) {
+        return;
+    }
+    NSString *formattedMessage = [self.formatter formattedLogMessage:logMessage];
+    @try {
+        [self.fileHandle seekToEndOfFile];
+        [self.fileHandle writeData:[formattedMessage dataUsingEncoding:NSUTF8StringEncoding]];
+    } @catch (NSException *exception) {
+        NSLog(@"SAFileLogger logMessage: %@", exception);
+    } @finally {
+        // any final action
+    }
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SALogger/SALog+Private.h b/SensorsAnalyticsSDK/SALogger/SALog+Private.h
new file mode 100644
index 00000000..244f8497
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALog+Private.h
@@ -0,0 +1,39 @@
+//
+// SALog+Private.h
+// SensorsAnalyticsSDK
+//
+// Created by 陈玉国 on 2020/3/27.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import "SAAbstractLogger.h"
+
+@interface SALog (Private)
+
+@property (nonatomic, strong, readonly) NSDateFormatter *dateFormatter;
+
++ (void)addLogger:(SAAbstractLogger<SALogger> *)logger;
++ (void)addLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers;
++ (void)removeLogger:(SAAbstractLogger<SALogger> *)logger;
++ (void)removeLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers;
++ (void)removeAllLoggers;
+
+- (void)addLogger:(SAAbstractLogger<SALogger> *)logger;
+- (void)addLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers;
+- (void)removeLogger:(SAAbstractLogger<SALogger> *)logger;
+- (void)removeLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers;
+- (void)removeAllLoggers;
+
+@end
diff --git a/SensorsAnalyticsSDK/SALogger/SALog.h b/SensorsAnalyticsSDK/SALogger/SALog.h
new file mode 100644
index 00000000..2a63da32
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALog.h
@@ -0,0 +1,73 @@
+//
+//  SALog.h
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+#define SENSORS_ANALYTICS_LOG_MACRO(isAsynchronous, lvl, fnct, ctx, frmt, ...) \
+[SALog log : isAsynchronous                                     \
+     level : lvl                                                \
+      file : __FILE__                                           \
+  function : fnct                                               \
+      line : __LINE__                                           \
+   context : ctx                                                \
+    format : (frmt), ## __VA_ARGS__]
+
+
+#define SALogError(frmt, ...)   SENSORS_ANALYTICS_LOG_MACRO(YES, SALogLevelError, __PRETTY_FUNCTION__, 0, frmt, ##__VA_ARGS__)
+#define SALogWarn(frmt, ...)   SENSORS_ANALYTICS_LOG_MACRO(YES, SALogLevelWarn, __PRETTY_FUNCTION__, 0, frmt, ##__VA_ARGS__)
+#define SALogInfo(frmt, ...)   SENSORS_ANALYTICS_LOG_MACRO(YES, SALogLevelInfo, __PRETTY_FUNCTION__, 0, frmt, ##__VA_ARGS__)
+#define SALogDebug(frmt, ...)   SENSORS_ANALYTICS_LOG_MACRO(YES, SALogLevelDebug, __PRETTY_FUNCTION__, 0, frmt, ##__VA_ARGS__)
+#define SALogVerbose(frmt, ...)   SENSORS_ANALYTICS_LOG_MACRO(YES, SALogLevelVerbose, __PRETTY_FUNCTION__, 0, frmt, ##__VA_ARGS__)
+
+
+typedef NS_OPTIONS(NSUInteger, SALogLevel) {
+    SALogLevelError = (1 << 0),
+    SALogLevelWarn = (1 << 1),
+    SALogLevelInfo = (1 << 2),
+    SALogLevelDebug = (1 << 3),
+    SALogLevelVerbose = (1 << 4)
+};
+
+
+@interface SALog : NSObject
+
++ (instancetype)sharedLog;
+
++ (void)log:(BOOL)asynchronous
+      level:(SALogLevel)level
+       file:(const char *)file
+   function:(const char *)function
+       line:(NSUInteger)line
+    context:(NSInteger)context
+     format:(NSString *)format, ... NS_FORMAT_FUNCTION(7, 8);
+
+- (void)log:(BOOL)asynchronous
+   level:(SALogLevel)level
+    file:(const char *)file
+function:(const char *)function
+    line:(NSUInteger)line
+ context:(NSInteger)context
+  format:(NSString *)format, ... NS_FORMAT_FUNCTION(7, 8);
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALogger/SALog.m b/SensorsAnalyticsSDK/SALogger/SALog.m
new file mode 100644
index 00000000..b5ddfb24
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALog.m
@@ -0,0 +1,194 @@
+//
+//  SALog.m
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "SALog.h"
+#import "SALog+Private.h"
+#import "SALogMessage.h"
+#import "SAAbstractLogger.h"
+#import "SAConsoleLogger.h"
+
+@interface SALog ()
+
+@property (nonatomic, strong) NSMutableArray <SAAbstractLogger <SALogger> *> *loggers;
+@property (nonatomic, strong, readonly) NSDateFormatter *dateFormatter;
+
+@end
+
+@implementation SALog
+
+static NSUInteger maxConcurrentCount;
+static dispatch_queue_t logConcurrentQueue;
+static dispatch_queue_t logSerialQueue;
+static dispatch_semaphore_t logQueueSemaphore;
+static dispatch_group_t logGroup;
+static NSDateFormatter *dateFormatter;
+static void *const GlobalLoggingQueueIdentityKey = (void *)&GlobalLoggingQueueIdentityKey;
+
++ (instancetype)sharedLog {
+    static SALog *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[self alloc] init];
+        logConcurrentQueue = dispatch_queue_create("cn.sensorsdata.SALogConcurrentQueue", DISPATCH_QUEUE_CONCURRENT);
+        logSerialQueue = dispatch_queue_create("cn.sensorsdata.SALogSerialQueue", DISPATCH_QUEUE_SERIAL);
+        logGroup = dispatch_group_create();
+        void *nonNullValue = GlobalLoggingQueueIdentityKey;
+        dispatch_queue_set_specific(logSerialQueue, GlobalLoggingQueueIdentityKey, nonNullValue, NULL);
+        maxConcurrentCount = 10;
+        logQueueSemaphore = dispatch_semaphore_create(maxConcurrentCount);
+        dateFormatter = [[NSDateFormatter alloc] init];
+        dateFormatter.dateFormat = @"yyyy-MM-dd HH:mm:ss.SSSSSSZ";
+    });
+    return sharedInstance;
+}
+
++ (void)log:(BOOL)asynchronous level:(SALogLevel)level file:(const char *)file function:(const char *)function line:(NSUInteger)line context:(NSInteger)context format:(NSString *)format, ... {
+    if (!format) {
+        return;
+    }
+    va_list args;
+    va_start(args, format);
+    NSString *message = [[NSString alloc] initWithFormat:format arguments:args];
+    va_end(args);
+    [self log:asynchronous message:message level:level file:file function:function line:line context:context];
+}
+
++ (void)log:(BOOL)asynchronous
+    message:(NSString *)message
+      level:(SALogLevel)level
+       file:(const char *)file
+   function:(const char *)function
+       line:(NSUInteger)line
+    context:(NSInteger)context {
+    [[self sharedLog] log:asynchronous message:message level:level file:file function:function line:line context:context];
+}
+
++ (void)addLogger:(SAAbstractLogger<SALogger> *)logger {
+    [[self sharedLog] addLogger:logger];
+}
+
++ (void)addLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers {
+    [[self sharedLog] addLoggers:loggers];
+}
+
++ (void)removeLogger:(SAAbstractLogger<SALogger> *)logger {
+    [[self sharedLog] removeLogger:logger];
+}
+
++ (void)removeLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers {
+    [[self sharedLog] removeLoggers:loggers];
+}
+
++ (void)removeAllLoggers {
+    [[self sharedLog] removeAllLoggers];
+}
+
+- (void)log:(BOOL)asynchronous level:(SALogLevel)level file:(const char *)file function:(const char *)function line:(NSUInteger)line context:(NSInteger)context format:(NSString *)format, ... {
+    if (!format) {
+        return;
+    }
+    va_list args;
+    va_start(args, format);
+    NSString *message = [[NSString alloc] initWithFormat:format arguments:args];
+    va_end(args);
+    [self log:asynchronous message:message level:level file:file function:function line:line context:context];
+}
+
+- (void)log:(BOOL)asynchronous
+    message:(NSString *)message
+      level:(SALogLevel)level
+       file:(const char *)file
+   function:(const char *)function
+       line:(NSUInteger)line
+    context:(NSInteger)context {
+    if (file == NULL || function == NULL) {
+        return;
+    }
+    NSDate *timestamp = [NSDate date];
+    SALogMessage *logMessage = [[SALogMessage alloc] initWithMessage:message level:level file:[NSString stringWithUTF8String:file] function:[NSString stringWithUTF8String:function] line:line context:context timestamp:timestamp];
+    [self queueLogMessage:logMessage asynchronously:asynchronous];
+}
+
+- (void)queueLogMessage:(SALogMessage *)logMessage asynchronously:(BOOL)asyncFlag {
+    dispatch_block_t logBlock = ^{
+        dispatch_semaphore_wait(logQueueSemaphore, DISPATCH_TIME_FOREVER);
+        @autoreleasepool {
+            [self log:logMessage];
+        }
+    };
+
+    if (asyncFlag) {
+        dispatch_async(logSerialQueue, logBlock);
+    } else if (dispatch_get_specific(GlobalLoggingQueueIdentityKey)) {
+        logBlock();
+    } else {
+        dispatch_sync(logSerialQueue, logBlock);
+    }
+}
+
+- (void)log:(SALogMessage *)logMessage {
+    for (SAAbstractLogger<SALogger> *logger in self.loggers) {
+        dispatch_group_async(logGroup, logger.loggerQueue, ^{
+            @autoreleasepool {
+                [logger logMessage:logMessage];
+            }
+        });
+        dispatch_group_wait(logGroup, DISPATCH_TIME_FOREVER);
+    }
+    dispatch_semaphore_signal(logQueueSemaphore);
+}
+
+- (void)addLogger:(SAAbstractLogger<SALogger> *)logger {
+    if ([self.loggers containsObject:logger]) {
+        return;
+    }
+    [self.loggers addObject:logger];
+}
+
+- (void)addLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers {
+    [self.loggers addObjectsFromArray:loggers];
+    NSOrderedSet *loggerSet = [NSOrderedSet orderedSetWithArray:self.loggers];
+    self.loggers = [NSMutableArray arrayWithArray:[loggerSet array]];
+}
+
+- (void)removeLogger:(SAAbstractLogger<SALogger> *)logger {
+    [self.loggers removeObject:logger];
+}
+
+- (void)removeLoggers:(NSArray<SAAbstractLogger<SALogger> *> *)loggers {
+    [self.loggers removeObjectsInArray:loggers];
+}
+
+- (void)removeAllLoggers {
+    [self.loggers removeAllObjects];
+}
+
+- (NSMutableArray<SAAbstractLogger<SALogger> *> *)loggers {
+    if (!_loggers) {
+        _loggers = [[NSMutableArray alloc] init];
+    }
+    return _loggers;
+}
+
+- (NSDateFormatter *)dateFormatter {
+    return dateFormatter;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SALogger/SALogMessage.h b/SensorsAnalyticsSDK/SALogger/SALogMessage.h
new file mode 100644
index 00000000..4a9f0bf1
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALogMessage.h
@@ -0,0 +1,49 @@
+//
+//  SALogMessage.h
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import "SALog.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SALogMessage : NSObject
+
+@property (nonatomic, copy, readonly) NSString *message;
+@property (nonatomic, assign, readonly) SALogLevel level;
+@property (nonatomic, copy, readonly) NSString *file;
+@property (nonatomic, copy, readonly) NSString *fileName;
+@property (nonatomic, copy, readonly) NSString *function;
+@property (nonatomic, assign, readonly) NSUInteger line;
+@property (nonatomic, assign, readonly) NSInteger context;
+@property (nonatomic, strong, readonly) NSDate *timestamp;
+
+- (instancetype)init NS_UNAVAILABLE;
+
+- (instancetype)initWithMessage:(NSString *)message
+                          level:(SALogLevel)level
+                           file:(NSString *)file
+                       function:(NSString *)function
+                           line:(NSUInteger)line
+                        context:(NSInteger)context
+                      timestamp:(NSDate *)timestamp NS_DESIGNATED_INITIALIZER;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALogger/SALogMessage.m b/SensorsAnalyticsSDK/SALogger/SALogMessage.m
new file mode 100644
index 00000000..de9617a0
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALogMessage.m
@@ -0,0 +1,39 @@
+//
+//  SALogMessage.m
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "SALogMessage.h"
+
+@implementation SALogMessage
+
+- (instancetype)initWithMessage:(NSString *)message level:(SALogLevel)level file:(NSString *)file function:(NSString *)function line:(NSUInteger)line context:(NSInteger)context timestamp:(NSDate *)timestamp {
+    if (self = [super init]) {
+        _message = message;
+        _level = level;
+        _file = file;
+        _function = function;
+        _line = line;
+        _context = context;
+        _timestamp = timestamp;
+        _fileName = file.lastPathComponent;
+    }
+    return self;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SALogger/SALoggerConsoleFormatter.h b/SensorsAnalyticsSDK/SALogger/SALoggerConsoleFormatter.h
new file mode 100644
index 00000000..1442f5b9
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALoggerConsoleFormatter.h
@@ -0,0 +1,32 @@
+//
+//  SALoggerConsoleColorFormatter.h
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import "SAAbstractLogger.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SALoggerConsoleFormatter : NSObject <SALogMessageFormatter>
+
+@property (nonatomic, copy) NSString *prefix;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALogger/SALoggerConsoleFormatter.m b/SensorsAnalyticsSDK/SALogger/SALoggerConsoleFormatter.m
new file mode 100644
index 00000000..3ac47ccc
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALoggerConsoleFormatter.m
@@ -0,0 +1,68 @@
+//
+//  SALoggerConsoleColorFormatter.m
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "SALoggerConsoleFormatter.h"
+#import "SALogMessage.h"
+#import "SALog+Private.h"
+
+@implementation SALoggerConsoleFormatter
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        _prefix = @"";
+    }
+    return self;
+}
+
+- (NSString *)formattedLogMessage:(nonnull SALogMessage *)logMessage {
+    NSString *prefixEmoji = @"";
+    NSString *levelString = @"";
+    switch (logMessage.level) {
+        case SALogLevelError:
+            prefixEmoji = @"❌";
+            levelString = @"Error";
+            break;
+        case SALogLevelWarn:
+            prefixEmoji = @"⚠️";
+            levelString = @"Warn";
+            break;
+        case SALogLevelInfo:
+            prefixEmoji = @"ℹ️";
+            levelString = @"Info";
+            break;
+        case SALogLevelDebug:
+            prefixEmoji = @"🛠";
+            levelString = @"Debug";
+            break;
+        case SALogLevelVerbose:
+            prefixEmoji = @"📝";
+            levelString = @"Verbose";
+            break;
+        default:
+            break;
+    }
+    
+    NSString *dateString = [[SALog sharedLog].dateFormatter stringFromDate:logMessage.timestamp];
+    NSString *line = [NSString stringWithFormat:@"%lu", logMessage.line];
+    return [NSString stringWithFormat:@"%@ %@ %@ %@ %@ %@ line:%@ %@\n", dateString, prefixEmoji, levelString, self.prefix, logMessage.fileName, logMessage.function, line, logMessage.message];
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SALogger/SALoggerPrePostFixFormatter.h b/SensorsAnalyticsSDK/SALogger/SALoggerPrePostFixFormatter.h
new file mode 100644
index 00000000..a466b311
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALoggerPrePostFixFormatter.h
@@ -0,0 +1,33 @@
+//
+//  SALoggerPrePostFixFormatter.h
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import "SALog+Private.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SALoggerPrePostFixFormatter : NSObject <SALogMessageFormatter>
+
+@property (nonatomic, copy) NSString *prefix;
+@property (nonatomic, copy) NSString *postfix;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SALogger/SALoggerPrePostFixFormatter.m b/SensorsAnalyticsSDK/SALogger/SALoggerPrePostFixFormatter.m
new file mode 100644
index 00000000..c3d1bb51
--- /dev/null
+++ b/SensorsAnalyticsSDK/SALogger/SALoggerPrePostFixFormatter.m
@@ -0,0 +1,30 @@
+//
+//  SALoggerPrePostFixFormatter.m
+//  Logger
+//
+//  Created by 陈玉国 on 2019/12/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "SALoggerPrePostFixFormatter.h"
+#import "SALogMessage.h"
+
+@implementation SALoggerPrePostFixFormatter
+
+- (NSString *)formattedLogMessage:(nonnull SALogMessage *)logMessage {
+    return [NSString stringWithFormat:@"%@ %@ %@", self.prefix, logMessage.message, self.postfix];
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SANetwork.h b/SensorsAnalyticsSDK/SANetwork.h
index 189ad719..b498dddf 100644
--- a/SensorsAnalyticsSDK/SANetwork.h
+++ b/SensorsAnalyticsSDK/SANetwork.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/3/8.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -70,9 +70,10 @@ typedef void(^SAURLSessionTaskCompletionHandler)(NSData * _Nullable data, NSHTTP
  数据将同步发送，请在异步线程中调用
 
  @param events 事件的 json 字符串组成的数组
+ @param isEncrypted 事件是否加密
  @return 同步返回数据是否上传成功
  */
-- (BOOL)flushEvents:(NSArray<NSString *> *)events;
+- (BOOL)flushEvents:(NSArray<NSString *> *)events isEncrypted:(BOOL)isEncrypted;
 
 /**
  设置 DebugMode 时回调请求方法
diff --git a/SensorsAnalyticsSDK/SANetwork.m b/SensorsAnalyticsSDK/SANetwork.m
index 329eb43a..0ce8b567 100644
--- a/SensorsAnalyticsSDK/SANetwork.m
+++ b/SensorsAnalyticsSDK/SANetwork.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/3/8.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,12 +23,12 @@
 #endif
 
 #import "SANetwork.h"
-#import "SANetwork+URLUtils.h"
+#import "SAURLUtils.h"
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SensorsAnalyticsSDK.h"
 #import "NSString+HashCode.h"
 #import "SAGzipUtility.h"
-#import "SALogger.h"
+#import "SALog.h"
 #import "SAJSONUtil.h"
 
 typedef NSURLSessionAuthChallengeDisposition (^SAURLSessionDidReceiveAuthenticationChallengeBlock)(NSURLSession *session, NSURLAuthenticationChallenge *challenge, NSURLCredential * __autoreleasing *credential);
@@ -87,7 +87,7 @@ - (void)setServerURL:(NSURL *)serverURL {
         NSURL *url = [serverURL URLByAppendingPathComponent:@"debug"];
         if ([url.host rangeOfString:@"_"].location != NSNotFound) { //包含下划线日志提示
             NSString * referenceURL = @"https://en.wikipedia.org/wiki/Hostname";
-            SALog(@"Server url:%@ contains '_'  is not recommend,see details:%@", serverURL.absoluteString, referenceURL);
+            SALogWarn(@"Server url:%@ contains '_'  is not recommend,see details:%@", serverURL.absoluteString, referenceURL);
         }
         _serverURL = url;
     }
@@ -151,19 +151,27 @@ - (NSString *)buildFlushJSONStringWithEvents:(NSArray<NSString *> *)events {
     return [NSString stringWithFormat:@"[%@]", [events componentsJoinedByString:@","]];
 }
 
-- (NSURLRequest *)buildFlushRequestWithJSONString:(NSString *)jsonString HTTPMethod:(NSString *)HTTPMethod {
+- (NSURLRequest *)buildFlushRequestWithJSONString:(NSString *)jsonString HTTPMethod:(NSString *)HTTPMethod isEncrypted:(BOOL)isEncrypted {
     NSString *postBody;
     @try {
-        // 2. 使用gzip进行压缩
-        NSData *zippedData = [SAGzipUtility gzipData:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
-        // 3. base64
-        NSString *b64String = [zippedData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
+        int gzip = 9; // gzip = 9 表示加密编码
+        NSString *b64String = [jsonString copy];
+        
+        if (!isEncrypted) {
+            // 加密数据已经做过 gzip 压缩和 base64 处理了，就不需要再处理。
+            gzip = 1;
+            // 使用gzip进行压缩
+            NSData *zippedData = [SAGzipUtility gzipData:[b64String dataUsingEncoding:NSUTF8StringEncoding]];
+            // base64
+            b64String = [zippedData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
+        }
+
         int hashCode = [b64String sensorsdata_hashCode];
         b64String = [b64String stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet alphanumericCharacterSet]];
-        
-        postBody = [NSString stringWithFormat:@"crc=%d&gzip=1&data_list=%@", hashCode, b64String];
+        postBody = [NSString stringWithFormat:@"crc=%d&gzip=%d&data_list=%@", hashCode, gzip, b64String];
+
     } @catch (NSException *exception) {
-        SAError(@"%@ flushByPost format data error: %@", self, exception);
+        SALogError(@"%@ flushByPost format data error: %@", self, exception);
         return nil;
     }
     
@@ -184,7 +192,7 @@ - (NSURLRequest *)buildFlushRequestWithJSONString:(NSString *)jsonString HTTPMet
 
 - (NSURL *)buildDebugModeCallbackURLWithParams:(NSDictionary<NSString *, id> *)params {
     NSURLComponents *urlComponents = [NSURLComponents componentsWithURL:self.serverURL resolvingAgainstBaseURL:NO];
-    NSString *queryString = [SANetwork urlQueryStringWithParams:params];
+    NSString *queryString = [SAURLUtils urlQueryStringWithParams:params];
     if (urlComponents.query.length) {
         urlComponents.query = [NSString stringWithFormat:@"%@&%@", urlComponents.query, queryString];
     } else {
@@ -217,7 +225,7 @@ - (NSURLRequest *)buildFunctionalManagermentConfigRequestWithWithRemoteConfigURL
         NSURL *url = self.serverURL.lastPathComponent.length > 0 ? [self.serverURL URLByDeletingLastPathComponent] : self.serverURL;
         urlComponets = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:YES];
         if (urlComponets == nil) {
-            SALog(@"URLString is malformed, nil is returned.");
+            SALogError(@"URLString is malformed, nil is returned.");
             return nil;
         }
         urlComponets.query = nil;
@@ -240,9 +248,9 @@ - (NSURLSessionDataTask *)dataTaskWithRequest:(NSURLRequest *)request completion
     }];
 }
 
-- (BOOL)flushEvents:(NSArray<NSString *> *)events {
+- (BOOL)flushEvents:(NSArray<NSString *> *)events isEncrypted:(BOOL)isEncrypted {
     if (![self isValidServerURL]) {
-        SAError(@"serverURL error，Please check the serverURL");
+        SALogError(@"serverURL error，Please check the serverURL");
         return NO;
     }
     
@@ -252,7 +260,7 @@ - (BOOL)flushEvents:(NSArray<NSString *> *)events {
     dispatch_semaphore_t flushSemaphore = dispatch_semaphore_create(0);
     SAURLSessionTaskCompletionHandler handler = ^(NSData * _Nullable data, NSHTTPURLResponse * _Nullable response, NSError * _Nullable error) {
         if (error || ![response isKindOfClass:[NSHTTPURLResponse class]]) {
-            SAError(@"%@", [NSString stringWithFormat:@"%@ network failure: %@", self, error ? error : @"Unknown error"]);
+            SALogError(@"%@", [NSString stringWithFormat:@"%@ network failure: %@", self, error ? error : @"Unknown error"]);
             dispatch_semaphore_signal(flushSemaphore);
             return;
         }
@@ -274,24 +282,23 @@ - (BOOL)flushEvents:(NSArray<NSString *> *)events {
         BOOL successCode = (statusCode < 500 || statusCode >= 600) && statusCode != 404 && statusCode != 403;
         flushSuccess = self.debugMode != SensorsAnalyticsDebugOff || successCode;
 
-        SAError(@"==========================================================================");
+        SALogDebug(@"==========================================================================");
         @try {
             NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
             NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableContainers error:nil];
-            SAError(@"%@ %@: %@", self, messageDesc, dict);
+            SALogDebug(@"%@ %@: %@", self, messageDesc, dict);
         } @catch (NSException *exception) {
-            SAError(@"%@: %@", self, exception);
+            SALogError(@"%@: %@", self, exception);
         }
         
         if (statusCode != 200) {
-            SAError(@"%@ ret_code: %ld", self, statusCode);
-            SAError(@"%@ ret_content: %@", self, urlResponseContent);
+            SALogError(@"%@ ret_code: %ld, ret_content: %@", self, (long)statusCode, urlResponseContent);
         }
         
         dispatch_semaphore_signal(flushSemaphore);
     };
     
-    NSURLRequest *request = [self buildFlushRequestWithJSONString:jsonString HTTPMethod:@"POST"];
+    NSURLRequest *request = [self buildFlushRequestWithJSONString:jsonString HTTPMethod:@"POST" isEncrypted:isEncrypted];
     NSURLSessionDataTask *task = [self dataTaskWithRequest:request completionHandler:handler];
     [task resume];
     
@@ -302,7 +309,7 @@ - (BOOL)flushEvents:(NSArray<NSString *> *)events {
 
 - (NSURLSessionTask *)debugModeCallbackWithDistinctId:(NSString *)distinctId params:(NSDictionary<NSString *, id> *)params {
     if (![self isValidServerURL]) {
-        SAError(@"serverURL error，Please check the serverURL");
+        SALogError(@"serverURL error，Please check the serverURL");
         return nil;
     }
     NSURL *url = [self buildDebugModeCallbackURLWithParams:params];
@@ -311,9 +318,9 @@ - (NSURLSessionTask *)debugModeCallbackWithDistinctId:(NSString *)distinctId par
     NSURLSessionDataTask *task = [self dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSHTTPURLResponse * _Nullable response, NSError * _Nullable error) {
         NSInteger statusCode = response.statusCode;
         if (statusCode == 200) {
-            SALog(@"config debugMode CallBack success");
+            SALogDebug(@"config debugMode CallBack success");
         } else {
-            SAError(@"config debugMode CallBack Faild statusCode：%d，url：%@", statusCode, url);
+            SALogError(@"config debugMode CallBack Faild statusCode：%ld，url：%@", statusCode, url);
         }
     }];
     [task resume];
@@ -322,7 +329,7 @@ - (NSURLSessionTask *)debugModeCallbackWithDistinctId:(NSString *)distinctId par
 
 - (NSURLSessionTask *)functionalManagermentConfigWithRemoteConfigURL:(nullable NSURL *)remoteConfigURL version:(NSString *)version completion:(void(^)(BOOL success, NSDictionary<NSString *, id> *config))completion {
     if (![self isValidServerURL]) {
-        SAError(@"serverURL error，Please check the serverURL");
+        SALogError(@"serverURL error，Please check the serverURL");
         return nil;
     }
     NSURLRequest *request = [self buildFunctionalManagermentConfigRequestWithWithRemoteConfigURL:remoteConfigURL version:version];
@@ -338,7 +345,7 @@ - (NSURLSessionTask *)functionalManagermentConfigWithRemoteConfigURL:(nullable N
                 config = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil];
             }
         } @catch (NSException *e) {
-            SAError(@"%@ error: %@", self, e);
+            SALogError(@"%@ error: %@", self, e);
             success = NO;
         }
         completion(success, config);
@@ -407,23 +414,23 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didRece
 @implementation SANetwork (ServerURL)
 
 - (NSString *)host {
-    return [SANetwork hostWithURL:self.serverURL] ?: @"";
+    return [SAURLUtils hostWithURL:self.serverURL] ?: @"";
 }
 
 - (NSString *)project {
-    return [SANetwork queryItemsWithURL:self.serverURL][@"project"] ?: @"default";
+    return [SAURLUtils queryItemsWithURL:self.serverURL][@"project"] ?: @"default";
 }
 
 - (NSString *)token {
-    return [SANetwork queryItemsWithURL:self.serverURL][@"token"] ?: @"";
+    return [SAURLUtils queryItemsWithURL:self.serverURL][@"token"] ?: @"";
 }
 
 - (BOOL)isSameProjectWithURLString:(NSString *)URLString {
     if (![self isValidServerURL] || URLString.length == 0) {
         return NO;
     }
-    BOOL isEqualHost = [self.host isEqualToString:[SANetwork hostWithURLString:URLString]];
-    NSString *project = [SANetwork queryItemsWithURLString:URLString][@"project"] ?: @"default";
+    BOOL isEqualHost = [self.host isEqualToString:[SAURLUtils hostWithURLString:URLString]];
+    NSString *project = [SAURLUtils queryItemsWithURLString:URLString][@"project"] ?: @"default";
     BOOL isEqualProject = [self.project isEqualToString:project];
     return isEqualHost && isEqualProject;
 }
diff --git a/SensorsAnalyticsSDK/SAObjectSelector.h b/SensorsAnalyticsSDK/SAObjectSelector.h
deleted file mode 100644
index d0b49a71..00000000
--- a/SensorsAnalyticsSDK/SAObjectSelector.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-//  SAObjectSelector.h
-//  SensorsAnalyticsSDK
-//
-//  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface SAObjectSelector : NSObject
-
-@property (nonatomic, strong, readonly) NSString *string;
-
-+ (SAObjectSelector *)objectSelectorWithString:(NSString *)string;
-- (instancetype)initWithString:(NSString *)string;
-
-- (NSArray *)selectFromRoot:(id)root;
-- (NSArray *)fuzzySelectFromRoot:(id)root;
-
-- (BOOL)isLeafSelected:(id)leaf fromRoot:(id)root;
-- (BOOL)fuzzyIsLeafSelected:(id)leaf fromRoot:(id)root;
-
-- (Class)selectedClass;
-- (NSString *)description;
-
-@end
diff --git a/SensorsAnalyticsSDK/SAObjectSelector.m b/SensorsAnalyticsSDK/SAObjectSelector.m
deleted file mode 100644
index bfc28dff..00000000
--- a/SensorsAnalyticsSDK/SAObjectSelector.m
+++ /dev/null
@@ -1,408 +0,0 @@
-//
-//  SAObjectSelector.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 <objc/runtime.h>
-#import <UIKit/UIKit.h>
-
-#import "SALogger.h"
-#import "SAObjectSelector.h"
-
-@interface SAObjectFilter : NSObject
-
-@property (nonatomic, strong) NSString *name;
-@property (nonatomic, strong) NSPredicate *predicate;
-@property (nonatomic, strong) NSNumber *index;
-@property (nonatomic, assign) BOOL unique;
-@property (nonatomic, assign) BOOL nameOnly;
-
-- (NSArray *)apply:(NSArray *)views;
-- (NSArray *)applyReverse:(NSArray *)views;
-- (BOOL)appliesTo:(NSObject *)view;
-- (BOOL)appliesToAny:(NSArray *)views;
-
-@end
-
-@interface SAObjectSelector () {
-    NSCharacterSet *_classAndPropertyChars;
-    NSCharacterSet *_separatorChars;
-    NSCharacterSet *_predicateStartChar;
-    NSCharacterSet *_predicateEndChar;
-    NSCharacterSet *_flagStartChar;
-    NSCharacterSet *_flagEndChar;
-
-}
-
-@property (nonatomic, strong) NSScanner *scanner;
-@property (nonatomic, strong) NSArray *filters;
-
-@end
-
-@implementation SAObjectSelector
-
-+ (SAObjectSelector *)objectSelectorWithString:(NSString *)string {
-    return [[SAObjectSelector alloc] initWithString:string];
-}
-
-- (instancetype)initWithString:(NSString *)string {
-    if (self = [super init]) {
-        _string = string;
-        _scanner = [NSScanner scannerWithString:string];
-        [_scanner setCharactersToBeSkipped:nil];
-        _separatorChars = [NSCharacterSet characterSetWithCharactersInString:@"/"];
-        _predicateStartChar = [NSCharacterSet characterSetWithCharactersInString:@"["];
-        _predicateEndChar = [NSCharacterSet characterSetWithCharactersInString:@"]"];
-        _classAndPropertyChars = [NSCharacterSet characterSetWithCharactersInString:@"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_.*"];
-        _flagStartChar = [NSCharacterSet characterSetWithCharactersInString:@"("];
-        _flagEndChar = [NSCharacterSet characterSetWithCharactersInString:@")"];
-
-        NSMutableArray *filters = [NSMutableArray array];
-        SAObjectFilter *filter;
-        BOOL isRoot = true;
-        while((filter = [self nextFilter])) {
-            // RootViewController不写入filters中
-            if (isRoot) {
-                isRoot = false;
-                continue;
-            }
-            [filters addObject:filter];
-        }
-        self.filters = [filters copy];
-    }
-    return self;
-}
-
-/*
- Starting at the root object, try and find an object
- in the view/controller tree that matches this selector.
-*/
-
-- (NSArray *)selectFromRoot:(id)root {
-    return [self selectFromRoot:root evaluatingFinalPredicate:YES];
-}
-
-- (NSArray *)fuzzySelectFromRoot:(id)root {
-    return [self selectFromRoot:root evaluatingFinalPredicate:NO];
-}
-
-- (NSArray *)selectFromRoot:(id)root evaluatingFinalPredicate:(BOOL)finalPredicate {
-    NSArray *views = @[];
-    if (root) {
-        views = @[root];
-
-        for (NSUInteger i = 0, n = [_filters count]; i < n; i++) {
-            SAObjectFilter *filter = _filters[i];
-            filter.nameOnly = (i == n-1 && !finalPredicate);
-            views = [filter apply:views];
-            if ([views count] == 0) {
-                break;
-            }
-        }
-    }
-    return views;
-}
-
-
-/*
- Starting at a leaf node, determine if it would be selected
- by this selector starting from the root object given.
- */
-
-- (BOOL)isLeafSelected:(id)leaf fromRoot:(id)root {
-    return [self isLeafSelected:leaf fromRoot:root evaluatingFinalPredicate:YES];
-}
-
-- (BOOL)fuzzyIsLeafSelected:(id)leaf fromRoot:(id)root {
-    return [self isLeafSelected:leaf fromRoot:root evaluatingFinalPredicate:NO];
-}
-
-- (BOOL)isLeafSelected:(id)leaf fromRoot:(id)root evaluatingFinalPredicate:(BOOL)finalPredicate {
-    BOOL isSelected = YES;
-    NSArray *views = @[leaf];
-    NSUInteger n = [_filters count], i = n;
-    while(i--) {
-        SAObjectFilter *filter = _filters[i];
-        filter.nameOnly = (i == n-1 && !finalPredicate);
-        if (![filter appliesToAny:views]) {
-            isSelected = NO;
-            break;
-        }
-        views = [filter applyReverse:views];
-        if ([views count] == 0) {
-            break;
-        }
-    }
-    return isSelected && [views indexOfObject:root] != NSNotFound;
-}
-
-- (SAObjectFilter *)nextFilter {
-    SAObjectFilter *filter;
-    if ([_scanner scanCharactersFromSet:_separatorChars intoString:nil]) {
-        NSString *name;
-        filter = [[SAObjectFilter alloc] init];
-        if ([_scanner scanCharactersFromSet:_classAndPropertyChars intoString:&name]) {
-            filter.name = name;
-        } else {
-            filter.name = @"*";
-        }
-        if ([_scanner scanCharactersFromSet:_flagStartChar intoString:nil]) {
-            NSString *flags;
-            [_scanner scanUpToCharactersFromSet:_flagEndChar intoString:&flags];
-            for (NSString *flag in[flags componentsSeparatedByString:@"|"]) {
-                if ([flag isEqualToString:@"unique"]) {
-                    filter.unique = YES;
-                }
-            }
-        }
-        if ([_scanner scanCharactersFromSet:_predicateStartChar intoString:nil]) {
-            NSString *predicateFormat;
-            NSInteger index = 0;
-            if ([_scanner scanInteger:&index] && [_scanner scanCharactersFromSet:_predicateEndChar intoString:nil]) {
-                filter.index = @((NSUInteger)index);
-            } else {
-                [_scanner scanUpToCharactersFromSet:_predicateEndChar intoString:&predicateFormat];
-                @try {
-                    NSPredicate *parsedPredicate = [NSPredicate predicateWithFormat:predicateFormat];
-                    filter.predicate = [NSPredicate predicateWithBlock:^BOOL(id evaluatedObject, NSDictionary *bindings) {
-                        @try {
-                            return [parsedPredicate evaluateWithObject:evaluatedObject substitutionVariables:bindings];
-                        }
-                        @catch (NSException *exception) {
-                            return false;
-                        }
-                    }];
-                }
-                @catch (NSException *exception) {
-                    filter.predicate = [NSPredicate predicateWithValue:NO];
-                }
-
-                [_scanner scanCharactersFromSet:_predicateEndChar intoString:nil];
-            }
-        }
-    }
-    return filter;
-}
-
-- (Class)selectedClass {
-    if ([_filters count] > 0) {
-        return NSClassFromString(((SAObjectFilter *)_filters[[_filters count] - 1]).name);
-    }
-    return nil;
-}
-
-- (NSString *)description {
-    return self.string;
-}
-
-@end
-
-@implementation SAObjectFilter
-
-- (instancetype)init {
-    if((self = [super init])) {
-        self.unique = NO;
-        self.nameOnly = NO;
-    }
-    return self;
-}
-
-/*
- Apply this filter to the views, returning all of their children
- that match this filter's class / predicate pattern
- */
-- (NSArray *)apply:(NSArray *)views {
-    NSMutableArray *result = [NSMutableArray array];
-    Class class = NSClassFromString(_name);
-    if (class || [_name isEqualToString:@"*"]) {
-        // Select all children
-        for (NSObject *view in views) {
-            NSArray *children = [self getChildrenOfObject:view ofType:class];
-            if (_index && [_index unsignedIntegerValue] < [children count]) {
-                // Indexing can only be used for subviews of UIView
-                if ([view isKindOfClass:[UIView class]]) {
-                    children = @[children[[_index unsignedIntegerValue]]];
-                } else {
-                    children = @[];
-                }
-            }
-            [result addObjectsFromArray:children];
-        }
-    }
-
-    if (!self.nameOnly) {
-        // If unique is set and there are more than one, return nothing
-        if(self.unique && [result count] != 1) {
-            return @[];
-        }
-        // Filter any resulting views by predicate
-        if (self.predicate) {
-            return [result filteredArrayUsingPredicate:self.predicate];
-        }
-    }
-    return [result copy];
-}
-
-/*
- Apply this filter to the views. For any view that
- matches this filter's class / predicate pattern, return
- its parents.
- */
-- (NSArray *)applyReverse:(NSArray *)views {
-    NSMutableArray *result = [NSMutableArray array];
-    for (NSObject *view in views) {
-        if ([self appliesTo:view]) {
-            [result addObjectsFromArray:[self getParentsOfObject:view]];
-        }
-    }
-    return [result copy];
-}
-
-/*
- Returns whether the given view would pass this filter.
- */
-- (BOOL)appliesTo:(NSObject *)view {
-    return (([self.name isEqualToString:@"*"] || [view isKindOfClass:NSClassFromString(self.name)])
-            && (self.nameOnly || (
-                (!self.predicate || [_predicate evaluateWithObject:view])
-                && (!self.index || [self isView:view siblingNumber:[_index integerValue]])
-                && (!(self.unique) || [self isView:view oneOfNSiblings:1])))
-            );
-}
-
-/*
- Returns whether any of the given views would pass this filter
- */
-- (BOOL)appliesToAny:(NSArray *)views {
-    for (NSObject *view in views) {
-        if ([self appliesTo:view]) {
-            return YES;
-        }
-    }
-    return NO;
-}
-
-/*
- Returns true if the given view is at the index given by number in
- its parent's subviews. The view's parent must be of type UIView
- */
-
-- (BOOL)isView:(NSObject *)view siblingNumber:(NSInteger)number {
-    return [self isView:view siblingNumber:number of:-1];
-}
-
-- (BOOL)isView:(NSObject *)view oneOfNSiblings:(NSInteger)number {
-    return [self isView:view siblingNumber:-1 of:number];
-}
-
-- (BOOL)isView:(NSObject *)view siblingNumber:(NSInteger)index of:(NSInteger)numSiblings {
-    NSArray *parents = [self getParentsOfObject:view];
-    for (NSObject *parent in parents) {
-        if ([parent isKindOfClass:[UIView class]]) {
-            NSArray *siblings = [self getChildrenOfObject:parent ofType:NSClassFromString(_name)];
-            if ((index < 0 || ((NSUInteger)index < [siblings count] && siblings[(NSUInteger)index] == view))
-                && (numSiblings < 0 || [siblings count] == (NSUInteger)numSiblings)) {
-                return YES;
-            }
-        }
-    }
-    return NO;
-}
-
-- (NSArray *)getParentsOfObject:(NSObject *)obj {
-    NSMutableArray *result = [NSMutableArray array];
-    if ([obj isKindOfClass:[UIView class]]) {
-        if ([(UIView *)obj superview]) {
-            [result addObject:[(UIView *)obj superview]];
-        }
-        // For UIView, nextResponder should be its controller or its superview.
-        if ([(UIView *)obj nextResponder] && [(UIView *)obj nextResponder] != [(UIView *)obj superview]) {
-            [result addObject:[(UIView *)obj nextResponder]];
-        }
-    } else if ([obj isKindOfClass:[UIViewController class]]) {
-        if ([(UIViewController *)obj parentViewController]) {
-            [result addObject:[(UIViewController *)obj parentViewController]];
-        }
-        if ([(UIViewController *)obj presentingViewController]) {
-            [result addObject:[(UIViewController *)obj presentingViewController]];
-        }
-        if ([UIApplication sharedApplication].keyWindow.rootViewController == obj) {
-            //TODO is there a better way to get the actual window that has this VC
-            [result addObject:[UIApplication sharedApplication].keyWindow];
-        }
-    }
-    return [result copy];
-}
-
-- (NSArray *)getChildrenOfObject:(NSObject *)obj ofType:(Class)class {
-    NSMutableArray *children = [NSMutableArray array];
-    // A UIWindow is also a UIView, so we could in theory follow the subviews chain from UIWindow, but
-    // for now we only follow rootViewController from UIView.
-    if ([obj isKindOfClass:[UIWindow class]] && [((UIWindow *)obj).rootViewController isKindOfClass:class]) {
-        [children addObject:((UIWindow *)obj).rootViewController];
-    } else if ([obj isKindOfClass:[UIView class]]) {
-        // For UIViews, only add subviews, nothing else.
-        // The ordering of this result is critical to being able to
-        // apply the index filter.
-        for (NSObject *child in [(UIView *)obj subviews]) {
-            if (!class || [child isKindOfClass:class]) {
-                [children addObject:child];
-            }
-        }
-    } else if ([obj isKindOfClass:[UIViewController class]]) {
-        UIViewController *viewController = (UIViewController *)obj;
-        for (NSObject *child in [viewController childViewControllers]) {
-            if (!class || [child isKindOfClass:class]) {
-                [children addObject:child];
-            }
-        }
-        if (viewController.presentedViewController && (!class || [viewController.presentedViewController isKindOfClass:class])) {
-            [children addObject:viewController.presentedViewController];
-        }
-        if (!class || (viewController.isViewLoaded && [viewController.view isKindOfClass:class])) {
-            [children addObject:viewController.view];
-        }
-    }
-    NSArray *result;
-    // Reorder the cells in a table view so that they are arranged by y position
-    if ([class isSubclassOfClass:[UITableViewCell class]]) {
-//        result = [children sortedArrayUsingComparator:^NSComparisonResult(UIView *obj1, UIView *obj2) {
-//            if (obj2.frame.origin.y > obj1.frame.origin.y) {
-//                return NSOrderedAscending;
-//            } else if (obj2.frame.origin.y < obj1.frame.origin.y) {
-//                return NSOrderedDescending;
-//            }
-//            return NSOrderedSame;
-//        }];
-        result = [children copy];
-    } else {
-        result = [children copy];
-    }
-    return result;
-}
-
-- (NSString *)description; {
-    return [NSString stringWithFormat:@"%@[%@]", self.name, self.index ?: self.predicate];
-}
-
-@end
diff --git a/SensorsAnalyticsSDK/SAReachability.h b/SensorsAnalyticsSDK/SAReachability.h
index 579dad9f..24db276a 100644
--- a/SensorsAnalyticsSDK/SAReachability.h
+++ b/SensorsAnalyticsSDK/SAReachability.h
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAReachability.m b/SensorsAnalyticsSDK/SAReachability.m
index b910438a..4ff2c061 100644
--- a/SensorsAnalyticsSDK/SAReachability.m
+++ b/SensorsAnalyticsSDK/SAReachability.m
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -40,59 +40,49 @@
 
 #pragma mark - SAReachability implementation
 
-@implementation SAReachability
-{
+@implementation SAReachability {
 	SCNetworkReachabilityRef _reachabilityRef;
 }
 
-+ (instancetype)reachabilityWithHostName:(NSString *)hostName
-{
-	SAReachability* returnValue = NULL;
-	SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(NULL, [hostName UTF8String]);
-	if (reachability != NULL)
-	{
-		returnValue= [[self alloc] init];
-		if (returnValue != NULL)
-		{
++ (instancetype)reachabilityWithHostName:(NSString *)hostName {
+    SAReachability *returnValue = NULL;
+    SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithName(NULL, [hostName UTF8String]);
+    if (reachability != NULL) {
+        returnValue = [[self alloc] init];
+        if (returnValue != NULL) {
             returnValue->_reachabilityRef = reachability;
-		}
-        else {
+        } else {
             CFRelease(reachability);
         }
-	}
-	return returnValue;
+    }
+    return returnValue;
 }
 
 
-+ (instancetype)reachabilityWithAddress:(const struct sockaddr *)hostAddress
-{
-	SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, hostAddress);
++ (instancetype)reachabilityWithAddress:(const struct sockaddr *)hostAddress {
+    SCNetworkReachabilityRef reachability = SCNetworkReachabilityCreateWithAddress(kCFAllocatorDefault, hostAddress);
 
-	SAReachability* returnValue = NULL;
+    SAReachability *returnValue = NULL;
 
-	if (reachability != NULL)
-	{
-		returnValue = [[self alloc] init];
-		if (returnValue != NULL)
-		{
+    if (reachability != NULL) {
+        returnValue = [[self alloc] init];
+        if (returnValue != NULL) {
             returnValue->_reachabilityRef = reachability;
-		}
-        else {
+        } else {
             CFRelease(reachability);
         }
-	}
-	return returnValue;
+    }
+    return returnValue;
 }
 
 
-+ (instancetype)reachabilityForInternetConnection
-{
-	struct sockaddr_in zeroAddress;
-	bzero(&zeroAddress, sizeof(zeroAddress));
-	zeroAddress.sin_len = sizeof(zeroAddress);
-	zeroAddress.sin_family = AF_INET;
-    
-    return [self reachabilityWithAddress: (const struct sockaddr *) &zeroAddress];
++ (instancetype)reachabilityForInternetConnection {
+    struct sockaddr_in zeroAddress;
+    bzero(&zeroAddress, sizeof(zeroAddress));
+    zeroAddress.sin_len = sizeof(zeroAddress);
+    zeroAddress.sin_family = AF_INET;
+
+    return [self reachabilityWithAddress:(const struct sockaddr *)&zeroAddress];
 }
 
 #pragma mark reachabilityForLocalWiFi
@@ -104,33 +94,28 @@ + (instancetype)reachabilityForInternetConnection
 
 #pragma mark - Network Flag Handling
 
-- (SANetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags
-{
-	if ((flags & kSCNetworkReachabilityFlagsReachable) == 0)
-	{
-		// The target host is not reachable.
-		return SANotReachable;
-	}
+- (SANetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags {
+    if ((flags & kSCNetworkReachabilityFlagsReachable) == 0) {
+        // The target host is not reachable.
+        return SANotReachable;
+    }
 
     SANetworkStatus returnValue = SANotReachable;
 
-	if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0)
-	{
-		/*
-         If the target host is reachable and no connection is required then we'll assume (for now) that you're on Wi-Fi...
-         */
-		returnValue = SAReachableViaWiFi;
-	}
+    if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0) {
+        /*
+ If the target host is reachable and no connection is required then we'll assume (for now) that you're on Wi-Fi...
+ */
+        returnValue = SAReachableViaWiFi;
+    }
 
-	if ((((flags & kSCNetworkReachabilityFlagsConnectionOnDemand ) != 0) ||
-        (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0))
-	{
+    if ((((flags & kSCNetworkReachabilityFlagsConnectionOnDemand) != 0) ||
+         (flags & kSCNetworkReachabilityFlagsConnectionOnTraffic) != 0)) {
         /*
          ... and the connection is on-demand (or on-traffic) if the calling application is using the CFSocketStream or higher APIs...
          */
 
-        if ((flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0)
-        {
+        if ((flags & kSCNetworkReachabilityFlagsInterventionRequired) == 0) {
             /*
              ... and no [user] intervention is needed...
              */
@@ -138,36 +123,31 @@ - (SANetworkStatus)networkStatusForFlags:(SCNetworkReachabilityFlags)flags
         }
     }
 
-	if ((flags & kSCNetworkReachabilityFlagsIsWWAN) == kSCNetworkReachabilityFlagsIsWWAN)
-	{
-		/*
-         ... but WWAN connections are OK if the calling application is using the CFNetwork APIs.
-         */
-		returnValue = SAReachableViaWWAN;
-	}
-    
-	return returnValue;
+    if ((flags & kSCNetworkReachabilityFlagsIsWWAN) == kSCNetworkReachabilityFlagsIsWWAN) {
+        /*
+ ... but WWAN connections are OK if the calling application is using the CFNetwork APIs.
+ */
+        returnValue = SAReachableViaWWAN;
+    }
+
+    return returnValue;
 }
 
 
-- (SANetworkStatus)currentReachabilityStatus
-{
-	NSAssert(_reachabilityRef != NULL, @"currentNetworkStatus called with NULL SCNetworkReachabilityRef");
-	SANetworkStatus returnValue = SANotReachable;
-	SCNetworkReachabilityFlags flags;
-    
-	if (SCNetworkReachabilityGetFlags(_reachabilityRef, &flags))
-	{
+- (SANetworkStatus)currentReachabilityStatus {
+    NSAssert(_reachabilityRef != NULL, @"currentNetworkStatus called with NULL SCNetworkReachabilityRef");
+    SANetworkStatus returnValue = SANotReachable;
+    SCNetworkReachabilityFlags flags;
+
+    if (SCNetworkReachabilityGetFlags(_reachabilityRef, &flags)) {
         returnValue = [self networkStatusForFlags:flags];
-	}
-    
-	return returnValue;
+    }
+
+    return returnValue;
 }
 
-- (void)dealloc
-{
-    if (_reachabilityRef != NULL)
-    {
+- (void)dealloc {
+    if (_reachabilityRef != NULL) {
         CFRelease(_reachabilityRef);
     }
 }
diff --git a/SensorsAnalyticsSDK/SASDKRemoteConfig.h b/SensorsAnalyticsSDK/SASDKRemoteConfig.h
index 2cd31e68..f2669750 100644
--- a/SensorsAnalyticsSDK/SASDKRemoteConfig.h
+++ b/SensorsAnalyticsSDK/SASDKRemoteConfig.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/4/24.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -29,6 +29,9 @@ static NSInteger kSAAutoTrackModeEnabledAll = 15;
 @property (nonatomic, assign) BOOL disableDebugMode;
 @property (nonatomic, assign) NSInteger autoTrackMode;//-1,0,1~15
 
+//本地保存 SDK 版本号
+@property(nonatomic,copy)NSString *localLibVersion;
+
 + (instancetype)configWithDict:(NSDictionary *)dict;
 - (instancetype)initWithDict:(NSDictionary *)dict;
 @end
diff --git a/SensorsAnalyticsSDK/SASDKRemoteConfig.m b/SensorsAnalyticsSDK/SASDKRemoteConfig.m
index a49138e1..a7a0801f 100644
--- a/SensorsAnalyticsSDK/SASDKRemoteConfig.m
+++ b/SensorsAnalyticsSDK/SASDKRemoteConfig.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/4/24.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict{
         _v = [dict valueForKey:@"v"];
         _disableSDK = [[dict valueForKeyPath:@"configs.disableSDK"] boolValue];
         _disableDebugMode = [[dict valueForKeyPath:@"configs.disableDebugMode"] boolValue];
+        _localLibVersion = [dict valueForKey:@"localLibVersion"];
         NSNumber *autoTrackMode = [dict valueForKeyPath:@"configs.autoTrackMode"];
         if (autoTrackMode != nil) {
             NSInteger iMode = autoTrackMode.integerValue;
diff --git a/SensorsAnalyticsSDK/SASecurityPolicy.h b/SensorsAnalyticsSDK/SASecurityPolicy.h
index 0757d5fc..6960de18 100755
--- a/SensorsAnalyticsSDK/SASecurityPolicy.h
+++ b/SensorsAnalyticsSDK/SASecurityPolicy.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/3/9.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SASecurityPolicy.m b/SensorsAnalyticsSDK/SASecurityPolicy.m
index 459cfff2..2577a3e1 100755
--- a/SensorsAnalyticsSDK/SASecurityPolicy.m
+++ b/SensorsAnalyticsSDK/SASecurityPolicy.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/3/9.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 
 #import "SASecurityPolicy.h"
 #import <AssertMacros.h>
-#import "SALogger.h"
+#import "SALog.h"
 
 #if !TARGET_OS_IOS && !TARGET_OS_WATCH && !TARGET_OS_TV
 static NSData * SASecKeyGetData(SecKeyRef key) {
@@ -224,8 +224,7 @@ - (void)setPinnedCertificates:(NSSet *)pinnedCertificates {
 #pragma mark -
 
 - (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust
-                  forDomain:(NSString *)domain
-{
+                  forDomain:(NSString *)domain {
     if (domain && self.allowInvalidCertificates && self.validatesDomainName && (self.SSLPinningMode == SASSLPinningModeNone || [self.pinnedCertificates count] == 0)) {
         // https://developer.apple.com/library/mac/documentation/NetworkingInternet/Conceptual/NetworkingTopics/Articles/OverridingSSLChainValidationCorrectly.html
         //  According to the docs, you should only trust your provided certs for evaluation.
@@ -235,7 +234,7 @@ - (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust
         //  From Apple Docs:
         //          "Do not implicitly trust self-signed certificates as anchors (kSecTrustOptionImplicitAnchors).
         //           Instead, add your own (self-signed) CA certificate to the list of trusted anchors."
-        SALog(@"In order to validate a domain name for self signed certificates, you MUST use pinning.");
+        SALogDebug(@"In order to validate a domain name for self signed certificates, you MUST use pinning.");
         return NO;
     }
 
diff --git a/SensorsAnalyticsSDK/SASwizzle.h b/SensorsAnalyticsSDK/SASwizzle.h
index 80bebe99..1e619fbc 100755
--- a/SensorsAnalyticsSDK/SASwizzle.h
+++ b/SensorsAnalyticsSDK/SASwizzle.h
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SASwizzle.m b/SensorsAnalyticsSDK/SASwizzle.m
index 05f36a5d..b4b032e1 100755
--- a/SensorsAnalyticsSDK/SASwizzle.m
+++ b/SensorsAnalyticsSDK/SASwizzle.m
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SASwizzler.h b/SensorsAnalyticsSDK/SASwizzler.h
index 9b3e5b1b..aee072fe 100644
--- a/SensorsAnalyticsSDK/SASwizzler.h
+++ b/SensorsAnalyticsSDK/SASwizzler.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SASwizzler.m b/SensorsAnalyticsSDK/SASwizzler.m
index 2e815399..185854cc 100644
--- a/SensorsAnalyticsSDK/SASwizzler.m
+++ b/SensorsAnalyticsSDK/SASwizzler.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 
 #import <objc/runtime.h>
 
-#import "SALogger.h"
+#import "SALog.h"
 #import "SASwizzler.h"
 
 #define MIN_ARGS 2
@@ -129,7 +129,7 @@ + (void)printSwizzles {
     NSEnumerator *en = [swizzles objectEnumerator];
     SASwizzle *swizzle;
     while((swizzle = (SASwizzle *)[en nextObject])) {
-        SADebug(@"%@", swizzle);
+        SALogDebug(@"%@", swizzle);
     }
 }
 
@@ -166,7 +166,7 @@ + (void)swizzleSelector:(SEL)aSelector
     Method aMethod = class_getInstanceMethod(aClass, aSelector);
     if (!aMethod) {
 //        [NSException raise:@"SwizzleException" format:@"Cannot find method for %@ on %@", NSStringFromSelector(aSelector), NSStringFromClass(aClass)];
-        SALog(@"SwizzleException:Cannot find method for %@ on %@", NSStringFromSelector(aSelector), NSStringFromClass(aClass));
+        SALogError(@"SwizzleException:Cannot find method for %@ on %@", NSStringFromSelector(aSelector), NSStringFromClass(aClass));
         return;
     }
     
@@ -223,7 +223,7 @@ + (void)swizzleSelector:(SEL)aSelector
             @try {
                 swizzle = [[SASwizzle alloc] initWithBlock:aBlock named:aName forClass:aClass selector:aSelector originalMethod:originalMethod];
             } @catch (NSException *exception) {
-                SAError(@"%@ error: %@", self, exception);
+                SALogError(@"%@ error: %@", self, exception);
             }
             [self setSwizzle:swizzle forMethod:aMethod];
         }
diff --git a/SensorsAnalyticsSDK/SATrackTimer.h b/SensorsAnalyticsSDK/SATrackTimer.h
new file mode 100644
index 00000000..4bd6f15a
--- /dev/null
+++ b/SensorsAnalyticsSDK/SATrackTimer.h
@@ -0,0 +1,127 @@
+//
+// SATrackTimer.h
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2019/12/26.
+// Copyright © 2019 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <Foundation/Foundation.h>
+#import "SAConstants.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SATrackTimer : NSObject
+
+#pragma mark - generate event id
+/**
+ @abstract
+ 生成事件计时的 eventId
+
+ @param eventName 开始计时的事件名
+ @return 计时事件的 eventId
+*/
+- (NSString *)generateEventIdByEventName:(NSString *)eventName;
+
+#pragma mark - track timer for event
+/**
+ @abstract
+ 开始事件计时
+
+ @discussion
+ 多次调用 trackTimerStart: 时，以最后一次调用为准。
+
+ @param eventId 开始计时的事件名或 eventId
+*/
+- (void)trackTimerStart:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime;
+
+/**
+ @abstract
+ 为了兼容废弃接口功能提供 timeUnit 入参
+
+ @param eventId 开始计时的事件名或 eventId
+ @param timeUnit 计时单位，毫秒/秒/分钟/小时
+*/
+- (void)trackTimerStart:(NSString *)eventId timeUnit:(SensorsAnalyticsTimeUnit)timeUnit currentSysUpTime:(UInt64)currentSysUpTime;
+
+/**
+ @abstract
+ 暂停事件计时
+
+ @discussion
+ 多次调用 trackTimerPause: 时，以首次调用为准。
+
+ @param eventId  trackTimerStart: 返回的 ID 或事件名
+*/
+- (void)trackTimerPause:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime;
+
+/**
+ @abstract
+ 恢复事件计时
+
+ @discussion
+ 多次调用 trackTimerResume: 时，以首次调用为准。
+
+ @param eventId trackTimerStart: 返回的 ID 或事件名
+*/
+- (void)trackTimerResume:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime;
+
+#pragma mark -
+/**
+ @abstract
+ 获取事件时长
+
+ @param eventId trackTimerStart: 返回的 ID 或事件名
+ @param currentSysUpTime 当前系统启动时间
+
+ @return 计时事件的时长
+*/
+- (nullable NSNumber *)eventDurationFromEventId:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime;
+
+/**
+ @abstract
+ 获取计时事件原始事件名
+
+ @param eventId trackTimerStart: 返回的 ID 或事件名
+ @return 计时事件的原始事件名
+*/
+- (NSString *)eventNameFromEventId:(NSString *)eventId;
+
+#pragma mark - operation all timing events
+/**
+ @abstract
+ 暂停所有计时事件
+*/
+- (void)pauseAllEventTimers:(UInt64)currentSysUpTime;
+
+/**
+ @abstract
+ 恢复所有计时事件
+*/
+- (void)resumeAllEventTimers:(UInt64)currentSysUpTime;
+
+/**
+ @abstract
+ 清除所有计时事件
+*/
+- (void)clearAllEventTimers;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/SATrackTimer.m b/SensorsAnalyticsSDK/SATrackTimer.m
new file mode 100644
index 00000000..15d5b2a7
--- /dev/null
+++ b/SensorsAnalyticsSDK/SATrackTimer.m
@@ -0,0 +1,259 @@
+//
+// SATrackTimer.m
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2019/12/26.
+// Copyright © 2019 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SATrackTimer.h"
+#import "SAConstants+Private.h"
+
+@interface SATrackTimer ()
+
+@property (nonatomic, strong) NSMutableDictionary *eventNames;
+@property (nonatomic, strong) NSMutableDictionary *eventIds;
+
+@end
+
+@implementation SATrackTimer
+
+static NSString *const kEventIdSuffix = @"_SATimer";
+
+#pragma mark - properties lazy load
+- (NSMutableDictionary *)eventNames {
+    if (!_eventNames) {
+        _eventNames = [[NSMutableDictionary alloc] init];
+    }
+    return _eventNames;
+}
+
+- (NSMutableDictionary *)eventIds {
+    if (!_eventIds) {
+        _eventIds = [[NSMutableDictionary alloc] init];
+    }
+    return _eventIds;
+}
+
+#pragma mark - public methods
+- (NSString *)generateEventIdByEventName:(NSString *)eventName {
+    NSString *eventId = eventName;
+    if (eventId == nil || eventId.length == 0) {
+        return eventId;
+    }
+    if (![eventName hasSuffix:kEventIdSuffix]) {
+        //生成计时事件的 eventId，结构为 {eventName}_{uuid}_SATimer
+        //uuid 字符串中 ‘-’ 是不合法字符，替换为 ‘_’
+        NSString *uuid = [NSUUID.UUID.UUIDString stringByReplacingOccurrencesOfString:@"-" withString:@"_"];
+        eventId = [NSString stringWithFormat:@"%@_%@%@", eventName, uuid, kEventIdSuffix];
+    }
+    return eventId;
+}
+
+- (void)trackTimerStart:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime {
+    return [self trackTimerStart:eventId timeUnit:SensorsAnalyticsTimeUnitSeconds currentSysUpTime:currentSysUpTime];
+}
+
+- (void)trackTimerStart:(NSString *)eventId timeUnit:(SensorsAnalyticsTimeUnit)timeUnit currentSysUpTime:(UInt64)currentSysUpTime {
+    NSDictionary *params = @{@"eventBegin" : @(currentSysUpTime), @"eventAccumulatedDuration" : @(0.0), @"timeUnit" : @(timeUnit),@"isPause":@(NO)};
+    self.eventIds[eventId] = params;
+    NSString *eventName = [self eventNameFromEventId:eventId];
+    self.eventNames[eventName] = params;
+}
+
+- (void)trackTimerPause:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime {
+    //此处根据优先级先查找 eventIds 表再查找 eventNames 表，如果 eventIds 表匹配成功停止后续查询
+    if ([self handleEventPause:eventId mapping:self.eventIds currentSystemUpTime:currentSysUpTime]) {
+        return;
+    }
+    [self handleEventPause:eventId mapping:self.eventNames currentSystemUpTime:currentSysUpTime];
+}
+
+- (void)trackTimerResume:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime {
+    //此处根据优先级先查找 eventIds 表再查找 eventNames 表，如果 eventIds 表匹配成功停止后续查询
+    if ([self handleEventResume:eventId mapping:self.eventIds currentSystemUpTime:currentSysUpTime]) {
+        return;
+    }
+    [self handleEventResume:eventId mapping:self.eventNames currentSystemUpTime:currentSysUpTime];
+}
+
+- (NSString *)eventNameFromEventId:(NSString *)eventId {
+    if (![eventId hasSuffix:kEventIdSuffix]) {
+        return eventId;
+    }
+    //eventId 结构为 {eventName}_D3AC265B_3CC2_4C45_B8F0_3E05A83A9DAE_SATimer，新增后缀长度为 44
+    NSString *eventName = [eventId substringToIndex:(eventId.length - 1) - 44];
+    return eventName;
+}
+
+- (nullable NSNumber *)eventDurationFromEventId:(NSString *)eventId currentSysUpTime:(UInt64)currentSysUpTime {
+    //为了保证获取事件时长的准确性，计算时长时需要从外部传入当前系统开机时间
+    //事件计时 eventIds 表优先级更高，在 eventIds 表中查询不到时再查询 eventNames 表
+    NSNumber *duration = [self handleEventDuration:eventId mapping:self.eventIds currentSystemUpTime:currentSysUpTime];
+    if (!duration) {
+        duration = [self handleEventDuration:eventId mapping:self.eventNames currentSystemUpTime:currentSysUpTime];
+    }
+    return duration;
+}
+
+#pragma mark - operation all timing events
+- (void)pauseAllEventTimers:(UInt64)currentSysUpTime {
+    // 遍历 trackTimer
+    // eventAccumulatedDuration = eventAccumulatedDuration + currentSystemUpTime - eventBegin
+    [self handleAllEventsPause:self.eventIds time:currentSysUpTime];
+    [self handleAllEventsPause:self.eventNames time:currentSysUpTime];
+}
+
+- (void)resumeAllEventTimers:(UInt64)currentSysUpTime {
+    //当前逻辑只会在 App 进入到前台时调用
+    // 遍历 trackTimer ,修改 eventBegin 为当前 currentSystemUpTime
+    //此处逻辑和恢复单个事件计时不同，恢复所有事件时不更改 isPause 状态，只修改事件开始时间 eventBegin
+    for (NSString *key in self.eventIds.allKeys) {
+        NSMutableDictionary *eventTimer = [[NSMutableDictionary alloc] initWithDictionary:self.eventIds[key]];
+        if (eventTimer) {
+            [eventTimer setValue:@(currentSysUpTime) forKey:@"eventBegin"];
+            self.eventIds[key] = eventTimer;
+        }
+    }
+    for (NSString *key in self.eventNames.allKeys) {
+        NSMutableDictionary *eventTimer = [[NSMutableDictionary alloc] initWithDictionary:self.eventNames[key]];
+        if (eventTimer) {
+            [eventTimer setValue:@(currentSysUpTime) forKey:@"eventBegin"];
+            self.eventNames[key] = eventTimer;
+        }
+    }
+}
+
+- (void)clearAllEventTimers {
+    [self.eventNames removeAllObjects];
+    [self.eventIds removeAllObjects];
+}
+
+#pragma mark - private methods
+- (UInt64)getSystemUpTime {
+    return NSProcessInfo.processInfo.systemUptime * 1000;
+}
+
+- (NSNumber *)handleEventDuration:(NSString *)eventId mapping:(NSMutableDictionary *)mapping currentSystemUpTime:(UInt64)currentSystemUpTime {
+    NSDictionary *eventTimer = mapping[eventId];
+    if (!eventTimer) {
+        return nil;
+    }
+    [mapping removeObjectForKey:eventId];
+    NSNumber *eventBegin = [eventTimer valueForKey:@"eventBegin"];
+    NSNumber *eventAccumulatedDuration = [eventTimer objectForKey:@"eventAccumulatedDuration"];
+    SensorsAnalyticsTimeUnit timeUnit = [[eventTimer valueForKey:@"timeUnit"] intValue];
+    BOOL isPause = [eventTimer[@"isPause"] boolValue];
+
+    float eventDuration = 0;
+    if (!isPause) {
+        eventDuration = [self eventTimerDurationWithCurrentTime:currentSystemUpTime eventStart:eventBegin.longValue timeUnit:timeUnit];
+    }
+
+    if (eventAccumulatedDuration) {
+        eventDuration += eventAccumulatedDuration.floatValue;
+    }
+
+    return @([[NSString stringWithFormat:@"%.3f", eventDuration] floatValue]);
+}
+
+- (BOOL)handleEventPause:(NSString *)eventId mapping:(NSMutableDictionary *)mapping currentSystemUpTime:(UInt64)currentSystemUpTime {
+    NSMutableDictionary *eventTimer = [mapping[eventId] mutableCopy];
+    BOOL isPause = [eventTimer[@"isPause"] boolValue];
+
+    if (eventTimer && !isPause) {
+        UInt64 eventBegin = [eventTimer[@"eventBegin"] longValue];
+        SensorsAnalyticsTimeUnit timeUnit = [[eventTimer valueForKey:@"timeUnit"] intValue];
+
+        isPause = YES;
+        float eventDuration = [self eventTimerDurationWithCurrentTime:currentSystemUpTime eventStart:eventBegin timeUnit:timeUnit];
+
+        eventTimer[@"eventBegin"] = @(eventBegin);
+        eventTimer[@"isPause"] = @(isPause);
+        if (eventDuration > 0) {
+            eventTimer[@"eventAccumulatedDuration"] = @([eventTimer[@"eventAccumulatedDuration"] floatValue] + eventDuration);
+        }
+        mapping[eventId] = [eventTimer copy];
+        return YES;
+    }
+    return NO;
+}
+
+- (BOOL)handleEventResume:(NSString *)eventId mapping:(NSMutableDictionary *)mapping currentSystemUpTime:(UInt64)currentSystemUpTime {
+    NSMutableDictionary *eventTimer = [mapping[eventId] mutableCopy];
+    BOOL isPause = [eventTimer[@"isPause"] boolValue];
+    if (eventTimer && isPause) {
+        isPause = NO;
+        eventTimer[@"eventBegin"] = @(currentSystemUpTime);
+        eventTimer[@"isPause"] = @(isPause);
+        mapping[eventId] = [eventTimer copy];
+        return YES;
+    }
+    return NO;
+}
+
+- (void)handleAllEventsPause:(NSMutableDictionary *)mapping time:(UInt64)currentSystemUpTime {
+    for (NSString *key in mapping.allKeys) {
+        if (key != nil) {
+            if ([key isEqualToString:SA_EVENT_NAME_APP_END]) {
+                continue;
+            }
+        }
+        //当前逻辑只会在 App 进入到后台时调用
+        //此处逻辑和暂停单个事件计时不同，暂停所有事件时不更改 isPause 状态，只累加已累计时长
+        NSMutableDictionary *eventTimer = [[NSMutableDictionary alloc] initWithDictionary:mapping[key]];
+        if (eventTimer && ![eventTimer[@"isPause"] boolValue]) {
+            UInt64 eventBegin = [[eventTimer valueForKey:@"eventBegin"] longValue];
+            NSNumber *eventAccumulatedDuration = [eventTimer objectForKey:@"eventAccumulatedDuration"];
+            SensorsAnalyticsTimeUnit timeUnit = [[eventTimer valueForKey:@"timeUnit"] intValue];
+            float eventDuration = [self eventTimerDurationWithCurrentTime:currentSystemUpTime eventStart:eventBegin timeUnit:timeUnit];
+            if (eventAccumulatedDuration) {
+                eventDuration += [eventAccumulatedDuration floatValue];
+            }
+            [eventTimer setObject:@(eventDuration) forKey:@"eventAccumulatedDuration"];
+            [eventTimer setObject:@(currentSystemUpTime) forKey:@"eventBegin"];
+            mapping[key] = eventTimer;
+        }
+    }
+}
+
+//计算事件时长
+- (float)eventTimerDurationWithCurrentTime:(UInt64)currentSystemUpTime eventStart:(UInt64)startTime timeUnit:(SensorsAnalyticsTimeUnit)timeUnit {
+    if (startTime <= 0) {
+        return 0;
+    }
+    float eventDuration = currentSystemUpTime - startTime;
+    if (eventDuration > 0 && eventDuration < 24 * 60 * 60 * 1000) {
+        switch (timeUnit) {
+            case SensorsAnalyticsTimeUnitHours:
+                eventDuration = eventDuration / 60.0;
+            case SensorsAnalyticsTimeUnitMinutes:
+                eventDuration = eventDuration / 60.0;
+            case SensorsAnalyticsTimeUnitSeconds:
+                eventDuration = eventDuration / 1000.0;
+            case SensorsAnalyticsTimeUnitMilliseconds:
+                break;
+        }
+    } else {
+        eventDuration = 0;
+    }
+    return eventDuration;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.h b/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.h
index add4b298..da1414c3 100644
--- a/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.h
+++ b/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/5/26.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.m b/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.m
index a73191e8..e19b2a20 100644
--- a/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.m
+++ b/SensorsAnalyticsSDK/SensorsAnalyticsExceptionHandler.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 王灼洲 on 2017/5/26.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,10 +25,11 @@
 
 #import "SensorsAnalyticsExceptionHandler.h"
 #import "SensorsAnalyticsSDK.h"
-#import "SALogger.h"
+#import "SALog.h"
 #include <libkern/OSAtomic.h>
 #include <execinfo.h>
 #import "SAConstants+Private.h"
+#import "SACommonUtility.h"
 #import "SensorsAnalyticsSDK+Private.h"
 
 #if defined(SENSORS_ANALYTICS_CRASH_SLIDEADDRESS)
@@ -90,14 +91,16 @@ - (void)setupHandlers {
     sigemptyset(&action.sa_mask);
     action.sa_flags = SA_SIGINFO;
     action.sa_sigaction = &SASignalHandler;
-    int signals[] = {SIGABRT, SIGILL, SIGSEGV, SIGFPE, SIGBUS, SIGPIPE};
+    int signals[] = {SIGABRT, SIGILL, SIGSEGV, SIGFPE, SIGBUS};
     for (int i = 0; i < sizeof(signals) / sizeof(int); i++) {
         struct sigaction prev_action;
         int err = sigaction(signals[i], &action, &prev_action);
         if (err == 0) {
-            memcpy(_prev_signal_handlers + signals[i], &prev_action, sizeof(prev_action));
+            char *address_action = (char *)&prev_action;
+            char *address_signal = (char *)(_prev_signal_handlers + signals[i]);
+            strlcpy(address_signal, address_action, sizeof(prev_action));
         } else {
-            SALog(@"Errored while trying to set up sigaction for signal %d", signals[i]);
+            SALogError(@"Errored while trying to set up sigaction for signal %d", signals[i]);
         }
     }
 }
@@ -138,7 +141,9 @@ static void SASignalHandler(int crashSignal, struct __siginfo *info, void *conte
         if (prev_action.sa_sigaction) {
             prev_action.sa_sigaction(crashSignal, info, context);
         }
-    } else if (prev_action.sa_handler) {
+    } else if (prev_action.sa_handler &&
+               prev_action.sa_handler != SIG_IGN) {
+        // SIG_IGN 表示忽略信号
         prev_action.sa_handler(crashSignal);
     }
 }
@@ -160,35 +165,36 @@ - (void) sa_handleUncaughtException:(NSException *)exception {
     // Archive the values for each SensorsAnalytics instance
     @try {
         for (SensorsAnalyticsSDK *instance in self.sensorsAnalyticsSDKInstances) {
-            NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
-            @try {
+            if (instance.configOptions.enableTrackAppCrash) {
+                NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
                 if ([exception callStackSymbols]) {
+                   NSString *exceptionStack = [[exception callStackSymbols] componentsJoinedByString:@"\n"];
+                    
 #if defined(SENSORS_ANALYTICS_CRASH_SLIDEADDRESS)
                     long slide_address = [SensorsAnalyticsExceptionHandler sa_computeImageSlide];
-                    [properties setValue:[NSString stringWithFormat:@"Exception Reason:%@\nSlide_Address:%lx\nException Stack:%@", [exception reason], slide_address, [exception callStackSymbols]] forKey:@"app_crashed_reason"];
-                    
+                    [properties setValue:[NSString stringWithFormat:@"Exception Reason:%@\nSlide_Address:%lx\nException Stack:%@", [exception reason], slide_address, exceptionStack] forKey:@"app_crashed_reason"];
 #else
-                    [properties setValue:[NSString stringWithFormat:@"Exception Reason:%@\nException Stack:%@", [exception reason], [exception callStackSymbols]] forKey:@"app_crashed_reason"];
-                    
+                    [properties setValue:[NSString stringWithFormat:@"Exception Reason:%@\nException Stack:%@", [exception reason], exceptionStack] forKey:@"app_crashed_reason"];
 #endif
                 } else {
-                    [properties setValue:[NSString stringWithFormat:@"%@ %@", [exception reason], [NSThread callStackSymbols]] forKey:@"app_crashed_reason"];
+                    NSString *exceptionStack = [[NSThread callStackSymbols] componentsJoinedByString:@"\n"];
+                    [properties setValue:[NSString stringWithFormat:@"%@ %@", [exception reason], exceptionStack] forKey:@"app_crashed_reason"];
                 }
-            } @catch(NSException *exception) {
-                SAError(@"%@ error: %@", self, exception);
+                [instance track:SA_EVENT_NAME_APP_CRASHED withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
             }
-            [instance track:@"AppCrashed" withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
             if (![instance isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppEnd]) {
-                [instance track:@"$AppEnd" withTrackType:SensorsAnalyticsTrackTypeAuto];
+                [SACommonUtility performBlockOnMainThread:^{
+                    if (UIApplication.sharedApplication.applicationState == UIApplicationStateActive) {
+                        [instance track:@"$AppEnd" withTrackType:SensorsAnalyticsTrackTypeAuto];
+                    }
+                }];
             }
-            
-            dispatch_sync(instance.serialQueue, ^{
-                
-            });
+            // 阻塞当前线程，完成 serialQueue 中数据相关的任务
+            sensorsdata_dispatch_safe_sync(instance.serialQueue, ^{});
         }
-        SALog(@"Encountered an uncaught exception. All SensorsAnalytics instances were archived.");
+        SALogError(@"Encountered an uncaught exception. All SensorsAnalytics instances were archived.");
     } @catch(NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
     }
 
     NSSetUncaughtExceptionHandler(NULL);
@@ -197,7 +203,6 @@ - (void) sa_handleUncaughtException:(NSException *)exception {
     signal(SIGSEGV, SIG_DFL);
     signal(SIGFPE, SIG_DFL);
     signal(SIGBUS, SIG_DFL);
-    signal(SIGPIPE, SIG_DFL);
 }
 
 #if defined(SENSORS_ANALYTICS_CRASH_SLIDEADDRESS)
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK+Private.h b/SensorsAnalyticsSDK/SensorsAnalyticsSDK+Private.h
index 1f4f8884..1100a551 100644
--- a/SensorsAnalyticsSDK/SensorsAnalyticsSDK+Private.h
+++ b/SensorsAnalyticsSDK/SensorsAnalyticsSDK+Private.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/8/9.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@
 #import "SensorsAnalyticsSDK.h"
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
 #import "SANetwork.h"
-
+#import "SADataEncryptBuilder.h"
 
 /**
  埋点方式
@@ -77,11 +78,22 @@ typedef NS_ENUM(NSInteger, SensorsAnalyticsTrackType) {
  */
 - (BOOL)shouldTrackViewController:(UIViewController *)controller ofType:(SensorsAnalyticsAutoTrackEventType)type;
 
+/**
+向 WKWebView 注入 Message Handler
+
+@param webView 需要注入的 wkwebView
+*/
+- (void)addScriptMessageHandlerWithWebView:(WKWebView *)webView;
+
 #pragma mark - property
 @property (nonatomic, strong, readonly) SAConfigOptions *configOptions;
 
 @property (nonatomic, strong, readonly) SANetwork *network;
 
+@property (nonatomic, strong, readonly) SADataEncryptBuilder *encryptBuilder;
+
+@property (nonatomic, weak) UIViewController *previousTrackViewController;
+
 @end
 
 
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_autotrack_viewcontroller_blacklist.json b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_autotrack_viewcontroller_blacklist.json
index 45dc33a1..c778435a 100644
--- a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_autotrack_viewcontroller_blacklist.json
+++ b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_autotrack_viewcontroller_blacklist.json
@@ -1,68 +1,143 @@
- [
-  "SFBrowserRemoteViewController",
-  "SFSafariViewController",
-  "UIAlertController",
-  "UIInputWindowController",
-  "UINavigationController",
-  "UIKeyboardCandidateGridCollectionViewController",
-  "UICompatibilityInputViewController",
-  "UIApplicationRotationFollowingController",
-  "UIApplicationRotationFollowingControllerNoTouches",
-  "AVPlayerViewController",
-  "UIActivityGroupViewController",
-  "UIReferenceLibraryViewController",
-  "UIKeyboardCandidateRowViewController",
-  "UIKeyboardHiddenViewController",
-  "_UIAlertControllerTextFieldViewController",
-  "_UILongDefinitionViewController",
-  "_UIResilientRemoteViewContainerViewController",
-  "_UIShareExtensionRemoteViewController",
-  "_UIRemoteDictionaryViewController",
-  "UISystemKeyboardDockController",
-  "_UINoDefinitionViewController",
-  "UIImagePickerController",
-  "_UIActivityGroupListViewController",
-  "_UIRemoteViewController",
-  "_UIFallbackPresentationViewController",
-  "_UIDocumentPickerRemoteViewController",
-  "_UIAlertShimPresentingViewController",
-  "_UIWaitingForRemoteViewContainerViewController",
-  "UIDocumentMenuViewController",
-  "UIActivityViewController",
-  "_UIActivityUserDefaultsViewController",
-  "_UIActivityViewControllerContentController",
-  "_UIRemoteInputViewController",
-  "_UIUserDefaultsActivityNavigationController",
-  "_SFAppPasswordSavingViewController",
-  "UISnapshotModalViewController",
-  "WKActionSheet",
-  "DDSafariViewController",
-  "SFAirDropActivityViewController",
-  "CKSMSComposeController",
-  "DDParsecLoadingViewController",
-  "PLUIPrivacyViewController",
-  "PLUICameraViewController",
-  "SLRemoteComposeViewController",
-  "CAMViewfinderViewController",
-  "DDParsecNoDataViewController",
-  "CAMPreviewViewController",
-  "DDParsecCollectionViewController",
-  "SLComposeViewController",
-  "DDParsecRemoteCollectionViewController",
-  "AVFullScreenPlaybackControlsViewController",
-  "PLPhotoTileViewController",
-  "AVFullScreenViewController",
-  "CAMImagePickerCameraViewController",
-  "CKSMSComposeRemoteViewController",
-  "PUPhotoPickerHostViewController",
-  "PUUIAlbumListViewController",
-  "PUUIPhotosAlbumViewController",
-  "SFAppAutoFillPasswordViewController",
-  "PUUIMomentsGridViewController",
-  "SFPasswordRemoteViewController",
-  "UIWebRotatingAlertController",
-  "UIEditUserWordController",
-  "UISplitViewController",
-  "UITabBarController",
-  "SAAlertController"
-  ]
+{
+    "$AppViewScreen": {
+        "public": [
+            "UIAlertController",
+            "UITabBarController",
+            "UINavigationController",
+            "SAAlertController",
+            "SFSafariViewController",
+            "AVPlayerViewController",
+            "UIReferenceLibraryViewController",
+            "UIImagePickerController",
+            "UIDocumentMenuViewController",
+            "UIActivityViewController",
+            "SLComposeViewController",
+            "UISplitViewController"
+        ],
+        "private": [
+            "UIApplicationRotationFollowingController",
+            "SFBrowserRemoteViewController",
+            "UIInputWindowController",
+            "UIKeyboardCandidateGridCollectionViewController",
+            "UICompatibilityInputViewController",
+            "UIApplicationRotationFollowingControllerNoTouches",
+            "UIActivityGroupViewController",
+            "UIKeyboardCandidateRowViewController",
+            "UIKeyboardHiddenViewController",
+            "_UIAlertControllerTextFieldViewController",
+            "_UILongDefinitionViewController",
+            "_UIResilientRemoteViewContainerViewController",
+            "_UIShareExtensionRemoteViewController",
+            "_UIRemoteDictionaryViewController",
+            "UISystemKeyboardDockController",
+            "_UINoDefinitionViewController",
+            "_UIActivityGroupListViewController",
+            "_UIRemoteViewController",
+            "_UIFallbackPresentationViewController",
+            "_UIDocumentPickerRemoteViewController",
+            "_UIAlertShimPresentingViewController",
+            "_UIWaitingForRemoteViewContainerViewController",
+            "_UIActivityUserDefaultsViewController",
+            "_UIActivityViewControllerContentController",
+            "_UIRemoteInputViewController",
+            "_UIUserDefaultsActivityNavigationController",
+            "_SFAppPasswordSavingViewController",
+            "UISnapshotModalViewController",
+            "WKActionSheet",
+            "DDSafariViewController",
+            "SFAirDropActivityViewController",
+            "CKSMSComposeController",
+            "DDParsecLoadingViewController",
+            "PLUIPrivacyViewController",
+            "PLUICameraViewController",
+            "SLRemoteComposeViewController",
+            "CAMViewfinderViewController",
+            "DDParsecNoDataViewController",
+            "CAMPreviewViewController",
+            "DDParsecCollectionViewController",
+            "DDParsecRemoteCollectionViewController",
+            "AVFullScreenPlaybackControlsViewController",
+            "PLPhotoTileViewController",
+            "AVFullScreenViewController",
+            "CAMImagePickerCameraViewController",
+            "CKSMSComposeRemoteViewController",
+            "PUPhotoPickerHostViewController",
+            "PUUIAlbumListViewController",
+            "PUUIPhotosAlbumViewController",
+            "SFAppAutoFillPasswordViewController",
+            "PUUIMomentsGridViewController",
+            "SFPasswordRemoteViewController",
+            "UIWebRotatingAlertController",
+            "UIEditUserWordController"
+        ]
+    },
+    "$AppClick": {
+        "public": [
+            "UINavigationController",
+            "SAAlertController",
+            "SFSafariViewController",
+            "AVPlayerViewController",
+            "UIReferenceLibraryViewController",
+            "UIImagePickerController",
+            "UIDocumentMenuViewController",
+            "UIActivityViewController",
+            "SLComposeViewController",
+            "UISplitViewController"
+        ],
+        "private": [
+            "SFBrowserRemoteViewController",
+            "UIInputWindowController",
+            "UIKeyboardCandidateGridCollectionViewController",
+            "UICompatibilityInputViewController",
+            "UIApplicationRotationFollowingControllerNoTouches",
+            "UIActivityGroupViewController",
+            "UIKeyboardCandidateRowViewController",
+            "UIKeyboardHiddenViewController",
+            "_UIAlertControllerTextFieldViewController",
+            "_UILongDefinitionViewController",
+            "_UIResilientRemoteViewContainerViewController",
+            "_UIShareExtensionRemoteViewController",
+            "_UIRemoteDictionaryViewController",
+            "UISystemKeyboardDockController",
+            "_UINoDefinitionViewController",
+            "_UIActivityGroupListViewController",
+            "_UIRemoteViewController",
+            "_UIFallbackPresentationViewController",
+            "_UIDocumentPickerRemoteViewController",
+            "_UIAlertShimPresentingViewController",
+            "_UIWaitingForRemoteViewContainerViewController",
+            "_UIActivityUserDefaultsViewController",
+            "_UIActivityViewControllerContentController",
+            "_UIRemoteInputViewController",
+            "_UIUserDefaultsActivityNavigationController",
+            "_SFAppPasswordSavingViewController",
+            "UISnapshotModalViewController",
+            "WKActionSheet",
+            "DDSafariViewController",
+            "SFAirDropActivityViewController",
+            "CKSMSComposeController",
+            "DDParsecLoadingViewController",
+            "PLUIPrivacyViewController",
+            "PLUICameraViewController",
+            "SLRemoteComposeViewController",
+            "CAMViewfinderViewController",
+            "DDParsecNoDataViewController",
+            "CAMPreviewViewController",
+            "DDParsecCollectionViewController",
+            "DDParsecRemoteCollectionViewController",
+            "AVFullScreenPlaybackControlsViewController",
+            "PLPhotoTileViewController",
+            "AVFullScreenViewController",
+            "CAMImagePickerCameraViewController",
+            "CKSMSComposeRemoteViewController",
+            "PUPhotoPickerHostViewController",
+            "PUUIAlbumListViewController",
+            "PUUIPhotosAlbumViewController",
+            "SFAppAutoFillPasswordViewController",
+            "PUUIMomentsGridViewController",
+            "SFPasswordRemoteViewController",
+            "UIWebRotatingAlertController",
+            "UIEditUserWordController"
+        ]
+    }
+}
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_visualizedautotrack_path.json b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_visualizedautotrack_path.json
index c27392a2..8ef0ef65 100644
--- a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_visualizedautotrack_path.json
+++ b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.bundle/sa_visualizedautotrack_path.json
@@ -2,127 +2,11 @@
   "type": "snapshot_request",
   "payload": {
     "config": {
-      "enums": [
-        {
-          "name": "UIControlState",
-          "flag_set": true,
-          "base_type": "NSUInteger",
-          "values": [
-            {
-              "value": 0,
-              "display_name": "Normal"
-            },
-            {
-              "value": 1,
-              "display_name": "Highlighted"
-            },
-            {
-              "value": 2,
-              "display_name": "Disabled"
-            },
-            {
-              "value": 4,
-              "display_name": "Selected"
-            }
-          ]
-        },
-        {
-          "name": "UIControlEvents",
-          "base_type": "NSUInteger",
-          "flag_set": true,
-          "values": [
-            {
-              "value": 1,
-              "display_name": "TouchDown"
-            },
-            {
-              "value": 2,
-              "display_name": "TouchDownRepeat"
-            },
-            {
-              "value": 4,
-              "display_name": "TouchDragInside"
-            },
-            {
-              "value": 8,
-              "display_name": "TouchDragOutside"
-            },
-            {
-              "value": 16,
-              "display_name": "TouchDragEnter"
-            },
-            {
-              "value": 32,
-              "display_name": "TouchDragExit"
-            },
-            {
-              "value": 64,
-              "display_name": "TouchUpInside"
-            },
-            {
-              "value": 128,
-              "display_name": "TouchUpOutside"
-            },
-            {
-              "value": 256,
-              "display_name": "TouchCancel"
-            },
-            {
-              "value": 4096,
-              "display_name": "ValueChanged"
-            },
-            {
-              "value": 65536,
-              "display_name": "EditingDidBegin"
-            },
-            {
-              "value": 131072,
-              "display_name": "EditingChanged"
-            },
-            {
-              "value": 262144,
-              "display_name": "EditingDidEnd"
-            },
-            {
-              "value": 524288,
-              "display_name": "EditingDidEndOnExit"
-            },
-            {
-              "value": 4095,
-              "display_name": "AllTouchEvents"
-            },
-            {
-              "value": 983040,
-              "display_name": "AllEditingEvents"
-            },
-            {
-              "value": 251658240,
-              "display_name": "ApplicationReserved"
-            },
-            {
-              "value": 4026531840,
-              "display_name": "SystemReserved"
-            },
-            {
-              "value": 4294967295,
-              "display_name": "AllEvents"
-            }
-          ]
-        }
-      ],
       "classes": [
         {
           "name": "NSObject",
           "superclass": null,
           "properties": [
-            
-          ]
-        },
-        {
-          "name": "UIResponder",
-          "superclass": "NSObject",
-          "properties": [
-            
           ]
         },
         {
@@ -150,183 +34,93 @@
               "type": "NSString",
               "readonly": true
             },
-            {
-              "name": "viewController",
-              "type": "UIViewController"
-            },
             {
               "name": "performOnViewLoad",
               "type": "BOOL"
             }
           ]
         },
-        {
-          "name": "UINavigationItem",
-          "superclass": "NSObject",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "UIBarItem",
-          "superclass": "NSObject",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "UIBarButtonItem",
-          "superclass": "UIBarItem",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "UIGestureRecognizer",
-          "superclass": "NSObject",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "UIGestureRecognizerTarget",
-          "superclass": "NSObject",
-          "properties": [
-            
-          ]
-        },
         {
           "name": "UIView",
           "superclass": "UIResponder",
           "properties": [
             {
-              "name": "userInteractionEnabled",
-              "type": "BOOL"
-            },
-            {
-              "name": "frame",
-              "type": "CGRect"
-            },
-            {
-              "name": "bounds",
-              "type": "CGRect"
-            },
-            {
-              "name": "transform",
-              "type": "CGAffineTransform"
-            },
-            {
-              "name": "superview",
-              "type": "UIView"
-            },
-            {
-              "name": "window",
-              "type": "UIWindow"
-            },
-            {
-              "name": "subviews",
-              "type": "NSArray"
+              "name": "sensorsdata_enableAppClick",
+              "key": "enableAppClick",
+              "type": "BOOL",
+              "use_kvc": false
             },
             {
-              "name": "jjf_fingerprintVersion",
+              "name": "sensorsdata_subElements",
+              "key": "subelements",
               "type": "NSArray",
               "use_kvc": false
             },
             {
-              "name": "jjf_varA",
+              "name": "sensorsdata_elementValidContent",
+              "key": "element_content",
               "type": "NSString",
               "use_kvc": false
             },
             {
-              "name": "sensorsAnalyticsViewID",
-              "type": "NSString",
-              "use_kvc": false
+                "name": "sensorsdata_elementPath",
+                "key": "element_path",
+                "type": "NSString",
+                "use_kvc": false
             },
             {
-              "name": "jjf_varB",
+              "name": "sensorsdata_elementPosition",
+              "key": "element_position",
               "type": "NSString",
               "use_kvc": false
             },
             {
-              "name": "jjf_varC",
-              "type": "NSString",
+              "name": "sensorsdata_frame",
+              "key": "frame",
+              "type": "CGRect",
               "use_kvc": false
             },
             {
-              "name": "jjf_varSetD",
-              "type": "NSArray",
+              "name": "jjf_fingerprintVersion",
+              "type": "NSString",
               "use_kvc": false
             },
             {
-              "name": "jjf_varE",
+              "name": "sensorsAnalyticsViewID",
               "type": "NSString",
               "use_kvc": false
             },
             {
               "name": "restorationIdentifier",
               "type": "NSString"
-            }
-          ]
-        },
-        {
-          "name": "UILabel",
-          "superclass": "UIView",
-          "properties": [
-            {
-              "name": "text",
-              "type": "NSString"
-            }
-          ]
-        },
-        {
-          "name": "UIImageView",
-          "superclass": "UIView",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "UIControlTargetAction",
-          "superclass": "NSObject",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "UIControl",
-          "superclass": "UIView",
-          "properties": [
-            {
-              "name": "state",
-              "type": "UIControlState"
             },
             {
-              "name": "enabled",
-              "type": "BOOL"
-            },
-            {
-              "name": "allTargets",
-              "type": "NSSet"
-            },
-            {
-              "name": "allControlEvents",
-              "type": "UIControlEvents"
-            },
-            {
-              "name": "_targetActions",
-              "type": "NSArray"
-            },
-            {
-              "name": "nextResponder",
-              "type": "UIResponder"
+              "name": "sensorsdata_isFromWeb",
+              "key": "is_h5",
+              "type": "BOOL",
+              "use_kvc": false
             }
           ]
         },
         {
-          "name": "UISwitch",
-          "superclass": "UIControl",
+          "name": "SAJSTouchEventView",
+          "superclass": "UIView",
           "properties": [
-            
+              {
+                "name": "url",
+                "type": "NSString"
+              },
+              {
+                "name": "title",
+                "key": "h5_title",
+                "type": "NSString"
+              },
+              {
+                  "name": "sensorsdata_elementPath",
+                  "key": "element_selector",
+                  "type": "NSString",
+                  "use_kvc": false
+              }
           ]
         },
         {
@@ -353,28 +147,6 @@
             }
           ]
         },
-        {
-            "name": "UITableViewCell",
-            "superclass": "UIView",
-            "properties": [
-              {
-                  "name": "sa_indexPath",
-                  "type": "NSString",
-                  "use_kvc": false
-              }
-            ]
-        },
-        {
-            "name": "UITableViewHeaderFooterView",
-            "superclass": "UIView",
-            "properties": [
-                {
-                    "name": "sa_section",
-                    "type": "NSString",
-                    "use_kvc": false
-                }
-            ]
-        },
         {
           "name": "UICollectionView",
           "superclass": "UIScrollView",
@@ -385,67 +157,10 @@
             }
           ]
         },
-        {
-            "name": "UICollectionViewCell",
-            "superclass": "UIView",
-            "properties": [
-                {
-                    "name": "sa_indexPath",
-                    "type": "NSString",
-                    "use_kvc": false
-                }
-            ]
-        },
-        {
-          "name": "UITextView",
-          "superclass": "UIScrollView",
-          "properties": [
-            {
-              "name": "text",
-              "type": "NSString"
-            }
-          ]
-        },
-        {
-          "name": "UIButton",
-          "superclass": "UIControl",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "UISegmentedControl",
-          "superclass": "UIControl",
-          "properties": [
-            {
-                "name":"sa_subviewsFixed",
-                "type":"NSArray",
-                "use_kvc": false
-            }
-          ]
-        },
-        {
-          "name": "CALayer",
-          "superclass": "NSObject",
-          "properties": [
-            
-          ]
-        },
-        {
-          "name": "NSLayoutConstraint",
-          "superclass": "NSObject",
-          "properties": [
-            
-          ]
-        },
         {
           "name": "UIWindow",
           "superclass": "UIView",
           "properties": [
-            {
-              "name": "rootViewController",
-              "type": "UIViewController"
-            },
             {
               "name": "screen",
               "type": "UIScreen",
@@ -463,29 +178,14 @@
               "readonly": true
             },
             {
-              "name": "view",
-              "type": "UIView",
-              "predicate": "self.isViewLoaded == YES"
+              "name": "sensorsdata_subElements",
+              "key": "subelements",
+              "type": "NSArray",
+              "use_kvc": false
             },
             {
               "name": "restorationIdentifier",
               "type": "NSString"
-            },
-            {
-              "name": "parentViewController",
-              "type": "UIViewController"
-            },
-            {
-              "name": "presentedViewController",
-              "type": "UIViewController"
-            },
-            {
-              "name": "presentingViewController",
-              "type": "UIViewController"
-            },
-            {
-              "name": "childViewControllers",
-              "type": "NSArray"
             }
           ]
         }
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.h b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.h
index 62f0d1ef..8b7ce8bb 100755
--- a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.h
+++ b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.h
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 曹犟 on 15/7/1.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <UIKit/UIApplication.h>
+
 #import "SASecurityPolicy.h"
 #import "SAConfigOptions.h"
 #import "SAConstants.h"
@@ -149,50 +150,19 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, strong) SASecurityPolicy *securityPolicy;
 
+#pragma mark- init instance
 /**
- * @property
- *
- * @abstract
- * 两次数据发送的最小时间间隔，单位毫秒
- *
- * @discussion
- * 默认值为 15 * 1000 毫秒， 在每次调用 track、trackSignUp 以及 profileSet 等接口的时候，
- * 都会检查如下条件，以判断是否向服务器上传数据:
- * 1. 是否 WIFI/3G/4G 网络
- * 2. 是否满足以下数据发送条件之一:
- *   1) 与上次发送的时间间隔是否大于 flushInterval
- *   2) 本地缓存日志数目是否达到 flushBulkSize
- * 如果满足这两个条件之一，则向服务器发送一次数据；如果都不满足，则把数据加入到队列中，等待下次检查时把整个队列的内容一并发送。
- * 需要注意的是，为了避免占用过多存储，队列最多只缓存10000条数据。
- */
-@property (atomic) UInt64 flushInterval __attribute__((deprecated("已过时，请参考 SAConfigOptions 类的 flushInterval")));
+ 通过配置参数，配置神策 SDK
 
-/**
- * @property
- *
- * @abstract
- * 本地缓存的最大事件数目，当累积日志量达到阈值时发送数据
- *
- * @discussion
- * 默认值为 100，在每次调用 track、trackSignUp 以及 profileSet 等接口的时候，都会检查如下条件，以判断是否向服务器上传数据:
- * 1. 是否 WIFI/3G/4G 网络
- * 2. 是否满足以下数据发送条件之一:
- *   1) 与上次发送的时间间隔是否大于 flushInterval
- *   2) 本地缓存日志数目是否达到 flushBulkSize
- * 如果同时满足这两个条件，则向服务器发送一次数据；如果不满足，则把数据加入到队列中，等待下次检查时把整个队列的内容一并发送。
- * 需要注意的是，为了避免占用过多存储，队列最多只缓存 10000 条数据。
- */
-@property (atomic) UInt64 flushBulkSize __attribute__((deprecated("已过时，请参考 SAConfigOptions 类的 flushBulkSize")));
-#pragma mark- init instance
+ 此方法调用必须符合以下条件：
+     1、必须在应用启动时调用，即在 application:didFinishLaunchingWithOptions: 中调用，
+     2、必须在主线线程中调用
+     3、必须在 SDK 其他方法调用之前调用
+ 如果不符合上述条件，存在丢失 $AppStart 事件及应用首页的 $AppViewScreen 事件风险
 
-/**
- * @abstract
- * 根据传入的配置，初始化并返回一个 SensorsAnalyticsSDK 的单例
- *
  @param configOptions 参数配置
- @return 返回的单例
  */
-+ (SensorsAnalyticsSDK *)sharedInstanceWithConfig:(nonnull SAConfigOptions *)configOptions;
++ (void)startWithConfigOptions:(nonnull SAConfigOptions *)configOptions NS_SWIFT_NAME(start(configOptions:));
 
 /**
  * @abstract
@@ -220,37 +190,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)setServerUrl:(NSString *)serverUrl;
 
-#pragma mark- about webView
-/**
- * @abstract
- * 将 distinctId 传递给当前的 WebView
- *
- * @discussion
- * 混合开发时,将 distinctId 传递给当前的 WebView
- *
- * @param webView 当前 WebView，支持 UIWebView 和 WKWebView
- *
- * @return YES:SDK 已进行处理，NO:SDK 没有进行处理
- */
-- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request;
-
-- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request enableVerify:(BOOL)enableVerify;
-
-/**
- * @abstract
- * 将 distinctId 传递给当前的 WebView
- *
- * @discussion
- * 混合开发时,将 distinctId 传递给当前的 WebView
- *
- * @param webView 当前 WebView，支持 UIWebView 和 WKWebView
- * @param request NSURLRequest
- * @param propertyDict NSDictionary 自定义扩展属性
- *
- * @return YES:SDK 已进行处理，NO:SDK 没有进行处理
- */
-- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request andProperties:(nullable NSDictionary *)propertyDict;
-
 #pragma mark--cache and flush
 
 /**
@@ -416,8 +355,9 @@ NS_ASSUME_NONNULL_BEGIN
  SDK 会追踪 "Event" 事件，并自动将事件持续时间记录在事件属性 "event_duration" 中，时间单位为秒。
  
  @param event 事件名称
+ @return 返回计时事件的 eventId，用于交叉计时场景。普通计时可忽略
  */
-- (void)trackTimerStart:(NSString *)event;
+- (nullable NSString *)trackTimerStart:(NSString *)event;
 
 /**
  结束事件计时
@@ -425,7 +365,7 @@ NS_ASSUME_NONNULL_BEGIN
  @discussion
  多次调用 trackTimerEnd: 时，以首次调用为准
  
- @param event 事件名称
+ @param event 事件名称或事件的 eventId
  @param propertyDict 自定义属性
  */
 - (void)trackTimerEnd:(NSString *)event withProperties:(nullable NSDictionary *)propertyDict;
@@ -436,7 +376,7 @@ NS_ASSUME_NONNULL_BEGIN
  @discussion
  多次调用 trackTimerEnd: 时，以首次调用为准
  
- @param event 事件名称
+ @param event 事件名称或事件的 eventId
  */
 - (void)trackTimerEnd:(NSString *)event;
 
@@ -446,7 +386,7 @@ NS_ASSUME_NONNULL_BEGIN
  @discussion
  多次调用 trackTimerPause: 时，以首次调用为准。
  
- @param event 事件名
+ @param event 事件名称或事件的 eventId
  */
 - (void)trackTimerPause:(NSString *)event;
 
@@ -456,7 +396,7 @@ NS_ASSUME_NONNULL_BEGIN
  @discussion
  多次调用 trackTimerResume: 时，以首次调用为准。
  
- @param event 事件名
+ @param event 事件名称或事件的 eventId
  */
 - (void)trackTimerResume:(NSString *)event;
 
@@ -539,6 +479,21 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)track:(NSString *)event;
 
+/**
+ 调用 track 接口并附加渠道信息
+
+ @param event event 的名称
+ */
+- (void)trackChannelEvent:(NSString *)event;
+
+/**
+调用 track 接口并附加渠道信息
+
+ @param event event 的名称
+ @param propertyDict event 的属性
+ */
+- (void)trackChannelEvent:(NSString *)event properties:(nullable NSDictionary *)propertyDict;
+
 /**
  * @abstract
  * 设置 Cookie
@@ -557,17 +512,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (NSString *)getCookieWithDecode:(BOOL)decode;
 
-- (void)trackFromH5WithEvent:(NSString *)eventInfo;
-
-- (void)trackFromH5WithEvent:(NSString *)eventInfo enableVerify:(BOOL)enableVerify;
-
 /**
  * @abstract
  * 在 AutoTrack 时，用户可以设置哪些 controllers 不被 AutoTrack
  *
  * @param controllers   controller ‘字符串’数组
  */
-- (void)ignoreAutoTrackViewControllers:(NSArray *)controllers;
+- (void)ignoreAutoTrackViewControllers:(NSArray<NSString *> *)controllers;
 
 /**
  * @abstract
@@ -591,30 +542,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (NSDictionary *)getLastScreenTrackProperties;
 
-/**
- * @abstract
- * H5 数据打通的时候默认通过 ServerUrl 校验
- */
-- (void)addWebViewUserAgentSensorsDataFlag;
-
-/**
- * @abstract
- * H5 数据打通的时候是否通过 ServerUrl 校验, 如果校验通过，H5 的事件数据走 App 上报否则走 JSSDK 上报
- *
- * @param enableVerify YES/NO   校验通过后可走 App，上报数据/直接走 App，上报数据
- */
-- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify;
-
-/**
- * @abstract
- * H5 数据打通的时候是否通过 ServerUrl 校验, 如果校验通过，H5 的事件数据走 App 上报否则走 JSSDK 上报
- *
- * @param enableVerify YES/NO   校验通过后可走 App，上报数据/直接走 App，上报数据
- * @param userAgent  userAgent = nil ,SDK 会从 webview 中读取 ua
- 
- */
-- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify userAgent:(nullable NSString *)userAgent;
-
 - (SensorsAnalyticsDebugMode)debugMode;
 
 /**
@@ -773,12 +700,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)canHandleURL:(NSURL *)url;
 
-/**
- * 开启 可视化全埋点 分析，默认不开启，
- * $AppClick 事件将会采集控件的 viewPath。
- */
-- (void)enableVisualizedAutoTrack;
-
 /**
  是否开启 可视化全埋点 分析，默认不
 
@@ -803,10 +724,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (BOOL)isVisualizedAutoTrackViewController:(UIViewController *)viewController;
 
 #pragma mark HeatMap
-/**
- 开启 HeatMap，$AppClick 事件将会采集控件的 viewPath
- */
-- (void)enableHeatMap;
 
 /**
  是否开启点击图
@@ -862,10 +779,21 @@ NS_ASSUME_NONNULL_BEGIN
  * @discussion
  * 设置用户的 pushId 比如 @{@"jgId":pushId}，并触发 profileSet 设置对应的用户属性。
  * 当 disctinct_id 或者 pushId 没有发生改变的时,不会触发 profileSet。
- * @param pushKey  pushId 的 key
+ * @param pushTypeKey  pushId 的 key
  * @param pushId  pushId 的值
  */
-- (void)profilePushKey:(NSString *)pushKey pushId:(NSString *)pushId;
+- (void)profilePushKey:(NSString *)pushTypeKey pushId:(NSString *)pushId;
+
+/**
+ * @abstract
+ * 删除用户设置的 pushId
+ *
+ * *@discussion
+ * 删除用户设置的 pushId 比如 @{@"jgId":pushId}，并触发 profileUnset 删除对应的用户属性。
+ * 当 disctinct_id 未找到本地缓存记录时, 不会触发 profileUnset。
+ * @param pushTypeKey  pushId 的 key
+ */
+- (void)profileUnsetPushKey:(NSString *)pushTypeKey;
 
 /**
  * @abstract
@@ -1006,6 +934,72 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+#pragma mark - JSCall
+@interface SensorsAnalyticsSDK (JSCall)
+
+#pragma mark about webView
+
+/**
+ * @abstract
+ * H5 数据打通的时候默认通过 ServerUrl 校验
+ */
+- (void)addWebViewUserAgentSensorsDataFlag;
+
+/**
+ * @abstract
+ * H5 数据打通的时候是否通过 ServerUrl 校验, 如果校验通过，H5 的事件数据走 App 上报否则走 JSSDK 上报
+ *
+ * @param enableVerify YES/NO   校验通过后可走 App，上报数据/直接走 App，上报数据
+ */
+- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify;
+
+/**
+ * @abstract
+ * H5 数据打通的时候是否通过 ServerUrl 校验, 如果校验通过，H5 的事件数据走 App 上报否则走 JSSDK 上报
+ *
+ * @param enableVerify YES/NO   校验通过后可走 App，上报数据/直接走 App，上报数据
+ * @param userAgent  userAgent = nil ,SDK 会从 webview 中读取 ua
+
+ */
+- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify userAgent:(nullable NSString *)userAgent;
+/**
+ * @abstract
+ * 将 distinctId 传递给当前的 WebView
+ *
+ * @discussion
+ * 混合开发时,将 distinctId 传递给当前的 WebView
+ *
+ * @param webView 当前 WebView，支持 WKWebView
+ *
+ * @return YES:SDK 已进行处理，NO:SDK 没有进行处理
+ */
+- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request;
+
+- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request enableVerify:(BOOL)enableVerify;
+
+/**
+ * @abstract
+ * 将 distinctId 传递给当前的 WebView
+ *
+ * @discussion
+ * 混合开发时,将 distinctId 传递给当前的 WebView
+ *
+ * @param webView 当前 WebView，支持 WKWebView
+ * @param request NSURLRequest
+ * @param propertyDict NSDictionary 自定义扩展属性
+ *
+ * @return YES:SDK 已进行处理，NO:SDK 没有进行处理
+ */
+- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request andProperties:(nullable NSDictionary *)propertyDict;
+
+#pragma mark trackFromH5
+
+- (void)trackFromH5WithEvent:(NSString *)eventInfo;
+
+- (void)trackFromH5WithEvent:(NSString *)eventInfo enableVerify:(BOOL)enableVerify;
+@end
+
+#pragma mark -
 /**
  * @class
  * SensorsAnalyticsPeople 类
@@ -1128,6 +1122,49 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - Deprecated
 @interface SensorsAnalyticsSDK (Deprecated)
 
+/**
+ * @property
+ *
+ * @abstract
+ * 两次数据发送的最小时间间隔，单位毫秒
+ *
+ * @discussion
+ * 默认值为 15 * 1000 毫秒， 在每次调用 track、trackSignUp 以及 profileSet 等接口的时候，
+ * 都会检查如下条件，以判断是否向服务器上传数据:
+ * 1. 是否 WIFI/3G/4G 网络
+ * 2. 是否满足以下数据发送条件之一:
+ *   1) 与上次发送的时间间隔是否大于 flushInterval
+ *   2) 本地缓存日志数目是否达到 flushBulkSize
+ * 如果满足这两个条件之一，则向服务器发送一次数据；如果都不满足，则把数据加入到队列中，等待下次检查时把整个队列的内容一并发送。
+ * 需要注意的是，为了避免占用过多存储，队列最多只缓存10000条数据。
+ */
+@property (atomic) UInt64 flushInterval __attribute__((deprecated("已过时，请参考 SAConfigOptions 类的 flushInterval")));
+
+/**
+ * @property
+ *
+ * @abstract
+ * 本地缓存的最大事件数目，当累积日志量达到阈值时发送数据
+ *
+ * @discussion
+ * 默认值为 100，在每次调用 track、trackSignUp 以及 profileSet 等接口的时候，都会检查如下条件，以判断是否向服务器上传数据:
+ * 1. 是否 WIFI/3G/4G 网络
+ * 2. 是否满足以下数据发送条件之一:
+ *   1) 与上次发送的时间间隔是否大于 flushInterval
+ *   2) 本地缓存日志数目是否达到 flushBulkSize
+ * 如果同时满足这两个条件，则向服务器发送一次数据；如果不满足，则把数据加入到队列中，等待下次检查时把整个队列的内容一并发送。
+ * 需要注意的是，为了避免占用过多存储，队列最多只缓存 10000 条数据。
+ */
+@property (atomic) UInt64 flushBulkSize __attribute__((deprecated("已过时，请参考 SAConfigOptions 类的 flushBulkSize")));
+
+/**
+ * @abstract
+ * 根据传入的配置，初始化并返回一个 SensorsAnalyticsSDK 的单例
+ *
+ @param configOptions 参数配置
+ @return 返回的单例
+ */
++ (SensorsAnalyticsSDK *)sharedInstanceWithConfig:(nonnull SAConfigOptions *)configOptions __attribute__((deprecated("已过时，请使用 + (void)startWithConfigOptions: 方法进行初始化")));
 
 /**
  * @abstract
@@ -1284,7 +1321,8 @@ NS_ASSUME_NONNULL_BEGIN
  * @param timeUnit          计时单位，毫秒/秒/分钟/小时
  */
 - (void)trackTimer:(NSString *)event withTimeUnit:(SensorsAnalyticsTimeUnit)timeUnit __attribute__((deprecated("已过时，请参考 trackTimerStart")));
-#pragma mark- heatMap
+
+#pragma mark- HeatMap & VisualizedAutoTrack
 /**
  * @abstract
  * 神策 SDK 会处理 点击图，可视化全埋点url
@@ -1295,6 +1333,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)handleHeatMapUrl:(NSURL *)url __attribute__((deprecated("已过时，请参考 handleSchemeUrl:")));
 
+/**
+ * 开启 可视化全埋点 分析，默认不开启，
+ * $AppClick 事件将会采集控件的 viewPath。
+ */
+- (void)enableVisualizedAutoTrack __attribute__((deprecated("已过时，请参考 SAConfigOptions 类的 enableVisualizedAutoTrack")));
+
+/**
+ 开启 HeatMap，$AppClick 事件将会采集控件的 viewPath
+ */
+- (void)enableHeatMap __attribute__((deprecated("已过时，请参考 SAConfigOptions 类的 enableHeatMap")));
+
 /**
  * @abstract
  * Track $AppViewScreen事件
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.m
index f23de36c..6c0815a8 100755
--- a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.m
+++ b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.m
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 曹犟 on 15/7/1.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -22,21 +22,17 @@
 #endif
 
 
+#import <Availability.h>
 #import <objc/runtime.h>
 #include <sys/sysctl.h>
 #include <stdlib.h>
 
-#import <CoreTelephony/CTCarrier.h>
-#import <CoreTelephony/CTTelephonyNetworkInfo.h>
 #import <UIKit/UIApplication.h>
 #import <UIKit/UIDevice.h>
 #import <UIKit/UIScreen.h>
-
 #import "SAJSONUtil.h"
 #import "SAGzipUtility.h"
 #import "MessageQueueBySqlite.h"
-#import "SALogger.h"
-#import "SAReachability.h"
 #import "SASwizzler.h"
 #import "SensorsAnalyticsSDK.h"
 #import "UIApplication+AutoTrack.h"
@@ -44,13 +40,17 @@
 #import "SASwizzle.h"
 #import "NSString+HashCode.h"
 #import "SensorsAnalyticsExceptionHandler.h"
-#import "SANetwork.h"
-#import "SANetwork+URLUtils.h"
+#import "SAURLUtils.h"
 #import "SAAppExtensionDataManager.h"
 #import "SAAutoTrackUtils.h"
+#import "SAReadWriteLock.h"
 
 #ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
-     #import "SAKeyChainItemWrapper.h"
+    #import "SAKeyChainItemWrapper.h"
+#endif
+
+#ifdef SENSORS_ANALYTICS_DISABLE_UIWEBVIEW
+#import <WebKit/WebKit.h>
 #endif
 
 #import "SASDKRemoteConfig.h"
@@ -63,16 +63,26 @@
 #import "SensorsAnalyticsSDK+Private.h"
 #import "SAAlertController.h"
 #import "SAAuxiliaryToolManager.h"
-
-
-#define VERSION @"1.11.11"
+#import "SAWeakPropertyContainer.h"
+#import "SADateFormatter.h"
+#import "SALinkHandler.h"
+#import "SAFileStore.h"
+#import "SATrackTimer.h"
+#import "SAScriptMessageHandler.h"
+#import "WKWebView+SABridge.h"
+#import "SAIdentifier.h"
+#import "SAPresetProperty.h"
+#import "SAValidator.h"
+#import "SALog+Private.h"
+#import "SAConsoleLogger.h"
+#import "SAEncryptSecretKeyHandler.h"
+
+#define VERSION @"2.1.0-pre"
 
 static NSUInteger const SA_PROPERTY_LENGTH_LIMITATION = 8191;
 
 static NSString* const SA_JS_GET_APP_INFO_SCHEME = @"sensorsanalytics://getAppInfo";
 static NSString* const SA_JS_TRACK_EVENT_NATIVE_SCHEME = @"sensorsanalytics://trackEvent";
-//中国运营商 mcc 标识
-static NSString* const CARRIER_CHINA_MCC = @"460";
 
 void *SensorsAnalyticsQueueTag = &SensorsAnalyticsQueueTag;
 
@@ -93,6 +103,7 @@ - (void)setSensorsAnalyticsImageName:(NSString *)sensorsAnalyticsImageName {
 @end
 
 @implementation UIView (SensorsAnalytics)
+
 - (UIViewController *)sensorsAnalyticsViewController {
     return self.sensorsdata_viewController;
 }
@@ -134,11 +145,13 @@ - (void)setSensorsAnalyticsViewProperties:(NSDictionary *)sensorsAnalyticsViewPr
 }
 
 - (id<SAUIViewAutoTrackDelegate>)sensorsAnalyticsDelegate {
-    return objc_getAssociatedObject(self, @"sensorsAnalyticsDelegate");
+    SAWeakPropertyContainer *container = objc_getAssociatedObject(self, @"sensorsAnalyticsDelegate");
+    return container.weakProperty;
 }
 
 - (void)setSensorsAnalyticsDelegate:(id<SAUIViewAutoTrackDelegate>)sensorsAnalyticsDelegate {
-    objc_setAssociatedObject(self, @"sensorsAnalyticsDelegate", sensorsAnalyticsDelegate, OBJC_ASSOCIATION_ASSIGN);
+    SAWeakPropertyContainer *container = [SAWeakPropertyContainer containerWithWeakProperty:sensorsAnalyticsDelegate];
+    objc_setAssociatedObject(self, @"sensorsAnalyticsDelegate", container, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 @end
 
@@ -152,20 +165,16 @@ @interface SensorsAnalyticsSDK()
 
 @property (nonatomic, strong) SANetwork *network;
 
-@property (atomic, copy) NSString *originalId;
-@property (nonatomic, copy) NSString *anonymousId;
-@property (atomic, copy) NSString *loginId;
-@property (atomic, copy) NSString *firstDay;
 @property (nonatomic, strong) dispatch_queue_t serialQueue;
 @property (nonatomic, strong) dispatch_queue_t readWriteQueue;
+@property (nonatomic, strong) SAReadWriteLock *readWriteLock;
+@property (nonatomic, strong) SAReadWriteLock *dynamicSuperPropertiesLock;
 
-@property (atomic, strong) NSDictionary *automaticProperties;
 @property (atomic, strong) NSDictionary *superProperties;
-@property (nonatomic, strong) NSMutableDictionary *trackTimer;
+@property (nonatomic, strong) SATrackTimer *trackTimer;
 
-@property (nonatomic, strong) NSPredicate *regexTestName;
-
-@property (nonatomic, strong) NSPredicate *regexEventName;
+@property (nonatomic, strong) NSRegularExpression *propertiesRegex;
+@property (nonatomic, copy) NSSet *presetEventNames;
 
 @property (atomic, strong) MessageQueueBySqlite *messageQueue;
 
@@ -173,14 +182,19 @@ @interface SensorsAnalyticsSDK()
 
 //用户设置的不被AutoTrack的Controllers
 @property (nonatomic, strong) NSMutableArray *ignoredViewControllers;
+@property (nonatomic, weak) UIViewController *previousTrackViewController;
 
 @property (nonatomic, strong) NSMutableSet<NSString *> *heatMapViewControllers;
 @property (nonatomic, strong) NSMutableSet<NSString *> *visualizedAutoTrackViewControllers;
 
 @property (nonatomic, strong) NSMutableArray *ignoredViewTypeList;
+@property (nonatomic, copy) NSString *userAgent;
+
+@property (nonatomic, strong) NSMutableSet<NSString *> *trackChannelEventNames;
 
 @property (nonatomic, strong) SASDKRemoteConfig *remoteConfig;
 @property (nonatomic, strong) SAConfigOptions *configOptions;
+@property (nonatomic, strong) SADataEncryptBuilder *encryptBuilder;
 
 #ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
 @property (nonatomic, strong) SADeviceOrientationManager *deviceOrientationManager;
@@ -192,6 +206,11 @@ @interface SensorsAnalyticsSDK()
 @property (nonatomic, strong) SAGPSLocationConfig *locationConfig;
 #endif
 
+#ifdef SENSORS_ANALYTICS_DISABLE_UIWEBVIEW
+@property (nonatomic, strong) WKWebView *wkWebView;
+@property (nonatomic, strong) dispatch_group_t loadUAGroup;
+#endif
+
 @property (nonatomic, copy) void(^reqConfigBlock)(BOOL success , NSDictionary *configDict);
 @property (nonatomic, assign) NSUInteger pullSDKConfigurationRetryMaxCount;
 
@@ -201,15 +220,24 @@ @interface SensorsAnalyticsSDK()
 ///是否为被动启动
 @property (nonatomic, assign, getter=isLaunchedPassively) BOOL launchedPassively;
 @property (nonatomic, strong) NSMutableArray <UIViewController *> *launchedPassivelyControllers;
+
+/// DeepLink handler
+@property (nonatomic, strong) SALinkHandler *linkHandler;
+
+@property (nonatomic, strong) SAIdentifier *identifier;
+
+@property (nonatomic, strong) SAPresetProperty *presetProperty;
+
+@property (nonatomic, strong) SAConsoleLogger *consoleLogger;
+
+@property (nonatomic, strong) SAEncryptSecretKeyHandler *secretKeyHandler;
+
 @end
 
 @implementation SensorsAnalyticsSDK {
     SensorsAnalyticsDebugMode _debugMode;
-    NSDateFormatter *_dateFormatter;
     BOOL _appRelaunched;                // App 从后台恢复
     BOOL _showDebugAlertView;
-    BOOL _shouldHeatMap;
-    BOOL _shouldVisualizedAutoTrack;
     UInt8 _debugAlertViewHasShownNumber;
     NSString *_referrerScreenUrl;
     NSDictionary *_lastScreenTrackProperties;
@@ -217,23 +245,25 @@ @implementation SensorsAnalyticsSDK {
     BOOL _applicationWillResignActive;
     BOOL _clearReferrerWhenAppEnd;
     SensorsAnalyticsNetworkType _networkTypePolicy;
-    NSString *_deviceModel;
-    NSString *_osVersion;
-    NSString *_userAgent;
 }
 
 @synthesize remoteConfig = _remoteConfig;
+@synthesize encryptBuilder = _encryptBuilder;
 
 #pragma mark - Initialization
-+ (SensorsAnalyticsSDK *)sharedInstanceWithConfig:(nonnull SAConfigOptions *)configOptions {
++ (void)startWithConfigOptions:(SAConfigOptions *)configOptions {
     NSAssert(sensorsdata_is_same_queue(dispatch_get_main_queue()), @"神策 iOS SDK 必须在主线程里进行初始化，否则会引发无法预料的问题（比如丢失 $AppStart 事件）。");
+    if (configOptions.enableEncrypt) {
+        NSAssert((configOptions.saveSecretKey && configOptions.loadSecretKey) ||
+                 (!configOptions.saveSecretKey && !configOptions.loadSecretKey), @"存储公钥和获取公钥的回调需要全部实现或者全部不实现。");
+    }
     dispatch_once(&sdkInitializeOnceToken, ^{
         sharedInstance = [[SensorsAnalyticsSDK alloc] initWithConfigOptions:configOptions debugMode:SensorsAnalyticsDebugOff];
     });
-    return sharedInstance;
 }
 
 + (SensorsAnalyticsSDK *_Nullable)sharedInstance {
+    NSAssert(sharedInstance, @"请先使用 startWithConfigOptions: 初始化 SDK");
     if (sharedInstance.remoteConfig.disableSDK) {
         return nil;
     }
@@ -248,7 +278,7 @@ - (instancetype)initWithServerURL:(NSString *)serverURL
         SAConfigOptions * options = [[SAConfigOptions alloc]initWithServerURL:serverURL launchOptions:launchOptions];
         self = [self initWithConfigOptions:options debugMode:debugMode];
     } @catch(NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
     }
     return self;
 }
@@ -262,13 +292,12 @@ - (instancetype)initWithConfigOptions:(nonnull SAConfigOptions *)configOptions d
             _networkTypePolicy = SensorsAnalyticsNetworkType3G | SensorsAnalyticsNetworkType4G | SensorsAnalyticsNetworkTypeWIFI;
             
             dispatch_block_t mainThreadBlock = ^(){
-                UIApplicationState applicationState = UIApplication.sharedApplication.applicationState;
                 //判断被动启动
-                if (applicationState == UIApplicationStateBackground) {
+                if (UIApplication.sharedApplication.applicationState == UIApplicationStateBackground) {
                     self->_launchedPassively = YES;
                 }
             };
-            sensorsdata_dispatch_main_safe_sync(mainThreadBlock);
+            [SACommonUtility performBlockOnMainThread:mainThreadBlock];
             
             _people = [[SensorsAnalyticsPeople alloc] init];
             _debugMode = debugMode;
@@ -285,12 +314,18 @@ - (instancetype)initWithConfigOptions:(nonnull SAConfigOptions *)configOptions d
             _pullSDKConfigurationRetryMaxCount = 3;// SDK 开启关闭功能接口最大重试次数
             _flushBeforeEnterBackground = YES;
             
-            NSString *label = [NSString stringWithFormat:@"com.sensorsdata.serialQueue.%p", self];
-            _serialQueue = dispatch_queue_create([label UTF8String], DISPATCH_QUEUE_SERIAL);
+            NSString *serialQueueLabel = [NSString stringWithFormat:@"com.sensorsdata.serialQueue.%p", self];
+            _serialQueue = dispatch_queue_create([serialQueueLabel UTF8String], DISPATCH_QUEUE_SERIAL);
             dispatch_queue_set_specific(_serialQueue, SensorsAnalyticsQueueTag, &SensorsAnalyticsQueueTag, NULL);
             
-            NSString *readWriteLabel = [NSString stringWithFormat:@"com.sensorsdata.readWriteQueue.%p", self];
-            _readWriteQueue = dispatch_queue_create([readWriteLabel UTF8String], DISPATCH_QUEUE_SERIAL);
+            NSString *readWriteQueueLabel = [NSString stringWithFormat:@"com.sensorsdata.readWriteQueue.%p", self];
+            _readWriteQueue = dispatch_queue_create([readWriteQueueLabel UTF8String], DISPATCH_QUEUE_SERIAL);
+            
+            NSString *readWriteLockLabel = [NSString stringWithFormat:@"com.sensorsdata.readWriteLock.%p", self];
+            _readWriteLock = [[SAReadWriteLock alloc] initWithQueueLabel:readWriteLockLabel];
+            
+            NSString *dynamicSuperPropertiesLockLabel = [NSString stringWithFormat:@"com.sensorsdata.dynamicSuperPropertiesLock.%p", self];
+            _dynamicSuperPropertiesLock = [[SAReadWriteLock alloc] initWithQueueLabel:dynamicSuperPropertiesLockLabel];
             
             NSDictionary *sdkConfig = [[NSUserDefaults standardUserDefaults] objectForKey:SA_SDK_TRACK_CONFIG];
             [self setSDKWithRemoteConfigDict:sdkConfig];
@@ -307,57 +342,87 @@ - (instancetype)initWithConfigOptions:(nonnull SAConfigOptions *)configOptions d
             _ignoredViewTypeList = [[NSMutableArray alloc] init];
             _heatMapViewControllers = [[NSMutableSet alloc] init];
             _visualizedAutoTrackViewControllers = [[NSMutableSet alloc] init];
+            _trackChannelEventNames = [[NSMutableSet alloc] init];
+
+             _trackTimer = [[SATrackTimer alloc] init];
             
-            _dateFormatter = [[NSDateFormatter alloc] init];
-            [_dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss.SSS"];
-            
-             _trackTimer = [NSMutableDictionary dictionary];
+            // 初始化 LinkHandler 处理 deepLink 相关操作
+            _linkHandler = [[SALinkHandler alloc] initWithConfigOptions:configOptions];
             
-            _messageQueue = [[MessageQueueBySqlite alloc] initWithFilePath:[self filePathForData:@"message-v2"]];
+            // 初始化密钥处理器
+            _secretKeyHandler = [[SAEncryptSecretKeyHandler alloc] initWithConfigOptions:configOptions];
+
+            _messageQueue = [[MessageQueueBySqlite alloc] initWithFilePath:[SAFileStore filePath:@"message-v2"]];
             if (self.messageQueue == nil) {
-                SADebug(@"SqliteException: init Message Queue in Sqlite fail");
+                SALogError(@"SqliteException: init Message Queue in Sqlite fail");
             }
             
-            NSString *namePattern = @"^((?!^distinct_id$|^original_id$|^time$|^event$|^properties$|^id$|^first_id$|^second_id$|^users$|^events$|^event$|^user_id$|^date$|^datetime$)[a-zA-Z_$][a-zA-Z\\d_$]{0,99})$";
-            _regexTestName = [NSPredicate predicateWithFormat:@"SELF MATCHES[c] %@", namePattern];
-            
-            NSString *eventPattern = @"^\\$((AppEnd)|(AppStart)|(AppViewScreen)|(AppClick)|(SignUp))|(^AppCrashed)$";
-            _regexEventName = [NSPredicate predicateWithFormat:@"SELF MATCHES %@", eventPattern];
-            
+            NSString *namePattern = @"^([a-zA-Z_$][a-zA-Z\\d_$]{0,99})$";
+            _propertiesRegex = [NSRegularExpression regularExpressionWithPattern:namePattern options:NSRegularExpressionCaseInsensitive error:nil];
+            _presetEventNames = [NSSet setWithObjects:
+                                      SA_EVENT_NAME_APP_START,
+                                      SA_EVENT_NAME_APP_START_PASSIVELY ,
+                                      SA_EVENT_NAME_APP_END,
+                                      SA_EVENT_NAME_APP_VIEW_SCREEN,
+                                      SA_EVENT_NAME_APP_CLICK,
+                                      SA_EVENT_NAME_APP_SIGN_UP,
+                                      SA_EVENT_NAME_APP_CRASHED, nil];
+
             if (!_launchedPassively) {
                 [self startFlushTimer];
             }
+
+            _identifier = [[SAIdentifier alloc] initWithQueue:_readWriteQueue];
+            
+            _presetProperty = [[SAPresetProperty alloc] initWithQueue:_readWriteQueue libVersion:[self libVersion]];
             
             // 取上一次进程退出时保存的distinctId、loginId、superProperties
             [self unarchive];
-            
-            if (self.firstDay == nil) {
-                NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-                [dateFormatter setDateFormat:@"yyyy-MM-dd"];
-                self.firstDay = [dateFormatter stringFromDate:[NSDate date]];
-                [self archiveFirstDay];
-            }
-
-            self.automaticProperties = [self collectAutomaticProperties];
 
             [self startAppEndTimer];
             [self setUpListeners];
             
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [self autoTrackAppStart];
+            });
+
             if (_configOptions.enableTrackAppCrash) {
                 // Install uncaught exception handlers first
                 [[SensorsAnalyticsExceptionHandler sharedHandler] addSensorsAnalyticsInstance:self];
             }
-
             [self configServerURLWithDebugMode:_debugMode showDebugModeWarning:YES];
+            
+            if (_configOptions.enableLog) {
+                [self enableLog:YES];
+            }
+            
+            // WKWebView 打通
+            if (_configOptions.enableJavaScriptBridge || _configOptions.enableVisualizedAutoTrack) {
+                [self swizzleWebViewMethod];
+            }
+            
+            // 加密
+            if (_configOptions.enableEncrypt) {
+                [self updateEncryptBuilder];
+            }
         }
         
     } @catch(NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
     }
     
     return self;
 }
 
+- (void)enableLoggers:(BOOL)enableLog {
+    if (!self.consoleLogger) {
+        SAConsoleLogger *consoleLogger = [[SAConsoleLogger alloc] init];
+        [SALog addLogger:consoleLogger];
+        self.consoleLogger = consoleLogger;
+    }
+    self.consoleLogger.enableLog = enableLog;
+}
+
 + (UInt64)getCurrentTime {
     return [[NSDate date] timeIntervalSince1970] * 1000;
 }
@@ -366,136 +431,84 @@ + (UInt64)getSystemUpTime {
     return NSProcessInfo.processInfo.systemUptime * 1000;
 }
 
-+ (NSString *)getUniqueHardwareId {
-    NSString *distinctId = NULL;
-
-    // 宏 SENSORS_ANALYTICS_IDFA 定义时，优先使用IDFA
-//#if defined(SENSORS_ANALYTICS_IDFA)
-    Class ASIdentifierManagerClass = NSClassFromString(@"ASIdentifierManager");
-    if (ASIdentifierManagerClass) {
-        SEL sharedManagerSelector = NSSelectorFromString(@"sharedManager");
-        id sharedManager = ((id (*)(id, SEL))[ASIdentifierManagerClass methodForSelector:sharedManagerSelector])(ASIdentifierManagerClass, sharedManagerSelector);
-        SEL advertisingIdentifierSelector = NSSelectorFromString(@"advertisingIdentifier");
-        NSUUID *uuid = ((NSUUID * (*)(id, SEL))[sharedManager methodForSelector:advertisingIdentifierSelector])(sharedManager, advertisingIdentifierSelector);
-        distinctId = [uuid UUIDString];
-        // 在 iOS 10.0 以后，当用户开启限制广告跟踪，advertisingIdentifier 的值将是全零
-        // 00000000-0000-0000-0000-000000000000
-        if (!distinctId || [distinctId hasPrefix:@"00000000"]) {
-            distinctId = NULL;
-        }
-    }
-//#endif
-    
-    // 没有IDFA，则使用IDFV
-    if (!distinctId && NSClassFromString(@"UIDevice")) {
-        distinctId = [[UIDevice currentDevice].identifierForVendor UUIDString];
+- (void)loadUserAgentWithCompletion:(void (^)(NSString *))completion {
+    if (self.userAgent) {
+        return completion(self.userAgent);
     }
-    
-    // 没有IDFV，则使用UUID
-    if (!distinctId) {
-        SADebug(@"%@ error getting device identifier: falling back to uuid", self);
-        distinctId = [[NSUUID UUID] UUIDString];
-    }
-    return distinctId;
-}
-
-+ (NSString *)getUserAgent {
-    //在此之前调用过 addWebViewUserAgentSensorsDataFlag ，可以直接从 _userAgent 获取 ua
-    __block  NSString *currentUA = self.sharedInstance->_userAgent;
-    if (currentUA  == nil)  {
-        if ([NSThread isMainThread]) {
-            UIWebView* webView = [[UIWebView alloc] initWithFrame:CGRectZero];
-            currentUA = [webView stringByEvaluatingJavaScriptFromString:@"navigator.userAgent"];
-            self.sharedInstance->_userAgent = currentUA;
-        } else {
-            dispatch_sync(dispatch_get_main_queue(), ^{
-                UIWebView* webView = [[UIWebView alloc] initWithFrame:CGRectZero];
-                currentUA = [webView stringByEvaluatingJavaScriptFromString:@"navigator.userAgent"];
-                self.sharedInstance->_userAgent = currentUA;
+#ifdef SENSORS_ANALYTICS_DISABLE_UIWEBVIEW
+    __weak typeof(self) weakSelf = self;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.wkWebView) {
+            dispatch_group_notify(self.loadUAGroup, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
+                completion(self.userAgent);
             });
+        } else {
+            self.wkWebView = [[WKWebView alloc] initWithFrame:CGRectZero];
+            self.loadUAGroup = dispatch_group_create();
+            dispatch_group_enter(self.loadUAGroup);
+
+            [self.wkWebView evaluateJavaScript:@"navigator.userAgent" completionHandler:^(id _Nullable response, NSError *_Nullable error) {
+                if (error || !response) {
+                    SALogError(@"WKWebView evaluateJavaScript load UA error:%@", error);
+                    completion(nil);
+                } else {
+                    weakSelf.userAgent = response;
+                    completion(weakSelf.userAgent);
+                }
+                weakSelf.wkWebView = nil;
+                dispatch_group_leave(weakSelf.loadUAGroup);
+            }];
         }
-    }
-    return currentUA;
+    });
+#else
+    [SACommonUtility performBlockOnMainThread:^{
+        UIWebView *webView = [[UIWebView alloc] initWithFrame:CGRectZero];
+        self.userAgent = [webView stringByEvaluatingJavaScriptFromString:@"navigator.userAgent"];
+        completion(self.userAgent);
+    }];
+#endif
 }
 
 - (BOOL)shouldTrackViewController:(UIViewController *)controller ofType:(SensorsAnalyticsAutoTrackEventType)type {
     if ([self isViewControllerIgnored:controller]) {
         return NO;
     }
-    // UITabBarController 默认包含在黑名单，单独判断，防止 UITabBar 点击事件被忽略
-    if (type == SensorsAnalyticsEventTypeAppClick && [controller isKindOfClass:[UITabBarController class]]) {
-        return YES;
-    }
 
-    return ![self isBlackListContainsViewController:controller];
+    return ![self isBlackListViewController:controller ofType:type];
 }
 
-- (BOOL)isBlackListContainsViewController:(UIViewController *)viewController {
-    static NSSet *blacklistedClasses = nil;
+- (BOOL)isBlackListViewController:(UIViewController *)viewController ofType:(SensorsAnalyticsAutoTrackEventType)type {
     static dispatch_once_t onceToken;
-
+    static NSDictionary *allClasses = nil;
     dispatch_once(&onceToken, ^{
         NSBundle *sensorsBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[SensorsAnalyticsSDK class]] pathForResource:@"SensorsAnalyticsSDK" ofType:@"bundle"]];
         //文件路径
         NSString *jsonPath = [sensorsBundle pathForResource:@"sa_autotrack_viewcontroller_blacklist.json" ofType:nil];
         NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
         @try {
-            NSArray *blacklistedViewControllerClassNames = [NSJSONSerialization JSONObjectWithData:jsonData  options:NSJSONReadingAllowFragments  error:nil];
-            blacklistedClasses = [NSSet setWithArray:blacklistedViewControllerClassNames];
+            allClasses = [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingAllowFragments error:nil];
         } @catch(NSException *exception) {  // json加载和解析可能失败
-            SAError(@"%@ error: %@", self, exception);
+            SALogError(@"%@ error: %@", self, exception);
         }
     });
 
-    __block BOOL isContains = NO;
-    [blacklistedClasses enumerateObjectsUsingBlock:^(id  _Nonnull obj, BOOL * _Nonnull stop) {
-        NSString *blackClassName = (NSString *)obj;
-        Class blackClass = NSClassFromString(blackClassName);
-        if (blackClass && [viewController isKindOfClass:blackClass]) {
-            isContains = YES;
-            *stop = YES;
+    NSDictionary *dictonary = (type == SensorsAnalyticsEventTypeAppViewScreen) ? allClasses[SA_EVENT_NAME_APP_VIEW_SCREEN] : allClasses[SA_EVENT_NAME_APP_CLICK];
+    for (NSString *publicClass in dictonary[@"public"]) {
+        if ([viewController isKindOfClass:NSClassFromString(publicClass)]) {
+            return YES;
         }
-    }];
-    return isContains;
+    }
+    return [(NSArray *)dictonary[@"private"] containsObject:NSStringFromClass(viewController.class)];
 }
 
 - (NSDictionary *)getPresetProperties {
-    NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
-    @try {
-        id app_version = [_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-        if (app_version) {
-            [properties setValue:app_version forKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-        }
-        [properties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_LIB] forKey:SA_EVENT_COMMON_PROPERTY_LIB];
-        [properties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_LIB_VERSION] forKey:SA_EVENT_COMMON_PROPERTY_LIB_VERSION];
-        [properties setValue:@"Apple" forKey:SA_EVENT_COMMON_PROPERTY_MANUFACTURER];
-        [properties setValue:_deviceModel forKey:SA_EVENT_COMMON_PROPERTY_MODEL];
-        [properties setValue:@"iOS" forKey:SA_EVENT_COMMON_PROPERTY_OS];
-        [properties setValue:_osVersion forKey:SA_EVENT_COMMON_PROPERTY_OS_VERSION];
-        [properties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_SCREEN_HEIGHT] forKey:SA_EVENT_COMMON_PROPERTY_SCREEN_HEIGHT];
-        [properties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_SCREEN_WIDTH] forKey:SA_EVENT_COMMON_PROPERTY_SCREEN_WIDTH];
-        NSString *networkType = [SensorsAnalyticsSDK getNetWorkStates];
-        [properties setObject:networkType forKey:SA_EVENT_COMMON_PROPERTY_NETWORK_TYPE];
-        if ([networkType isEqualToString:@"WIFI"]) {
-            [properties setObject:@YES forKey:SA_EVENT_COMMON_PROPERTY_WIFI];
-        } else {
-            [properties setObject:@NO forKey:SA_EVENT_COMMON_PROPERTY_WIFI];
-        }
-        [properties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_CARRIER] forKey:SA_EVENT_COMMON_PROPERTY_CARRIER];
-        if ([self isFirstDay]) {
-            [properties setObject:@YES forKey:SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY];
-        } else {
-            [properties setObject:@NO forKey:SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY];
-        }
-        [properties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_DEVICE_ID] forKey:SA_EVENT_COMMON_PROPERTY_DEVICE_ID];
-    } @catch(NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
-    }
-    return [properties copy];
+    return [NSDictionary dictionaryWithDictionary:[self.presetProperty currentPresetProperties]];
 }
 
 - (void)setServerUrl:(NSString *)serverUrl {
-    self.network.serverURL = [NSURL URLWithString:serverUrl];
+    dispatch_async(self.serialQueue, ^{
+        self.network.serverURL = [NSURL URLWithString:serverUrl];
+    });
 }
 
 - (void)configServerURLWithDebugMode:(SensorsAnalyticsDebugMode)debugMode showDebugModeWarning:(BOOL)isShow {
@@ -505,11 +518,9 @@ - (void)configServerURLWithDebugMode:(SensorsAnalyticsDebugMode)debugMode showDe
     [self enableLog:debugMode != SensorsAnalyticsDebugOff];
     
     if (isShow) {
-        NSString *logMessage = nil;
-        logMessage = [NSString stringWithFormat:@"%@ initialized the instance of Sensors Analytics SDK with server url '%@', debugMode: '%@'",
-                      self, self.configOptions.serverURL, [self debugModeToString:_debugMode]];
-        SALog(@"%@", logMessage);
-        
+        //SDK 初始化时默认 debugMode 为 DebugOff，SALog 不会打印日志
+        SALogDebug(@"%@ initialized the instance of Sensors Analytics SDK with debugMode: '%@'", self, [self debugModeToString:_debugMode]);
+
         //打开debug模式，弹出提示
 #ifndef SENSORS_ANALYTICS_DISABLE_DEBUG_WARNING
         if (_debugMode != SensorsAnalyticsDebugOff) {
@@ -522,7 +533,6 @@ - (void)configServerURLWithDebugMode:(SensorsAnalyticsDebugMode)debugMode showDe
             [self showDebugModeWarning:alertMessage withNoMoreButton:NO];
         }
 #endif
-        
     }
 }
 
@@ -626,14 +636,6 @@ - (void)showDebugModeAlertWithParams:(NSDictionary<NSString *, id> *)params {
     });
 }
 
-- (BOOL)isFirstDay {
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setDateFormat:@"yyyy-MM-dd"];
-    NSString *current = [dateFormatter stringFromDate:[NSDate date]];
-
-    return [[self firstDay] isEqualToString:current];
-}
-
 - (void)setFlushNetworkPolicy:(SensorsAnalyticsNetworkType)networkType {
     @synchronized (self) {
         _networkTypePolicy = networkType;
@@ -661,385 +663,142 @@ - (UIViewController *)currentViewController {
     return [SAAutoTrackUtils currentViewController];
 }
 
-- (void)trackFromH5WithEvent:(NSString *)eventInfo enableVerify:(BOOL)enableVerify {
-    dispatch_async(self.serialQueue, ^{
-        @try {
-            if (eventInfo == nil) {
-                return;
-            }
-
-            NSData *jsonData = [eventInfo dataUsingEncoding:NSUTF8StringEncoding];
-            NSError *err;
-            NSMutableDictionary *eventDict = [NSJSONSerialization JSONObjectWithData:jsonData
-                                                                             options:NSJSONReadingMutableContainers
-                                                                               error:&err];
-            if(err) {
-                return;
-            }
-
-            if (!eventDict) {
-                return;
-            }
-
-            if (enableVerify) {
-                NSString *serverUrl = [eventDict valueForKey:@"server_url"];
-                if (![self.network isSameProjectWithURLString:serverUrl]) {
-                    return;
-                }
-            }
-
-            NSString *type = [eventDict valueForKey:SA_EVENT_TYPE];
-            NSString *bestId = self.distinctId;
-            NSNumber *timeStamp = @([[self class] getCurrentTime]);
-
-            if([type isEqualToString:@"track_signup"]) {
-                NSString *realOriginalId = self.originalId ?: self.distinctId;
-                [eventDict setValue:realOriginalId forKey:@"original_id"];
-            } else {
-                [eventDict setValue:bestId forKey:SA_EVENT_DISTINCT_ID];
-            }
-            [eventDict setValue:@(arc4random()) forKey:SA_EVENT_TRACK_ID];
-
-            NSDictionary *libDict = [eventDict objectForKey:SA_EVENT_LIB];
-            id app_version = [self->_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-            if (app_version) {
-                [libDict setValue:app_version forKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-            }
+- (void)setMaxCacheSize:(UInt64)maxCacheSize {
+    @synchronized(self) {
+        //防止设置的值太小导致事件丢失
+        UInt64 temMaxCacheSize = maxCacheSize > 10000 ? maxCacheSize : 10000;
+        self.configOptions.maxCacheSize = (NSInteger)temMaxCacheSize;
+    };
+}
 
-            //update lib $app_version from super properties
-            app_version = [self->_superProperties objectForKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-            if (app_version) {
-                [libDict setValue:app_version forKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-            }
+- (UInt64)getMaxCacheSize {
+    @synchronized(self) {
+        return (UInt64)self.configOptions.maxCacheSize;
+    };
+}
 
-            NSMutableDictionary *automaticPropertiesCopy = [NSMutableDictionary dictionaryWithDictionary:self->_automaticProperties];
-            [automaticPropertiesCopy removeObjectForKey:SA_EVENT_COMMON_PROPERTY_LIB];
-            [automaticPropertiesCopy removeObjectForKey:SA_EVENT_COMMON_PROPERTY_LIB_VERSION];
+- (NSMutableDictionary *)webViewJavascriptBridgeCallbackInfo {
+    NSMutableDictionary *libProperties = [[NSMutableDictionary alloc] init];
+    [libProperties setValue:@"iOS" forKey:SA_EVENT_TYPE];
+    if (self.loginId != nil) {
+        [libProperties setValue:self.loginId forKey:SA_EVENT_DISTINCT_ID];
+        [libProperties setValue:[NSNumber numberWithBool:YES] forKey:@"is_login"];
+    } else{
+        [libProperties setValue:self.anonymousId forKey:SA_EVENT_DISTINCT_ID];
+        [libProperties setValue:[NSNumber numberWithBool:NO] forKey:@"is_login"];
+    }
+    return [libProperties copy];
+}
 
-            NSMutableDictionary *propertiesDict = [eventDict objectForKey:SA_EVENT_PROPERTIES];
-            if([type isEqualToString:@"track"] || [type isEqualToString:@"track_signup"]) {
-                // track / track_signup 类型的请求，还是要加上各种公共property
-                // 这里注意下顺序，按照优先级从低到高，依次是automaticProperties, superProperties,dynamicSuperPropertiesDict,propertieDict
-                [propertiesDict addEntriesFromDictionary:automaticPropertiesCopy];
-                NSDictionary *dynamicSuperPropertiesDict = self.dynamicSuperProperties?self.dynamicSuperProperties():nil;
-                //去重
-                [self unregisterSameLetterSuperProperties:dynamicSuperPropertiesDict];
-                [propertiesDict addEntriesFromDictionary:self->_superProperties];
-                [propertiesDict addEntriesFromDictionary:dynamicSuperPropertiesDict];
+- (void)login:(NSString *)loginId {
+    [self login:loginId withProperties:nil];
+}
 
-                // 每次 track 时手机网络状态
-                NSString *networkType = [SensorsAnalyticsSDK getNetWorkStates];
-                [propertiesDict setObject:networkType forKey:SA_EVENT_COMMON_PROPERTY_NETWORK_TYPE];
-                if ([networkType isEqualToString:@"WIFI"]) {
-                    [propertiesDict setObject:@YES forKey:SA_EVENT_COMMON_PROPERTY_WIFI];
-                } else {
-                    [propertiesDict setObject:@NO forKey:SA_EVENT_COMMON_PROPERTY_WIFI];
-                }
+- (void)login:(NSString *)loginId withProperties:(NSDictionary * _Nullable )properties {
+    if (![self.identifier isValidLoginId:loginId]) {
+        return;
+    }
 
-                //  是否首日访问
-                if([type isEqualToString:@"track"]) {
-                    if ([self isFirstDay]) {
-                        [propertiesDict setObject:@YES forKey:SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY];
-                    } else {
-                        [propertiesDict setObject:@NO forKey:SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY];
-                    }
-                }
-                [propertiesDict removeObjectForKey:@"_nocache"];
-            }
+    dispatch_async(self.serialQueue, ^{
+        [self.identifier login:loginId];
+    });
 
-            [eventDict removeObjectForKey:@"_nocache"];
-            [eventDict removeObjectForKey:@"server_url"];
+    NSMutableDictionary *eventProperties = [NSMutableDictionary dictionary];
+    // 添加来源渠道信息
+    [eventProperties addEntriesFromDictionary:[self.linkHandler latestUtmProperties]];
+    if ([SAValidator isValidDictionary:properties]) {
+        [eventProperties addEntriesFromDictionary:properties];
+    }
+    [self track:SA_EVENT_NAME_APP_SIGN_UP withProperties:eventProperties withType:@"track_signup"];
+    [[NSNotificationCenter defaultCenter] postNotificationName:SA_TRACK_LOGIN_NOTIFICATION object:nil];
+}
 
-            // $project & $token
-            NSString *project = [propertiesDict objectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT];
-            NSString *token = [propertiesDict objectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN];
-            NSInteger customTimeInt = [propertiesDict[SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME] integerValue];
-            
-            if (project) {
-                [propertiesDict removeObjectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT];
-                [eventDict setValue:project forKey:SA_EVENT_PROJECT];
-            }
-            if (token) {
-                [propertiesDict removeObjectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN];
-                [eventDict setValue:token forKey:SA_EVENT_TOKEN];
-            }
-            if (customTimeInt > 0) { //包含 $time
-                if (customTimeInt  >= SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT) {
-                    timeStamp = @(customTimeInt);
-                } else {
-                    SALog(@"H5 $time error %ld，Please check the value", customTimeInt);
-                }
-                [propertiesDict removeObjectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME];
-            }
-            
-            [eventDict setValue:timeStamp forKey:SA_EVENT_TIME];
+- (void)logout {
+    dispatch_async(self.serialQueue, ^{
+        [self.identifier logout];
+        [[NSNotificationCenter defaultCenter] postNotificationName:SA_TRACK_LOGOUT_NOTIFICATION object:nil];
+    });
+}
 
-            //JS SDK Data add _hybrid_h5 flag
-            [eventDict setValue:@(YES) forKey:SA_EVENT_HYBRID_H5];
+- (NSString *)loginId {
+    return self.identifier.loginId;
+}
 
-            NSDictionary *enqueueEvent = [self willEnqueueWithType:type andEvent:eventDict];
-            if (!enqueueEvent) {
-                return;
-            }
-            SALog(@"\n【track event from H5】:\n%@", enqueueEvent);
+- (NSString *)anonymousId {
+    return self.identifier.anonymousId;
+}
 
-            if([type isEqualToString:@"track_signup"]) {
+- (NSString *)distinctId {
+    return self.identifier.distinctId;
+}
 
-                NSString *newLoginId = [eventDict objectForKey:SA_EVENT_DISTINCT_ID];
+- (NSString *)originalId {
+    return self.identifier.originalId;
+}
 
-                if (![newLoginId isEqualToString:self.loginId]) {
-                    self.loginId = newLoginId;
-                    [self archiveLoginId];
-                    if (![newLoginId isEqualToString:self.anonymousId]) {
-                        self.originalId = self.anonymousId;
-                        [self enqueueWithType:type andEvent:[enqueueEvent copy]];
-                    }
-                }
-            } else {
-                [self enqueueWithType:type andEvent:[enqueueEvent copy]];
-            }
-        } @catch (NSException *exception) {
-            SAError(@"%@: %@", self, exception);
+- (void)resetAnonymousId {
+    dispatch_async(self.serialQueue, ^{
+        [self.identifier resetAnonymousId];
+        if (!self.loginId) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:SA_TRACK_RESETANONYMOUSID_NOTIFICATION object:nil];
         }
     });
 }
 
-- (void)trackFromH5WithEvent:(NSString *)eventInfo {
-    [self trackFromH5WithEvent:eventInfo enableVerify:NO];
-}
-
-- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request {
-    return [self showUpWebView:webView WithRequest:request andProperties:nil];
+- (void)trackAppCrash {
+    _configOptions.enableTrackAppCrash = YES;
+    // Install uncaught exception handlers first
+    [[SensorsAnalyticsExceptionHandler sharedHandler] addSensorsAnalyticsInstance:self];
 }
 
-- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request enableVerify:(BOOL)enableVerify {
-    return [self showUpWebView:webView WithRequest:request andProperties:nil enableVerify:enableVerify];
+- (void)enableAutoTrack:(SensorsAnalyticsAutoTrackEventType)eventType {
+    if (self.configOptions.autoTrackEventType != eventType) {
+        self.configOptions.autoTrackEventType = eventType;
+        
+        [self _enableAutoTrack];
+    }
 }
 
-- (BOOL)shouldHandleWebView:(id)webView request:(NSURLRequest *)request {
-    if (webView == nil) {
-        SADebug(@"showUpWebView == nil");
-        return NO;
+- (void)autoTrackAppStart {
+    // 是否首次启动
+    BOOL isFirstStart = NO;
+    if (![[NSUserDefaults standardUserDefaults] boolForKey:SA_HAS_LAUNCHED_ONCE]) {
+        isFirstStart = YES;
+        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:SA_HAS_LAUNCHED_ONCE];
+        [[NSUserDefaults standardUserDefaults] synchronize];
     }
 
-    if (request == nil || ![request isKindOfClass:NSURLRequest.class]) {
-        SADebug(@"request == nil or not NSURLRequest class");
-        return NO;
+    if ([self isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppStart]) {
+        return;
     }
 
-    NSString *urlString = request.URL.absoluteString;
-    if ([urlString rangeOfString:SA_JS_GET_APP_INFO_SCHEME].length ||[urlString rangeOfString:SA_JS_TRACK_EVENT_NATIVE_SCHEME].length) {
-        return YES;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        NSString *eventName = [self isLaunchedPassively] ? SA_EVENT_NAME_APP_START_PASSIVELY : SA_EVENT_NAME_APP_START;
+        NSMutableDictionary *properties = [NSMutableDictionary dictionary];
+        properties[SA_EVENT_PROPERTY_RESUME_FROM_BACKGROUND] = @(self->_appRelaunched);
+        properties[SA_EVENT_PROPERTY_APP_FIRST_START] = @(isFirstStart);
+        //添加 deeplink 相关渠道信息，可能不存在
+        [properties addEntriesFromDictionary:[_linkHandler utmProperties]];
+
+        [self track:eventName withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
+    });
+}
+
+- (void)startAppEndTimer {
+    if ([self isLaunchedPassively]) {
+        return;
     }
-    return NO;
+
+    // 启动 AppEnd 事件计时器
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [self trackTimerStart:SA_EVENT_NAME_APP_END];
+    });
 }
 
-- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request andProperties:(NSDictionary *)propertyDict enableVerify:(BOOL)enableVerify {
-    if (![self shouldHandleWebView:webView request:request]) {
-        return NO;
-    }
-    @try {
-        SADebug(@"showUpWebView");
-        SAJSONUtil *_jsonUtil = [[SAJSONUtil alloc] init];
-        NSDictionary *bridgeCallbackInfo = [self webViewJavascriptBridgeCallbackInfo];
-        NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
-        if (bridgeCallbackInfo) {
-            [properties addEntriesFromDictionary:bridgeCallbackInfo];
-        }
-        if (propertyDict) {
-            [properties addEntriesFromDictionary:propertyDict];
-        }
-        NSData* jsonData = [_jsonUtil JSONSerializeObject:properties];
-        NSString* jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-        
-        NSString *js = [NSString stringWithFormat:@"sensorsdata_app_js_bridge_call_js('%@')", jsonString];
-        
-        //判断系统是否支持WKWebView
-        Class wkWebViewClass = NSClassFromString(@"WKWebView");
-        
-        NSString *urlstr = request.URL.absoluteString;
-        if (!urlstr) {
-            return YES;
-        }
-        
-         //解析参数
-        NSMutableDictionary *paramsDic = [[SANetwork queryItemsWithURLString:urlstr] mutableCopy];
-        
-        if ([webView isKindOfClass:[UIWebView class]]) {//UIWebView
-            SADebug(@"showUpWebView: UIWebView");
-            if ([urlstr rangeOfString:SA_JS_GET_APP_INFO_SCHEME].location != NSNotFound) {
-                [webView stringByEvaluatingJavaScriptFromString:js];
-            } else if ([urlstr rangeOfString:SA_JS_TRACK_EVENT_NATIVE_SCHEME].location != NSNotFound) {
-                if ([paramsDic count] > 0) {
-                    NSString *eventInfo = [paramsDic objectForKey:SA_EVENT_NAME];
-                    if (eventInfo != nil) {
-                        NSString* encodedString = [eventInfo stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-                        [self trackFromH5WithEvent:encodedString enableVerify:enableVerify];
-                    }
-                }
-            }
-        } else if(wkWebViewClass && [webView isKindOfClass:wkWebViewClass]) {//WKWebView
-            SADebug(@"showUpWebView: WKWebView");
-            if ([urlstr rangeOfString:SA_JS_GET_APP_INFO_SCHEME].location != NSNotFound) {
-                typedef void(^Myblock)(id, NSError *);
-                Myblock myBlock = ^(id _Nullable response, NSError * _Nullable error) {
-                    SALog(@"response: %@ error: %@", response, error);
-                };
-                SEL sharedManagerSelector = NSSelectorFromString(@"evaluateJavaScript:completionHandler:");
-                if (sharedManagerSelector) {
-                    ((void (*)(id, SEL, NSString *, Myblock))[webView methodForSelector:sharedManagerSelector])(webView, sharedManagerSelector, js, myBlock);
-                }
-            } else if ([urlstr rangeOfString:SA_JS_TRACK_EVENT_NATIVE_SCHEME].location != NSNotFound) {
-                if ([paramsDic count] > 0) {
-                    NSString *eventInfo = [paramsDic objectForKey:SA_EVENT_NAME];
-                    if (eventInfo != nil) {
-                        NSString* encodedString = [eventInfo stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-                        [self trackFromH5WithEvent:encodedString enableVerify:enableVerify];
-                    }
-                }
-            }
-        } else {
-            SADebug(@"showUpWebView: not UIWebView or WKWebView");
-        }
-    } @catch (NSException *exception) {
-        SAError(@"%@: %@", self, exception);
-    } @finally {
-        return YES;
-    }
-}
-
-- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request andProperties:(NSDictionary *)propertyDict {
-    return [self showUpWebView:webView WithRequest:request andProperties:propertyDict enableVerify:NO];
-}
-
-- (void)setMaxCacheSize:(UInt64)maxCacheSize {
-    @synchronized(self) {
-        //防止设置的值太小导致事件丢失
-        UInt64 temMaxCacheSize = maxCacheSize > 10000 ? maxCacheSize : 10000;
-        self.configOptions.maxCacheSize = (NSInteger)temMaxCacheSize;
-    };
-}
-
-- (UInt64)getMaxCacheSize {
-    @synchronized(self) {
-        return self.configOptions.maxCacheSize;
-    };
-}
-
-- (NSMutableDictionary *)webViewJavascriptBridgeCallbackInfo {
-    NSMutableDictionary *libProperties = [[NSMutableDictionary alloc] init];
-    [libProperties setValue:@"iOS" forKey:SA_EVENT_TYPE];
-    if (self.loginId != nil) {
-        [libProperties setValue:self.loginId forKey:SA_EVENT_DISTINCT_ID];
-        [libProperties setValue:[NSNumber numberWithBool:YES] forKey:@"is_login"];
-    } else{
-        [libProperties setValue:self.anonymousId forKey:SA_EVENT_DISTINCT_ID];
-        [libProperties setValue:[NSNumber numberWithBool:NO] forKey:@"is_login"];
-    }
-    return [libProperties copy];
-}
-
-- (void)login:(NSString *)loginId {
-    [self login:loginId withProperties:nil];
-}
-
-- (void)login:(NSString *)loginId withProperties:(NSDictionary * _Nullable )properties {
-    if (loginId == nil || loginId.length == 0) {
-        SAError(@"%@ cannot login blank login_id: %@", self, loginId);
-        return;
-    }
-    if (loginId.length > 255) {
-        SAError(@"%@ max length of login_id is 255, login_id: %@", self, loginId);
-        return;
-    }
-    
-    dispatch_async(self.serialQueue, ^{
-        if (![loginId isEqualToString:self.loginId]) {
-            self.loginId = loginId;
-            [self archiveLoginId];
-            if (![loginId isEqualToString:self.anonymousId]) {
-                self.originalId = self.anonymousId;
-                [self track:SA_EVENT_NAME_APP_SIGN_UP withProperties:properties withType:@"track_signup"];
-            }
-        }
-    });
-}
-
-- (void)logout {
-    dispatch_async(self.serialQueue, ^{
-        self.loginId = nil;
-        [self archiveLoginId];
-    });
-}
-
-- (NSString *)anonymousId {
-    if (!_anonymousId) {
-        [self resetAnonymousId];
-    }
-    return _anonymousId;
-}
-
--(NSString *)distinctId {
-    NSString *distinctId = self.loginId;
-    if (distinctId.length == 0) {
-        distinctId = self.anonymousId;
-    }
-    return distinctId;
-}
-
-- (void)resetAnonymousId {
-    _anonymousId = [self.class getUniqueHardwareId];
-    [self archiveAnonymousId];
-}
-
-- (void)trackAppCrash {
-    // Install uncaught exception handlers first
-    [[SensorsAnalyticsExceptionHandler sharedHandler] addSensorsAnalyticsInstance:self];
-}
-
-- (void)enableAutoTrack:(SensorsAnalyticsAutoTrackEventType)eventType {
-    if (self.configOptions.autoTrackEventType != eventType) {
-        self.configOptions.autoTrackEventType = eventType;
-        
-        [self _enableAutoTrack];
-    }
-}
-
-- (void)autoTrackAppStart {
-    // 是否首次启动
-    BOOL isFirstStart = NO;
-    if (![[NSUserDefaults standardUserDefaults] boolForKey:SA_HAS_LAUNCHED_ONCE]) {
-        isFirstStart = YES;
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:SA_HAS_LAUNCHED_ONCE];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    }
-
-    if ([self isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppStart]) {
-        return;
-    }
-
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        NSString *eventName = [self isLaunchedPassively] ? SA_EVENT_NAME_APP_START_PASSIVELY : SA_EVENT_NAME_APP_START;
-        NSDictionary *properties = @{SA_EVENT_PROPERTY_RESUME_FROM_BACKGROUND: @(self->_appRelaunched), SA_EVENT_PROPERTY_APP_FIRST_START: @(isFirstStart)};
-        [self track:eventName withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
-    });
-}
-
-- (void)startAppEndTimer {
-    if ([self isLaunchedPassively]) {
-        return;
-    }
-
-    // 启动 AppEnd 事件计时器
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        [self trackTimerStart:SA_EVENT_NAME_APP_END];
-    });
-}
-
-- (BOOL)isAutoTrackEnabled {
-    if (sharedInstance.remoteConfig.disableSDK) {
+- (BOOL)isAutoTrackEnabled {
+    if (sharedInstance.remoteConfig.disableSDK) {
         return NO;
     }
     if (self.remoteConfig.autoTrackMode != kSAAutoTrackModeDefault) {
@@ -1072,7 +831,12 @@ - (void)ignoreViewType:(Class)aClass {
 }
 
 - (BOOL)isViewTypeIgnored:(Class)aClass {
-    return [_ignoredViewTypeList containsObject:aClass];
+    for (Class obj in _ignoredViewTypeList) {
+        if ([aClass isSubclassOfClass:obj]) {
+            return YES;
+        }
+    }
+    return NO;
 }
 
 - (BOOL)isViewControllerIgnored:(UIViewController *)viewController {
@@ -1091,24 +855,36 @@ - (void)showDebugInfoView:(BOOL)show {
     _showDebugAlertView = show;
 }
 
-- (void)flushByType:(NSString *)type flushSize:(int)flushSize {
+- (BOOL)flushByType:(NSString *)type flushSize:(int)flushSize {
     // 1、获取前 n 条数据
-    NSArray *recordArray = [self.messageQueue getFirstRecords:flushSize withType:@"POST"];
+    __block NSArray *recordArray = [self.messageQueue getFirstRecords:flushSize withType:@"POST"];
     if (recordArray == nil) {
-        SAError(@"Failed to get records from SQLite.");
-        return;
+        SALogError(@"Failed to get records from SQLite.");
+        return NO;
+    }
+
+    NSInteger recordCount = recordArray.count;
+    __block BOOL isRecordEncrypted = NO;
+    if (self.configOptions.enableEncrypt) {
+        [self.encryptBuilder buildFlushEncryptionDataWithRecords:recordArray
+                                                      completion:^(BOOL isContentEncrypted, NSArray * _Nonnull contentArray) {
+            isRecordEncrypted = isContentEncrypted;
+            recordArray = contentArray;
+        }];
     }
+    
     // 2、上传获取到的记录。如果数据上传完成，结束递归
-    if (recordArray.count == 0 || ![self.network flushEvents:recordArray]) {
-        return;
+    if (recordArray.count == 0 || ![self.network flushEvents:recordArray isEncrypted:isRecordEncrypted]) {
+        return NO;
     }
     // 3、删除已上传的记录。删除失败，结束递归
-    if (![self.messageQueue removeFirstRecords:recordArray.count withType:@"POST"]) {
-        SAError(@"Failed to remove records from SQLite.");
-        return;
+    if (![self.messageQueue removeFirstRecords:recordCount withType:@"POST"]) {
+        SALogError(@"Failed to remove records from SQLite.");
+        return NO;
     }
     // 4、继续上传剩余数据
     [self flushByType:type flushSize:flushSize];
+    return YES;
 }
 
 - (void)_flush:(BOOL) vacuumAfterFlushing {
@@ -1116,20 +892,21 @@ - (void)_flush:(BOOL) vacuumAfterFlushing {
         return;
     }
     // 判断当前网络类型是否符合同步数据的网络策略
-    NSString *networkType = [SensorsAnalyticsSDK getNetWorkStates];
+    NSString *networkType = [SACommonUtility currentNetworkStatus];
     if (!([self toNetworkType:networkType] & _networkTypePolicy)) {
         return;
     }
-    
-    [self flushByType:@"Post" flushSize:(_debugMode == SensorsAnalyticsDebugOff ? 50 : 1)];
+
+    BOOL uploadedEvents = [self flushByType:@"Post" flushSize:(_debugMode == SensorsAnalyticsDebugOff ? 50 : 1)];
 
     if (vacuumAfterFlushing) {
         if (![self.messageQueue vacuum]) {
-            SAError(@"failed to VACUUM SQLite.");
+            SALogError(@"failed to VACUUM SQLite.");
         }
     }
-
-    SADebug(@"events flushed.");
+    if (uploadedEvents) {
+        SALogDebug(@"events flushed.");
+    }
 }
 
 - (void)flush {
@@ -1139,23 +916,23 @@ - (void)flush {
 }
 
 - (void)deleteAll {
-    [self.messageQueue deleteAll];
+    // 新增线程保护
+    dispatch_async(self.serialQueue, ^{
+        [self.messageQueue deleteAll];
+    });
 }
 
 #pragma mark - HandleURL
 - (BOOL)canHandleURL:(NSURL *)url {
-   return [[SAAuxiliaryToolManager sharedInstance] canHandleURL:url];
+   return [[SAAuxiliaryToolManager sharedInstance] canHandleURL:url] || [_linkHandler canHandleURL:url];
 }
 
 - (BOOL)handleAutoTrackURL:(NSURL *)URL{
     if (URL == nil) {
         return NO;
     }
-    NSString *networkType = [SensorsAnalyticsSDK getNetWorkStates];
-    BOOL isWifi = NO;
-    if ([networkType isEqualToString:@"WIFI"]) {
-        isWifi = YES;
-    }
+    
+    BOOL isWifi = [[SACommonUtility currentNetworkStatus] isEqualToString:@"WIFI"];
     return [[SAAuxiliaryToolManager sharedInstance] handleURL:URL isWifi:isWifi];
 }
 
@@ -1166,12 +943,12 @@ - (BOOL)handleSchemeUrl:(NSURL *)url {
             return NO;
         }
         
-        if ([[SAAuxiliaryToolManager sharedInstance] isVisualizedAutoTrackURL:url] || [[SAAuxiliaryToolManager sharedInstance] isHeatMapURL:url]) {//点击图
-            
+        if ([[SAAuxiliaryToolManager sharedInstance] isVisualizedAutoTrackURL:url] || [[SAAuxiliaryToolManager sharedInstance] isHeatMapURL:url]) {
+            //点击图 & 可视化全埋点
             return [self handleAutoTrackURL:url];
         } else if ([[SAAuxiliaryToolManager sharedInstance] isDebugModeURL:url]) {//动态 debug 配置
             // url query 解析
-            NSMutableDictionary *paramDic = [[SANetwork queryItemsWithURL:url] mutableCopy];
+            NSMutableDictionary *paramDic = [[SAURLUtils queryItemsWithURL:url] mutableCopy];
 
             //如果没传 info_id，视为伪造二维码，不做处理
             if (paramDic.allKeys.count &&  [paramDic.allKeys containsObject:@"info_id"]) {
@@ -1180,20 +957,22 @@ - (BOOL)handleSchemeUrl:(NSURL *)url {
             } else {
                 return NO;
             }
+        } else if ([[SAAuxiliaryToolManager sharedInstance] isSecretKeyURL:url]) {
+            // 校验加密公钥
+            [self.secretKeyHandler checkSecretKeyURL:url];
+            return YES;
+        } else if ([_linkHandler canHandleURL:url]) {
+            [_linkHandler handleDeepLink:url];
         }
     } @catch (NSException *exception) {
-        SAError(@"%@: %@", self, exception);
+        SALogError(@"%@: %@", self, exception);
     }
     return NO;
 }
 
 #pragma mark - VisualizedAutoTrack
-- (void)enableVisualizedAutoTrack {
-    _shouldVisualizedAutoTrack = YES;
-}
-
 - (BOOL)isVisualizedAutoTrackEnabled {
-    return _shouldVisualizedAutoTrack;
+    return self.configOptions.enableVisualizedAutoTrack;
 }
 
 - (void)addVisualizedAutoTrackViewControllers:(NSArray<NSString *> *)controllers {
@@ -1208,7 +987,7 @@ - (BOOL)isVisualizedAutoTrackViewController:(UIViewController *)viewController {
         return NO;
     }
 
-    if (_visualizedAutoTrackViewControllers.count == 0) {
+    if (_visualizedAutoTrackViewControllers.count == 0 && self.configOptions.enableVisualizedAutoTrack) {
         return YES;
     }
 
@@ -1216,13 +995,95 @@ - (BOOL)isVisualizedAutoTrackViewController:(UIViewController *)viewController {
     return [_visualizedAutoTrackViewControllers containsObject:screenName];
 }
 
-#pragma mark - Heat Map
-- (void)enableHeatMap {
-    _shouldHeatMap = YES;
+#pragma mark - WKWebView 打通
+
+- (void)swizzleWebViewMethod {
+    static dispatch_once_t onceTokenWebView;
+    dispatch_once(&onceTokenWebView, ^{
+        NSError *error = NULL;
+
+        [WKWebView sa_swizzleMethod:@selector(loadRequest:)
+                         withMethod:@selector(sensorsdata_loadRequest:)
+                              error:&error];
+
+        [WKWebView sa_swizzleMethod:@selector(loadHTMLString:baseURL:)
+                         withMethod:@selector(sensorsdata_loadHTMLString:baseURL:)
+                              error:&error];
+
+        if (@available(iOS 9.0, *)) {
+            [WKWebView sa_swizzleMethod:@selector(loadFileURL:allowingReadAccessToURL:)
+                             withMethod:@selector(sensorsdata_loadFileURL:allowingReadAccessToURL:)
+                                  error:&error];
+
+            [WKWebView sa_swizzleMethod:@selector(loadData:MIMEType:characterEncodingName:baseURL:)
+                             withMethod:@selector(sensorsdata_loadData:MIMEType:characterEncodingName:baseURL:)
+                                  error:&error];
+        }
+
+        if (error) {
+            SALogError(@"Failed to swizzle on WKWebView. Details: %@", error);
+            error = NULL;
+        }
+    });
+}
+
+- (void)addScriptMessageHandlerWithWebView:(WKWebView *)webView {
+    NSAssert([webView isKindOfClass:[WKWebView class]], @"此注入方案只支持 WKWebView！❌");
+    if (![webView isKindOfClass:[WKWebView class]]) {
+        return;
+    }
+
+    @try {
+        WKUserContentController *contentController = webView.configuration.userContentController;
+        [contentController removeScriptMessageHandlerForName:SA_SCRIPT_MESSAGE_HANDLER_NAME];
+        [contentController addScriptMessageHandler:[SAScriptMessageHandler sharedInstance] name:SA_SCRIPT_MESSAGE_HANDLER_NAME];
+
+        NSMutableString *javaScriptSource = [NSMutableString string];
+
+        // 开启 WKWebView 的 H5 打通功能
+        if (self.configOptions.enableJavaScriptBridge) {
+            if ([self.network.serverURL isKindOfClass:[NSURL class]] && [self.network.serverURL absoluteString]) {
+                [javaScriptSource appendString:@"window.SensorsData_iOS_JS_Bridge = {};"];
+                [javaScriptSource appendFormat:@"window.SensorsData_iOS_JS_Bridge.sensorsdata_app_server_url = '%@';", [self.network.serverURL absoluteString]];
+            } else {
+                SALogError(@"%@ get network serverURL is failed!", self);
+            }
+        }
+
+        // App 内嵌 H5 数据交互
+        if (self.configOptions.enableVisualizedAutoTrack) {
+            [javaScriptSource appendString:@"window.SensorsData_App_Visual_Bridge = {};"];
+            if ([SAAuxiliaryToolManager sharedInstance].isVisualizedConnecting) {
+                [javaScriptSource appendFormat:@"window.SensorsData_App_Visual_Bridge.sensorsdata_visualized_mode = true;"];
+            }
+        }
+        
+        if (javaScriptSource.length == 0) {
+            return;
+        }
+        
+        NSArray<WKUserScript *> *userScripts = contentController.userScripts;
+        __block BOOL isContainJavaScriptBridge = NO;
+        [userScripts enumerateObjectsUsingBlock:^(WKUserScript * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            if ([obj.source containsString:@"sensorsdata_app_server_url"] || [obj.source containsString:@"sensorsdata_visualized_mode"]) {
+                isContainJavaScriptBridge = YES;
+                *stop = YES;
+            }
+        }];
+        
+        if (!isContainJavaScriptBridge) {
+            // forMainFrameOnly:标识脚本是仅应注入主框架（YES）还是注入所有框架（NO）
+            WKUserScript *userScript = [[WKUserScript alloc] initWithSource:[NSString stringWithString:javaScriptSource] injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO];
+            [contentController addUserScript:userScript];
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@ error: %@", self, exception);
+    }
 }
 
+#pragma mark - Heat Map
 - (BOOL)isHeatMapEnabled {
-    return _shouldHeatMap;
+    return self.configOptions.enableHeatMap;
 }
 
 - (void)addHeatMapViewControllers:(NSArray<NSString *> *)controllers {
@@ -1237,7 +1098,7 @@ - (BOOL)isHeatMapViewController:(UIViewController *)viewController {
         return NO;
     }
 
-    if (_heatMapViewControllers.count == 0) {
+    if (_heatMapViewControllers.count == 0 && self.configOptions.enableHeatMap) {
         return YES;
     }
 
@@ -1273,7 +1134,7 @@ - (void)trackItems:(nullable NSDictionary <NSString *, id> *)itemDict properties
     NSString *itemType = itemDict[SA_EVENT_ITEM_TYPE];
     if (itemType.length == 0 || ![self isValidName:itemType]) {
         NSString *errMsg = [NSString stringWithFormat:@"item_type name[%@] not valid", itemType];
-        SAError(@"%@", errMsg);
+        SALogError(@"%@", errMsg);
         if (_debugMode != SensorsAnalyticsDebugOff) {
             [self showDebugModeWarning:errMsg withNoMoreButton:YES];
         }
@@ -1282,130 +1143,81 @@ - (void)trackItems:(nullable NSDictionary <NSString *, id> *)itemDict properties
 
     NSString *itemId = itemDict[SA_EVENT_ITEM_ID];
     if (itemId.length == 0 || itemId.length > 255) {
-        SAError(@"%@ max length of item_id is 255, item_id: %@", self, itemId);
+        SALogError(@"%@ max length of item_id is 255, item_id: %@", self, itemId);
         return;
     }
-
+    
     // 校验 properties
     NSString *type = itemDict[SA_EVENT_TYPE];
     if (![self assertPropertyTypes:&propertyDict withEventType:type]) {
-        SAError(@"%@ failed to item properties", self);
+        SALogError(@"%@ failed to item properties", self);
         return;
     }
-
+    
     NSMutableDictionary *itemProperties = [NSMutableDictionary dictionaryWithDictionary:itemDict];
-    if (propertyDict.count > 0) {
-        itemProperties[SA_EVENT_PROPERTIES] = propertyDict;
-    }
-
-    NSMutableDictionary *libProperties = [[NSMutableDictionary alloc] init];
-    [libProperties setValue:@"code" forKey:SA_EVENT_COMMON_PROPERTY_LIB_METHOD];
-    [libProperties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_LIB] forKey:SA_EVENT_COMMON_PROPERTY_LIB];
-    [libProperties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_LIB_VERSION] forKey:SA_EVENT_COMMON_PROPERTY_LIB_VERSION];
-    NSString *app_version = [_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-    if (app_version) {
-        [libProperties setValue:app_version forKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
+    
+    // 处理 $project
+    NSMutableDictionary *propertyMDict = [NSMutableDictionary dictionaryWithDictionary:propertyDict];
+    id project = propertyMDict[SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT];
+    if (project) {
+        itemProperties[SA_EVENT_PROJECT] = project;
+        [propertyMDict removeObjectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT];
     }
-
-    if (libProperties.count > 0) {
-        itemProperties[SA_EVENT_LIB] = libProperties;
+    
+    if (propertyMDict.count > 0) {
+        itemProperties[SA_EVENT_PROPERTIES] = propertyMDict;
     }
+    
+    itemProperties[SA_EVENT_LIB] = [self.presetProperty libPropertiesWithMethod:@"code"];
 
     NSNumber *timeStamp = @([[self class] getCurrentTime]);
     itemProperties[SA_EVENT_TIME] = timeStamp;
 
-    SALog(@"\n【track event】:\n%@", itemProperties);
+    SALogDebug(@"\n【track event】:\n%@", itemProperties);
 
     [self enqueueWithType:@"Post" andEvent:itemProperties];
 }
 #pragma mark - track event
 
-- (BOOL) isValidName : (NSString *) name {
+- (BOOL)isValidName:(NSString *)name {
     @try {
-        if (_deviceModel == nil) {
-            _deviceModel = [self deviceModel];
-        }
-
-        if (_osVersion == nil) {
-            UIDevice *device = [UIDevice currentDevice];
-            _osVersion = [device systemVersion];
-        }
-
-        //据反馈，该函数在 iPhone 8、iPhone 8 Plus，并且系统版本号为 11.0 上可能会 crash，具体原因暂未查明
-        if ([_osVersion isEqualToString:@"11.0"]) {
-            if ([_deviceModel isEqualToString:@"iPhone10,1"] ||
-                [_deviceModel isEqualToString:@"iPhone10,4"] ||
-                [_deviceModel isEqualToString:@"iPhone10,2"] ||
-                [_deviceModel isEqualToString:@"iPhone10,5"]) {
-                    return YES;
+        // 保留字段通过字符串直接比较，效率更高
+        NSSet *reservedProperties = sensorsdata_reserved_properties();
+        for (NSString *reservedProperty in reservedProperties) {
+            if ([reservedProperty caseInsensitiveCompare:name] == NSOrderedSame) {
+                return NO;
             }
         }
-        return [self.regexTestName evaluateWithObject:name];
+        // 属性名通过正则表达式匹配，比使用谓词效率更高
+        NSRange range = NSMakeRange(0, name.length);
+        return ([self.propertiesRegex numberOfMatchesInString:name options:0 range:range] > 0);
     } @catch (NSException *exception) {
-        SAError(@"%@: %@", self, exception);
+        SALogError(@"%@: %@", self, exception);
         return NO;
     }
 }
 
-- (NSString *)filePathForData:(NSString *)data {
-    NSString *filename = [NSString stringWithFormat:@"sensorsanalytics-%@.plist", data];
-    NSString *filepath = [[NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES) lastObject]
-            stringByAppendingPathComponent:filename];
-    SADebug(@"filepath for %@ is %@", data, filepath);
-    return filepath;
-}
-
 - (NSDictionary<NSString *, id> *)willEnqueueWithType:(NSString *)type andEvent:(NSDictionary *)e {
     if (!self.trackEventCallback || !e[@"event"]) {
         return [e copy];
     }
     NSMutableDictionary *event = [e mutableCopy];
-    
-    NSDictionary<NSString *, id> *originProperties = event[@"properties"];
-    // can only modify "$device_id"
-    NSArray *modifyKeys = @[SA_EVENT_COMMON_PROPERTY_DEVICE_ID];
-    NSArray *returnKeys = @[SA_EVENT_PROPERTY_ELEMENT_ID,
-                            SA_EVENT_PROPERTY_SCREEN_NAME,
-                            SA_EVENT_PROPERTY_TITLE,
-                            SA_EVENT_PROPERTY_ELEMENT_POSITION,
-                            SA_EVENT_PROPERTY_ELEMENT_CONTENT,
-                            SA_EVENT_PROPERTY_ELEMENT_TYPE];
-    BOOL(^canModifyPropertyKeys)(NSString *key) = ^BOOL(NSString *key) {
-        return (![key hasPrefix:@"$"] || [modifyKeys containsObject:key]);
-    };
-    NSMutableDictionary *properties = [NSMutableDictionary dictionary];
-    // 添加可修改的事件属性
-    [originProperties enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
-        if (canModifyPropertyKeys(key) || [returnKeys containsObject:key]) {
-            properties[key] = obj;
-        }
-    }];
-    BOOL isIncluded = self.trackEventCallback(event[@"event"], properties);
+    NSMutableDictionary<NSString *, id> *originProperties = event[@"properties"];
+    BOOL isIncluded = self.trackEventCallback(event[@"event"], originProperties);
     if (!isIncluded) {
-        SALog(@"\n【track event】: %@ can not enter database.", event[@"event"]);
+        SALogDebug(@"\n【track event】: %@ can not enter database.", event[@"event"]);
         return nil;
     }
     // 校验 properties
-    if (![self assertPropertyTypes:&properties withEventType:type]) {
-        SAError(@"%@ failed to track event.", self);
+    if (![self assertPropertyTypes:&originProperties withEventType:type]) {
+        SALogError(@"%@ failed to track event.", self);
         return nil;
     }
-    // assert 可能修改 properties 的类型
-    properties = [properties mutableCopy];
-    // 添加不可修改的事件属性，得到修改之后的所有属性
-    [originProperties enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
-        if (!canModifyPropertyKeys(key)) {
-            properties[key] = obj;
-        }
-    }];
-    // 对 properties 重新赋值
-    event[@"properties"] = properties;
-
     return event;
 }
 
 - (void)enqueueWithType:(NSString *)type andEvent:(NSDictionary *)e {
-    [self.messageQueue addObejct:e withType:@"Post"];
+    [self.messageQueue addObject:e withType:@"Post"];
 }
 
 - (void)track:(NSString *)event withProperties:(NSDictionary *)propertieDict withType:(NSString *)type {
@@ -1414,14 +1226,13 @@ - (void)track:(NSString *)event withProperties:(NSDictionary *)propertieDict wit
     }
     propertieDict = [propertieDict copy];
     
-    NSMutableDictionary *libProperties = [[NSMutableDictionary alloc] init];
-    [libProperties setValue:@"autoTrack" forKey:SA_EVENT_COMMON_PROPERTY_LIB_METHOD];
+    NSMutableDictionary *libProperties = [self.presetProperty libPropertiesWithMethod:@"autoTrack"];
 
     // 对于type是track数据，它们的event名称是有意义的
     if ([type isEqualToString:@"track"] || [type isEqualToString:@"codeTrack"]) {
         if (event == nil || [event length] == 0) {
             NSString *errMsg = @"SensorsAnalytics track called with empty event parameter";
-            SAError(@"%@", errMsg);
+            SALogError(@"%@", errMsg);
             if (_debugMode != SensorsAnalyticsDebugOff) {
                 [self showDebugModeWarning:errMsg withNoMoreButton:YES];
             }
@@ -1429,7 +1240,7 @@ - (void)track:(NSString *)event withProperties:(NSDictionary *)propertieDict wit
         }
         if (![self isValidName:event]) {
             NSString *errMsg = [NSString stringWithFormat:@"Event name[%@] not valid", event];
-            SAError(@"%@", errMsg);
+            SALogError(@"%@", errMsg);
             if (_debugMode != SensorsAnalyticsDebugOff) {
                 [self showDebugModeWarning:errMsg withNoMoreButton:YES];
             }
@@ -1437,232 +1248,183 @@ - (void)track:(NSString *)event withProperties:(NSDictionary *)propertieDict wit
         }
 
         if ([type isEqualToString:@"codeTrack"]) {
-            [libProperties setValue:@"code" forKey:SA_EVENT_COMMON_PROPERTY_LIB_METHOD];
+            libProperties[SAEventPresetPropertyLibMethod] = @"code";
             type = @"track";
         }
     }
 
     if (propertieDict) {
         if (![self assertPropertyTypes:&propertieDict withEventType:type]) {
-            SAError(@"%@ failed to track event.", self);
+            SALogError(@"%@ failed to track event.", self);
             return;
         }
     }
-    [libProperties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_LIB] forKey:SA_EVENT_COMMON_PROPERTY_LIB];
-    [libProperties setValue:[_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_LIB_VERSION] forKey:SA_EVENT_COMMON_PROPERTY_LIB_VERSION];
-    id app_version = [_automaticProperties objectForKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-    if (app_version) {
-        [libProperties setValue:app_version forKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-    }
 
-    NSString *lib_detail = nil;
+    NSString *libDetail = nil;
     if ([self isAutoTrackEnabled] && propertieDict) {
+        //不考虑 $AppClick 或者 $AppViewScreen 的计时采集，所以这里的 event 不会出现是 trackTimerStart 返回值的情况
         if ([event isEqualToString:SA_EVENT_NAME_APP_CLICK]) {
             if ([self isAutoTrackEventTypeIgnored: SensorsAnalyticsEventTypeAppClick] == NO) {
-                lib_detail = [NSString stringWithFormat:@"%@######", [propertieDict objectForKey:SA_EVENT_PROPERTY_SCREEN_NAME] ?: @""];
+                libDetail = [NSString stringWithFormat:@"%@######", [propertieDict objectForKey:SA_EVENT_PROPERTY_SCREEN_NAME] ?: @""];
             }
         } else if ([event isEqualToString:SA_EVENT_NAME_APP_VIEW_SCREEN]) {
             if ([self isAutoTrackEventTypeIgnored: SensorsAnalyticsEventTypeAppViewScreen] == NO) {
-                lib_detail = [NSString stringWithFormat:@"%@######", [propertieDict objectForKey:SA_EVENT_PROPERTY_SCREEN_NAME] ?: @""];
+                libDetail = [NSString stringWithFormat:@"%@######", [propertieDict objectForKey:SA_EVENT_PROPERTY_SCREEN_NAME] ?: @""];
             }
         }
     }
-
-    if (lib_detail) {
-        [libProperties setValue:lib_detail forKey:SA_EVENT_COMMON_PROPERTY_LIB_DETAIL];
-    }
-    __block NSDictionary *dynamicSuperPropertiesDict = self.dynamicSuperProperties?self.dynamicSuperProperties():nil;
+    libProperties[SAEventPresetPropertyLibDetail] = libDetail;
+    
+    __block NSDictionary *dynamicSuperPropertiesDict = [self acquireDynamicSuperProperties];
+    
+    UInt64 currentSystemUpTime = [[self class] getSystemUpTime];
+    
+    __block NSNumber *timeStamp = @([[self class] getCurrentTime]);
+    
     dispatch_async(self.serialQueue, ^{
+        //根据当前 event 解析计时操作时加工前的原始 eventName，若当前 event 不是 trackTimerStart 计时操作后返回的字符串，event 和 eventName 一致
+        NSString *eventName = [self.trackTimer eventNameFromEventId:event];
+
         //获取用户自定义的动态公共属性
         if (dynamicSuperPropertiesDict && [dynamicSuperPropertiesDict isKindOfClass:NSDictionary.class] == NO) {
-            SALog(@"dynamicSuperProperties  returned: %@  is not an NSDictionary Obj.", dynamicSuperPropertiesDict);
+            SALogDebug(@"dynamicSuperProperties  returned: %@  is not an NSDictionary Obj.", dynamicSuperPropertiesDict);
+            dynamicSuperPropertiesDict = nil;
+        } else if (![self assertPropertyTypes:&dynamicSuperPropertiesDict withEventType:@"register_super_properties"]) {
             dynamicSuperPropertiesDict = nil;
-        } else {
-            if ([self assertPropertyTypes:&dynamicSuperPropertiesDict withEventType:@"register_super_properties"] == NO) {
-                dynamicSuperPropertiesDict = nil;
-            }
         }
         //去重
         [self unregisterSameLetterSuperProperties:dynamicSuperPropertiesDict];
 
-        NSNumber *timeStamp = @([[self class] getCurrentTime]);
-        NSMutableDictionary *p = [NSMutableDictionary dictionary];
+        NSMutableDictionary *eventPropertiesDic = [NSMutableDictionary dictionary];
         if ([type isEqualToString:@"track"] || [type isEqualToString:@"track_signup"]) {
             // track / track_signup 类型的请求，还是要加上各种公共property
             // 这里注意下顺序，按照优先级从低到高，依次是automaticProperties, superProperties,dynamicSuperPropertiesDict,propertieDict
-            [p addEntriesFromDictionary:self->_automaticProperties];
-            [p addEntriesFromDictionary:self->_superProperties];
-            [p addEntriesFromDictionary:dynamicSuperPropertiesDict];
+            [eventPropertiesDic addEntriesFromDictionary:self.presetProperty.automaticProperties];
+            [eventPropertiesDic addEntriesFromDictionary:self->_superProperties];
+            [eventPropertiesDic addEntriesFromDictionary:dynamicSuperPropertiesDict];
 
             //update lib $app_version from super properties
-            id app_version = [self->_superProperties objectForKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-            if (app_version) {
-                [libProperties setValue:app_version forKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
+            id appVersion = self->_superProperties[SAEventPresetPropertyAppVersion];
+            if (appVersion) {
+                libProperties[SAEventPresetPropertyAppVersion] = appVersion;
             }
 
             // 每次 track 时手机网络状态
-            NSString *networkType = [SensorsAnalyticsSDK getNetWorkStates];
-            [p setObject:networkType forKey:SA_EVENT_COMMON_PROPERTY_NETWORK_TYPE];
-            if ([networkType isEqualToString:@"WIFI"]) {
-                [p setObject:@YES forKey:SA_EVENT_COMMON_PROPERTY_WIFI];
+            [eventPropertiesDic addEntriesFromDictionary:[self.presetProperty currentNetworkProperties]];
+
+            //根据 event 获取事件时长，如返回为 Nil 表示此事件没有相应事件时长，不设置 event_duration 属性
+            //为了保证事件时长准确性，当前开机时间需要在 serialQueue 队列外获取，再在此处传入方法内进行计算
+            NSNumber *eventDuration = [self.trackTimer eventDurationFromEventId:event currentSysUpTime:currentSystemUpTime];
+            if (eventDuration) {
+                eventPropertiesDic[@"event_duration"] = eventDuration;
+            }
+        }
+        
+        if ([propertieDict isKindOfClass:[NSDictionary class]]) {
+            [eventPropertiesDic addEntriesFromDictionary:propertieDict];
+        }
+
+        // 事件、公共属性和动态公共属性都需要支持修改 $project, $token, $time
+        NSString *project = (NSString *)eventPropertiesDic[SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT];
+        NSString *token = (NSString *)eventPropertiesDic[SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN];
+        id originalTime = eventPropertiesDic[SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME];
+        if ([originalTime isKindOfClass:NSDate.class]) {
+            NSDate *customTime = (NSDate *)originalTime;
+            NSInteger customTimeInt = [customTime timeIntervalSince1970] * 1000;
+            if (customTimeInt >= SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT) {
+                timeStamp = @(customTimeInt);
             } else {
-                [p setObject:@NO forKey:SA_EVENT_COMMON_PROPERTY_WIFI];
+                SALogError(@"$time error %ld，Please check the value", (long)customTimeInt);
             }
-
-            NSDictionary *eventTimer = self.trackTimer[event];
-            if (eventTimer) {
-                [self.trackTimer removeObjectForKey:event];
-                NSNumber *eventBegin = [eventTimer valueForKey:@"eventBegin"];
-                NSNumber *eventAccumulatedDuration = [eventTimer objectForKey:@"eventAccumulatedDuration"];
-                SensorsAnalyticsTimeUnit timeUnit = [[eventTimer valueForKey:@"timeUnit"] intValue];
-                BOOL isPause = [eventTimer[@"isPause"] boolValue];
-
-                float eventDuration = 0;
-                if (!isPause) {
-                    eventDuration = [self eventTimerDurationWithEventStart:eventBegin.longValue timeUnit:timeUnit];
-                }
-
-                if (eventAccumulatedDuration) {
-                    eventDuration += eventAccumulatedDuration.floatValue;
-                }
-
-                p[@"event_duration"] = @([[NSString stringWithFormat:@"%.3f", eventDuration] floatValue]);
-            }
-        }
-
-        NSString *project = nil;
-        NSString *token = nil;
-        if (propertieDict) {
-            NSArray *keys = propertieDict.allKeys;
-            for (id key in keys) {
-                NSObject *obj = propertieDict[key];
-                if ([key isEqualToString:SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT]) {
-                    project = (NSString *)obj;
-                } else if ([key isEqualToString:SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN]) {
-                    token = (NSString *)obj;
-                } else if ([key isEqualToString:SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME] && [obj isKindOfClass:NSDate.class]) {
-                    NSDate *customTime = (NSDate *)obj;
-                    NSInteger customTimeInt = [customTime timeIntervalSince1970] * 1000;
-                    if (customTimeInt >= SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT) {
-                        timeStamp = @(customTimeInt);
-                    } else {
-                        SALog(@"$time error %ld，Please check the value", customTimeInt);
-                    }
-                } else {
-                    if ([obj isKindOfClass:[NSDate class]]) {
-                        // 序列化所有 NSDate 类型
-                        NSString *dateStr = [self->_dateFormatter stringFromDate:(NSDate *)obj];
-                        [p setObject:dateStr forKey:key];
-                    } else {
-                        [p setObject:obj forKey:key];
-                    }
-                }
+        } else if (originalTime) {
+            SALogError(@"$time '%@' invalid，Please check the value", originalTime);
+        }
+        
+        // $project, $token, $time 处理完毕后需要移除
+        NSArray<NSString *> *needRemoveKeys = @[SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT,
+                                                SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN,
+                                                SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME];
+        [eventPropertiesDic removeObjectsForKeys:needRemoveKeys];
+        
+        // 序列化所有 NSDate 类型
+        [eventPropertiesDic enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
+            if ([obj isKindOfClass:[NSDate class]]) {
+                NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:@"yyyy-MM-dd HH:mm:ss.SSS"];
+                NSString *dateStr = [dateFormatter stringFromDate:(NSDate *)obj];
+                eventPropertiesDic[key] = dateStr;
             }
+        }];
+
+        //修正 $device_id，防止用户修改
+        if (eventPropertiesDic[SAEventPresetPropertyDeviceID] && self.presetProperty.deviceID) {
+            eventPropertiesDic[SAEventPresetPropertyDeviceID] = self.presetProperty.deviceID;
         }
 
-        NSMutableDictionary *e;
+        NSMutableDictionary *eventDic = nil;
         NSString *bestId = self.distinctId;
 
         if ([type isEqualToString:@"track_signup"]) {
-            e = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                 event, SA_EVENT_NAME,
-                 [NSDictionary dictionaryWithDictionary:p], SA_EVENT_PROPERTIES,
-                 bestId, SA_EVENT_DISTINCT_ID,
-                 self.originalId, @"original_id",
-                 timeStamp, SA_EVENT_TIME,
-                 type, SA_EVENT_TYPE,
-                 libProperties, SA_EVENT_LIB,
-                 @(arc4random()), SA_EVENT_TRACK_ID,
-                 nil];
+            eventDic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                        eventName, SA_EVENT_NAME,
+                        eventPropertiesDic, SA_EVENT_PROPERTIES,
+                        bestId, SA_EVENT_DISTINCT_ID,
+                        self.originalId, @"original_id",
+                        timeStamp, SA_EVENT_TIME,
+                        type, SA_EVENT_TYPE,
+                        libProperties, SA_EVENT_LIB,
+                        @(arc4random()), SA_EVENT_TRACK_ID,
+                        nil];
         } else if([type isEqualToString:@"track"]) {
-            //  是否首日访问
-            if ([self isFirstDay]) {
-                [p setObject:@YES forKey:SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY];
-            } else {
-                [p setObject:@NO forKey:SA_EVENT_COMMON_PROPERTY_IS_FIRST_DAY];
-            }
-
-            @try {
-                if ([self isLaunchedPassively]) {
-                    [p setObject:@"background" forKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_APP_STATE];
-                }
-            } @catch (NSException *e) {
-                SAError(@"%@: %@", self, e);
-            }
-
+            NSDictionary *presetPropertiesOfTrackType = [self.presetProperty presetPropertiesOfTrackType:[self isLaunchedPassively]
 #ifndef SENSORS_ANALYTICS_DISABLE_TRACK_DEVICE_ORIENTATION
-            @try {
-                //采集设备方向
-                if (self.deviceOrientationConfig.enableTrackScreenOrientation && self.deviceOrientationConfig.deviceOrientation.length) {
-                    [p setObject:self.deviceOrientationConfig.deviceOrientation forKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_SCREEN_ORIENTATION];
-                }
-            } @catch (NSException *e) {
-                SAError(@"%@: %@", self, e);
-            }
+                                                                                       orientationConfig:self.deviceOrientationConfig
 #endif
-
 #ifndef SENSORS_ANALYTICS_DISABLE_TRACK_GPS
-            @try {
-                //采集地理位置信息
-                if (self.locationConfig.enableGPSLocation) {
-                    if (CLLocationCoordinate2DIsValid(self.locationConfig.coordinate)) {
-                        NSInteger latitude = self.locationConfig.coordinate.latitude * pow(10, 6);
-                        NSInteger longitude = self.locationConfig.coordinate.longitude * pow(10, 6);
-                        [p setObject:@(latitude) forKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_LATITUDE];
-                        [p setObject:@(longitude) forKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_LONGITUDE];
-                    }
-                }
-            } @catch (NSException *e) {
-                SAError(@"%@: %@", self, e);
-            }
+                                                                                          locationConfig:self.locationConfig
 #endif
-            e = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                 event, SA_EVENT_NAME,
-                 [NSDictionary dictionaryWithDictionary:p], SA_EVENT_PROPERTIES,
-                 bestId, SA_EVENT_DISTINCT_ID,
-                 timeStamp, SA_EVENT_TIME,
-                 type, SA_EVENT_TYPE,
-                 libProperties, SA_EVENT_LIB,
-                 @(arc4random()), SA_EVENT_TRACK_ID,
-                 nil];
+                                                         ];
+            [eventPropertiesDic addEntriesFromDictionary:presetPropertiesOfTrackType];
+            
+            eventDic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                        eventName, SA_EVENT_NAME,
+                        eventPropertiesDic, SA_EVENT_PROPERTIES,
+                        bestId, SA_EVENT_DISTINCT_ID,
+                        timeStamp, SA_EVENT_TIME,
+                        type, SA_EVENT_TYPE,
+                        libProperties, SA_EVENT_LIB,
+                        @(arc4random()), SA_EVENT_TRACK_ID,
+                        nil];
         } else {
             // 此时应该都是对Profile的操作
-            e = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                 [NSDictionary dictionaryWithDictionary:p], SA_EVENT_PROPERTIES,
-                 bestId, SA_EVENT_DISTINCT_ID,
-                 timeStamp, SA_EVENT_TIME,
-                 type, SA_EVENT_TYPE,
-                 libProperties, SA_EVENT_LIB,
-                 @(arc4random()), SA_EVENT_TRACK_ID,
-                 nil];
+            eventDic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
+                        eventPropertiesDic, SA_EVENT_PROPERTIES,
+                        bestId, SA_EVENT_DISTINCT_ID,
+                        timeStamp, SA_EVENT_TIME,
+                        type, SA_EVENT_TYPE,
+                        libProperties, SA_EVENT_LIB,
+                        @(arc4random()), SA_EVENT_TRACK_ID,
+                        nil];
         }
 
         if (project) {
-            [e setObject:project forKey:SA_EVENT_PROJECT];
+            eventDic[SA_EVENT_PROJECT] = project;
         }
         if (token) {
-            [e setObject:token forKey:SA_EVENT_TOKEN];
+            eventDic[SA_EVENT_TOKEN] = token;
         }
 
-        //修正 $device_id，防止用户修改
-        NSDictionary *infoProperties = [e objectForKey:SA_EVENT_PROPERTIES];
-        if (infoProperties && [infoProperties.allKeys containsObject:SA_EVENT_COMMON_PROPERTY_DEVICE_ID]) {
-            NSDictionary *autoProperties = self.automaticProperties;
-            if (autoProperties && [autoProperties.allKeys containsObject:SA_EVENT_COMMON_PROPERTY_DEVICE_ID]) {
-                NSMutableDictionary *correctInfoProperties = [NSMutableDictionary dictionaryWithDictionary:infoProperties];
-                correctInfoProperties[SA_EVENT_COMMON_PROPERTY_DEVICE_ID] = autoProperties[SA_EVENT_COMMON_PROPERTY_DEVICE_ID];
-                [e setObject:correctInfoProperties forKey:SA_EVENT_PROPERTIES];
-            }
-        }
+        eventDic[SA_EVENT_LOGIN_ID] = self.loginId;
+        eventDic[SA_EVENT_ANONYMOUS_ID] = self.anonymousId;
 
-        NSDictionary *eventDic = [self willEnqueueWithType:type andEvent:e];
-        if (!eventDic) {
+        NSDictionary *trackEventDic = [self willEnqueueWithType:type andEvent:eventDic];
+        if (!trackEventDic) {
             return;
         }
 
-        SALog(@"\n【track event】:\n%@", eventDic);
+        [[NSNotificationCenter defaultCenter] postNotificationName:SA_TRACK_EVENT_NOTIFICATION object:nil userInfo:trackEventDic];
+        SALogDebug(@"\n【track event】:\n%@", trackEventDic);
 
-        [self enqueueWithType:type andEvent:eventDic];
+        [self enqueueWithType:type andEvent:trackEventDic];
 
         if (self->_debugMode != SensorsAnalyticsDebugOff) {
             // 在DEBUG模式下，直接发送事件
@@ -1684,20 +1446,88 @@ - (void)track:(NSString *)event withProperties:(NSDictionary *)propertieDict {
     [self track:event withProperties:propertieDict withTrackType:SensorsAnalyticsTrackTypeCode];
 }
 
+- (void)trackChannelEvent:(NSString *)event {
+    [self trackChannelEvent:event properties:nil];
+}
+
+- (void)trackChannelEvent:(NSString *)event properties:(nullable NSDictionary *)propertyDict {
+
+    if (_configOptions.enableAutoAddChannelCallbackEvent) {
+        [self track:event withProperties:propertyDict withTrackType:SensorsAnalyticsTrackTypeCode];
+        return;
+    }
+
+    NSMutableDictionary *properties = [NSMutableDictionary dictionaryWithDictionary:propertyDict];
+    // ua
+    NSString *userAgent = [propertyDict objectForKey:SA_EVENT_PROPERTY_APP_USER_AGENT];
+
+    dispatch_block_t trackChannelEventBlock = ^{
+        // idfa
+        NSString *idfa = [SAIdentifier idfa];
+        if (idfa) {
+            [properties setValue:[NSString stringWithFormat:@"idfa=%@", idfa] forKey:SA_EVENT_PROPERTY_CHANNEL_INFO];
+        } else {
+            [properties setValue:@"" forKey:SA_EVENT_PROPERTY_CHANNEL_INFO];
+        }
+
+        if ([self.trackChannelEventNames containsObject:event]) {
+            [properties setValue:@(NO) forKey:SA_EVENT_PROPERTY_CHANNEL_CALLBACK_EVENT];
+        } else {
+            [properties setValue:@(YES) forKey:SA_EVENT_PROPERTY_CHANNEL_CALLBACK_EVENT];
+            [self.trackChannelEventNames addObject:event];
+            dispatch_async(self.serialQueue, ^{
+                [self archiveTrackChannelEventNames];
+            });
+        }
+
+        [self track:event withProperties:properties withTrackType:SensorsAnalyticsTrackTypeCode];
+    };
+
+    if (userAgent.length == 0) {
+        [self loadUserAgentWithCompletion:^(NSString *ua) {
+            [properties setValue:ua forKey:SA_EVENT_PROPERTY_APP_USER_AGENT];
+            trackChannelEventBlock();
+        }];
+    } else {
+        trackChannelEventBlock();
+    }
+}
+
 - (void)track:(NSString *)event withTrackType:(SensorsAnalyticsTrackType)trackType {
     [self track:event withProperties:nil withTrackType:trackType];
 }
 
 - (void)track:(NSString *)event withProperties:(NSDictionary *)propertieDict withTrackType:(SensorsAnalyticsTrackType)trackType {
+    NSMutableDictionary *eventProperties = [NSMutableDictionary dictionary];
+    // 添加 latest utms 属性，用户传入的属性优先级更高，最后添加到字典中
+    [eventProperties addEntriesFromDictionary:[_linkHandler latestUtmProperties]];
+    if ([SAValidator isValidDictionary:propertieDict]) {
+        [eventProperties addEntriesFromDictionary:propertieDict];
+    }
     if (trackType == SensorsAnalyticsTrackTypeCode) {
         //事件校验，预置事件提醒
-        if ([self.regexEventName evaluateWithObject:event]) {
-            SAError(@"\n【event warning】\n %@ is a preset event name of us, it is recommended that you use a new one", event);
+        if ([_presetEventNames containsObject:event]) {
+            SALogWarn(@"\n【event warning】\n %@ is a preset event name of us, it is recommended that you use a new one", event);
         };
-        
-        [self track:event withProperties:propertieDict withType:@"codeTrack"];
+
+        if (_configOptions.enableAutoAddChannelCallbackEvent) {
+            // 后端匹配逻辑已经不需要 $channel_device_info 信息
+            // 这里仍然添加此字段是为了解决服务端版本兼容问题
+            eventProperties[SA_EVENT_PROPERTY_CHANNEL_INFO] = @"1";
+
+            BOOL isContains = [self.trackChannelEventNames containsObject:event];
+            eventProperties[SA_EVENT_PROPERTY_CHANNEL_CALLBACK_EVENT] = @(!isContains);
+            if (!isContains && event) {
+                [self.trackChannelEventNames addObject:event];
+                dispatch_async(self.serialQueue, ^{
+                    [self archiveTrackChannelEventNames];
+                });
+            }
+        }
+
+        [self track:event withProperties:eventProperties withType:@"codeTrack"];
     } else {
-        [self track:event withProperties:propertieDict withType:@"track"];
+        [self track:event withProperties:eventProperties withType:@"track"];
     }
 }
 
@@ -1709,149 +1539,82 @@ - (NSString *)getCookieWithDecode:(BOOL)decode {
     return [_network cookieWithDecoded:decode];
 }
 
-- (void)trackTimerStart:(NSString *)event {
-    [self trackTimerStart:event timeUnit:SensorsAnalyticsTimeUnitSeconds];
+- (BOOL)checkEventName:(NSString *)eventName {
+    if ([self isValidName:eventName]) {
+        return YES;
+    }
+    NSString *errMsg = [NSString stringWithFormat:@"Event name[%@] not valid", eventName];
+    SALogError(@"%@", errMsg);
+    if (_debugMode != SensorsAnalyticsDebugOff) {
+        [self showDebugModeWarning:errMsg withNoMoreButton:YES];
+    }
+    return NO;
 }
 
-- (void)trackTimerStart:(NSString *)event timeUnit:(SensorsAnalyticsTimeUnit)timeUnit {
-    if (![self isValidName:event]) {
-        NSString *errMsg = [NSString stringWithFormat:@"Event name[%@] not valid", event];
-        SAError(@"%@", errMsg);
-        if (_debugMode != SensorsAnalyticsDebugOff) {
-            [self showDebugModeWarning:errMsg withNoMoreButton:YES];
-        }
-        return;
+- (nullable NSString *)trackTimerStart:(NSString *)event {
+    if (![self checkEventName:event]) {
+        return nil;
     }
-    
-    NSNumber *eventBegin = @([[self class] getSystemUpTime]);
+    NSString *eventId = [_trackTimer generateEventIdByEventName:event];
+    UInt64 currentSysUpTime = [self.class getSystemUpTime];
     dispatch_async(self.serialQueue, ^{
-        self.trackTimer[event] = @{@"eventBegin" : eventBegin, @"eventAccumulatedDuration" : @(0.0), @"timeUnit" : [NSNumber numberWithInt:timeUnit],@"isPause":@(NO)};
+        [self.trackTimer trackTimerStart:eventId currentSysUpTime:currentSysUpTime];
     });
+    return eventId;
 }
 
 - (void)trackTimerEnd:(NSString *)event {
-    [self track:event withTrackType:SensorsAnalyticsTrackTypeAuto];
+    [self trackTimerEnd:event withProperties:nil];
 }
 
 - (void)trackTimerEnd:(NSString *)event withProperties:(NSDictionary *)propertyDict {
-    [self track:event withProperties:propertyDict withTrackType:SensorsAnalyticsTrackTypeAuto];
+    // trackTimerEnd 事件需要支持新渠道匹配功能，且用户手动调用 trackTimerEnd 应归为手动埋点
+    // 所以这里 type 类型为 Code
+    [self track:event withProperties:propertyDict withTrackType:SensorsAnalyticsTrackTypeCode];
 }
 
 - (void)trackTimerPause:(NSString *)event {
-    if (![self isValidName:event]) {
-        NSString *errMsg = [NSString stringWithFormat:@"Event name[%@] not valid", event];
-        SAError(@"%@", errMsg);
-        if (_debugMode != SensorsAnalyticsDebugOff) {
-            [self showDebugModeWarning:errMsg withNoMoreButton:YES];
-        }
+    if (![self checkEventName:event]) {
         return;
     }
-
+    UInt64 currentSysUpTime = [self.class getSystemUpTime];
     dispatch_async(self.serialQueue, ^{
-        NSMutableDictionary *eventTimer = [self.trackTimer[event] mutableCopy];
-        BOOL isPause = [eventTimer[@"isPause"] boolValue];
-
-        if (eventTimer && !isPause) {
-            UInt64 eventBegin = [eventTimer[@"eventBegin"] longValue];
-            SensorsAnalyticsTimeUnit timeUnit = [[eventTimer valueForKey:@"timeUnit"] intValue];
-
-            isPause = YES;
-            float eventDuration = [self eventTimerDurationWithEventStart:eventBegin timeUnit:timeUnit];
-
-            eventTimer[@"eventBegin"] = @(eventBegin);
-            eventTimer[@"isPause"] = @(isPause);
-            if (eventDuration > 0) {
-                eventTimer[@"eventAccumulatedDuration"] = @([eventTimer[@"eventAccumulatedDuration"] floatValue] + eventDuration);
-            }
-
-            self.trackTimer[event] = [eventTimer copy];
-        }
+        [self.trackTimer trackTimerPause:event currentSysUpTime:currentSysUpTime];
     });
 }
 
 - (void)trackTimerResume:(NSString *)event {
-    if (![self isValidName:event]) {
-        NSString *errMsg = [NSString stringWithFormat:@"Event name[%@] not valid", event];
-        SAError(@"%@", errMsg);
-        if (_debugMode != SensorsAnalyticsDebugOff) {
-            [self showDebugModeWarning:errMsg withNoMoreButton:YES];
-        }
+    if (![self checkEventName:event]) {
         return;
     }
-
+    UInt64 currentSysUpTime = [self.class getSystemUpTime];
     dispatch_async(self.serialQueue, ^{
-        NSMutableDictionary *eventTimer = [self.trackTimer[event] mutableCopy];
-        BOOL isPause = [eventTimer[@"isPause"] boolValue];
-
-        if (eventTimer && isPause) {
-            UInt64 currentSystemUpTime = [[self class] getSystemUpTime];
-            isPause = NO;
-
-            eventTimer[@"eventBegin"] = @(currentSystemUpTime);
-            eventTimer[@"isPause"] = @(isPause);
-
-            self.trackTimer[event] = [eventTimer copy];
-        }
+        [self.trackTimer trackTimerResume:event currentSysUpTime:currentSysUpTime];
     });
 }
 
-//计算事件时长
-- (float)eventTimerDurationWithEventStart:(UInt64)startTime timeUnit:(SensorsAnalyticsTimeUnit)timeUnit {
-    if (startTime <= 0) {
-        return 0;
-    }
-    
-    UInt64 currentSystemUpTime = [[self class] getSystemUpTime];
-    float eventDuration = currentSystemUpTime - startTime;
-    
-    if (eventDuration > 0 && eventDuration < 24 * 60 * 60 * 1000) {
-        switch (timeUnit) {
-            case SensorsAnalyticsTimeUnitHours:
-                eventDuration = eventDuration / 60.0;
-            case SensorsAnalyticsTimeUnitMinutes:
-                eventDuration = eventDuration / 60.0;
-            case SensorsAnalyticsTimeUnitSeconds:
-                eventDuration = eventDuration / 1000.0;
-            case SensorsAnalyticsTimeUnitMilliseconds:
-                break;
-        }
-    } else {
-        eventDuration = 0;
-    }
-    
-    return eventDuration;
-}
-
 - (void)clearTrackTimer {
     dispatch_async(self.serialQueue, ^{
-        self.trackTimer = [NSMutableDictionary dictionary];
+        [self.trackTimer clearAllEventTimers];
     });
 }
 
 - (void)trackInstallation:(NSString *)event withProperties:(NSDictionary *)propertyDict disableCallback:(BOOL)disableCallback {
-    BOOL hasTrackInstallation = NO;
-    NSString *userDefaultsKey = nil;
-    userDefaultsKey = disableCallback?SA_HAS_TRACK_INSTALLATION_DISABLE_CALLBACK:SA_HAS_TRACK_INSTALLATION;
-    
-#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
-#ifndef SENSORS_ANALYTICS_DISABLE_INSTALLATION_MARK_IN_KEYCHAIN
-    hasTrackInstallation = disableCallback?[SAKeyChainItemWrapper hasTrackInstallationWithDisableCallback]:[SAKeyChainItemWrapper hasTrackInstallation];
+    NSString *userDefaultsKey = disableCallback ? SA_HAS_TRACK_INSTALLATION_DISABLE_CALLBACK : SA_HAS_TRACK_INSTALLATION;
+    BOOL hasTrackInstallation = [[NSUserDefaults standardUserDefaults] boolForKey:userDefaultsKey];
     if (hasTrackInstallation) {
         return;
     }
-#endif
-#endif
 
-    
-    if (![[NSUserDefaults standardUserDefaults] boolForKey:userDefaultsKey]) {
-        hasTrackInstallation = NO;
-        [[NSUserDefaults standardUserDefaults] setBool:YES forKey:userDefaultsKey];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-    } else {
-        hasTrackInstallation = YES;
-    }
+    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:userDefaultsKey];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+
 #ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
 #ifndef SENSORS_ANALYTICS_DISABLE_INSTALLATION_MARK_IN_KEYCHAIN
+    hasTrackInstallation = disableCallback ? [SAKeyChainItemWrapper hasTrackInstallationWithDisableCallback] : [SAKeyChainItemWrapper hasTrackInstallation];
+    if (hasTrackInstallation) {
+        return;
+    }
     if (disableCallback) {
         [SAKeyChainItemWrapper markHasTrackInstallationWithDisableCallback];
     } else {
@@ -1859,10 +1622,12 @@ - (void)trackInstallation:(NSString *)event withProperties:(NSDictionary *)prope
     }
 #endif
 #endif
+
     if (!hasTrackInstallation) {
+
         // 追踪渠道是特殊功能，需要同时发送 track 和 profile_set_once
         NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
-        NSString *idfa = [self getIDFA];
+        NSString *idfa = [SAIdentifier idfa];
         if (idfa != nil) {
             [properties setValue:[NSString stringWithFormat:@"idfa=%@", idfa] forKey:SA_EVENT_PROPERTY_APP_INSTALL_SOURCE];
         } else {
@@ -1873,27 +1638,42 @@ - (void)trackInstallation:(NSString *)event withProperties:(NSDictionary *)prope
             [properties setValue:@YES forKey:SA_EVENT_PROPERTY_APP_INSTALL_DISABLE_CALLBACK];
         }
 
-        NSString *userAgent = [propertyDict objectForKey:SA_EVENT_PROPERTY_APP_INSTALL_USER_AGENT];
-        if (userAgent ==nil || userAgent.length == 0) {
-            userAgent = self.class.getUserAgent;
-        }
-        if (userAgent) {
-            [properties setValue:userAgent forKey:SA_EVENT_PROPERTY_APP_INSTALL_USER_AGENT];
-        }
+        __block NSString *userAgent = [propertyDict objectForKey:SA_EVENT_PROPERTY_APP_USER_AGENT];
+        dispatch_block_t trackInstallationBlock = ^{
+            if (userAgent) {
+                [properties setValue:userAgent forKey:SA_EVENT_PROPERTY_APP_USER_AGENT];
+            }
 
-        if (propertyDict != nil) {
-            [properties addEntriesFromDictionary:propertyDict];
-        }
+            // 添加 deepLink 来源渠道信息
+            // 来源渠道消息只需要添加到 event 事件中，这里使用一个新的字典来添加 latest_utms 参数
+            NSMutableDictionary *eventProperties = [properties mutableCopy];
+            [eventProperties addEntriesFromDictionary:[self.linkHandler latestUtmProperties]];
+            if ([SAValidator isValidDictionary:propertyDict]) {
+                [eventProperties addEntriesFromDictionary:propertyDict];
+            }
+            // 先发送 track
+            [self track:event withProperties:eventProperties withType:@"track"];
 
-        // 先发送 track
-        [self track:event withProperties:properties withType:@"track"];
+            // 再发送 profile_set_once
+            // profile 事件不需要添加来源渠道信息，这里只追加用户传入的 propertyDict 和时间属性
+            NSMutableDictionary *profileProperties = [properties mutableCopy];
+            if ([SAValidator isValidDictionary:propertyDict]) {
+                [profileProperties addEntriesFromDictionary:propertyDict];
+            }
+            [profileProperties setValue:[NSDate date] forKey:SA_EVENT_PROPERTY_APP_INSTALL_FIRST_VISIT_TIME];
+            [self track:nil withProperties:profileProperties withType: self.configOptions.enableMultipleChannelMatch ? SA_PROFILE_SET : SA_PROFILE_SET_ONCE];
 
-        // 再发送 profile_set_once
-        NSMutableDictionary *profileProperties = [properties mutableCopy];
-        [profileProperties setValue:[NSDate date] forKey:SA_EVENT_PROPERTY_APP_INSTALL_FIRST_VISIT_TIME];
-        [self track:nil withProperties:profileProperties withType:SA_PROFILE_SET_ONCE];
+            [self flush];
+        };
 
-        [self flush];
+        if (userAgent.length == 0) {
+            [self loadUserAgentWithCompletion:^(NSString *ua) {
+                userAgent = ua;
+                trackInstallationBlock();
+            }];
+        } else {
+            trackInstallationBlock();
+        }
     }
 }
 
@@ -1905,32 +1685,7 @@ - (void)trackInstallation:(NSString *)event {
     [self trackInstallation:event withProperties:nil disableCallback:NO];
 }
 
-- (NSString  *)getIDFA {
-    NSString *idfa = nil;
-    @try {
-//#if defined(SENSORS_ANALYTICS_IDFA)
-        Class ASIdentifierManagerClass = NSClassFromString(@"ASIdentifierManager");
-        if (ASIdentifierManagerClass) {
-            SEL sharedManagerSelector = NSSelectorFromString(@"sharedManager");
-            id sharedManager = ((id (*)(id, SEL))[ASIdentifierManagerClass methodForSelector:sharedManagerSelector])(ASIdentifierManagerClass, sharedManagerSelector);
-            SEL advertisingIdentifierSelector = NSSelectorFromString(@"advertisingIdentifier");
-            NSUUID *uuid = ((NSUUID * (*)(id, SEL))[sharedManager methodForSelector:advertisingIdentifierSelector])(sharedManager, advertisingIdentifierSelector);
-            NSString *temp = [uuid UUIDString];
-            // 在 iOS 10.0 以后，当用户开启限制广告跟踪，advertisingIdentifier 的值将是全零
-            // 00000000-0000-0000-0000-000000000000
-            if (temp && ![temp hasPrefix:@"00000000"]) {
-                idfa = temp;
-            }
-        }
-//#endif
-        return idfa;
-    } @catch (NSException *exception) {
-        SADebug(@"%@: %@", self, exception);
-        return idfa;
-    }
-}
-
-- (void)ignoreAutoTrackViewControllers:(NSArray *)controllers {
+- (void)ignoreAutoTrackViewControllers:(NSArray<NSString *> *)controllers {
     if (controllers == nil || controllers.count == 0) {
         return;
     }
@@ -1946,34 +1701,17 @@ - (void)ignoreAutoTrackViewControllers:(NSArray *)controllers {
 }
 
 - (void)identify:(NSString *)anonymousId {
-    if (anonymousId.length == 0) {
-        SAError(@"%@ cannot identify blank distinct id: %@", self, anonymousId);
-//        @throw [NSException exceptionWithName:@"InvalidDataException" reason:@"SensorsAnalytics distinct_id should not be nil or empty" userInfo:nil];
-        return;
-    }
-    if (anonymousId.length > 255) {
-        SAError(@"%@ max length of distinct_id is 255, distinct_id: %@", self, anonymousId);
-//        @throw [NSException exceptionWithName:@"InvalidDataException" reason:@"SensorsAnalytics max length of distinct_id is 255" userInfo:nil];
-    }
-    
     dispatch_async(self.serialQueue, ^{
-        // 先把之前的anonymousId设为originalId
-        self.originalId = self.anonymousId;
-        // 更新anonymousId
-        self.anonymousId = anonymousId;
-        [self archiveAnonymousId];
+        if (![self.identifier identify:anonymousId]) {
+            return;
+        }
+        // SensorsFocus SDK 接收匿名 ID 修改通知
+        if (!self.loginId) {
+            [[NSNotificationCenter defaultCenter] postNotificationName:SA_TRACK_IDENTIFY_NOTIFICATION object:nil];
+        }
     });
 }
 
-- (NSString *)deviceModel {
-    size_t size;
-    sysctlbyname("hw.machine", NULL, &size, NULL, 0);
-    char answer[size];
-    sysctlbyname("hw.machine", answer, &size, NULL, 0);
-    NSString *results = @(answer);
-    return results;
-}
-
 - (NSString *)libVersion {
     return VERSION;
 }
@@ -1986,7 +1724,7 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
         // key 必须是NSString
         if (![k isKindOfClass: [NSString class]]) {
             NSString *errMsg = @"Property Key should by NSString";
-            SAError(@"%@", errMsg);
+            SALogError(@"%@", errMsg);
             if (_debugMode != SensorsAnalyticsDebugOff) {
                 [self showDebugModeWarning:errMsg withNoMoreButton:YES];
             }
@@ -1996,7 +1734,7 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
         // key的名称必须符合要求
         if (![self isValidName: k]) {
             NSString *errMsg = [NSString stringWithFormat:@"property name[%@] is not valid", k];
-            SAError(@"%@", errMsg);
+            SALogError(@"%@", errMsg);
             if (_debugMode != SensorsAnalyticsDebugOff) {
                 [self showDebugModeWarning:errMsg withNoMoreButton:YES];
             }
@@ -2011,7 +1749,7 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
            ![propertyValue isKindOfClass:[NSArray class]] &&
            ![propertyValue isKindOfClass:[NSDate class]]) {
             NSString * errMsg = [NSString stringWithFormat:@"%@ property values must be NSString, NSNumber, NSSet, NSArray or NSDate. got: %@ %@", self, [propertyValue class], propertyValue];
-            SAError(@"%@", errMsg);
+            SALogError(@"%@", errMsg);
             if (_debugMode != SensorsAnalyticsDebugOff) {
                 [self showDebugModeWarning:errMsg withNoMoreButton:YES];
             }
@@ -2033,7 +1771,7 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
             // NSSet、NSArray 类型的属性中，每个元素必须是 NSString 类型
             if (![string isKindOfClass:[NSString class]]) {
                 NSString * errMsg = [NSString stringWithFormat:@"%@ value of NSSet、NSArray must be NSString. got: %@ %@", self, [string class], string];
-                SAError(@"%@", errMsg);
+                SALogError(@"%@", errMsg);
                 if (isDebugMode) {
                     [self showDebugModeWarning:errMsg withNoMoreButton:YES];
                 }
@@ -2073,7 +1811,7 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
             }
         } else if ([propertyValue isKindOfClass:[NSArray class]]) {
             NSMutableArray *newArray = nil;
-            for (NSInteger index = 0; index < [propertyValue count]; index++) {
+            for (NSInteger index = 0; index < [(NSArray *)propertyValue count]; index++) {
                 id object = [propertyValue objectAtIndex:index];
                 NSString *string = verifyString(object, &newProperties, &newArray);
                 if (string == nil) {
@@ -2109,7 +1847,7 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
         if ([eventType isEqualToString:SA_PROFILE_INCREMENT]) {
             if (![propertyValue isKindOfClass:[NSNumber class]]) {
                 NSString *errMsg = [NSString stringWithFormat:@"%@ profile_increment value must be NSNumber. got: %@ %@", self, [properties[k] class], propertyValue];
-                SAError(@"%@", errMsg);
+                SALogError(@"%@", errMsg);
                 if (_debugMode != SensorsAnalyticsDebugOff) {
                     [self showDebugModeWarning:errMsg withNoMoreButton:YES];
                 }
@@ -2121,7 +1859,7 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
         if ([eventType isEqualToString:SA_PROFILE_APPEND]) {
             if (![propertyValue isKindOfClass:[NSSet class]] && ![propertyValue isKindOfClass:[NSArray class]]) {
                 NSString *errMsg = [NSString stringWithFormat:@"%@ profile_append value must be NSSet、NSArray. got %@ %@", self, [propertyValue  class], propertyValue];
-                SAError(@"%@", errMsg);
+                SALogError(@"%@", errMsg);
                 if (_debugMode != SensorsAnalyticsDebugOff) {
                     [self showDebugModeWarning:errMsg withNoMoreButton:YES];
                 }
@@ -2142,100 +1880,10 @@ - (BOOL)assertPropertyTypes:(NSDictionary **)propertiesAddress withEventType:(NS
     return YES;
 }
 
-- (NSDictionary *)collectAutomaticProperties {
-    NSMutableDictionary *p = [NSMutableDictionary dictionary];
-    UIDevice *device = [UIDevice currentDevice];
-    _deviceModel = [self deviceModel];
-    _osVersion = [device systemVersion];
-    struct CGSize size = [UIScreen mainScreen].bounds.size;
-    CTTelephonyNetworkInfo *telephonyInfo = [[CTTelephonyNetworkInfo alloc] init];
-    CTCarrier *carrier = nil;
-    
-#ifdef __IPHONE_12_0
-    if (@available(iOS 12.1, *)) {
-        carrier = telephonyInfo.serviceSubscriberCellularProviders.allValues.lastObject;
-    }
-#endif
-    if(!carrier) {
-        carrier = telephonyInfo.subscriberCellularProvider;
-    }
-
-    // Use setValue semantics to avoid adding keys where value can be nil.
-    [p setValue:[[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"] forKey:SA_EVENT_COMMON_PROPERTY_APP_VERSION];
-    if (carrier != nil) {
-        NSString *networkCode = [carrier mobileNetworkCode];
-        NSString *countryCode = [carrier mobileCountryCode];
-        
-        NSString *carrierName = nil;
-        //中国运营商
-        if (countryCode && [countryCode isEqualToString:CARRIER_CHINA_MCC]) {
-            if (networkCode) {
-                
-                //中国移动
-                if ([networkCode isEqualToString:@"00"] || [networkCode isEqualToString:@"02"] || [networkCode isEqualToString:@"07"] || [networkCode isEqualToString:@"08"]) {
-                    carrierName= @"中国移动";
-                }
-                //中国联通
-                if ([networkCode isEqualToString:@"01"] || [networkCode isEqualToString:@"06"] || [networkCode isEqualToString:@"09"]) {
-                    carrierName= @"中国联通";
-                }
-                //中国电信
-                if ([networkCode isEqualToString:@"03"] || [networkCode isEqualToString:@"05"] || [networkCode isEqualToString:@"11"]) {
-                    carrierName= @"中国电信";
-                }
-                //中国卫通
-                if ([networkCode isEqualToString:@"04"]) {
-                    carrierName= @"中国卫通";
-                }
-                //中国铁通
-                if ([networkCode isEqualToString:@"20"]) {
-                    carrierName= @"中国铁通";
-                }
-            }
-        } else { //国外运营商解析
-            //加载当前 bundle
-            NSBundle *sensorsBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[SensorsAnalyticsSDK class]] pathForResource:@"SensorsAnalyticsSDK" ofType:@"bundle"]];
-            //文件路径
-            NSString *jsonPath = [sensorsBundle pathForResource:@"sa_mcc_mnc_mini.json" ofType:nil];
-            NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
-            if (jsonData) {
-                NSDictionary *dicAllMcc =  [NSJSONSerialization JSONObjectWithData:jsonData options:NSJSONReadingMutableLeaves error:nil];
-                if (dicAllMcc) {
-                    NSString *mccMncKey = [NSString stringWithFormat:@"%@%@", countryCode, networkCode];
-                    carrierName = dicAllMcc[mccMncKey];
-                }
-            }
-        }
-        
-        if (carrierName != nil) {
-            [p setValue:carrierName forKey:SA_EVENT_COMMON_PROPERTY_CARRIER];
-        } else {
-            if (carrier.carrierName) {
-                [p setValue:carrier.carrierName forKey:SA_EVENT_COMMON_PROPERTY_CARRIER];
-            }
-        }
-    }
-    
-#if !SENSORS_ANALYTICS_DISABLE_AUTOTRACK_DEVICEID
-    [p setValue:[[self class] getUniqueHardwareId] forKey:SA_EVENT_COMMON_PROPERTY_DEVICE_ID];
-#endif
-    [p addEntriesFromDictionary:@{
-                                  SA_EVENT_COMMON_PROPERTY_LIB: @"iOS",
-                                  SA_EVENT_COMMON_PROPERTY_LIB_VERSION: [self libVersion],
-                                  SA_EVENT_COMMON_PROPERTY_MANUFACTURER: @"Apple",
-                                  SA_EVENT_COMMON_PROPERTY_OS: @"iOS",
-                                  SA_EVENT_COMMON_PROPERTY_OS_VERSION: _osVersion,
-                                  SA_EVENT_COMMON_PROPERTY_MODEL: _deviceModel,
-                                  SA_EVENT_COMMON_PROPERTY_SCREEN_HEIGHT: @((NSInteger)size.height),
-                                  SA_EVENT_COMMON_PROPERTY_SCREEN_WIDTH: @((NSInteger)size.width),
-                                      }];
-    return [p copy];
-}
-
 - (void)registerSuperProperties:(NSDictionary *)propertyDict {
     propertyDict = [propertyDict copy];
     if (![self assertPropertyTypes:&propertyDict withEventType:@"register_super_properties"]) {
-        SAError(@"%@ failed to register super properties.", self);
+        SALogError(@"%@ failed to register super properties.", self);
         return;
     }
     dispatch_async(self.serialQueue, ^{
@@ -2249,16 +1897,26 @@ - (void)registerSuperProperties:(NSDictionary *)propertyDict {
 }
 
 - (void)registerDynamicSuperProperties:(NSDictionary<NSString *, id> *(^)(void)) dynamicSuperProperties {
-    dispatch_async(self.serialQueue, ^{
+    [self.dynamicSuperPropertiesLock writeWithBlock:^{
         self.dynamicSuperProperties = dynamicSuperProperties;
-    });
+    }];
+}
+
+- (NSDictionary *)acquireDynamicSuperProperties {
+    // 获取动态公共属性不能放到 self.serialQueue 中，如果 dispatch_async(self.serialQueue, ^{}) 后面有 dispatch_sync(self.serialQueue, ^{}) 可能会出现死锁
+    return [self.dynamicSuperPropertiesLock readWithBlock:^id _Nonnull{
+        if (self.dynamicSuperProperties) {
+            return self.dynamicSuperProperties();
+        }
+        return nil;
+    }];
 }
 
 - (void)trackEventCallback:(BOOL (^)(NSString *eventName, NSMutableDictionary<NSString *, id> *properties))callback {
     if (!callback) {
         return;
     }
-    SALog(@"SDK have set trackEvent callBack");
+    SALogDebug(@"SDK have set trackEvent callBack");
     dispatch_async(self.serialQueue, ^{
         self.trackEventCallback = callback;
     });
@@ -2283,7 +1941,6 @@ - (void)unregisterSameLetterSuperProperties:(NSDictionary *)propertyDict {
             [self unregisterSuperPropertys:unregisterPropertyKeys];
         }
     };
-
     if (dispatch_get_specific(SensorsAnalyticsQueueTag)) {
         block();
     } else {
@@ -2330,326 +1987,88 @@ - (NSDictionary *)currentSuperProperties {
 #pragma mark - Local caches
 
 - (void)unarchive {
-        [self unarchiveAnonymousId];
-        [self unarchiveLoginId];
-        [self unarchiveSuperProperties];
-        [self unarchiveFirstDay];
+    [self unarchiveSuperProperties];
+    [self unarchiveTrackChannelEvents];
 }
 
-- (id)unarchiveFromFile:(NSString *)filePath {
-    id unarchivedData = nil;
-    @try {
-        unarchivedData = [NSKeyedUnarchiver unarchiveObjectWithFile:filePath];
-    } @catch (NSException *exception) {
-        SAError(@"%@ unable to unarchive data in %@, starting fresh", self, filePath);
-        unarchivedData = nil;
-    }
-    return unarchivedData;
+- (void)unarchiveSuperProperties {
+    NSDictionary *archivedSuperProperties = (NSDictionary *)[SAFileStore unarchiveWithFileName:@"super_properties"];
+    _superProperties = archivedSuperProperties ? [archivedSuperProperties copy] : [NSDictionary dictionary];
 }
 
-- (void)unarchiveAnonymousId {
-    NSString *filePath = [self filePathForData:SA_EVENT_DISTINCT_ID];
-    NSString *archivedAnonymousId = (NSString *)[self unarchiveFromFile:filePath];
-
-#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
-    NSString *anonymousIdInKeychain = [SAKeyChainItemWrapper saUdid];
-    if (anonymousIdInKeychain.length > 0) {
-        self.anonymousId = anonymousIdInKeychain;
-        if (![archivedAnonymousId isEqualToString:anonymousIdInKeychain]) {
-            //保存 Archiver
-            NSDictionary *protection = [NSDictionary dictionaryWithObject:NSFileProtectionComplete forKey:NSFileProtectionKey];
-            [[NSFileManager defaultManager] setAttributes:protection ofItemAtPath:filePath error:nil];
-            if (![NSKeyedArchiver archiveRootObject:[self.anonymousId copy] toFile:filePath]) {
-                SAError(@"%@ unable to archive distinctId", self);
-            }
-        }
-    } else {
-#endif
-        if (archivedAnonymousId.length == 0) {
-            self.anonymousId = [[self class] getUniqueHardwareId];
-            [self archiveAnonymousId];
-        } else {
-            self.anonymousId = archivedAnonymousId;
-#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
-            //保存 KeyChain
-            [SAKeyChainItemWrapper saveUdid:self.anonymousId];
-        }
-#endif
-    }
+- (void)unarchiveTrackChannelEvents {
+    NSArray *trackChannelEvents = (NSArray *)[SAFileStore unarchiveWithFileName:SA_EVENT_PROPERTY_CHANNEL_INFO];
+    [self.trackChannelEventNames addObjectsFromArray:trackChannelEvents];
 }
 
-- (void)unarchiveLoginId {
-    NSString *archivedLoginId = (NSString *)[self unarchiveFromFile:[self filePathForData:@"login_id"]];
-    self.loginId = archivedLoginId;
+- (void)archiveSuperProperties {
+    [SAFileStore archiveWithFileName:@"super_properties" value:self.superProperties];
 }
 
-- (void)unarchiveFirstDay {
-    NSString *archivedFirstDay = (NSString *)[self unarchiveFromFile:[self filePathForData:@"first_day"]];
-    self.firstDay = archivedFirstDay;
+- (void)archiveTrackChannelEventNames {
+    [SAFileStore archiveWithFileName:SA_EVENT_PROPERTY_CHANNEL_INFO value:self.trackChannelEventNames];
 }
 
-- (void)unarchiveSuperProperties {
-    NSDictionary *archivedSuperProperties = (NSDictionary *)[self unarchiveFromFile:[self filePathForData:@"super_properties"]];
-    if (archivedSuperProperties == nil) {
-        _superProperties = [NSDictionary dictionary];
-    } else {
-        _superProperties = [archivedSuperProperties copy];
+- (void)startFlushTimer {
+    if (self.remoteConfig.disableSDK || (self.timer && [self.timer isValid])) {
+        return;
     }
+    SALogDebug(@"starting flush timer.");
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.configOptions.flushInterval > 0) {
+            double interval = self.configOptions.flushInterval > 100 ? (double)self.configOptions.flushInterval / 1000.0 : 0.1f;
+            self.timer = [NSTimer scheduledTimerWithTimeInterval:interval
+                                                          target:self
+                                                        selector:@selector(flush)
+                                                        userInfo:nil
+                                                         repeats:YES];
+            [[NSRunLoop currentRunLoop] addTimer:self.timer forMode:NSRunLoopCommonModes];
+        }
+    });
 }
 
-- (void)archiveAnonymousId {
-    NSString *filePath = [self filePathForData:SA_EVENT_DISTINCT_ID];
-    /* 为filePath文件设置保护等级 */
-    NSDictionary *protection = [NSDictionary dictionaryWithObject:NSFileProtectionComplete
-                                                           forKey:NSFileProtectionKey];
-    [[NSFileManager defaultManager] setAttributes:protection
-                                     ofItemAtPath:filePath
-                                            error:nil];
-    if (![NSKeyedArchiver archiveRootObject:[self.anonymousId copy] toFile:filePath]) {
-        SAError(@"%@ unable to archive distinctId", self);
-    }
-#ifndef SENSORS_ANALYTICS_DISABLE_KEYCHAIN
-    [SAKeyChainItemWrapper saveUdid:self.anonymousId];
-#endif
-    SADebug(@"%@ archived distinctId", self);
+- (void)stopFlushTimer {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.timer) {
+            [self.timer invalidate];
+        }
+        self.timer = nil;
+    });
 }
 
-- (void)archiveLoginId {
-    NSString *filePath = [self filePathForData:@"login_id"];
-    /* 为filePath文件设置保护等级 */
-    NSDictionary *protection = [NSDictionary dictionaryWithObject:NSFileProtectionComplete
-                                                           forKey:NSFileProtectionKey];
-    [[NSFileManager defaultManager] setAttributes:protection
-                                     ofItemAtPath:filePath
-                                            error:nil];
-    if (![NSKeyedArchiver archiveRootObject:[self.loginId copy] toFile:filePath]) {
-        SAError(@"%@ unable to archive loginId", self);
-    }
-    SADebug(@"%@ archived loginId", self);
+- (NSString *)getLastScreenUrl {
+    return _referrerScreenUrl;
 }
 
-- (void)archiveFirstDay {
-    NSString *filePath = [self filePathForData:@"first_day"];
-    /* 为filePath文件设置保护等级 */
-    NSDictionary *protection = [NSDictionary dictionaryWithObject:NSFileProtectionComplete
-                                                           forKey:NSFileProtectionKey];
-    [[NSFileManager defaultManager] setAttributes:protection
-                                     ofItemAtPath:filePath
-                                            error:nil];
-    if (![NSKeyedArchiver archiveRootObject:[[self firstDay] copy] toFile:filePath]) {
-        SAError(@"%@ unable to archive firstDay", self);
-    }
-    SADebug(@"%@ archived firstDay", self);
+- (void)clearReferrerWhenAppEnd {
+    _clearReferrerWhenAppEnd = YES;
 }
 
-- (void)archiveSuperProperties {
-    NSString *filePath = [self filePathForData:@"super_properties"];
-    /* 为filePath文件设置保护等级 */
-    NSDictionary *protection = [NSDictionary dictionaryWithObject:NSFileProtectionComplete
-                                                           forKey:NSFileProtectionKey];
-    [[NSFileManager defaultManager] setAttributes:protection
-                                     ofItemAtPath:filePath
-                                            error:nil];
-    if (![NSKeyedArchiver archiveRootObject:[self.superProperties copy] toFile:filePath]) {
-        SAError(@"%@ unable to archive super properties", self);
-    }
-    SADebug(@"%@ archive super properties data", self);
+- (NSDictionary *)getLastScreenTrackProperties {
+    return _lastScreenTrackProperties;
+}
+
+- (SensorsAnalyticsDebugMode)debugMode {
+    return _debugMode;
 }
 
-#pragma mark - Network control
+- (void)trackViewAppClick:(UIView *)view {
+    [self trackViewAppClick:view withProperties:nil];
+}
 
-+ (NSString *)getNetWorkStates {
-#ifdef SA_UT
-    SADebug(@"In unit test, set NetWorkStates to wifi");
-    return @"WIFI";
-#endif
-    NSString *network = @"NULL";
-    @try {
-        SAReachability *reachability = [SAReachability reachabilityForInternetConnection];
-        SANetworkStatus status = [reachability currentReachabilityStatus];
-        
-        if (status == SAReachableViaWiFi) {
-            network = @"WIFI";
-        } else if (status == SAReachableViaWWAN) {
-            static CTTelephonyNetworkInfo *netinfo = nil;
-            NSString *currentRadioAccessTechnology = nil;
-            
-            if (!netinfo) {
-                netinfo = [[CTTelephonyNetworkInfo alloc] init];
-            }
-#ifdef __IPHONE_12_0
-            if (@available(iOS 12.1, *)) {
-                currentRadioAccessTechnology = netinfo.serviceCurrentRadioAccessTechnology.allValues.lastObject;
-            }
-#endif
-            //测试发现存在少数 12.0 和 12.0.1 的机型 serviceCurrentRadioAccessTechnology 返回空
-            if (!currentRadioAccessTechnology) {
-                currentRadioAccessTechnology = netinfo.currentRadioAccessTechnology;
-            }
-            
-            if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyGPRS]) {
-                network = @"2G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyEdge]) {
-                network = @"2G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyWCDMA]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSDPA]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSUPA]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMA1x]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyeHRPD]) {
-                network = @"3G";
-            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyLTE]) {
-                network = @"4G";
-            } else {
-                network = @"UNKNOWN";
-            }
-        }
-    } @catch (NSException *exception) {
-        SADebug(@"%@: %@", self, exception);
-    }
-    return network;
-}
-
-- (UInt64)flushInterval {
-    @synchronized(self) {
-        return self.configOptions.flushInterval;
-    }
-}
-
-- (void)setFlushInterval:(UInt64)interval {
-    @synchronized(self) {
-        if (interval < 5 * 1000) {
-            interval = 5 * 1000;
-        }
-        self.configOptions.flushInterval = (NSInteger)interval;
-    }
-    [self flush];
-    [self stopFlushTimer];
-    [self startFlushTimer];
-}
-
-- (void)startFlushTimer {
-    if (self.remoteConfig.disableSDK || (self.timer && [self.timer isValid])) {
-        return;
-    }
-    SADebug(@"starting flush timer.");
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if (self.configOptions.flushInterval > 0) {
-            double interval = self.configOptions.flushInterval > 100 ? (double)self.configOptions.flushInterval / 1000.0 : 0.1f;
-            self.timer = [NSTimer scheduledTimerWithTimeInterval:interval
-                                                          target:self
-                                                        selector:@selector(flush)
-                                                        userInfo:nil
-                                                         repeats:YES];
-            [[NSRunLoop currentRunLoop] addTimer:self.timer forMode:NSRunLoopCommonModes];
-        }
-    });
-}
-
-- (void)stopFlushTimer {
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if (self.timer) {
-            [self.timer invalidate];
-        }
-        self.timer = nil;
-    });
-}
-
-- (UInt64)flushBulkSize {
-    @synchronized(self) {
-        return self.configOptions.flushBulkSize;
-    }
-}
-
-- (void)setFlushBulkSize:(UInt64)bulkSize {
-    @synchronized(self) {
-        //加上最小值保护，50
-        NSInteger newBulkSize = (NSInteger)bulkSize;
-        self.configOptions.flushBulkSize = newBulkSize >= 50 ? newBulkSize : 50;
-    }
-}
-
-- (NSString *)getLastScreenUrl {
-    return _referrerScreenUrl;
-}
-
-- (void)clearReferrerWhenAppEnd {
-    _clearReferrerWhenAppEnd = YES;
-}
-
-- (NSDictionary *)getLastScreenTrackProperties {
-    return _lastScreenTrackProperties;
-}
-
-- (void)addWebViewUserAgentSensorsDataFlag {
-    [self addWebViewUserAgentSensorsDataFlag:YES];
-}
-
-- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify  {
-    [self addWebViewUserAgentSensorsDataFlag:enableVerify userAgent:nil];
-}
-
-- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify userAgent:(nullable NSString *)userAgent{
-    
-    dispatch_block_t mainThreadBlock = ^(){
-        BOOL verify = enableVerify;
-        @try {
-            if (![self.network isValidServerURL]) {
-                verify = NO;
-            }
-            NSString *oldAgent = nil;
-            if (userAgent && userAgent.length) {
-                oldAgent = userAgent;
-            } else {
-                oldAgent = self.class.getUserAgent;
-            }
-            NSString *newAgent = oldAgent;
-            if ([oldAgent rangeOfString:@"sa-sdk-ios"].location == NSNotFound) {
-                if (verify) {
-                    newAgent = [oldAgent stringByAppendingString:[NSString stringWithFormat: @" /sa-sdk-ios/sensors-verify/%@?%@ ", self.network.host, self.network.project]];
-                } else {
-                    newAgent = [oldAgent stringByAppendingString:@" /sa-sdk-ios"];
-                }
-            }
-            //使 newAgent 生效，并设置 _userAgent
-            NSDictionary *dictionnary = [[NSDictionary alloc] initWithObjectsAndKeys:newAgent, @"UserAgent", nil];
-            [[NSUserDefaults standardUserDefaults] registerDefaults:dictionnary];
-            self->_userAgent = newAgent;
-            [[NSUserDefaults standardUserDefaults] synchronize];
-        } @catch (NSException *exception) {
-            SADebug(@"%@: %@", self, exception);
-        }
-    };
-    sensorsdata_dispatch_main_safe_sync(mainThreadBlock);
-}
-
-- (SensorsAnalyticsDebugMode)debugMode {
-    return _debugMode;
-}
-
-- (void)trackViewAppClick:(UIView *)view {
-    [self trackViewAppClick:view withProperties:nil];
-}
-
-- (void)trackViewAppClick:(UIView *)view withProperties:(NSDictionary *)p {
+- (void)trackViewAppClick:(UIView *)view withProperties:(NSDictionary *)p {
     @try {
         if (view == nil) {
             return;
         }
-        NSMutableDictionary *properties = [NSMutableDictionary dictionaryWithDictionary:p];
+        NSMutableDictionary *properties = [[NSMutableDictionary alloc]init];
         [properties addEntriesFromDictionary:[SAAutoTrackUtils propertiesWithAutoTrackObject:view isCodeTrack:YES]];
+        if ([SAValidator isValidDictionary:p]) {
+            [properties addEntriesFromDictionary:p];
+        }
         [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
     } @catch (NSException *exception) {
-        SAError(@"%@: %@", self, exception);
+        SALogError(@"%@: %@", self, exception);
     }
 }
 
@@ -2658,12 +2077,12 @@ - (void)trackViewAppClick:(UIView *)view withProperties:(NSDictionary *)p {
 - (void)setUpListeners {
     // 监听 App 启动或结束事件
     NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
-    
+
     [notificationCenter addObserver:self
                            selector:@selector(applicationDidFinishLaunching:)
                                name:UIApplicationDidFinishLaunchingNotification
                              object:nil];
-    
+
     [notificationCenter addObserver:self
                            selector:@selector(applicationWillEnterForeground:)
                                name:UIApplicationWillEnterForegroundNotification
@@ -2708,59 +2127,64 @@ - (void)autoTrackViewScreen:(UIViewController *)controller {
         return;
     }
 
-    [self trackViewScreen:controller];
+    [self trackViewScreen:controller properties:nil autoTrack:YES];
 }
 
 - (void)trackViewScreen:(UIViewController *)controller {
     [self trackViewScreen:controller properties:nil];
 }
 
-- (void)trackViewScreen:(UIViewController *)controller properties:(nullable NSDictionary<NSString *, id> *)properties_ {
+- (void)trackViewScreen:(UIViewController *)controller properties:(nullable NSDictionary<NSString *, id> *)properties {
+    [self trackViewScreen:controller properties:properties autoTrack:NO];
+}
+
+- (void)trackViewScreen:(UIViewController *)controller properties:(nullable NSDictionary<NSString *, id> *)properties autoTrack:(BOOL)autoTrack {
     if (!controller) {
         return;
     }
-    
-    if ([self isBlackListContainsViewController:controller]) {
+
+    if ([self isBlackListViewController:controller ofType:SensorsAnalyticsEventTypeAppViewScreen]) {
         return;
     }
 
-    NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
+    NSMutableDictionary *eventProperties = [[NSMutableDictionary alloc] init];
 
-    NSDictionary *dic = [SAAutoTrackUtils propertiesWithViewController:controller];
-    [properties addEntriesFromDictionary:dic];
+    NSDictionary *autoTrackProperties = [SAAutoTrackUtils propertiesWithViewController:controller];
+    [eventProperties addEntriesFromDictionary:autoTrackProperties];
 
-    if ([controller conformsToProtocol:@protocol(SAAutoTracker)] && [controller respondsToSelector:@selector(getTrackProperties)]) {
-        UIViewController<SAAutoTracker> *autoTrackerController = (UIViewController<SAAutoTracker> *)controller;
-        _lastScreenTrackProperties = [autoTrackerController getTrackProperties];
-        [properties addEntriesFromDictionary:_lastScreenTrackProperties];
+    if (autoTrack) {
+        // App 通过 Deeplink 启动时第一个页面浏览事件会添加 utms 属性
+        // 只需要处理全埋点的页面浏览事件
+        [eventProperties addEntriesFromDictionary:[_linkHandler utmProperties]];
+        [_linkHandler clearUtmProperties];
     }
 
-#ifdef SENSORS_ANALYTICS_AUTOTRACT_APPVIEWSCREEN_URL
-    NSString *screenName = NSStringFromClass(controller.class);
-    [properties setValue:screenName forKey:SA_EVENT_PROPERTY_SCREEN_URL];
+    _lastScreenTrackProperties = [eventProperties copy];
+
+    NSString *currentScreenUrl;
+    if ([controller conformsToProtocol:@protocol(SAScreenAutoTracker)] && [controller respondsToSelector:@selector(getScreenUrl)]) {
+        UIViewController<SAScreenAutoTracker> *screenAutoTrackerController = (UIViewController<SAScreenAutoTracker> *)controller;
+        currentScreenUrl = [screenAutoTrackerController getScreenUrl];
+    }
+    currentScreenUrl = [currentScreenUrl isKindOfClass:NSString.class] ? currentScreenUrl : NSStringFromClass(controller.class);
+    [eventProperties setValue:currentScreenUrl forKey:SA_EVENT_PROPERTY_SCREEN_URL];
     @synchronized(_referrerScreenUrl) {
         if (_referrerScreenUrl) {
-            [properties setValue:_referrerScreenUrl forKey:SA_EVENT_PROPERTY_SCREEN_REFERRER_URL];
+            [eventProperties setValue:_referrerScreenUrl forKey:SA_EVENT_PROPERTY_SCREEN_REFERRER_URL];
         }
-        _referrerScreenUrl = screenName;
+        _referrerScreenUrl = currentScreenUrl;
     }
-#endif
-
-    if ([controller conformsToProtocol:@protocol(SAScreenAutoTracker)] && [controller respondsToSelector:@selector(getScreenUrl)]) {
-        UIViewController<SAScreenAutoTracker> *screenAutoTrackerController = (UIViewController<SAScreenAutoTracker> *)controller;
-        NSString *currentScreenUrl = [screenAutoTrackerController getScreenUrl];
-        
-        [properties setValue:currentScreenUrl forKey:SA_EVENT_PROPERTY_SCREEN_URL];
 
-        @synchronized(_referrerScreenUrl) {
-            if (_referrerScreenUrl) {
-                [properties setValue:_referrerScreenUrl forKey:SA_EVENT_PROPERTY_SCREEN_REFERRER_URL];
-            }
-            _referrerScreenUrl = currentScreenUrl;
+    if (properties) {
+        NSMutableDictionary *tempProperties = [NSMutableDictionary dictionaryWithDictionary: _lastScreenTrackProperties];
+        if ([SAValidator isValidDictionary:properties]) {
+            [eventProperties addEntriesFromDictionary:properties];
+            [tempProperties addEntriesFromDictionary:properties];
         }
+        _lastScreenTrackProperties = [tempProperties copy];
     }
-    [properties addEntriesFromDictionary:properties_];
-    [self track:SA_EVENT_NAME_APP_VIEW_SCREEN withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
+
+    [self track:SA_EVENT_NAME_APP_VIEW_SCREEN withProperties:eventProperties withTrackType:SensorsAnalyticsTrackTypeAuto];
 }
 
 #ifdef SENSORS_ANALYTICS_REACT_NATIVE
@@ -2778,7 +2202,7 @@ static inline void sa_methodExchange(const char *className, const char *original
             }
         }
     } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", [SensorsAnalyticsSDK sharedInstance], exception);
+        SALogError(@"%@ error: %@", [SensorsAnalyticsSDK sharedInstance], exception);
     }
 }
 
@@ -2833,12 +2257,17 @@ static void sa_imp_setJSResponderBlockNativeResponder(id obj, SEL cmd, id reactT
                     if (controllerTitle != nil) {
                         [properties setValue:viewController.navigationItem.title forKey:SA_EVENT_PROPERTY_TITLE];
                     }
+                    
+                    NSString *viewPath = [SAAutoTrackUtils viewSimilarPathForView:uiView atViewController:viewController shouldSimilarPath:NO];
+                    if (viewPath) {
+                        properties[SA_EVENT_PROPERTY_ELEMENT_PATH] = viewPath;
+                    }
                 }
 
                 [[SensorsAnalyticsSDK sharedInstance] track:SA_EVENT_NAME_APP_CLICK withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
             }
         } @catch (NSException *exception) {
-            SAError(@"%@ error: %@", [SensorsAnalyticsSDK sharedInstance], exception);
+            SALogError(@"%@ error: %@", [SensorsAnalyticsSDK sharedInstance], exception);
         }
     });
 }
@@ -2887,7 +2316,7 @@ - (void)_enableAutoTrack {
                              withMethod:@selector(sa_sendAction:to:from:forEvent:)
                                   error:&error];
         if (error) {
-            SAError(@"Failed to swizzle sendAction:to:forEvent: on UIAppplication. Details: %@", error);
+            SALogError(@"Failed to swizzle sendAction:to:forEvent: on UIAppplication. Details: %@", error);
             error = NULL;
         }
     });
@@ -2924,7 +2353,7 @@ - (void)_enableAutoTrack {
                                       withMethod:@selector(sa_initWithTarget:action:)
                                            error:&error];
         if (error) {
-            SAError(@"Failed to swizzle Target on UITapGestureRecognizer. Details: %@", error);
+            SALogError(@"Failed to swizzle Target on UITapGestureRecognizer. Details: %@", error);
             error = NULL;
         }
     });
@@ -2955,12 +2384,12 @@ - (void)trackEventFromExtensionWithGroupIdentifier:(NSString *)groupIdentifier c
             }
         }
     } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
+        SALogError(@"%@ error: %@", self, exception);
     }
 }
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
-    SADebug(@"%@ applicationDidFinishLaunchingNotification did become active", self);
+    SALogDebug(@"%@ applicationDidFinishLaunchingNotification did become active", self);
     if (self.configOptions.autoTrackEventType != SensorsAnalyticsEventTypeNone) {
         //全埋点
         [self autoTrackAppStart];
@@ -2968,14 +2397,14 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {
 }
 
 - (void)applicationWillEnterForeground:(NSNotification *)notification {
-    SADebug(@"%@ application will enter foreground", self);
+    SALogDebug(@"%@ application will enter foreground", self);
     
     _appRelaunched = YES;
     self.launchedPassively = NO;
 }
 
 - (void)applicationDidBecomeActive:(NSNotification *)notification {
-    SADebug(@"%@ application did become active", self);
+    SALogDebug(@"%@ application did become active", self);
     if (_appRelaunched) {
         //下次启动 App 的时候重新初始化
         NSDictionary *sdkConfig = [[NSUserDefaults standardUserDefaults] objectForKey:SA_SDK_TRACK_CONFIG];
@@ -3015,41 +2444,34 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification {
     }
     
     [self shouldRequestRemoteConfig];
-    
+
     // 是否首次启动
     BOOL isFirstStart = NO;
     if (![[NSUserDefaults standardUserDefaults] boolForKey:SA_HAS_LAUNCHED_ONCE]) {
         isFirstStart = YES;
     }
     
-    // 遍历 trackTimer ,修改 eventBegin 为当前 currentSystemUpTime
+    // 遍历 trackTimer
+    UInt64 currentSysUpTime = [self.class getSystemUpTime];
     dispatch_async(self.serialQueue, ^{
-        NSNumber *currentSystemUpTime = @([[self class] getSystemUpTime]);
-        NSArray *keys = [self.trackTimer allKeys];
-        NSString *key = nil;
-        NSMutableDictionary *eventTimer = nil;
-        for (key in keys) {
-            eventTimer = [[NSMutableDictionary alloc] initWithDictionary:self.trackTimer[key]];
-            if (eventTimer) {
-                [eventTimer setValue:currentSystemUpTime forKey:@"eventBegin"];
-                self.trackTimer[key] = eventTimer;
-            }
-        }
+        [self.trackTimer resumeAllEventTimers:currentSysUpTime];
     });
-    
+
     if ([self isAutoTrackEnabled] && _appRelaunched) {
         // 追踪 AppStart 事件
         if ([self isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppStart] == NO) {
-            [self track:SA_EVENT_NAME_APP_START withProperties:@{
-                                                                 SA_EVENT_PROPERTY_RESUME_FROM_BACKGROUND: @(_appRelaunched),
-                                                                 SA_EVENT_PROPERTY_APP_FIRST_START: @(isFirstStart),
-                                                                 } withTrackType:SensorsAnalyticsTrackTypeAuto];
+            NSMutableDictionary *properties = [NSMutableDictionary dictionary];
+            properties[SA_EVENT_PROPERTY_RESUME_FROM_BACKGROUND] = @(_appRelaunched);
+            properties[SA_EVENT_PROPERTY_APP_FIRST_START] = @(isFirstStart);
+            [properties addEntriesFromDictionary:[_linkHandler utmProperties]];
+
+            [self track:SA_EVENT_NAME_APP_START withProperties:properties withTrackType:SensorsAnalyticsTrackTypeAuto];
         }
     }
-    
+
     // 启动 AppEnd 事件计时器
     [self trackTimerStart:SA_EVENT_NAME_APP_END];
-    
+
     //track 被动启动的页面浏览
     if (self.launchedPassivelyControllers) {
         [self.launchedPassivelyControllers enumerateObjectsUsingBlock:^(UIViewController * _Nonnull controller, NSUInteger idx, BOOL * _Nonnull stop) {
@@ -3062,13 +2484,20 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification {
 }
 
 - (void)applicationWillResignActive:(NSNotification *)notification {
-    SADebug(@"%@ application will resign active", self);
+    SALogDebug(@"%@ application will resign active", self);
     _applicationWillResignActive = YES;
 }
 
 - (void)applicationDidEnterBackground:(NSNotification *)notification {
-    SADebug(@"%@ application did enter background", self);
+    SALogDebug(@"%@ application did enter background", self);
+    
+    if (!_applicationWillResignActive) {
+        return;
+    }
     _applicationWillResignActive = NO;
+
+    // 清除本次启动解析的来源渠道信息
+    [_linkHandler clearUtmProperties];
     
     [self stopFlushTimer];
     
@@ -3100,32 +2529,9 @@ - (void)applicationDidEnterBackground:(NSNotification *)notification {
     }];
 
     // 遍历 trackTimer
-    // eventAccumulatedDuration = eventAccumulatedDuration + currentSystemUpTime - eventBegin
+    UInt64 currentSysUpTime = [self.class getSystemUpTime];
     dispatch_async(self.serialQueue, ^{
-        NSNumber *currentSystemUpTime = @([[self class] getSystemUpTime]);
-        NSArray *keys = [self.trackTimer allKeys];
-        NSString *key = nil;
-        NSMutableDictionary *eventTimer = nil;
-        for (key in keys) {
-            if (key != nil) {
-                if ([key isEqualToString:SA_EVENT_NAME_APP_END]) {
-                    continue;
-                }
-            }
-            eventTimer = [[NSMutableDictionary alloc] initWithDictionary:self.trackTimer[key]];
-            if (eventTimer && ![eventTimer[@"isPause"] boolValue]) {
-                UInt64 eventBegin = [[eventTimer valueForKey:@"eventBegin"] longValue];
-                NSNumber *eventAccumulatedDuration = [eventTimer objectForKey:@"eventAccumulatedDuration"];
-                SensorsAnalyticsTimeUnit timeUnit = [[eventTimer valueForKey:@"timeUnit"] intValue];
-                float eventDuration = [self eventTimerDurationWithEventStart:eventBegin timeUnit:timeUnit];
-                if (eventAccumulatedDuration) {
-                    eventDuration += [eventAccumulatedDuration floatValue];
-                }
-                [eventTimer setObject:@(eventDuration) forKey:@"eventAccumulatedDuration"];
-                [eventTimer setObject:currentSystemUpTime forKey:@"eventBegin"];
-                self.trackTimer[key] = eventTimer;
-            }
-        }
+        [self.trackTimer pauseAllEventTimers:currentSysUpTime];
     });
 
     if ([self isAutoTrackEnabled]) {
@@ -3149,9 +2555,8 @@ - (void)applicationDidEnterBackground:(NSNotification *)notification {
         });
     }
 }
-
 - (void)applicationWillTerminateNotification:(NSNotification *)notification {
-    SALog(@"applicationWillTerminateNotification");
+    SALogDebug(@"applicationWillTerminateNotification");
     dispatch_sync(self.serialQueue, ^{
     });
 }
@@ -3162,19 +2567,27 @@ - (void)set:(NSDictionary *)profileDict {
     [[self people] set:profileDict];
 }
 
-- (void)profilePushKey:(NSString *)pushKey pushId:(NSString *)pushId {
-    if ([pushKey isKindOfClass:NSString.class] && pushKey.length && [pushId isKindOfClass:NSString.class] && pushId.length) {
-        NSString * distinctId = self.distinctId;
-        NSString * keyOfPushId = [NSString stringWithFormat:@"sa_%@_%@", distinctId, pushKey];
+- (void)profilePushKey:(NSString *)pushTypeKey pushId:(NSString *)pushId {
+    if ([pushTypeKey isKindOfClass:NSString.class] && pushTypeKey.length && [pushId isKindOfClass:NSString.class] && pushId.length) {
+        NSString * keyOfPushId = [NSString stringWithFormat:@"sa_%@", pushTypeKey];
         NSString * valueOfPushId = [NSUserDefaults.standardUserDefaults valueForKey:keyOfPushId];
-        NSString * newValueOfPushId = [NSString stringWithFormat:@"%@_%@", distinctId, pushId];
+        NSString * newValueOfPushId = [NSString stringWithFormat:@"%@_%@", self.distinctId, pushId];
         if (![valueOfPushId isEqualToString:newValueOfPushId]) {
-            [self set:@{pushKey:pushId}];
+            [self set:@{pushTypeKey:pushId}];
             [NSUserDefaults.standardUserDefaults setValue:newValueOfPushId forKey:keyOfPushId];
         }
     }
 }
 
+- (void)profileUnsetPushKey:(NSString *)pushTypeKey {
+    NSAssert(([pushTypeKey isKindOfClass:[NSString class]] && pushTypeKey.length), @"pushTypeKey should be a non-empty string object!!!❌❌❌");
+    NSString *localKey = [NSString stringWithFormat:@"sa_%@", pushTypeKey];
+    NSString *localValue = [NSUserDefaults.standardUserDefaults valueForKey:localKey];
+    if ([localValue hasPrefix:self.distinctId]) {
+        [self unset:pushTypeKey];
+        [NSUserDefaults.standardUserDefaults removeObjectForKey:localKey];
+    }
+}
 
 - (void)setOnce:(NSDictionary *)profileDict {
     [[self people] setOnce:profileDict];
@@ -3211,7 +2624,7 @@ - (void)deleteUser {
 }
 
 - (void)enableLog:(BOOL)enabelLog{
-    [SALogger enableLog:enabelLog];
+    [self enableLoggers:enabelLog];
 }
 
 - (void)enableLog {
@@ -3223,7 +2636,7 @@ - (void)enableLog {
     if ( [self debugMode] != SensorsAnalyticsDebugOff) {
         printLog = YES;
     }
-    [SALogger enableLog:printLog];
+    [self enableLog:printLog];
 }
 
 - (void)setSDKWithRemoteConfigDict:(NSDictionary *)configDict {
@@ -3233,30 +2646,21 @@ - (void)setSDKWithRemoteConfigDict:(NSDictionary *)configDict {
             [self configServerURLWithDebugMode:SensorsAnalyticsDebugOff  showDebugModeWarning:NO];
         }
     } @catch (NSException *e) {
-        SAError(@"%@ error: %@", self, e);
+        SALogError(@"%@ error: %@", self, e);
     }
 }
 
-- (void)setRemoteConfig:(SASDKRemoteConfig *)remoteConfig {
-    dispatch_async(self.readWriteQueue, ^{
-        self->_remoteConfig = remoteConfig;
-    });
-}
-
-- (id)remoteConfig {
-    __block SASDKRemoteConfig *remoteConfig = nil;
-    dispatch_sync(self.readWriteQueue, ^{
-        remoteConfig = self->_remoteConfig;
-    });
-    return remoteConfig;
-}
-
 - (void)shouldRequestRemoteConfig {
+    // 如果开启加密并且未设置公钥（新用户安装或者从未加密版本升级而来），需要及时请求一次远程配置，获取公钥。
+    if (self.configOptions.enableEncrypt && !self.encryptBuilder) {
+        [self requestFunctionalManagermentConfig];
+        return;
+    }
     
-    //判断是否符合分散 remoteconfig 请求条件
+     //判断是否符合分散 remoteconfig 请求条件
     if (self.configOptions.disableRandomTimeRequestRemoteConfig || self.configOptions.maxRequestHourInterval < self.configOptions.minRequestHourInterval) {
         [self requestFunctionalManagermentConfig];
-        SALog(@"disableRandomTimeRequestRemoteConfig or minHourInterval and maxHourInterval error，Please check the value");
+        SALogDebug(@"disableRandomTimeRequestRemoteConfig or minHourInterval and maxHourInterval error，Please check the value");
         return;
     }
 
@@ -3265,29 +2669,26 @@ - (void)shouldRequestRemoteConfig {
     double startDeviceTime = [[requestTimeConfig objectForKey:@"startDeviceTime"] doubleValue];
     //当前时间，以开机时间为准，单位：秒
     NSTimeInterval currentTime = NSProcessInfo.processInfo.systemUptime;
-
-    dispatch_block_t createRandomTimeBlock = ^() {
-        //转换成 秒 再取随机时间
-        NSInteger durationSecond = (self.configOptions.maxRequestHourInterval - self.configOptions.minRequestHourInterval) * 60 * 60;
-        NSInteger randomDurationTime = arc4random() % durationSecond;
-        double createRandomTime = currentTime + (self.configOptions.minRequestHourInterval * 60 * 60) + randomDurationTime;
-
-        NSDictionary *createRequestTimeConfig = @{@"randomTime": @(createRandomTime), @"startDeviceTime": @(currentTime) };
-        [[NSUserDefaults standardUserDefaults] setObject:createRequestTimeConfig forKey:SA_REQUEST_REMOTECONFIG_TIME];
-    };
-
     if (currentTime >= startDeviceTime && currentTime < randomTime) {
         return;
     }
+    
     [self requestFunctionalManagermentConfig];
-    createRandomTimeBlock();
+    
+    //转换成 秒 再取随机时间
+    NSInteger durationSecond = (self.configOptions.maxRequestHourInterval - self.configOptions.minRequestHourInterval) * 60 * 60;
+    NSInteger randomDurationTime = arc4random() % durationSecond;
+    double createRandomTime = currentTime + (self.configOptions.minRequestHourInterval * 60 * 60) + randomDurationTime;
+
+    NSDictionary *createRequestTimeConfig = @{@"randomTime": @(createRandomTime), @"startDeviceTime": @(currentTime) };
+    [[NSUserDefaults standardUserDefaults] setObject:createRequestTimeConfig forKey:SA_REQUEST_REMOTECONFIG_TIME];
 }
 
 - (void)requestFunctionalManagermentConfig {
     @try {
         [self requestFunctionalManagermentConfigDelay:0 index:0];
     } @catch (NSException *e) {
-        SAError(@"%@ error: %@", self, e);
+        SALogError(@"%@ error: %@", self, e);
     }
 }
 
@@ -3317,12 +2718,30 @@ - (void)requestFunctionalManagermentConfigDelay:(NSTimeInterval) delay index:(NS
                     if (autoTrackMode == nil) {
                         autoTrackMode = [NSNumber numberWithInteger:-1];
                     }
-                    NSDictionary *configToBeSet = nil;
+                    NSMutableDictionary *configToBeSet = nil;
                     if (v) {
-                        configToBeSet = @{@"v": v, @"configs": @{@"disableSDK": disableSDK, @"disableDebugMode": disableDebugMode, @"autoTrackMode": autoTrackMode}};
+                        configToBeSet = [NSMutableDictionary dictionaryWithDictionary:@{@"v": v, @"configs": @{@"disableSDK": disableSDK, @"disableDebugMode": disableDebugMode, @"autoTrackMode": autoTrackMode}}];
                     } else {
-                        configToBeSet = @{@"configs": @{@"disableSDK": disableSDK, @"disableDebugMode": disableDebugMode, @"autoTrackMode": autoTrackMode}};
+                        configToBeSet =  [NSMutableDictionary dictionaryWithDictionary:@{@"configs": @{@"disableSDK": disableSDK, @"disableDebugMode": disableDebugMode, @"autoTrackMode": autoTrackMode}}];
+                    }
+
+                    if (self.configOptions.enableEncrypt) {
+                        NSDictionary *publicKeyDic = [configDict valueForKeyPath:@"configs.key"];
+                        if (publicKeyDic) {
+                            SASecretKey *secretKey = [[SASecretKey alloc] init];
+                            secretKey.version = [publicKeyDic[@"pkv"] integerValue];
+                            secretKey.key = publicKeyDic[@"public_key"];
+                            
+                            // 存储公钥
+                            [self.secretKeyHandler saveSecretKey:secretKey];
+                            
+                            // 更新加密构造器
+                            [self updateEncryptBuilder];
+                        }
                     }
+
+                    //存储当前 SDK 版本号
+                    [configToBeSet setValue:self.libVersion forKey:@"localLibVersion"];
                     [[NSUserDefaults standardUserDefaults] setObject:configToBeSet forKey:SA_SDK_TRACK_CONFIG];
                     [[NSUserDefaults standardUserDefaults] synchronize];
                 }
@@ -3334,29 +2753,34 @@ - (void)requestFunctionalManagermentConfigDelay:(NSTimeInterval) delay index:(NS
                 }
             }
         } @catch (NSException *e) {
-            SAError(@"%@ error: %@", self, e);
+            SALogError(@"%@ error: %@", self, e);
         }
     };
     @try {
         self.reqConfigBlock = block;
         [self performSelector:@selector(requestFunctionalManagermentConfigWithCompletion:) withObject:self.reqConfigBlock afterDelay:delay inModes:@[NSRunLoopCommonModes, NSDefaultRunLoopMode]];
     } @catch (NSException *e) {
-        SAError(@"%@ error: %@", self, e);
+        SALogError(@"%@ error: %@", self, e);
     }
 }
 
 - (void)requestFunctionalManagermentConfigWithCompletion:(void(^)(BOOL success, NSDictionary*configDict )) completion{
     @try {
-        NSString *networkTypeString = [SensorsAnalyticsSDK getNetWorkStates];
+        NSString *networkTypeString = [SACommonUtility currentNetworkStatus];
         SensorsAnalyticsNetworkType networkType = [self toNetworkType:networkTypeString];
         if (networkType == SensorsAnalyticsNetworkTypeNONE) {
             completion(NO, nil);
             return;
         }
         NSURL *url = [NSURL URLWithString:self.configOptions.remoteConfigURL];
-        [self.network functionalManagermentConfigWithRemoteConfigURL:url version:self.remoteConfig.v completion:completion];
+        BOOL shouldAddVersion = [self.remoteConfig.localLibVersion isEqualToString:self.libVersion];
+        if (self.configOptions.enableEncrypt) {
+            shouldAddVersion = shouldAddVersion && self.encryptBuilder;
+        }
+        NSString *configVersion = shouldAddVersion ? self.remoteConfig.v : nil;
+        [self.network functionalManagermentConfigWithRemoteConfigURL:url version:configVersion completion:completion];
     } @catch (NSException *e) {
-        SAError(@"%@ error: %@", self, e);
+        SALogError(@"%@ error: %@", self, e);
     }
 }
 
@@ -3383,7 +2807,7 @@ - (void)enableTrackScreenOrientation:(BOOL)enable {
             }
         }
     } @catch (NSException * e) {
-        SAError(@"%@ error: %@", self, e);
+        SALogError(@"%@ error: %@", self, e);
     }
 #endif
 }
@@ -3402,7 +2826,7 @@ - (void)enableTrackGPSLocation:(BOOL)enableGPSLocation {
                         strongSelf.locationConfig.coordinate = location.coordinate;
                     }
                     if (error) {
-                        SALog(@"enableTrackGPSLocation error：%@", error);
+                        SALogError(@"enableTrackGPSLocation error：%@", error);
                     }
                 };
             }
@@ -3438,8 +2862,363 @@ - (SASecurityPolicy *)securityPolicy {
     return self.network.securityPolicy;
 }
 
+#pragma mark - SecretKey
+- (void)updateEncryptBuilder {
+    // 获取公钥
+    SASecretKey *secretKey = [self.secretKeyHandler loadSecretKey];
+    if (secretKey.key.length > 0) {
+        self.encryptBuilder = [[SADataEncryptBuilder alloc] initWithRSAPublicKey:secretKey];
+    }
+}
+
+#pragma mark – Getters and Setters
+
+- (void)setRemoteConfig:(SASDKRemoteConfig *)remoteConfig {
+    [self.readWriteLock writeWithBlock:^{
+        self->_remoteConfig = remoteConfig;
+    }];
+}
+
+- (id)remoteConfig {
+    return [self.readWriteLock readWithBlock:^id _Nonnull{
+        return self->_remoteConfig;
+    }];
+}
+
+- (void)setEncryptBuilder:(SADataEncryptBuilder *)encryptBuilder {
+    [self.readWriteLock writeWithBlock:^{
+        self->_encryptBuilder = encryptBuilder;
+    }];
+}
+
+- (SADataEncryptBuilder *)encryptBuilder {
+    return [self.readWriteLock readWithBlock:^id _Nonnull{
+        return self->_encryptBuilder;
+    }];
+}
+
 @end
 
+
+#pragma mark - JSCall
+
+@implementation SensorsAnalyticsSDK (JSCall)
+
+#pragma mark about webView
+
+- (void)addWebViewUserAgentSensorsDataFlag {
+    [self addWebViewUserAgentSensorsDataFlag:YES];
+}
+
+- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify  {
+    [self addWebViewUserAgentSensorsDataFlag:enableVerify userAgent:nil];
+}
+
+- (void)addWebViewUserAgentSensorsDataFlag:(BOOL)enableVerify userAgent:(nullable NSString *)userAgent {
+    void (^ changeUserAgent)(BOOL verify, NSString *oldUserAgent) = ^void (BOOL verify, NSString *oldUserAgent) {
+        NSString *newAgent = oldUserAgent;
+        if ([oldUserAgent rangeOfString:@"sa-sdk-ios"].location == NSNotFound) {
+            if (verify) {
+                newAgent = [oldUserAgent stringByAppendingString:[NSString stringWithFormat:@" /sa-sdk-ios/sensors-verify/%@?%@ ", self.network.host, self.network.project]];
+            } else {
+                newAgent = [oldUserAgent stringByAppendingString:@" /sa-sdk-ios"];
+            }
+        }
+        //使 newAgent 生效，并设置 userAgent
+        NSDictionary *dictionnary = [[NSDictionary alloc] initWithObjectsAndKeys:newAgent, @"UserAgent", nil];
+        [[NSUserDefaults standardUserDefaults] registerDefaults:dictionnary];
+        self.userAgent = newAgent;
+        [[NSUserDefaults standardUserDefaults] synchronize];
+    };
+
+    BOOL verify = enableVerify;
+    @try {
+        if (![self.network isValidServerURL]) {
+            verify = NO;
+        }
+        NSString *oldAgent = userAgent.length > 0 ? userAgent : self.userAgent;
+        if (oldAgent) {
+            changeUserAgent(verify, oldAgent);
+        } else {
+            [self loadUserAgentWithCompletion:^(NSString *ua) {
+                changeUserAgent(verify, ua);
+            }];
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@: %@", self, exception);
+    }
+}
+
+- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request {
+    return [self showUpWebView:webView WithRequest:request andProperties:nil];
+}
+
+- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request enableVerify:(BOOL)enableVerify {
+    return [self showUpWebView:webView WithRequest:request andProperties:nil enableVerify:enableVerify];
+}
+
+
+- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request andProperties:(NSDictionary *)propertyDict {
+    return [self showUpWebView:webView WithRequest:request andProperties:propertyDict enableVerify:NO];
+}
+
+- (BOOL)showUpWebView:(id)webView WithRequest:(NSURLRequest *)request andProperties:(NSDictionary *)propertyDict enableVerify:(BOOL)enableVerify {
+    if (![self shouldHandleWebView:webView request:request]) {
+        return NO;
+    }
+#ifdef SENSORS_ANALYTICS_DISABLE_UIWEBVIEW
+    NSAssert([webView isKindOfClass:WKWebView.class], @"当前集成方式，请使用 WKWebView！❌");
+#endif
+
+    @try {
+        SALogDebug(@"showUpWebView");
+        SAJSONUtil *_jsonUtil = [[SAJSONUtil alloc] init];
+        NSDictionary *bridgeCallbackInfo = [self webViewJavascriptBridgeCallbackInfo];
+        NSMutableDictionary *properties = [[NSMutableDictionary alloc] init];
+        if (bridgeCallbackInfo) {
+            [properties addEntriesFromDictionary:bridgeCallbackInfo];
+        }
+        if (propertyDict) {
+            [properties addEntriesFromDictionary:propertyDict];
+        }
+        NSData *jsonData = [_jsonUtil JSONSerializeObject:properties];
+        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+
+        NSString *js = [NSString stringWithFormat:@"sensorsdata_app_js_bridge_call_js('%@')", jsonString];
+
+        //判断系统是否支持WKWebView
+        Class wkWebViewClass = NSClassFromString(@"WKWebView");
+
+        NSString *urlstr = request.URL.absoluteString;
+        if (!urlstr) {
+            return YES;
+        }
+
+        //解析参数
+        NSMutableDictionary *paramsDic = [[SAURLUtils queryItemsWithURLString:urlstr] mutableCopy];
+
+#ifndef SENSORS_ANALYTICS_DISABLE_UIWEBVIEW
+        if ([webView isKindOfClass:[UIWebView class]]) {//UIWebView
+            SALogDebug(@"showUpWebView: UIWebView");
+            if ([urlstr rangeOfString:SA_JS_GET_APP_INFO_SCHEME].location != NSNotFound) {
+                [webView stringByEvaluatingJavaScriptFromString:js];
+            } else if ([urlstr rangeOfString:SA_JS_TRACK_EVENT_NATIVE_SCHEME].location != NSNotFound) {
+                if ([paramsDic count] > 0) {
+                    NSString *eventInfo = [paramsDic objectForKey:SA_EVENT_NAME];
+                    if (eventInfo != nil) {
+                        NSString *encodedString = [eventInfo stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                        [self trackFromH5WithEvent:encodedString enableVerify:enableVerify];
+                    }
+                }
+            }
+        } else
+#endif
+        if (wkWebViewClass && [webView isKindOfClass:wkWebViewClass]) {//WKWebView
+            SALogDebug(@"showUpWebView: WKWebView");
+            if ([urlstr rangeOfString:SA_JS_GET_APP_INFO_SCHEME].location != NSNotFound) {
+                typedef void (^Myblock)(id, NSError *);
+                Myblock myBlock = ^(id _Nullable response, NSError *_Nullable error) {
+                    SALogDebug(@"response: %@ error: %@", response, error);
+                };
+                SEL sharedManagerSelector = NSSelectorFromString(@"evaluateJavaScript:completionHandler:");
+                if (sharedManagerSelector) {
+                    ((void (*)(id, SEL, NSString *, Myblock))[webView methodForSelector:sharedManagerSelector])(webView, sharedManagerSelector, js, myBlock);
+                }
+            } else if ([urlstr rangeOfString:SA_JS_TRACK_EVENT_NATIVE_SCHEME].location != NSNotFound) {
+                if ([paramsDic count] > 0) {
+                    NSString *eventInfo = [paramsDic objectForKey:SA_EVENT_NAME];
+                    if (eventInfo != nil) {
+                        NSString *encodedString = [eventInfo stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+                        [self trackFromH5WithEvent:encodedString enableVerify:enableVerify];
+                    }
+                }
+            }
+        } else {
+            SALogDebug(@"showUpWebView: not valid webview");
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@: %@", self, exception);
+    } @finally {
+        return YES;
+    }
+}
+
+
+- (BOOL)shouldHandleWebView:(id)webView request:(NSURLRequest *)request {
+    if (webView == nil) {
+        SALogDebug(@"showUpWebView == nil");
+        return NO;
+    }
+
+    if (request == nil || ![request isKindOfClass:NSURLRequest.class]) {
+        SALogDebug(@"request == nil or not NSURLRequest class");
+        return NO;
+    }
+
+    NSString *urlString = request.URL.absoluteString;
+    if ([urlString rangeOfString:SA_JS_GET_APP_INFO_SCHEME].length ||[urlString rangeOfString:SA_JS_TRACK_EVENT_NATIVE_SCHEME].length) {
+        return YES;
+    }
+    return NO;
+}
+
+#pragma mark trackFromH5
+
+- (void)trackFromH5WithEvent:(NSString *)eventInfo {
+    [self trackFromH5WithEvent:eventInfo enableVerify:NO];
+}
+
+- (void)trackFromH5WithEvent:(NSString *)eventInfo enableVerify:(BOOL)enableVerify {
+    __block NSNumber *timeStamp = @([[self class] getCurrentTime]);
+    __block NSDictionary *dynamicSuperPropertiesDict = [self acquireDynamicSuperProperties];
+    
+    dispatch_async(self.serialQueue, ^{
+        @try {
+            if (!eventInfo) {
+                return;
+            }
+
+            NSData *jsonData = [eventInfo dataUsingEncoding:NSUTF8StringEncoding];
+            NSError *error;
+            NSMutableDictionary *eventDict = [NSJSONSerialization JSONObjectWithData:jsonData
+                                                                             options:NSJSONReadingMutableContainers
+                                                                               error:&error];
+            if(error || !eventDict) {
+                return;
+            }
+
+            if (enableVerify) {
+                NSString *serverUrl = eventDict[@"server_url"];
+                if (![self.network isSameProjectWithURLString:serverUrl]) {
+                    SALogError(@"Server_url verified faild, Web event lost! Web server_url = '%@'",serverUrl);
+                    return;
+                }
+            }
+
+            NSString *type = eventDict[SA_EVENT_TYPE];
+            NSString *bestId = self.distinctId;
+
+            if([type isEqualToString:@"track_signup"]) {
+                NSString *realOriginalId = self.originalId ?: self.distinctId;
+                eventDict[@"original_id"] = realOriginalId;
+            } else {
+                eventDict[SA_EVENT_DISTINCT_ID] = bestId;
+            }
+            eventDict[SA_EVENT_TRACK_ID] = @(arc4random());
+
+            NSMutableDictionary *libMDic = eventDict[SA_EVENT_LIB];
+            //update lib $app_version from super properties
+            id appVersion = self->_superProperties[SAEventPresetPropertyAppVersion] ?: self.presetProperty.appVersion;
+            if (appVersion) {
+                libMDic[SAEventPresetPropertyAppVersion] = appVersion;
+            }
+
+            NSMutableDictionary *automaticPropertiesCopy = [NSMutableDictionary dictionaryWithDictionary:self.presetProperty.automaticProperties];
+            [automaticPropertiesCopy removeObjectForKey:SAEventPresetPropertyLib];
+            [automaticPropertiesCopy removeObjectForKey:SAEventPresetPropertyLibVersion];
+
+            NSMutableDictionary *propertiesDict = eventDict[SA_EVENT_PROPERTIES];
+            if([type isEqualToString:@"track"] || [type isEqualToString:@"track_signup"]) {
+                // track / track_signup 类型的请求，还是要加上各种公共property
+                // 这里注意下顺序，按照优先级从低到高，依次是automaticProperties, superProperties,dynamicSuperPropertiesDict,propertieDict
+                [propertiesDict addEntriesFromDictionary:automaticPropertiesCopy];
+                
+                //获取用户自定义的动态公共属性
+                if (dynamicSuperPropertiesDict && [dynamicSuperPropertiesDict isKindOfClass:NSDictionary.class] == NO) {
+                    SALogDebug(@"dynamicSuperProperties  returned: %@  is not an NSDictionary Obj.", dynamicSuperPropertiesDict);
+                    dynamicSuperPropertiesDict = nil;
+                } else if (![self assertPropertyTypes:&dynamicSuperPropertiesDict withEventType:@"register_super_properties"]) {
+                    dynamicSuperPropertiesDict = nil;
+                }
+                // 去重
+                [self unregisterSameLetterSuperProperties:dynamicSuperPropertiesDict];
+                
+                [propertiesDict addEntriesFromDictionary:self->_superProperties];
+                [propertiesDict addEntriesFromDictionary:dynamicSuperPropertiesDict];
+
+                // 每次 track 时手机网络状态
+                [propertiesDict addEntriesFromDictionary:[self.presetProperty currentNetworkProperties]];
+
+                //  是否首日访问
+                if([type isEqualToString:@"track"]) {
+                    propertiesDict[SAEventPresetPropertyIsFirstDay] = @([self.presetProperty isFirstDay]);
+                }
+                [propertiesDict removeObjectForKey:@"_nocache"];
+
+                // 添加 DeepLink 来源渠道参数。优先级最高，覆盖 H5 传过来的同名字段
+                [propertiesDict addEntriesFromDictionary:[self.linkHandler latestUtmProperties]];
+            }
+
+            [eventDict removeObjectForKey:@"_nocache"];
+            [eventDict removeObjectForKey:@"server_url"];
+
+            // $project & $token
+            NSString *project = propertiesDict[SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT];
+            NSString *token = propertiesDict[SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN];
+            id timeNumber = propertiesDict[SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME];
+
+            if (project) {
+                [propertiesDict removeObjectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_PROJECT];
+                eventDict[SA_EVENT_PROJECT] = project;
+            }
+            if (token) {
+                [propertiesDict removeObjectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_TOKEN];
+                eventDict[SA_EVENT_TOKEN] = token;
+            }
+            if (timeNumber) { //包含 $time
+                NSNumber *customTime = nil;
+                if ([timeNumber isKindOfClass:[NSDate class]]) {
+                    customTime = @([(NSDate *)timeNumber timeIntervalSince1970] * 1000);
+                } else if ([timeNumber isKindOfClass:[NSNumber class]]) {
+                    customTime = timeNumber;
+                }
+                
+                if (!customTime) {
+                    SALogError(@"H5 $time '%@' invalid，Please check the value", timeNumber);
+                } else if ([customTime compare:@(SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME_INT)] == NSOrderedAscending) {
+                    SALogError(@"H5 $time error %@，Please check the value", timeNumber);
+                } else {
+                    timeStamp = @([customTime unsignedLongLongValue]);
+                }
+                [propertiesDict removeObjectForKey:SA_EVENT_COMMON_OPTIONAL_PROPERTY_TIME];
+            }
+
+            eventDict[SA_EVENT_TIME] = timeStamp;
+
+            //JS SDK Data add _hybrid_h5 flag
+            eventDict[SA_EVENT_HYBRID_H5] = @(YES);
+
+            NSMutableDictionary *enqueueEvent = [[self willEnqueueWithType:type andEvent:eventDict] mutableCopy];
+
+            if (!enqueueEvent) {
+                return;
+            }
+            // 只有当本地 loginId 不为空时才覆盖 H5 数据
+            if (self.loginId) {
+                enqueueEvent[SA_EVENT_LOGIN_ID] = self.loginId;
+            }
+            enqueueEvent[SA_EVENT_ANONYMOUS_ID] = self.anonymousId;
+
+            if([type isEqualToString:@"track_signup"]) {
+                NSString *newLoginId = eventDict[SA_EVENT_DISTINCT_ID];
+                if ([self.identifier isValidLoginId:newLoginId]) {
+                    [self.identifier login:newLoginId];
+                    enqueueEvent[SA_EVENT_LOGIN_ID] = newLoginId;
+                    [self enqueueWithType:type andEvent:[enqueueEvent copy]];
+                    SALogDebug(@"\n【track event from H5】:\n%@", enqueueEvent);
+                }
+            } else {
+                [self enqueueWithType:type andEvent:[enqueueEvent copy]];
+                SALogDebug(@"\n【track event from H5】:\n%@", enqueueEvent);
+            }
+        } @catch (NSException *exception) {
+            SALogError(@"%@: %@", self, exception);
+        }
+    });
+}
+@end
+
+
 #pragma mark - People analytics
 
 @implementation SensorsAnalyticsPeople
@@ -3503,6 +3282,11 @@ - (void)deleteUser {
 #pragma mark - Deprecated
 @implementation SensorsAnalyticsSDK (Deprecated)
 
++ (SensorsAnalyticsSDK *)sharedInstanceWithConfig:(nonnull SAConfigOptions *)configOptions {
+    [self startWithConfigOptions:configOptions];
+    return sharedInstance;
+}
+
 + (SensorsAnalyticsSDK *)sharedInstanceWithServerURL:(NSString *)serverURL
                                         andDebugMode:(SensorsAnalyticsDebugMode)debugMode {
     return [SensorsAnalyticsSDK sharedInstanceWithServerURL:serverURL
@@ -3532,6 +3316,38 @@ + (SensorsAnalyticsSDK *)sharedInstanceWithServerURL:(nonnull NSString *)serverU
     return sharedInstance;
 }
 
+- (UInt64)flushInterval {
+    @synchronized(self) {
+        return self.configOptions.flushInterval;
+    }
+}
+
+- (void)setFlushInterval:(UInt64)interval {
+    @synchronized(self) {
+        if (interval < 5 * 1000) {
+            interval = 5 * 1000;
+        }
+        self.configOptions.flushInterval = (NSInteger)interval;
+    }
+    [self flush];
+    [self stopFlushTimer];
+    [self startFlushTimer];
+}
+
+- (UInt64)flushBulkSize {
+    @synchronized(self) {
+        return self.configOptions.flushBulkSize;
+    }
+}
+
+- (void)setFlushBulkSize:(UInt64)bulkSize {
+    @synchronized(self) {
+        //加上最小值保护，50
+        NSInteger newBulkSize = (NSInteger)bulkSize;
+        self.configOptions.flushBulkSize = newBulkSize >= 50 ? newBulkSize : 50;
+    }
+}
+
 - (void)setDebugMode:(SensorsAnalyticsDebugMode)debugMode {
     [self configServerURLWithDebugMode:debugMode  showDebugModeWarning:NO];
 }
@@ -3560,15 +3376,21 @@ - (void)trackTimerBegin:(NSString *)event {
 }
 
 - (void)trackTimerBegin:(NSString *)event withTimeUnit:(SensorsAnalyticsTimeUnit)timeUnit {
-    [self trackTimerStart:event timeUnit:timeUnit];
+    UInt64 currentSysUpTime = [self.class getSystemUpTime];
+    dispatch_async(self.serialQueue, ^{
+        [self.trackTimer trackTimerStart:event timeUnit:timeUnit currentSysUpTime:currentSysUpTime];
+    });
 }
 
 - (void)trackTimer:(NSString *)event {
-    [self trackTimerStart:event timeUnit:SensorsAnalyticsTimeUnitMilliseconds];
+    [self trackTimer:event withTimeUnit:SensorsAnalyticsTimeUnitMilliseconds];
 }
 
 - (void)trackTimer:(NSString *)event withTimeUnit:(SensorsAnalyticsTimeUnit)timeUnit {
-    [self trackTimerStart:event timeUnit:timeUnit];
+    UInt64 currentSysUpTime = [self.class getSystemUpTime];
+    dispatch_async(self.serialQueue, ^{
+        [self.trackTimer trackTimerStart:event timeUnit:timeUnit currentSysUpTime:currentSysUpTime];
+    });
 }
 
 - (void)trackSignUp:(NSString *)newDistinctId withProperties:(NSDictionary *)propertieDict {
@@ -3584,6 +3406,17 @@ - (BOOL)handleHeatMapUrl:(NSURL *)URL {
     return [self handleAutoTrackURL:URL];
 }
 
+- (void)enableVisualizedAutoTrack {
+    self.configOptions.enableVisualizedAutoTrack = YES;
+
+    // 开启 WKWebView 和 js 的数据交互
+    [self swizzleWebViewMethod];
+}
+
+- (void)enableHeatMap {
+    self.configOptions.enableHeatMap = YES;
+}
+
 - (void)trackViewScreen:(NSString *)url withProperties:(NSDictionary *)properties {
     NSMutableDictionary *trackProperties = [[NSMutableDictionary alloc] init];
     if (properties) {
diff --git a/SensorsAnalyticsSDK/UIView+AutoTrack.m b/SensorsAnalyticsSDK/UIView+AutoTrack.m
deleted file mode 100644
index 7969a89b..00000000
--- a/SensorsAnalyticsSDK/UIView+AutoTrack.m
+++ /dev/null
@@ -1,326 +0,0 @@
-//
-//  UIView+sa_autoTrack.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 向作为 on 2018/6/11.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 "SAAutoTrackUtils.h"
-#import "SensorsAnalyticsSDK.h"
-#import "UIView+SAHelpers.h"
-
-#pragma mark - UIView
-
-@implementation UIView (AutoTrack)
-
-- (BOOL)sensorsdata_isIgnored {
-    if (self.isHidden || self.sensorsAnalyticsIgnoreView) {
-        return YES;
-    }
-    
-    BOOL isAutoTrackEnabled = [[SensorsAnalyticsSDK sharedInstance] isAutoTrackEnabled];
-    BOOL isAutoTrackEventTypeIgnored = [[SensorsAnalyticsSDK sharedInstance] isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppClick];
-    BOOL isViewTypeIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[self class]];
-    return !isAutoTrackEnabled || isAutoTrackEventTypeIgnored || isViewTypeIgnored;
-}
-
-- (NSString *)sensorsdata_elementType {
-    return NSStringFromClass(self.class);
-}
-
-- (NSString *)sensorsdata_elementContent {
-    NSMutableString *elementContent = [NSMutableString string];
-
-    if ([self isKindOfClass:NSClassFromString(@"RTLabel")]) {   // RTLabel:https://github.com/honcheng/RTLabel
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-        if ([self respondsToSelector:NSSelectorFromString(@"text")]) {
-            NSString *title = [self performSelector:NSSelectorFromString(@"text")];
-            if (title.length > 0) {
-                [elementContent appendString:title];
-            }
-        }
-#pragma clang diagnostic pop
-    } else if ([self isKindOfClass:NSClassFromString(@"YYLabel")]) {    // RTLabel:https://github.com/ibireme/YYKit
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-        if ([self respondsToSelector:NSSelectorFromString(@"text")]) {
-            NSString *title = [self performSelector:NSSelectorFromString(@"text")];
-            if (title.length > 0) {
-                [elementContent appendString:title];
-            }
-        }
-#pragma clang diagnostic pop
-    } else {
-        NSMutableArray<NSString *> *elementContentArray = [NSMutableArray array];
-        for (UIView *subview in self.subviews) {
-            // 忽略隐藏控件
-            if (subview.isHidden || subview.sensorsAnalyticsIgnoreView) {
-                continue;
-            }
-            NSString *temp = subview.sensorsdata_elementContent;
-            if (temp.length > 0) {
-                [elementContentArray addObject:temp];
-            }
-        }
-        if (elementContentArray.count > 0) {
-            [elementContent appendString:[elementContentArray componentsJoinedByString:@"-"]];
-        }
-    }
-
-    return elementContent.length == 0 ? nil : [elementContent copy];
-}
-
-- (NSString *)sensorsdata_elementPosition {
-    return nil;
-}
-
-- (NSString *)sensorsdata_elementId {
-    return self.sensorsAnalyticsViewID;
-}
-
-- (UIViewController *)sensorsdata_viewController {
-    UIViewController *viewController = [SAAutoTrackUtils findNextViewControllerByResponder:self];
-    if ([viewController isKindOfClass:UINavigationController.class]) {
-        viewController = [SAAutoTrackUtils currentViewController];
-    }
-    return viewController;
-}
-
-- (NSString *)sensorsdata_itemPath {
-    NSString *identifier = [SAAutoTrackUtils viewIdentifierForView:self];
-    if (identifier) {
-        return identifier;
-    }
-    return [SAAutoTrackUtils itemPathForResponder:self];
-}
-
-@end
-
-@implementation UILabel (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-    return self.text ?: super.sensorsdata_elementContent;
-}
-
-@end
-
-@implementation UIImageView (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-#ifndef SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UIIMAGE_IMAGENAME
-    NSString *imageName = self.image.sensorsAnalyticsImageName;
-    if (imageName.length > 0) {
-        return [NSString stringWithFormat:@"$%@", imageName];
-    }
-#endif
-    return super.sensorsdata_elementContent;
-}
-
-@end
-
-@implementation UITextView (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-    return self.text ?: super.sensorsdata_elementContent;
-}
-
-@end
-
-@implementation UITabBar (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-    return self.selectedItem.title;
-}
-
-- (NSString *)sensorsdata_elementPosition {
-    return [NSString stringWithFormat: @"%ld", (long)[self.items indexOfObject:self.selectedItem]];
-}
-
-- (NSString *)sensorsdata_itemPath {
-    NSInteger selectedIndex = [self.items indexOfObject:self.selectedItem];
-    NSString *subPath = [NSString stringWithFormat:@"%@[%ld]", @"UITabBarButton", (long)selectedIndex];
-    return [NSString stringWithFormat:@"%@/%@", super.sensorsdata_itemPath, subPath];
-}
-
-@end
-
-@implementation UISearchBar (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-    return self.text;
-}
-
-@end
-
-@implementation UITableViewHeaderFooterView (AutoTrack)
-
-- (NSString *)sensorsdata_itemPath {
-    UITableView *tableView = (UITableView *)self.superview;
-
-    while (![tableView isKindOfClass:UITableView.class]) {
-        tableView = (UITableView *)tableView.superview;
-        if (!tableView) {
-            return super.sensorsdata_itemPath;
-        }
-    }
-    for (NSInteger i = 0; i < tableView.numberOfSections; i++) {
-        if (self == [tableView headerViewForSection:i]) {
-            return [NSString stringWithFormat:@"[SectionHeader][%ld]", (long)i];
-        }
-        if (self == [tableView footerViewForSection:i]) {
-            return [NSString stringWithFormat:@"[SectionFooter][%ld]", (long)i];
-        }
-    }
-
-    return super.sensorsdata_itemPath;
-}
-
-@end
-
-#pragma mark - UIControl
-
-@implementation UIButton (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-    NSString *text = self.titleLabel.text;
-    if (!text) {
-        text = super.sensorsdata_elementContent;
-    }
-#ifndef SENSORS_ANALYTICS_DISABLE_AUTOTRACK_UIIMAGE_IMAGENAME
-    if (text.length == 0) {
-        NSString *imageName = self.currentImage.sensorsAnalyticsImageName;
-        if (imageName.length > 0) {
-            return [NSString stringWithFormat:@"$%@", imageName];
-        }
-    }
-#endif
-    return text;
-}
-
-@end
-
-@implementation UISwitch (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-    return self.on ? @"checked" : @"unchecked";
-}
-
-@end
-
-@implementation UIStepper (AutoTrack)
-
-- (NSString *)sensorsdata_elementContent {
-    return [NSString stringWithFormat:@"%g", self.value];
-}
-
-@end
-
-@implementation UISegmentedControl (AutoTrack)
-
-- (BOOL)sensorsdata_isIgnored {
-    return super.sensorsdata_isIgnored || self.selectedSegmentIndex == UISegmentedControlNoSegment;
-}
-
-- (NSString *)sensorsdata_elementContent {
-    return [self titleForSegmentAtIndex:self.selectedSegmentIndex];
-}
-
-- (NSString *)sensorsdata_elementPosition {
-    return [NSString stringWithFormat: @"%ld", (long)self.selectedSegmentIndex];
-}
-
-- (NSString *)sensorsdata_itemPath {
-    NSString *subPath = [NSString stringWithFormat:@"%@[%ld]", @"UISegment", (long)self.selectedSegmentIndex];
-    return [NSString stringWithFormat:@"%@/%@", super.sensorsdata_itemPath, subPath];
-}
-
-@end
-
-@implementation UISlider (AutoTrack)
-
-- (BOOL)sensorsdata_isIgnored {
-    return self.tracking || super.sensorsdata_isIgnored;
-}
-
-- (NSString *)sensorsdata_elementContent {
-    return [NSString stringWithFormat:@"%f", self.value];
-}
-
-@end
-
-#pragma mark - UITabBarItem
-@implementation UITabBarItem (AutoTrack)
-
-- (BOOL)sensorsdata_isIgnored {
-    BOOL isAutoTrackEnabled = [[SensorsAnalyticsSDK sharedInstance] isAutoTrackEnabled];
-    BOOL isAutoTrackEventTypeIgnored = [[SensorsAnalyticsSDK sharedInstance] isAutoTrackEventTypeIgnored:SensorsAnalyticsEventTypeAppClick];
-    BOOL isViewTypeIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[self class]];
-    return !isAutoTrackEnabled || isAutoTrackEventTypeIgnored || isViewTypeIgnored;
-}
-
-- (NSString *)sensorsdata_elementId {
-    return nil;
-}
-
-- (NSString *)sensorsdata_elementType {
-    return NSStringFromClass(self.class);
-}
-
-- (NSString *)sensorsdata_elementContent {
-    return self.title;
-}
-
-- (NSString *)sensorsdata_elementPosition {
-    return nil;
-}
-
-- (UIViewController *)sensorsdata_viewController {
-    return nil;
-}
-
-@end
-
-#pragma mark - Cell
-
-@implementation UITableViewCell (AutoTrack)
-
-- (NSString *)sensorsdata_elementPositionWithIndexPath:(NSIndexPath *)indexPath {
-    return [NSString stringWithFormat: @"%ld:%ld", (long)indexPath.section, (long)indexPath.row];
-}
-
-- (NSString *)sensorsdata_itemPathWithIndexPath:(NSIndexPath *)indexPath {
-    return [NSString stringWithFormat:@"%@[%ld][%ld]", NSStringFromClass(self.class), (long)indexPath.section, (long)indexPath.row];
-}
-
-@end
-
-@implementation UICollectionViewCell (AutoTrack)
-
-- (NSString *)sensorsdata_elementPositionWithIndexPath:(NSIndexPath *)indexPath {
-    return [NSString stringWithFormat: @"%ld:%ld", (long)indexPath.section, (long)indexPath.row];
-}
-
-- (NSString *)sensorsdata_itemPathWithIndexPath:(NSIndexPath *)indexPath {
-    return [NSString stringWithFormat:@"%@[%ld][%ld]", NSStringFromClass(self.class), (long)indexPath.section, (long)indexPath.row];
-}
-
-@end
diff --git a/SensorsAnalyticsSDK/SACommonUtility.h b/SensorsAnalyticsSDK/Utils/SACommonUtility.h
similarity index 79%
rename from SensorsAnalyticsSDK/SACommonUtility.h
rename to SensorsAnalyticsSDK/Utils/SACommonUtility.h
index e2c350d2..42290e87 100644
--- a/SensorsAnalyticsSDK/SACommonUtility.h
+++ b/SensorsAnalyticsSDK/Utils/SACommonUtility.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 储强盛 on 2018/7/26.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -26,4 +26,10 @@
 ///按字节截取指定长度字符，包括汉字和表情
 + (NSString *)subByteString:(NSString *)string byteLength:(NSInteger )length;
 
+/// 获取当前网络状态
++ (NSString *)currentNetworkStatus;
+
+/// 主线程执行
++ (void)performBlockOnMainThread:(DISPATCH_NOESCAPE dispatch_block_t)block;
+
 @end
diff --git a/SensorsAnalyticsSDK/Utils/SACommonUtility.m b/SensorsAnalyticsSDK/Utils/SACommonUtility.m
new file mode 100644
index 00000000..4834519b
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SACommonUtility.m
@@ -0,0 +1,128 @@
+//
+//  SACommonUtility.m
+//  SensorsAnalyticsSDK
+//
+//  Created by 储强盛 on 2018/7/26.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <CoreTelephony/CTTelephonyNetworkInfo.h>
+
+#import "SACommonUtility.h"
+#import "SAReachability.h"
+#import "SALog.h"
+
+@implementation SACommonUtility
+
+
+///按字节截取指定长度字符，包括汉字
++ (NSString *)subByteString:(NSString *)string byteLength:(NSInteger )length {
+    
+    NSStringEncoding enc = CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingUTF8);
+    NSData* data = [string dataUsingEncoding:enc];
+    
+    NSData *subData = [data subdataWithRange:NSMakeRange(0, length)];
+    NSString*txt=[[NSString alloc] initWithData:subData encoding:enc];
+    
+     //utf8 汉字占三个字节，表情占四个字节，可能截取失败
+    NSInteger index = 1;
+    while (index <= 3 && !txt) {
+        if (length > index) {
+            subData = [data subdataWithRange:NSMakeRange(0, length - index)];
+            txt = [[NSString alloc] initWithData:subData encoding:enc];
+        }
+        index ++;
+    }
+    
+    if (!txt) {
+        return string;
+    }
+    return txt;
+}
+
++ (NSString *)currentNetworkStatus {
+#ifdef SA_UT
+    SALogDebug(@"In unit test, set NetWorkStates to wifi");
+    return @"WIFI";
+#endif
+    NSString *network = @"NULL";
+    @try {
+        SAReachability *reachability = [SAReachability reachabilityForInternetConnection];
+        SANetworkStatus status = [reachability currentReachabilityStatus];
+        
+        if (status == SAReachableViaWiFi) {
+            network = @"WIFI";
+        } else if (status == SAReachableViaWWAN) {
+            static CTTelephonyNetworkInfo *netinfo = nil;
+            NSString *currentRadioAccessTechnology = nil;
+            
+            if (!netinfo) {
+                netinfo = [[CTTelephonyNetworkInfo alloc] init];
+            }
+#ifdef __IPHONE_12_0
+            if (@available(iOS 12.1, *)) {
+                currentRadioAccessTechnology = netinfo.serviceCurrentRadioAccessTechnology.allValues.lastObject;
+            }
+#endif
+            //测试发现存在少数 12.0 和 12.0.1 的机型 serviceCurrentRadioAccessTechnology 返回空
+            if (!currentRadioAccessTechnology) {
+                currentRadioAccessTechnology = netinfo.currentRadioAccessTechnology;
+            }
+            
+            if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyGPRS]) {
+                network = @"2G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyEdge]) {
+                network = @"2G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyWCDMA]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSDPA]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyHSUPA]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMA1x]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORev0]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevA]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyCDMAEVDORevB]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyeHRPD]) {
+                network = @"3G";
+            } else if ([currentRadioAccessTechnology isEqualToString:CTRadioAccessTechnologyLTE]) {
+                network = @"4G";
+            } else {
+                network = @"UNKNOWN";
+            }
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@: %@", self, exception);
+    }
+    return network;
+}
+
++ (void)performBlockOnMainThread:(DISPATCH_NOESCAPE dispatch_block_t)block {
+    if (NSThread.isMainThread) {
+        block();
+    } else {
+        dispatch_sync(dispatch_get_main_queue(), block);
+    }
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/Utils/SADateFormatter.h b/SensorsAnalyticsSDK/Utils/SADateFormatter.h
new file mode 100644
index 00000000..9ec63320
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SADateFormatter.h
@@ -0,0 +1,43 @@
+//
+// SADateFormatter.h
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2019/12/23.
+// Copyright © 2019 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SADateFormatter : NSObject
+
+/**
+*  @abstract
+*  获取 NSDateFormatter 单例对象
+*
+*  @param string 日期格式
+*
+*  @return 返回 NSDateFormatter 单例对象
+*/
++ (NSDateFormatter *)dateFormatterFromString:(NSString *)string;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Utils/SADateFormatter.m b/SensorsAnalyticsSDK/Utils/SADateFormatter.m
new file mode 100644
index 00000000..7d3973c0
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SADateFormatter.m
@@ -0,0 +1,41 @@
+//
+// SADateFormatter.m
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2019/12/23.
+// Copyright © 2019 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SADateFormatter.h"
+
+@implementation SADateFormatter
+
++ (NSDateFormatter *)dateFormatterFromString:(NSString *)string {
+    static NSDateFormatter *dateFormatter;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        dateFormatter = [[NSDateFormatter alloc] init];
+    });
+    if (dateFormatter) {
+        [dateFormatter setDateFormat:string];
+    }
+    return dateFormatter;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SAGzipUtility.h b/SensorsAnalyticsSDK/Utils/SAGzipUtility.h
similarity index 95%
rename from SensorsAnalyticsSDK/SAGzipUtility.h
rename to SensorsAnalyticsSDK/Utils/SAGzipUtility.h
index 6039ffe5..a1eb3dd8 100644
--- a/SensorsAnalyticsSDK/SAGzipUtility.h
+++ b/SensorsAnalyticsSDK/Utils/SAGzipUtility.h
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAGzipUtility.m b/SensorsAnalyticsSDK/Utils/SAGzipUtility.m
similarity index 93%
rename from SensorsAnalyticsSDK/SAGzipUtility.m
rename to SensorsAnalyticsSDK/Utils/SAGzipUtility.m
index f61ec041..4fe6d15b 100644
--- a/SensorsAnalyticsSDK/SAGzipUtility.m
+++ b/SensorsAnalyticsSDK/Utils/SAGzipUtility.m
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 
 
 #import "zlib.h"
-#import "SALogger.h"
+#import "SALog.h"
 #import "SAGzipUtility.h"
 
 @implementation SAGzipUtility
@@ -31,8 +31,7 @@ @implementation SAGzipUtility
 /*******************************************************************************
  See header for documentation.
  */
-+ (NSData*)gzipData:(NSData *)pUncompressedData
-{
++ (NSData*)gzipData:(NSData *)pUncompressedData {
     /*
      Special thanks to Robbie Hanson of Deusty Designs for sharing sample code
      showing how deflateInit2() can be used to make zlib generate a compressed
@@ -42,9 +41,8 @@ showing how deflateInit2() can be used to make zlib generate a compressed
      
      */
     
-    if (!pUncompressedData || [pUncompressedData length] == 0)
-    {
-        SALog(@" Error: Can't compress an empty or null NSData object.");
+    if (!pUncompressedData || [pUncompressedData length] == 0) {
+        SALogError(@" Error: Can't compress an empty or null NSData object.");
         return nil;
     }
     
@@ -96,11 +94,9 @@ no modification time (set to zero), no header crc, and the
          produced by a filter (or predictor), or Z_HUFFMAN_ONLY to
          force Huffman encoding only (no string match) */
         int initError = deflateInit2(&zlibStreamStruct, Z_DEFAULT_COMPRESSION, Z_DEFLATED, (15+16), 8, Z_DEFAULT_STRATEGY);
-        if (initError != Z_OK)
-        {
+        if (initError != Z_OK) {
             NSString *errorMsg = nil;
-            switch (initError)
-            {
+            switch (initError) {
                 case Z_STREAM_ERROR:
                     errorMsg = @"Invalid parameter passed in to function.";
                     break;
@@ -114,7 +110,7 @@ produced by a filter (or predictor), or Z_HUFFMAN_ONLY to
                     errorMsg = @"Unknown error code.";
                     break;
             }
-            SALog(@"deflateInit2() Error: \"%@\" Message: \"%s\"", errorMsg, zlibStreamStruct.msg);
+            SALogError(@"deflateInit2() Error: \"%@\" Message: \"%s\"", errorMsg, zlibStreamStruct.msg);
             return nil;
         }
     
@@ -150,8 +146,7 @@ end of the input stream was reached (i.e.g, all of the data has been
         // Check for zlib error and convert code to usable error message if appropriate
         if (deflateStatus != Z_STREAM_END) {
             NSString *errorMsg = nil;
-            switch (deflateStatus)
-            {
+            switch (deflateStatus) {
                 case Z_ERRNO:
                     errorMsg = @"Error occured while reading file.";
                     break;
@@ -174,7 +169,7 @@ end of the input stream was reached (i.e.g, all of the data has been
                     errorMsg = @"Unknown error code.";
                     break;
             }
-            SALog(@"zlib error while attempting compression: \"%@\" Message: \"%s\"", errorMsg, zlibStreamStruct.msg);
+            SALogError(@"zlib error while attempting compression: \"%@\" Message: \"%s\"", errorMsg, zlibStreamStruct.msg);
             
             // Free data structures that were dynamically created for the stream.
             deflateEnd(&zlibStreamStruct);
diff --git a/SensorsAnalyticsSDK/SAJSONUtil.h b/SensorsAnalyticsSDK/Utils/SAJSONUtil.h
similarity index 86%
rename from SensorsAnalyticsSDK/SAJSONUtil.h
rename to SensorsAnalyticsSDK/Utils/SAJSONUtil.h
index 632528be..b2d36ab5 100644
--- a/SensorsAnalyticsSDK/SAJSONUtil.h
+++ b/SensorsAnalyticsSDK/Utils/SAJSONUtil.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 曹犟 on 15/7/7.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -32,11 +32,4 @@
  */
 - (NSData *)JSONSerializeObject:(id)obj;
 
-/**
- *  初始化
- *
- *  @return 初始化后的对象
- */
-- (instancetype)init;
-
 @end
diff --git a/SensorsAnalyticsSDK/SAJSONUtil.m b/SensorsAnalyticsSDK/Utils/SAJSONUtil.m
similarity index 79%
rename from SensorsAnalyticsSDK/SAJSONUtil.m
rename to SensorsAnalyticsSDK/Utils/SAJSONUtil.m
index ab4b5119..a6fdc431 100644
--- a/SensorsAnalyticsSDK/SAJSONUtil.m
+++ b/SensorsAnalyticsSDK/Utils/SAJSONUtil.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 曹犟 on 15/7/7.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -24,19 +24,10 @@
 
 
 #import "SAJSONUtil.h"
-#import "SALogger.h"
+#import "SALog.h"
+#import "SADateFormatter.h"
 
-@implementation SAJSONUtil {
-    NSDateFormatter *_dateFormatter;
-}
-
-- (instancetype)init {
-    self = [super init];
-    _dateFormatter = [[NSDateFormatter alloc] init];
-    [_dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss.SSS"];
-    [_dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"UTC+8"]];
-    return self;
-}
+@implementation SAJSONUtil
 
 /**
  *  @abstract
@@ -50,14 +41,17 @@ - (NSData *)JSONSerializeObject:(id)obj {
     id coercedObj = [self JSONSerializableObjectForObject:obj];
     NSError *error = nil;
     NSData *data = nil;
+    if (![NSJSONSerialization isValidJSONObject:coercedObj]) {
+        return data;
+    }
     @try {
         data = [NSJSONSerialization dataWithJSONObject:coercedObj options:0 error:&error];
     }
     @catch (NSException *exception) {
-        SAError(@"%@ exception encoding api data: %@", self, exception);
+        SALogError(@"%@ exception encoding api data: %@", self, exception);
     }
     if (error) {
-        SAError(@"%@ error encoding api data: %@", self, error);
+        SALogError(@"%@ error encoding api data: %@", self, error);
     }
     return data;
 }
@@ -103,7 +97,7 @@ - (id)JSONSerializableObjectForObject:(id)obj {
             NSString *stringKey;
             if (![key isKindOfClass:[NSString class]]) {
                 stringKey = [key description];
-                SAError(@"%@ warning: property keys should be strings. got: %@. coercing to: %@", self, [key class], stringKey);
+                SALogWarn(@"%@ warning: property keys should be strings. got: %@. coercing to: %@", self, [key class], stringKey);
             } else {
                 stringKey = [NSString stringWithString:key];
             }
@@ -121,11 +115,12 @@ - (id)JSONSerializableObjectForObject:(id)obj {
     }
     // some common cases
     if ([newObj isKindOfClass:[NSDate class]]) {
-        return [_dateFormatter stringFromDate:newObj];
+        NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:@"yyyy-MM-dd HH:mm:ss.SSS"];
+        return [dateFormatter stringFromDate:newObj];
     }
     // default to sending the object's description
     NSString *s = [newObj description];
-    SAError(@"%@ warning: property values should be valid json types. got: %@. coercing to: %@", self, [newObj class], s);
+    SALogWarn(@"%@ warning: property values should be valid json types. got: %@. coercing to: %@", self, [newObj class], s);
     return s;
 }
 
diff --git a/SensorsAnalyticsSDK/Utils/SAReadWriteLock.h b/SensorsAnalyticsSDK/Utils/SAReadWriteLock.h
new file mode 100644
index 00000000..07e12156
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SAReadWriteLock.h
@@ -0,0 +1,66 @@
+//
+// SAReadWriteLock.h
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/5/21.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAReadWriteLock : NSObject
+
+/**
+*  @abstract
+*  初始化方法
+*
+*  @param queueLabel 队列的标识
+*
+*  @return 读写锁实例
+*
+*/
+- (instancetype)initWithQueueLabel:(NSString *)queueLabel NS_DESIGNATED_INITIALIZER; 
+
+/// 禁用 init 初始化
+- (instancetype)init NS_UNAVAILABLE;
+
+/// 禁用 new 初始化
++ (instancetype)new NS_UNAVAILABLE;
+
+/**
+*  @abstract
+*  通过读写锁读取数据
+*
+*  @param block 读取操作
+*
+*  @return 读取的数据
+*
+*/
+- (id)readWithBlock:(id(^)(void))block;
+
+/**
+*  @abstract
+*  通过读写锁写入数据
+*
+*  @param block 写入操作
+*
+*/
+- (void)writeWithBlock:(void (^)(void))block;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Utils/SAReadWriteLock.m b/SensorsAnalyticsSDK/Utils/SAReadWriteLock.m
new file mode 100644
index 00000000..d5a7ed58
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SAReadWriteLock.m
@@ -0,0 +1,77 @@
+//
+// SAReadWriteLock.m
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/5/21.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAReadWriteLock.h"
+#import "SAValidator.h"
+
+@interface SAReadWriteLock ()
+
+@property (nonatomic, strong) dispatch_queue_t concurentQueue;
+
+@end
+
+@implementation SAReadWriteLock
+
+#pragma mark - Life Cycle
+
+- (instancetype)initWithQueueLabel:(NSString *)queueLabel {
+    self = [super init];
+    if (self) {
+        NSString *concurentQueueLabel = nil;
+        if ([SAValidator isValidString:queueLabel]) {
+            concurentQueueLabel = queueLabel;
+        } else {
+            concurentQueueLabel = [NSString stringWithFormat:@"com.sensorsdata.readWriteLock.%p", self];
+        }
+        
+        self.concurentQueue = dispatch_queue_create([concurentQueueLabel UTF8String], DISPATCH_QUEUE_CONCURRENT);
+    }
+    return self;
+}
+
+#pragma mark - Public Methods
+
+- (id)readWithBlock:(id(^)(void))block {
+    if (!block) {
+        return nil;
+    }
+    
+    __block id obj = nil;
+    dispatch_sync(self.concurentQueue, ^{
+        obj = block();
+    });
+    return obj;
+}
+
+- (void)writeWithBlock:(void (^)(void))block {
+    if (!block) {
+        return;
+    }
+    
+    dispatch_barrier_async(self.concurentQueue, ^{
+        block();
+    });
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/SANetwork+URLUtils.h b/SensorsAnalyticsSDK/Utils/SAURLUtils.h
similarity index 77%
rename from SensorsAnalyticsSDK/SANetwork+URLUtils.h
rename to SensorsAnalyticsSDK/Utils/SAURLUtils.h
index f2494f60..773d3b2f 100644
--- a/SensorsAnalyticsSDK/SANetwork+URLUtils.h
+++ b/SensorsAnalyticsSDK/Utils/SAURLUtils.h
@@ -1,9 +1,9 @@
 //
-//  SANetwork+URLUtils.h
+//  SAURLUtils.h
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/4/18.
-///  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+///  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 //  limitations under the License.
 //
 
-#import "SANetwork.h"
+#import <Foundation/Foundation.h>
 
-@interface SANetwork (URLUtils)
+@interface SAURLUtils : NSObject
 
 + (NSString *)hostWithURL:(NSURL *)url;
 + (NSString *)hostWithURLString:(NSString *)URLString;
@@ -30,4 +30,7 @@
 
 + (NSString *)urlQueryStringWithParams:(NSDictionary <NSString *, NSString *> *)params;
 
+/// 解码并解析 URL 参数
+/// @param url url 对象
++ (NSDictionary<NSString *, NSString *> *)decodeRueryItemsWithURL:(NSURL *)url;
 @end
diff --git a/SensorsAnalyticsSDK/SANetwork+URLUtils.m b/SensorsAnalyticsSDK/Utils/SAURLUtils.m
similarity index 75%
rename from SensorsAnalyticsSDK/SANetwork+URLUtils.m
rename to SensorsAnalyticsSDK/Utils/SAURLUtils.m
index ad1c8255..c29ea0cd 100644
--- a/SensorsAnalyticsSDK/SANetwork+URLUtils.m
+++ b/SensorsAnalyticsSDK/Utils/SAURLUtils.m
@@ -1,9 +1,9 @@
 //
-//  SANetwork+URLUtils.m
+//  SAURLUtils.m
 //  SensorsAnalyticsSDK
 //
 //  Created by 张敏超 on 2019/4/18.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 #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 "SANetwork+URLUtils.h"
+#import "SAURLUtils.h"
 
-@implementation SANetwork (URLUtils)
+@implementation SAURLUtils
 
 + (NSString *)hostWithURL:(NSURL *)url {
     if (!url) {
@@ -84,4 +84,29 @@ + (NSString *)urlQueryStringWithParams:(NSDictionary <NSString *, NSString *> *)
     }
 }
 
++ (NSDictionary<NSString *, NSString *> *)decodeRueryItemsWithURL:(NSURL *)url {
+    if (!url) {
+        return nil;
+    }
+    NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
+    return [self decodeRueryItemsWithURLComponents:components];
+}
+
++ (NSDictionary<NSString *, NSString *> *)decodeRueryItemsWithURLComponents:(NSURLComponents *)components{
+
+    if (!components) {
+        return nil;
+    }
+    NSArray<NSURLQueryItem *> *queryItems = components.queryItems;
+    if (queryItems.count) {
+        NSMutableDictionary *queryItemsDic = [NSMutableDictionary dictionary];
+        for (NSURLQueryItem *item in queryItems) {
+            queryItemsDic[item.name] = item.value;
+        }
+        return queryItemsDic;
+    } else {
+        return nil;
+    }
+}
+
 @end
diff --git a/SensorsAnalyticsSDK/Utils/SAValidator.h b/SensorsAnalyticsSDK/Utils/SAValidator.h
new file mode 100644
index 00000000..5aa9cf57
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SAValidator.h
@@ -0,0 +1,35 @@
+//
+// SAValidator.h
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/2/19.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAValidator : NSObject
+
++ (BOOL)isValidString:(NSString *)string;
+
++ (BOOL)isValidDictionary:(NSDictionary *)dictionary;
+
++ (BOOL)isValidArray:(NSArray *)array;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Utils/SAValidator.m b/SensorsAnalyticsSDK/Utils/SAValidator.m
new file mode 100644
index 00000000..328aa53b
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SAValidator.m
@@ -0,0 +1,41 @@
+//
+// SAValidator.m
+// SensorsAnalyticsSDK
+//
+// Created by wenquan on 2020/2/19.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAValidator.h"
+
+@implementation SAValidator
+
++ (BOOL)isValidString:(NSString *)string {
+    return ([string isKindOfClass:[NSString class]] && ([string length] > 0));
+}
+
++ (BOOL)isValidArray:(NSArray *)array {
+    return ([array isKindOfClass:[NSArray class]] && ([array count] > 0));
+}
+
++ (BOOL)isValidDictionary:(NSDictionary *)dictionary {
+    return ([dictionary isKindOfClass:[NSDictionary class]] && ([dictionary count] > 0));
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/Utils/SAWeakPropertyContainer.h b/SensorsAnalyticsSDK/Utils/SAWeakPropertyContainer.h
new file mode 100644
index 00000000..d1ee825c
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SAWeakPropertyContainer.h
@@ -0,0 +1,29 @@
+//
+// SAWeakPropertyContainer.h
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2019/8/8.
+// Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface SAWeakPropertyContainer : NSObject
+
+@property (readonly, nonatomic, weak) id weakProperty;
+
++ (instancetype)containerWithWeakProperty:(id)weakProperty;
+
+@end
diff --git a/SensorsAnalyticsSDK/Utils/SAWeakPropertyContainer.m b/SensorsAnalyticsSDK/Utils/SAWeakPropertyContainer.m
new file mode 100644
index 00000000..2ba9931f
--- /dev/null
+++ b/SensorsAnalyticsSDK/Utils/SAWeakPropertyContainer.m
@@ -0,0 +1,41 @@
+//
+// SAWeakPropertyContainer.m
+// SensorsAnalyticsSDK
+//
+// Created by 彭远洋 on 2019/8/8.
+// Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAWeakPropertyContainer.h"
+
+@interface SAWeakPropertyContainer ()
+ 
+@property (nonatomic, weak) id weakProperty;
+
+@end
+
+@implementation SAWeakPropertyContainer
+
++ (instancetype)containerWithWeakProperty:(id)weakProperty {
+    SAWeakPropertyContainer *container = [[SAWeakPropertyContainer alloc]init];
+    container.weakProperty = weakProperty;
+    return container;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/NSInvocation+SAHelpers.h b/SensorsAnalyticsSDK/Visualized/NSInvocation+SAHelpers.h
similarity index 92%
rename from SensorsAnalyticsSDK/NSInvocation+SAHelpers.h
rename to SensorsAnalyticsSDK/Visualized/NSInvocation+SAHelpers.h
index dcf075de..232043d9 100644
--- a/SensorsAnalyticsSDK/NSInvocation+SAHelpers.h
+++ b/SensorsAnalyticsSDK/Visualized/NSInvocation+SAHelpers.h
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/NSInvocation+SAHelpers.m b/SensorsAnalyticsSDK/Visualized/NSInvocation+SAHelpers.m
similarity index 74%
rename from SensorsAnalyticsSDK/NSInvocation+SAHelpers.m
rename to SensorsAnalyticsSDK/Visualized/NSInvocation+SAHelpers.m
index ca7c9fe2..67b0e078 100644
--- a/SensorsAnalyticsSDK/NSInvocation+SAHelpers.m
+++ b/SensorsAnalyticsSDK/Visualized/NSInvocation+SAHelpers.m
@@ -2,7 +2,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@
 
 
 #import <objc/runtime.h>
-#import "SALogger.h"
+#import <UIKit/UIKit.h>
+#import "SALog.h"
 #import "NSInvocation+SAHelpers.h"
 
 typedef union {
@@ -42,15 +43,13 @@
     _Bool                   _bool;
 } MPObjCNumericTypes;
 
-static void SAFree(void *p)
-{
+static void SAFree(void *p) {
     if (p) {
         free(p);
     }
 }
 
-static void *SAAllocBufferForObjCType(const char *objCType)
-{
+static void *SAAllocBufferForObjCType(const char *objCType) {
     void *buffer = NULL;
 
     NSUInteger size, alignment;
@@ -58,7 +57,7 @@ static void SAFree(void *p)
 
     int result = posix_memalign(&buffer, MAX(sizeof(void *), alignment), size);
     if (result != 0) {
-        SAError(@"Error allocating aligned memory: %s", strerror(result));
+        SALogError(@"Error allocating aligned memory: %s", strerror(result));
     }
 
     if (buffer) {
@@ -70,38 +69,33 @@ static void SAFree(void *p)
 
 @implementation NSInvocation (SAHelpers)
 
-- (void)sa_setArgument:(id)argumentValue atIndex:(NSUInteger)index
-{
+- (void)sa_setArgument:(id)argumentValue atIndex:(NSUInteger)index {
     const char *argumentType = [self.methodSignature getArgumentTypeAtIndex:index];
-
-    if ([argumentValue isKindOfClass:[NSNumber class]] && strlen(argumentType) == 1) {
+    if ([argumentValue isKindOfClass:[NSNumber class]] && strnlen(argumentType, 8) == 1) {
         // Deal with NSNumber instances (converting to primitive numbers)
         NSNumber *numberArgument = argumentValue;
 
         MPObjCNumericTypes arg;
-        switch (argumentType[0])
-        {
-            case _C_CHR:      arg._chr      = [numberArgument charValue];                break;
-            case _C_UCHR:     arg._uchr     = [numberArgument unsignedCharValue];        break;
-            case _C_SHT:      arg._sht      = [numberArgument shortValue];               break;
-            case _C_USHT:     arg._usht     = [numberArgument unsignedShortValue];       break;
-            case _C_INT:      arg._int      = [numberArgument intValue];                 break;
-            case _C_UINT:     arg._uint     = [numberArgument unsignedIntValue];         break;
-            case _C_LNG:      arg._lng      = [numberArgument longValue];                break;
-            case _C_ULNG:     arg._ulng     = [numberArgument unsignedLongValue];        break;
-            case _C_LNG_LNG:  arg._lng_lng  = [numberArgument longLongValue];            break;
+        switch (argumentType[0]) {
+            case _C_CHR:      arg._chr = [numberArgument charValue];                break;
+            case _C_UCHR:     arg._uchr = [numberArgument unsignedCharValue];        break;
+            case _C_SHT:      arg._sht = [numberArgument shortValue];               break;
+            case _C_USHT:     arg._usht = [numberArgument unsignedShortValue];       break;
+            case _C_INT:      arg._int = [numberArgument intValue];                 break;
+            case _C_UINT:     arg._uint = [numberArgument unsignedIntValue];         break;
+            case _C_LNG:      arg._lng = [numberArgument longValue];                break;
+            case _C_ULNG:     arg._ulng = [numberArgument unsignedLongValue];        break;
+            case _C_LNG_LNG:  arg._lng_lng = [numberArgument longLongValue];            break;
             case _C_ULNG_LNG: arg._ulng_lng = [numberArgument unsignedLongLongValue];    break;
-            case _C_FLT:      arg._flt      = [numberArgument floatValue];               break;
-            case _C_DBL:      arg._dbl      = [numberArgument doubleValue];              break;
-            case _C_BOOL:     arg._bool     = [numberArgument boolValue];                break;
+            case _C_FLT:      arg._flt = [numberArgument floatValue];               break;
+            case _C_DBL:      arg._dbl = [numberArgument doubleValue];              break;
+            case _C_BOOL:     arg._bool = [numberArgument boolValue];                break;
             default:
                 NSAssert(NO, @"Currently unsupported argument type!");
         }
 
         [self setArgument:&arg atIndex:(NSInteger)index];
-    }
-    else if ([argumentValue isKindOfClass:[NSValue class]])
-    {
+    } else if ([argumentValue isKindOfClass:[NSValue class]]) {
         NSValue *valueArgument = argumentValue;
 
         NSAssert2(strcmp([valueArgument objCType], argumentType) == 0, @"Objective-C type mismatch (%s != %s)!", [valueArgument objCType], argumentType);
@@ -114,15 +108,12 @@ - (void)sa_setArgument:(id)argumentValue atIndex:(NSUInteger)index
 
         SAFree(buffer);
     } else {
-        switch (argumentType[0])
-        {
-            case _C_ID:
-            {
+        switch (argumentType[0]) {
+            case _C_ID: {
                 [self setArgument:&argumentValue atIndex:(NSInteger)index];
                 break;
             }
-            case _C_SEL:
-            {
+            case _C_SEL: {
                 SEL sel = NSSelectorFromString(argumentValue);
                 [self setArgument:&sel atIndex:(NSInteger)index];
                 break;
@@ -133,8 +124,7 @@ - (void)sa_setArgument:(id)argumentValue atIndex:(NSUInteger)index
     }
 }
 
-- (void)sa_setArgumentsFromArray:(NSArray *)argumentArray
-{
+-(void)sa_setArgumentsFromArray: (NSArray *)argumentArray {
     NSParameterAssert([argumentArray count] == ([self.methodSignature numberOfArguments] - 2));
 
     for (NSUInteger i = 0; i < [argumentArray count]; ++i) {
@@ -143,8 +133,7 @@ - (void)sa_setArgumentsFromArray:(NSArray *)argumentArray
     }
 }
 
-- (id)sa_returnValue
-{
+- (id)sa_returnValue {
     __strong id returnValue = nil;
 
     NSMethodSignature *methodSignature = self.methodSignature;
@@ -154,9 +143,8 @@ - (id)sa_returnValue
 
     [self getReturnValue:buffer];
 
-    if (strlen(objCType) == 1) {
-        switch (objCType[0])
-        {
+    if (strnlen(objCType, 8) == 1) {
+        switch (objCType[0]) {
             case _C_CHR:      returnValue = @(*((char *)buffer));                   break;
             case _C_UCHR:     returnValue = @(*((unsigned char *)buffer));          break;
             case _C_SHT:      returnValue = @(*((short *)buffer));                  break;
@@ -177,15 +165,12 @@ - (id)sa_returnValue
                 break;
         }
     } else {
-        switch (objCType[0])
-        {
+        switch (objCType[0]) {
             case _C_STRUCT_B: returnValue = [NSValue valueWithBytes:buffer objCType:objCType]; break;
-            case _C_PTR:
-            {
+            case _C_PTR: {
                 CFTypeRef cfTypeRef = *(CFTypeRef *)buffer;
                 if ((strcmp(objCType, @encode(CGImageRef)) == 0 && CFGetTypeID(cfTypeRef) == CGImageGetTypeID()) ||
-                    (strcmp(objCType, @encode(CGColorRef)) == 0 && CFGetTypeID(cfTypeRef) == CGColorGetTypeID()))
-                {
+                    (strcmp(objCType, @encode(CGColorRef)) == 0 && CFGetTypeID(cfTypeRef) == CGColorGetTypeID())) {
                     returnValue = (__bridge id)cfTypeRef;
                 } else {
                     NSAssert(NO, @"Currently unsupported return type!");
diff --git a/SensorsAnalyticsSDK/SAApplicationStateSerializer.h b/SensorsAnalyticsSDK/Visualized/SAApplicationStateSerializer.h
similarity index 84%
rename from SensorsAnalyticsSDK/SAApplicationStateSerializer.h
rename to SensorsAnalyticsSDK/Visualized/SAApplicationStateSerializer.h
index e2701145..38b32bbc 100644
--- a/SensorsAnalyticsSDK/SAApplicationStateSerializer.h
+++ b/SensorsAnalyticsSDK/Visualized/SAApplicationStateSerializer.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@
                       configuration:(SAObjectSerializerConfig *)configuration
              objectIdentityProvider:(SAObjectIdentityProvider *)objectIdentityProvider;
 
-- (UIImage *)screenshotImageForWindow:(UIWindow *)window;
+/// 所有 window 截图合成
+- (void)screenshotImageForAllWindowWithCompletionHandler:(void(^)(UIImage *))completionHandler;
 
 - (NSDictionary *)objectHierarchyForWindow:(UIWindow *)window;
 
diff --git a/SensorsAnalyticsSDK/Visualized/SAApplicationStateSerializer.m b/SensorsAnalyticsSDK/Visualized/SAApplicationStateSerializer.m
new file mode 100644
index 00000000..b4773904
--- /dev/null
+++ b/SensorsAnalyticsSDK/Visualized/SAApplicationStateSerializer.m
@@ -0,0 +1,153 @@
+//
+//  SAApplicationStateSerializer.m
+//  SensorsAnalyticsSDK
+//
+//  Created by 雨晗 on 1/18/16.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <QuartzCore/QuartzCore.h>
+#import "SAApplicationStateSerializer.h"
+#import "SAClassDescription.h"
+#import "SALog.h"
+#import "SAObjectIdentityProvider.h"
+#import "SAHeatMapObjectSerializer.h"
+#import "SAVisualizedAutoTrackObjectSerializer.h"
+#import "SAObjectSerializerConfig.h"
+#import "SAAuxiliaryToolManager.h"
+
+@implementation SAApplicationStateSerializer {
+    SAHeatMapObjectSerializer *_heatmapSerializer;
+    SAVisualizedAutoTrackObjectSerializer *_visualizedAutoTrackSerializer;
+    UIApplication *_application;
+}
+
+- (instancetype)initWithApplication:(UIApplication *)application
+                      configuration:(SAObjectSerializerConfig *)configuration
+             objectIdentityProvider:(SAObjectIdentityProvider *)objectIdentityProvider {
+    NSParameterAssert(application != nil);
+    NSParameterAssert(configuration != nil);
+    if (!application || !configuration) {
+        return nil;
+    }
+    self = [super init];
+    if (self) {
+        _application = application;
+        _heatmapSerializer = [[SAHeatMapObjectSerializer alloc] initWithConfiguration:configuration objectIdentityProvider:objectIdentityProvider];
+        _visualizedAutoTrackSerializer = [[SAVisualizedAutoTrackObjectSerializer alloc] initWithConfiguration:configuration objectIdentityProvider:objectIdentityProvider];
+    }
+    
+    return self;
+}
+
+// 所有 window 截图合成
+- (void)screenshotImageForAllWindowWithCompletionHandler:(void (^)(UIImage *))completionHandler {
+    CGFloat scale = [UIScreen mainScreen].scale;
+
+    NSMutableArray <UIWindow *> *validWindows = [NSMutableArray array];
+    for (UIWindow *window in [UIApplication sharedApplication].windows) {
+        if ([window isMemberOfClass:UIWindow.class] && !window.hidden) {
+            [validWindows addObject:window];
+        }
+    }
+
+    if (validWindows.count == 0) {
+        completionHandler(nil);
+        return;
+    }
+    if (validWindows.count == 1) {
+        UIImage *image = [self screenshotWithView:validWindows.firstObject afterScreenUpdates:NO];
+        // 单张图片
+        completionHandler(image);
+        return;
+    }
+
+    CGSize keyWindowSize = [UIApplication sharedApplication].keyWindow.bounds.size;
+    CGSize newSize = CGSizeMake(keyWindowSize.width * scale, keyWindowSize.height * scale);
+    // 将上面得到的多张图片合并绘制为一张图片，最终得到 screenshotImage
+    UIImage *screenshotImage = nil;
+    UIGraphicsBeginImageContext(newSize);
+    for (UIWindow *window in validWindows) {
+        UIImage *image = [self screenshotWithView:window afterScreenUpdates:NO];
+        if (image) {
+            CGPoint windowPoint = window.frame.origin;
+            [image drawInRect:CGRectMake(windowPoint.x * scale, windowPoint.y * scale, image.size.width * scale, image.size.height * scale)];
+        }
+    }
+    screenshotImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+
+    // 绘制操作完成
+    completionHandler(screenshotImage);
+}
+
+// 对 view 截图
+- (UIImage *)screenshotWithView:(UIView *)currentView afterScreenUpdates:(BOOL)afterUpdates {
+    if (!currentView || ![currentView isKindOfClass:UIView.class]) {
+        return nil;
+    }
+    UIImage *screenshotImage = nil;
+    @try {
+        CGSize size = currentView.bounds.size;
+        UIGraphicsBeginImageContextWithOptions(size, NO, 0);
+        CGRect rect = currentView.bounds;
+        //  drawViewHierarchyInRect:afterScreenUpdates: 截取一个UIView或者其子类中的内容，并且以位图的形式（bitmap）保存到UIImage中
+        [currentView drawViewHierarchyInRect:rect afterScreenUpdates:afterUpdates];
+        screenshotImage = UIGraphicsGetImageFromCurrentImageContext();
+        UIGraphicsEndImageContext();
+    } @catch (NSException *exception) {
+        SALogError(@"screenshot fail，error %@: %@", self, exception);
+    }
+    return screenshotImage;
+}
+
+- (UIWindow *)uiMainWindow:(UIWindow *)window {
+    if (window != nil) {
+        return window;
+    }
+    return _application.windows[0];
+}
+
+- (NSDictionary *)objectHierarchyForWindow:(UIWindow *)window {
+    UIWindow *mainWindow = [self uiMainWindow:window];
+    if (mainWindow) {
+        // 点击图
+        if ([SAAuxiliaryToolManager sharedInstance].currentVisualizedType == SensorsAnalyticsVisualizedTypeHeatMap) {
+            return [_heatmapSerializer serializedObjectsWithRootObject:mainWindow];
+            
+            // 可视化全埋点
+        } else if ([SAAuxiliaryToolManager sharedInstance].currentVisualizedType == SensorsAnalyticsVisualizedTypeAutoTrack) {
+            // 遍历其他 window，兼容自定义 window 弹框等场景
+            __block UIWindow *validWindow = [UIApplication sharedApplication].keyWindow;
+            // 逆序遍历，获取最上层全屏 window
+            [[UIApplication sharedApplication].windows enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(__kindof UIWindow * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                if ([obj isMemberOfClass:UIWindow.class] && CGSizeEqualToSize(validWindow.frame.size, obj.frame.size) && !obj.hidden) {
+                    validWindow = obj;
+                    *stop = YES;
+                }
+            }];
+            return [_visualizedAutoTrackSerializer serializedObjectsWithRootObject:validWindow];
+        }
+    }
+    
+    return @{};
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/Visualized/SAAuxiliaryToolManager.h b/SensorsAnalyticsSDK/Visualized/SAAuxiliaryToolManager.h
new file mode 100644
index 00000000..e1b0c1a5
--- /dev/null
+++ b/SensorsAnalyticsSDK/Visualized/SAAuxiliaryToolManager.h
@@ -0,0 +1,38 @@
+//
+//  SAAuxiliaryToolManager.h
+//  SensorsAnalyticsSDK
+//
+//  Created by 向作为 on 2018/9/7.
+//  Copyright © 2015－2018 Sensors Data Co., Ltd. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SAVisualizedConnection.h"
+
+
+typedef NS_ENUM(NSInteger, SensorsAnalyticsVisualizedType) {
+    SensorsAnalyticsVisualizedTypeUnkhow,  // 未知或不允许
+    SensorsAnalyticsVisualizedTypeHeatMap, // 点击图
+    SensorsAnalyticsVisualizedTypeAutoTrack  //可视化全埋点
+};
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAAuxiliaryToolManager : NSObject
++ (instancetype)sharedInstance;
+
+- (BOOL)canHandleURL:(NSURL *)url;
+- (BOOL)handleURL:(NSURL *)url  isWifi:(BOOL)isWifi;
+
+- (BOOL)isHeatMapURL:(NSURL *)url;
+- (BOOL)isVisualizedAutoTrackURL:(NSURL *)url;
+- (BOOL)isDebugModeURL:(NSURL *)url;
+- (BOOL)isSecretKeyURL:(NSURL *)url;
+
+- (BOOL)isVisualizedConnecting;
+
+/// 当前类型
+- (SensorsAnalyticsVisualizedType)currentVisualizedType;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/Visualized/SAAuxiliaryToolManager.m b/SensorsAnalyticsSDK/Visualized/SAAuxiliaryToolManager.m
new file mode 100644
index 00000000..b401e3d2
--- /dev/null
+++ b/SensorsAnalyticsSDK/Visualized/SAAuxiliaryToolManager.m
@@ -0,0 +1,161 @@
+//
+//  SAAuxiliaryToolManager.m
+//  SensorsAnalyticsSDK
+//
+//  Created by 向作为 on 2018/9/7.
+//  Copyright © 2015－2018 Sensors Data Co., Ltd. All rights reserved.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAAuxiliaryToolManager.h"
+#import "SensorsAnalyticsSDK.h"
+#import "SALog.h"
+#import "SAAlertController.h"
+#import "SensorsAnalyticsSDK+Private.h"
+#import "SAVisualizedUtils.h"
+#import "SAURLUtils.h"
+
+@interface SAAuxiliaryToolManager()
+@property (nonatomic, strong) SAVisualizedConnection *visualizedConnection;
+@property (nonatomic, copy) NSString *postUrl;
+@property (nonatomic, copy) NSString *featureCode;
+@property (nonatomic, strong) NSURL *originalURL;
+@property (nonatomic, copy) NSString *project;
+@property (nonatomic, copy) NSString *host;
+
+/// 当前类型
+@property (nonatomic, assign) SensorsAnalyticsVisualizedType visualizedType;
+@end
+@implementation SAAuxiliaryToolManager
++ (instancetype)sharedInstance {
+    static SAAuxiliaryToolManager *sharedInstance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        sharedInstance = [[SAAuxiliaryToolManager alloc] init];
+    });
+    return sharedInstance;
+}
+
+- (BOOL)canHandleURL:(NSURL *)URL {
+    return [self isHeatMapURL:URL] || [self isVisualizedAutoTrackURL:URL] || [self isDebugModeURL:URL] || [self isSecretKeyURL:URL];
+}
+
+// 可视化全埋点 & 点击图 参数个接口判断
+- (BOOL)handleURL:(NSURL *)URL isWifi:(BOOL)isWifi {
+    if ([self canHandleURL:URL] == NO) {
+        return NO;
+    }
+
+    NSDictionary *queryItems = [SAURLUtils decodeRueryItemsWithURL:URL];
+    NSString *featureCode = queryItems[@"feature_code"];
+    NSString *postURLStr = queryItems[@"url"];
+
+    // project 和 host 不同
+    NSString *project = [SAURLUtils queryItemsWithURLString:postURLStr][@"project"] ?: @"default";
+    BOOL isEqualProject = [[SensorsAnalyticsSDK sharedInstance].network.project isEqualToString:project];
+    if (!isEqualProject) {     // 未开启可视化全埋点或点击图
+        [self showAlterViewWithTitle:@"提示" message:@"App 集成的项目与电脑浏览器打开的项目不同，无法进行可视化全埋点"];
+        return YES;
+    } else if ([self isHeatMapURL:URL] && ![[SensorsAnalyticsSDK sharedInstance] isHeatMapEnabled]) {
+        [self showAlterViewWithTitle:@"提示" message:@"SDK 没有被正确集成，请联系贵方技术人员开启点击图"];
+        return YES;
+    } else if ([self isVisualizedAutoTrackURL:URL] && ![[SensorsAnalyticsSDK sharedInstance] isVisualizedAutoTrackEnabled]) {
+        [self showAlterViewWithTitle:@"提示" message:@"SDK 没有被正确集成，请联系贵方技术人员开启可视化全埋点"];
+        return YES;
+    } else if (featureCode && postURLStr) {
+        [self showOpenDialogWithURL:URL featureCode:featureCode postURL:postURLStr isWifi:isWifi];
+        return YES;
+    } else { //feature_code  url 参数错误
+        [self showParameterError:@"ERROR" message:@"参数错误"];
+        return NO;
+    }
+    return NO;
+}
+
+- (void)showOpenDialogWithURL:(NSURL *)URL featureCode:(NSString *)featureCode postURL:(NSString *)postURL isWifi:(BOOL)isWifi {
+    self.featureCode = featureCode;
+    self.postUrl = postURL;
+    self.originalURL = URL;
+    NSString *alertTitle = @"提示";
+    NSString *alertMessage = [self alertMessageWithURL:URL isWifi:isWifi];
+
+    SAAlertController *alertController = [[SAAlertController alloc] initWithTitle:alertTitle message:alertMessage preferredStyle:SAAlertControllerStyleAlert];
+    
+    [alertController addActionWithTitle:@"取消" style:SAAlertActionStyleCancel handler:^(SAAlertAction * _Nonnull action) {
+        [self.visualizedConnection close];
+        self.visualizedConnection = nil;
+    }];
+    
+    [alertController addActionWithTitle:@"继续" style:SAAlertActionStyleDefault handler:^(SAAlertAction * _Nonnull action) {
+        // 关闭之前的连接
+        [self.visualizedConnection close];
+        // start
+        self.visualizedConnection = [[SAVisualizedConnection alloc] initWithURL:nil];
+        if ([self isHeatMapURL:URL]) {
+             SALogDebug(@"Confirmed to open HeatMap ...");
+            self.visualizedType = SensorsAnalyticsVisualizedTypeHeatMap;
+            [self.visualizedConnection startConnectionWithFeatureCode:featureCode url:postURL type:@"heatmap"];
+        } else if ([self isVisualizedAutoTrackURL:URL]) {
+            SALogDebug(@"Confirmed to open VisualizedAutoTrack ...");
+            self.visualizedType = SensorsAnalyticsVisualizedTypeAutoTrack;
+            [self.visualizedConnection startConnectionWithFeatureCode:featureCode url:postURL type:@"visualized"];
+        }
+    }];
+    
+    [alertController show];
+}
+
+- (BOOL)isVisualizedConnecting {
+    return self.visualizedConnection.isVisualizedConnecting;
+}
+- (NSString *)alertMessageWithURL:(NSURL *)URL isWifi:(BOOL)isWifi {
+    NSString *alertMessage = nil;
+    if ([self isHeatMapURL:URL]) {
+        alertMessage = @"正在连接 App 点击分析";
+    } else if ([self isVisualizedAutoTrackURL:URL]) {
+        alertMessage = @"正在连接 App 可视化全埋点";
+    }
+    if (!isWifi && alertMessage) {
+        alertMessage = [alertMessage stringByAppendingString: @"，建议在 WiFi 环境下使用"];
+    }
+    return alertMessage;
+}
+
+- (BOOL)isHeatMapURL:(NSURL *)url {
+    return [url.host isEqualToString:@"heatmap"];
+}
+
+- (BOOL)isVisualizedAutoTrackURL:(NSURL *)url {
+    return [url.host isEqualToString:@"visualized"];
+}
+
+- (BOOL)isDebugModeURL:(NSURL *)url {
+     return [url.host isEqualToString:@"debugmode"];
+}
+
+- (BOOL)isSecretKeyURL:(NSURL *)url {
+     return [url.host isEqualToString:@"encrypt"];
+}
+
+/// 当前类型
+- (SensorsAnalyticsVisualizedType)currentVisualizedType {
+    return self.visualizedType;
+}
+
+- (void)showParameterError:(NSString *)alertTitle message:(NSString *)alertMessage {
+    SAAlertController *alertController = [[SAAlertController alloc] initWithTitle:alertTitle message:alertMessage preferredStyle:SAAlertControllerStyleAlert];
+    [alertController addActionWithTitle:@"OK" style:SAAlertActionStyleDefault handler:^(SAAlertAction *_Nonnull action) {
+    }];
+    [alertController show];
+}
+
+- (void)showAlterViewWithTitle:(NSString *)title message:(NSString *)message {
+    SAAlertController *alertController = [[SAAlertController alloc] initWithTitle:title message:message preferredStyle:SAAlertControllerStyleAlert];
+    [alertController addActionWithTitle:@"确认" style:SAAlertActionStyleDefault handler:nil];
+    [alertController show];
+}
+@end
diff --git a/SensorsAnalyticsSDK/SAClassDescription.h b/SensorsAnalyticsSDK/Visualized/SAClassDescription.h
similarity index 83%
rename from SensorsAnalyticsSDK/SAClassDescription.h
rename to SensorsAnalyticsSDK/Visualized/SAClassDescription.h
index b60ab72b..b61efd1a 100644
--- a/SensorsAnalyticsSDK/SAClassDescription.h
+++ b/SensorsAnalyticsSDK/Visualized/SAClassDescription.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -32,11 +32,3 @@
 - (BOOL)isDescriptionForKindOfClass:(Class)class;
 
 @end
-
-@interface SADelegateInfo : NSObject
-
-@property (nonatomic, readonly) NSString *selectorName;
-
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary;
-
-@end
diff --git a/SensorsAnalyticsSDK/SAClassDescription.m b/SensorsAnalyticsSDK/Visualized/SAClassDescription.m
similarity index 81%
rename from SensorsAnalyticsSDK/SAClassDescription.m
rename to SensorsAnalyticsSDK/Visualized/SAClassDescription.m
index a9d135bd..2df874cf 100644
--- a/SensorsAnalyticsSDK/SAClassDescription.m
+++ b/SensorsAnalyticsSDK/Visualized/SAClassDescription.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -26,20 +26,8 @@
 #import "SAClassDescription.h"
 #import "SAPropertyDescription.h"
 
-@implementation SADelegateInfo
-
-- (instancetype)initWithDictionary:(NSDictionary *)dictionary {
-    if (self = [super init]) {
-        _selectorName = dictionary[@"selector"];
-    }
-    return self;
-}
-
-@end
-
 @implementation SAClassDescription {
     NSArray *_propertyDescriptions;
-    NSArray *_delegateInfos;
 }
 
 - (instancetype)initWithSuperclassDescription:(SAClassDescription *)superclassDescription
@@ -54,12 +42,6 @@ - (instancetype)initWithSuperclassDescription:(SAClassDescription *)superclassDe
         }
 
         _propertyDescriptions = [propertyDescriptions copy];
-
-        NSMutableArray *delegateInfos = [NSMutableArray array];
-        for (NSDictionary *delegateInfoDictionary in dictionary[@"delegateImplements"]) {
-            [delegateInfos addObject:[[SADelegateInfo alloc] initWithDictionary:delegateInfoDictionary]];
-        }
-        _delegateInfos = [delegateInfos copy];
     }
 
     return self;
diff --git a/SensorsAnalyticsSDK/SAEnumDescription.h b/SensorsAnalyticsSDK/Visualized/SAEnumDescription.h
similarity index 93%
rename from SensorsAnalyticsSDK/SAEnumDescription.h
rename to SensorsAnalyticsSDK/Visualized/SAEnumDescription.h
index 9f8755bb..d69bba22 100644
--- a/SensorsAnalyticsSDK/SAEnumDescription.h
+++ b/SensorsAnalyticsSDK/Visualized/SAEnumDescription.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAEnumDescription.m b/SensorsAnalyticsSDK/Visualized/SAEnumDescription.m
similarity index 95%
rename from SensorsAnalyticsSDK/SAEnumDescription.m
rename to SensorsAnalyticsSDK/Visualized/SAEnumDescription.m
index 7d0345db..d535e00e 100644
--- a/SensorsAnalyticsSDK/SAEnumDescription.m
+++ b/SensorsAnalyticsSDK/Visualized/SAEnumDescription.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAObjectIdentityProvider.h b/SensorsAnalyticsSDK/Visualized/SAObjectIdentityProvider.h
similarity index 91%
rename from SensorsAnalyticsSDK/SAObjectIdentityProvider.h
rename to SensorsAnalyticsSDK/Visualized/SAObjectIdentityProvider.h
index 4a82802d..e1e383d8 100644
--- a/SensorsAnalyticsSDK/SAObjectIdentityProvider.h
+++ b/SensorsAnalyticsSDK/Visualized/SAObjectIdentityProvider.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAObjectIdentityProvider.m b/SensorsAnalyticsSDK/Visualized/SAObjectIdentityProvider.m
similarity index 96%
rename from SensorsAnalyticsSDK/SAObjectIdentityProvider.m
rename to SensorsAnalyticsSDK/Visualized/SAObjectIdentityProvider.m
index 4365136a..2479526f 100644
--- a/SensorsAnalyticsSDK/SAObjectIdentityProvider.m
+++ b/SensorsAnalyticsSDK/Visualized/SAObjectIdentityProvider.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAObjectSerializerConfig.h b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerConfig.h
similarity index 94%
rename from SensorsAnalyticsSDK/SAObjectSerializerConfig.h
rename to SensorsAnalyticsSDK/Visualized/SAObjectSerializerConfig.h
index 2264fc06..3278a204 100644
--- a/SensorsAnalyticsSDK/SAObjectSerializerConfig.h
+++ b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerConfig.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAObjectSerializerConfig.m b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerConfig.m
similarity index 93%
rename from SensorsAnalyticsSDK/SAObjectSerializerConfig.m
rename to SensorsAnalyticsSDK/Visualized/SAObjectSerializerConfig.m
index e926af8b..0eb12511 100644
--- a/SensorsAnalyticsSDK/SAObjectSerializerConfig.m
+++ b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerConfig.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -40,8 +40,9 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
         for (NSDictionary *d in dictionary[@"classes"]) {
             NSString *superclassName = d[@"superclass"];
             SAClassDescription *superclassDescription = superclassName ? classDescriptions[superclassName] : nil;
-            SAClassDescription *classDescription = [[SAClassDescription alloc] initWithSuperclassDescription:superclassDescription
-                                                                                                  dictionary:d];
+            
+            // 构造一个类的描述信息
+            SAClassDescription *classDescription = [[SAClassDescription alloc] initWithSuperclassDescription:superclassDescription dictionary:d];
 
             classDescriptions[classDescription.name] = classDescription;
         }
@@ -51,7 +52,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
             SAEnumDescription *enumDescription = [[SAEnumDescription alloc] initWithDictionary:d];
             enumDescriptions[enumDescription.name] = enumDescription;
         }
-
+ 
         _classes = [classDescriptions copy];
         _enums = [enumDescriptions copy];
     }
diff --git a/SensorsAnalyticsSDK/SAObjectSerializerContext.h b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerContext.h
similarity index 87%
rename from SensorsAnalyticsSDK/SAObjectSerializerContext.h
rename to SensorsAnalyticsSDK/Visualized/SAObjectSerializerContext.h
index 590cf78c..c28dd573 100644
--- a/SensorsAnalyticsSDK/SAObjectSerializerContext.h
+++ b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerContext.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@
 - (BOOL)hasUnvisitedObjects;
 
 - (void)enqueueUnvisitedObject:(NSObject *)object;
+- (void)enqueueUnvisitedObjects:(NSArray *)objects;
+
 - (NSObject *)dequeueUnvisitedObject;
 
 - (void)addVisitedObject:(NSObject *)object;
@@ -35,4 +37,5 @@
 - (void)addSerializedObject:(NSDictionary *)serializedObject;
 - (NSArray *)allSerializedObjects;
 
+- (NSInteger)currentLevelIndex;
 @end
diff --git a/SensorsAnalyticsSDK/SAObjectSerializerContext.m b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerContext.m
similarity index 58%
rename from SensorsAnalyticsSDK/SAObjectSerializerContext.m
rename to SensorsAnalyticsSDK/Visualized/SAObjectSerializerContext.m
index b7e2f6b5..e7d21ce2 100644
--- a/SensorsAnalyticsSDK/SAObjectSerializerContext.m
+++ b/SensorsAnalyticsSDK/Visualized/SAObjectSerializerContext.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -27,18 +27,18 @@
 
 @implementation SAObjectSerializerContext {
     NSMutableSet *_visitedObjects;
-    NSMutableSet *_unvisitedObjects;
+    NSMutableArray *_unvisitedObjects;
     NSMutableDictionary *_serializedObjects;
+    NSInteger _levelIndex; // 保存当前元素层级序号
 }
 
 - (instancetype)initWithRootObject:(id)object {
     self = [super init];
     if (self) {
         _visitedObjects = [NSMutableSet set];
-        _unvisitedObjects = [NSMutableSet setWithObject:object];
+        _unvisitedObjects = [NSMutableArray arrayWithObject:object];
         _serializedObjects = [[NSMutableDictionary alloc] init];
     }
-
     return self;
 }
 
@@ -47,35 +47,53 @@ - (BOOL)hasUnvisitedObjects {
 }
 
 - (void)enqueueUnvisitedObject:(NSObject *)object {
-    NSParameterAssert(object != nil);
+    if (object && ![_unvisitedObjects containsObject:object]) {
+        [_unvisitedObjects insertObject:object atIndex:0];
+    }
+}
 
-    [_unvisitedObjects addObject:object];
+- (void)enqueueUnvisitedObjects:(NSArray *)objects {
+    if (!objects) {
+        return;
+    }
+    NSMutableArray *newObjects = [NSMutableArray array];
+    for (NSObject *object in objects) {
+        if (![_unvisitedObjects containsObject:object]) {
+            [newObjects addObject:object];
+        }
+    }
+    // 添加到最前面，深度优先遍历
+    [_unvisitedObjects insertObjects:newObjects atIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, newObjects.count)]];
 }
 
 - (NSObject *)dequeueUnvisitedObject {
-    NSObject *object = [_unvisitedObjects anyObject];
+    NSObject *object = [_unvisitedObjects firstObject];
     [_unvisitedObjects removeObject:object];
-
+    _levelIndex ++;
     return object;
 }
 
 - (void)addVisitedObject:(NSObject *)object {
-    NSParameterAssert(object != nil);
-
-    [_visitedObjects addObject:object];
+    if (object) {
+        [_visitedObjects addObject:object];
+    }
 }
 
 - (BOOL)isVisitedObject:(NSObject *)object {
-    return object && [_visitedObjects containsObject:object];
+    return [_visitedObjects containsObject:object];
 }
 
 - (void)addSerializedObject:(NSDictionary *)serializedObject {
-    NSParameterAssert(serializedObject[@"id"] != nil);
-    _serializedObjects[serializedObject[@"id"]] = serializedObject;
+    if (serializedObject[@"id"]) {
+        _serializedObjects[serializedObject[@"id"]] = serializedObject;
+    }
 }
 
 - (NSArray *)allSerializedObjects {
     return [_serializedObjects allValues];
 }
 
+- (NSInteger)currentLevelIndex {
+    return _levelIndex;
+}
 @end
diff --git a/SensorsAnalyticsSDK/SAPropertyDescription.h b/SensorsAnalyticsSDK/Visualized/SAPropertyDescription.h
similarity index 82%
rename from SensorsAnalyticsSDK/SAPropertyDescription.h
rename to SensorsAnalyticsSDK/Visualized/SAPropertyDescription.h
index c818fefd..d679d7f3 100644
--- a/SensorsAnalyticsSDK/SAPropertyDescription.h
+++ b/SensorsAnalyticsSDK/Visualized/SAPropertyDescription.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary;
 @property (nonatomic, readonly) NSString *name;
 @property (nonatomic, readonly) NSString *type;
+// 上传页面属性的 key
+@property (nonatomic, readonly) NSString *key;
 
 @end
 
@@ -35,7 +37,6 @@
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary;
 @property (nonatomic, readonly) NSString *selectorName;
 @property (nonatomic, readonly) NSString *returnType;
-@property (nonatomic, readonly) NSArray *parameters; // array of SAPropertySelectorParameterDescription
 
 @end
 
@@ -45,13 +46,15 @@
 
 @property (nonatomic, readonly) NSString *type;
 @property (nonatomic, readonly) BOOL readonly;
-@property (nonatomic, readonly) BOOL nofollow;
+
 @property (nonatomic, readonly) BOOL useKeyValueCoding;
-@property (nonatomic, readonly) BOOL useInstanceVariableAccess;
+
 @property (nonatomic, readonly) NSString *name;
 
+// 上传页面属性的 key
+@property (nonatomic, readonly) NSString *key;
+
 @property (nonatomic, readonly) SAPropertySelectorDescription *getSelectorDescription;
-@property (nonatomic, readonly) SAPropertySelectorDescription *setSelectorDescription;
 
 - (BOOL)shouldReadPropertyValueForObject:(NSObject *)object;
 
diff --git a/SensorsAnalyticsSDK/SAPropertyDescription.m b/SensorsAnalyticsSDK/Visualized/SAPropertyDescription.m
similarity index 68%
rename from SensorsAnalyticsSDK/SAPropertyDescription.m
rename to SensorsAnalyticsSDK/Visualized/SAPropertyDescription.m
index dd90ab47..870c4e7c 100644
--- a/SensorsAnalyticsSDK/SAPropertyDescription.m
+++ b/SensorsAnalyticsSDK/Visualized/SAPropertyDescription.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #endif
 
 
-#import "SALogger.h"
+#import "SALog.h"
 #import "SAPropertyDescription.h"
 
 @implementation SAPropertySelectorParameterDescription
@@ -36,6 +36,7 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
     if (self) {
         _name = [dictionary[@"name"] copy];
         _type = [dictionary[@"type"] copy];
+        _key = dictionary[@"key"] ?: _name;
     }
 
     return self;
@@ -47,17 +48,12 @@ @implementation SAPropertySelectorDescription
 
 - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
     NSParameterAssert(dictionary[@"selector"] != nil);
-    NSParameterAssert(dictionary[@"parameters"] != nil);
+//    NSParameterAssert(dictionary[@"parameters"] != nil);
 
     self = [super init];
     if (self) {
         _selectorName = [dictionary[@"selector"] copy];
-        NSMutableArray *parameters = [[NSMutableArray alloc] initWithCapacity:[dictionary[@"parameters"] count]];
-        for (NSDictionary *parameter in dictionary[@"parameters"]) {
-            [parameters addObject:[[SAPropertySelectorParameterDescription alloc] initWithDictionary:parameter]];
-        }
-
-        _parameters = [parameters copy];
+        
         _returnType = [dictionary[@"result"][@"type"] copy]; // optional
     }
 
@@ -94,10 +90,8 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
     self = [super init];
     if (self) {
         _name = [dictionary[@"name"] copy]; // required
-        _useInstanceVariableAccess = [dictionary[@"use_ivar"] boolValue]; // Optional
         _readonly = [dictionary[@"readonly"] boolValue]; // Optional
-        _nofollow = [dictionary[@"nofollow"] boolValue]; // Optional
-
+        _key = dictionary[@"key"] ?: _name;
         NSString *predicateFormat = dictionary[@"predicate"]; // Optional
         if (predicateFormat) {
             _predicate = [NSPredicate predicateWithFormat:predicateFormat];
@@ -111,36 +105,14 @@ - (instancetype)initWithDictionary:(NSDictionary *)dictionary {
                     @"result" : @{
                             @"type" : dictionary[@"type"],
                             @"name" : @"value"
-                    },
-                    @"parameters": @[]
-            };
-        }
-
-        NSDictionary *set = dictionary[@"set"];
-        if (set == nil && _readonly == NO) {
-            NSParameterAssert(dictionary[@"type"] != nil);
-            set = @{
-                    @"selector" : [NSString stringWithFormat:@"set%@:", [_name capitalizedString]],
-                    @"parameters" : @[
-                            @{
-                                    @"name" : @"value",
-                                    @"type" : dictionary[@"type"]
-                            }
-                    ]
+                    }
             };
         }
 
         _getSelectorDescription = [[SAPropertySelectorDescription alloc] initWithDictionary:get];
-        if (set) {
-            _setSelectorDescription = [[SAPropertySelectorDescription alloc] initWithDictionary:set];
-        } else {
-            _readonly = YES;
-        }
-
-        BOOL useKVC = (dictionary[@"use_kvc"] == nil ? YES : [dictionary[@"use_kvc"] boolValue]) && _useInstanceVariableAccess == NO;
-        _useKeyValueCoding = useKVC &&
-                [_getSelectorDescription.parameters count] == 0 &&
-                (_setSelectorDescription == nil || [_setSelectorDescription.parameters count] == 1);
+    
+        BOOL useKVC = (dictionary[@"use_kvc"] == nil ? YES : [dictionary[@"use_kvc"] boolValue]);
+        _useKeyValueCoding = useKVC;
     }
 
     return self;
@@ -158,11 +130,9 @@ - (NSString *)debugDescription {
     return [NSString stringWithFormat:@"<%@:%p name='%@' type='%@' %@>", NSStringFromClass([self class]), (__bridge void *)self, self.name, self.type, self.readonly ? @"readonly" : @""];
 }
 
+// 是否显示，是否需要读取属性
 - (BOOL)shouldReadPropertyValueForObject:(NSObject *)object {
-    if (_nofollow) {
-        return NO;
-    }
-    if (_predicate) {
+    if (_predicate) { // 判断 self.isViewLoaded == YES
         return [_predicate evaluateWithObject:object];
     }
 
diff --git a/SensorsAnalyticsSDK/SATypeDescription.h b/SensorsAnalyticsSDK/Visualized/SATypeDescription.h
similarity index 92%
rename from SensorsAnalyticsSDK/SATypeDescription.h
rename to SensorsAnalyticsSDK/Visualized/SATypeDescription.h
index 8a864d92..0d2e0f1b 100644
--- a/SensorsAnalyticsSDK/SATypeDescription.h
+++ b/SensorsAnalyticsSDK/Visualized/SATypeDescription.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SATypeDescription.m b/SensorsAnalyticsSDK/Visualized/SATypeDescription.m
similarity index 93%
rename from SensorsAnalyticsSDK/SATypeDescription.m
rename to SensorsAnalyticsSDK/Visualized/SATypeDescription.m
index 7c85ffba..c1711a70 100644
--- a/SensorsAnalyticsSDK/SATypeDescription.m
+++ b/SensorsAnalyticsSDK/Visualized/SATypeDescription.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAValueTransformers.h b/SensorsAnalyticsSDK/Visualized/SAValueTransformers.h
similarity index 97%
rename from SensorsAnalyticsSDK/SAValueTransformers.h
rename to SensorsAnalyticsSDK/Visualized/SAValueTransformers.h
index a6ed28bc..742cfd28 100644
--- a/SensorsAnalyticsSDK/SAValueTransformers.h
+++ b/SensorsAnalyticsSDK/Visualized/SAValueTransformers.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
diff --git a/SensorsAnalyticsSDK/SAValueTransformers.m b/SensorsAnalyticsSDK/Visualized/SAValueTransformers.m
similarity index 97%
rename from SensorsAnalyticsSDK/SAValueTransformers.m
rename to SensorsAnalyticsSDK/Visualized/SAValueTransformers.m
index 4ba1e661..956d3cbc 100644
--- a/SensorsAnalyticsSDK/SAValueTransformers.m
+++ b/SensorsAnalyticsSDK/Visualized/SAValueTransformers.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/20/16
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 #endif
 
 
-#import "SALogger.h"
+#import "SALog.h"
 #import "SAValueTransformers.h"
 
 #pragma mark -- PassThrough
@@ -127,8 +127,7 @@ static BOOL MPCATransform3DMakeWithDictionaryRepresentation(NSDictionary *dictio
     if (m11 && m12 && m13 && m14 &&
         m21 && m22 && m23 && m24 &&
         m31 && m32 && m33 && m34 &&
-        m41 && m42 && m43 && m44)
-    {
+        m41 && m42 && m43 && m44) {
         transform->m11 = (CGFloat)[m11 doubleValue];
         transform->m12 = (CGFloat)[m12 doubleValue];
         transform->m13 = (CGFloat)[m13 doubleValue];
@@ -413,7 +412,7 @@ - (id)transformedValue:(id)value {
                  @"data" : [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]
                  };
     }
-    SAError(@"Failed to convert NSAttributedString to HTML: %@", error);
+    SALogError(@"Failed to convert NSAttributedString to HTML: %@", error);
     
     return nil;
 }
@@ -437,7 +436,7 @@ - (id)reverseTransformedValue:(id)value {
                                                               error:&error];
 #endif
         if (attributedString == nil) {
-            SAError(@"Failed to convert HTML to NSAttributed string: %@", error);
+            SALogError(@"Failed to convert HTML to NSAttributed string: %@", error);
         }
         
         return attributedString;
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackAbstractMessage.h b/SensorsAnalyticsSDK/Visualized/SAVisualizedAbstractMessage.h
similarity index 77%
rename from SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackAbstractMessage.h
rename to SensorsAnalyticsSDK/Visualized/SAVisualizedAbstractMessage.h
index 5a4e3064..b39703c2 100644
--- a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackAbstractMessage.h
+++ b/SensorsAnalyticsSDK/Visualized/SAVisualizedAbstractMessage.h
@@ -1,9 +1,9 @@
 //
-//  SAVisualizedAutoTrackAbstractMessage.h
+//  SAVisualizedAbstractMessage.h
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/9/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import "SAVisualizedAutoTrackMessage.h"
+#import "SAVisualizedMessage.h"
 
-@interface SAVisualizedAutoTrackAbstractMessage : NSObject <SAVisualizedAutoTrackMessage>
+@interface SAVisualizedAbstractMessage : NSObject <SAVisualizedMessage>
 
 @property (nonatomic, copy, readonly) NSString *type;
 
@@ -35,6 +35,6 @@
 - (id)payloadObjectForKey:(NSString *)key;
 - (NSDictionary *)payload;
 
-- (NSData *)JSONData:(BOOL)useGzip featuerCode:(NSString *)fetureCode;
+- (NSData *)JSONData:(BOOL)useGzip featureCode:(NSString *)featureCode;
 
 @end
diff --git a/SensorsAnalyticsSDK/Visualized/SAVisualizedAbstractMessage.m b/SensorsAnalyticsSDK/Visualized/SAVisualizedAbstractMessage.m
new file mode 100644
index 00000000..dd866e57
--- /dev/null
+++ b/SensorsAnalyticsSDK/Visualized/SAVisualizedAbstractMessage.m
@@ -0,0 +1,177 @@
+//
+//  SAVisualizedAbstractMessage.m
+//  SensorsAnalyticsSDK
+//
+//  Created by 向作为 on 2018/9/4.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAGzipUtility.h"
+#import "SAVisualizedAbstractMessage.h"
+#import "SensorsAnalyticsSDK.h"
+#import "SALog.h"
+#import "UIViewController+AutoTrack.h"
+#import "SAAutoTrackUtils.h"
+#import "SAVisualizedObjectSerializerManger.h"
+#import "SAConstants+Private.h"
+
+
+@interface SAVisualizedAbstractMessage ()
+
+@property (nonatomic, copy, readwrite) NSString *type;
+
+@end
+
+@implementation SAVisualizedAbstractMessage {
+    NSMutableDictionary *_payload;
+}
+
++ (instancetype)messageWithType:(NSString *)type payload:(NSDictionary *)payload {
+    return [[self alloc] initWithType:type payload:payload];
+}
+
+- (instancetype)initWithType:(NSString *)type {
+    return [self initWithType:type payload:nil];
+}
+
+- (instancetype)initWithType:(NSString *)type payload:(NSDictionary *)payload {
+    self = [super init];
+    if (self) {
+        _type = type;
+        if (payload) {
+             _payload = [payload mutableCopy];
+        } else {
+            _payload = [NSMutableDictionary dictionary];
+        }
+    }
+
+    return self;
+}
+
+- (void)setPayloadObject:(id)object forKey:(NSString *)key {
+    _payload[key] = object ?: [NSNull null];
+}
+
+- (id)payloadObjectForKey:(NSString *)key {
+    id object = _payload[key];
+    return [object isEqual:[NSNull null]] ? nil : object;
+}
+
+- (NSDictionary *)payload {
+    return [_payload copy];
+}
+
+- (NSData *)JSONData:(BOOL)useGzip featureCode:(NSString *)featureCode {
+    NSMutableDictionary *jsonObject = [[NSMutableDictionary alloc] init];
+    jsonObject[@"type"] = _type;
+    jsonObject[@"os"] = @"iOS"; // 操作系统类型
+    jsonObject[@"lib"] = @"iOS"; // SDK 类型
+
+    @try {
+        UIViewController<SAAutoTrackViewControllerProperty> *viewController = nil;
+        if ([SAVisualizedObjectSerializerManger sharedInstance].currentViewController) {
+            viewController = [SAVisualizedObjectSerializerManger sharedInstance].currentViewController;
+        } else {
+            viewController = (UIViewController<SAAutoTrackViewControllerProperty> *)[SAAutoTrackUtils currentViewController];
+        }
+        if (viewController) {
+            NSDictionary *autoTrackScreenProperties = [SAAutoTrackUtils propertiesWithViewController:viewController];
+            jsonObject[@"screen_name"] = autoTrackScreenProperties[SA_EVENT_PROPERTY_SCREEN_NAME];
+            jsonObject[@"title"] = autoTrackScreenProperties[SA_EVENT_PROPERTY_TITLE];
+        }
+
+        // 获取 RN 页面信息
+        NSDictionary <NSString *, NSString *> *RNScreenInfo = nil;
+        Class managerClass = NSClassFromString(@"SAReactNativeManager");
+        SEL sharedInstanceSEL = NSSelectorFromString(@"sharedInstance");
+        if ([managerClass respondsToSelector:sharedInstanceSEL]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+            id manager = [managerClass performSelector:sharedInstanceSEL];
+            SEL propsSEL = NSSelectorFromString(@"visualizeProperties");
+            if ([manager respondsToSelector:propsSEL]) {
+                RNScreenInfo = [manager performSelector:propsSEL];
+            }
+#pragma clang diagnostic pop
+        }
+        if (RNScreenInfo[@"$screen_name"]) {
+            jsonObject[@"screen_name"] = RNScreenInfo[SA_EVENT_PROPERTY_SCREEN_NAME];
+            jsonObject[@"title"] = RNScreenInfo[SA_EVENT_PROPERTY_TITLE];
+        }
+    } @catch (NSException *exception) {
+        SALogError(@"%@ error: %@", self, exception);
+    }
+
+    jsonObject[@"app_version"] = [[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"];
+    jsonObject[@"feature_code"] = featureCode;
+    jsonObject[@"is_webview"] = @([SAVisualizedObjectSerializerManger sharedInstance].isContainWebView);
+
+    // 添加前端弹框信息
+    if ([SAVisualizedObjectSerializerManger sharedInstance].alertInfos.count > 0) {
+        jsonObject[@"app_alert_infos"] = [[SAVisualizedObjectSerializerManger sharedInstance].alertInfos copy];
+    }
+
+    // H5 页面信息
+    if ([SAVisualizedObjectSerializerManger sharedInstance].webPageInfo) {
+        SAVisualizedWebPageInfo *webPageInfo = [SAVisualizedObjectSerializerManger sharedInstance].webPageInfo;
+        jsonObject[@"h5_url"] = webPageInfo.url;
+        jsonObject[@"h5_title"] = webPageInfo.title;
+    }
+
+    // SDK 版本号
+    jsonObject[@"lib_version"] = SensorsAnalyticsSDK.sharedInstance.libVersion;
+
+    if (useGzip) {
+        // 如果使用 GZip 压缩
+        NSError *error = nil;
+
+        // 1. 序列化 Payload
+        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[_payload copy] options:0 error:&error];
+        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+
+        // 2. 使用 GZip 进行压缩
+        NSData *zippedData = [SAGzipUtility gzipData:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
+
+        // 3. Base64 Encode
+        NSString *b64String = [zippedData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
+
+        jsonObject[@"gzip_payload"] = b64String;
+    } else {
+        jsonObject[@"payload"] = [_payload copy];
+    }
+
+    NSError *error = nil;
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonObject options:0 error:&error];
+    if (!jsonData && error) {
+        SALogError(@"Failed to serialize test designer message: %@", error);
+    }
+
+    return jsonData;
+}
+
+- (NSOperation *)responseCommandWithConnection:(SAVisualizedConnection *)connection {
+    return nil;
+}
+
+- (NSString *)debugDescription {
+    return [NSString stringWithFormat:@"<%@:%p type='%@'>", NSStringFromClass([self class]), (__bridge void *)self, self.type];
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackConnection.h b/SensorsAnalyticsSDK/Visualized/SAVisualizedConnection.h
similarity index 72%
rename from SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackConnection.h
rename to SensorsAnalyticsSDK/Visualized/SAVisualizedConnection.h
index df74a3ca..ebe155c8 100644
--- a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackConnection.h
+++ b/SensorsAnalyticsSDK/Visualized/SAVisualizedConnection.h
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/9/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -20,18 +20,19 @@
 
 #import <Foundation/Foundation.h>
 
-@protocol SAVisualizedAutoTrackMessage;
+@protocol SAVisualizedMessage;
 
-@interface SAVisualizedAutoTrackConnection : NSObject
+@interface SAVisualizedConnection : NSObject
 
 @property (nonatomic, readonly) BOOL connected;
 @property (nonatomic, assign) BOOL useGzip;
 
 - (instancetype)initWithURL:(NSURL *)url;
-- (void)setSessionObject:(id)object forKey:(NSString *)key;
-- (id)sessionObjectForKey:(NSString *)key;
-- (void)sendMessage:(id<SAVisualizedAutoTrackMessage>)message;
-- (void)startConnectionWithFeatureCode:(NSString *)featureCode url:(NSString *)urlStr;
+
+- (void)sendMessage:(id<SAVisualizedMessage>)message;
+- (void)startConnectionWithFeatureCode:(NSString *)featureCode url:(NSString *)urlStr type:(NSString *)type;
 - (void)close;
 
+// 是否正在进行可视化全埋点上传页面信息
+- (BOOL)isVisualizedConnecting;
 @end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackConnection.m b/SensorsAnalyticsSDK/Visualized/SAVisualizedConnection.m
similarity index 68%
rename from SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackConnection.m
rename to SensorsAnalyticsSDK/Visualized/SAVisualizedConnection.m
index 1eea40d0..df79d31a 100644
--- a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackConnection.m
+++ b/SensorsAnalyticsSDK/Visualized/SAVisualizedConnection.m
@@ -1,9 +1,9 @@
 //
-//  SAVisualizedAutoTrackConnection.m,
+//  SAVisualizedConnection.m,
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/9/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -23,24 +23,26 @@
 #endif
 
 
-#import "SAVisualizedAutoTrackConnection.h"
-#import "SAVisualizedAutoTrackMessage.h"
-#import "SAVisualizedAutoTrackSnapshotMessage.h"
-#import "SALogger.h"
+#import "SAVisualizedConnection.h"
+#import "SAVisualizedMessage.h"
+#import "SAVisualizedSnapshotMessage.h"
+#import "SALog.h"
 #import "SensorsAnalyticsSDK+Private.h"
+#import "SAVisualizedObjectSerializerManger.h"
 
-@interface SAVisualizedAutoTrackConnection ()
+
+@interface SAVisualizedConnection ()
 
 @end
 
-@implementation SAVisualizedAutoTrackConnection {
+@implementation SAVisualizedConnection {
     BOOL _connected;
 
     NSURL *_url;
     NSDictionary *_typeToMessageClassMap;
     NSOperationQueue *_commandQueue;
-    NSTimer *timer;
-    id<SAVisualizedAutoTrackMessage> _designerMessage;
+    NSTimer *_timer;
+    id<SAVisualizedMessage> _designerMessage;
     NSString *_featureCode;
     NSString *_postUrl;
 }
@@ -49,7 +51,7 @@ - (instancetype)initWithURL:(NSURL *)url {
     self = [super init];
     if (self) {
         _typeToMessageClassMap = @{
-            SAVisualizedAutoTrackSnapshotRequestMessageType : [SAVisualizedAutoTrackSnapshotRequestMessage class],
+            SAVisualizedSnapshotRequestMessageType : [SAVisualizedSnapshotRequestMessage class],
         };
         _connected = NO;
         _useGzip = YES;
@@ -64,37 +66,40 @@ - (instancetype)initWithURL:(NSURL *)url {
 }
 
 - (void)close {
-    if (timer) {
-        [timer invalidate];
-        timer = nil;
+    if (_timer) {
+        [_timer invalidate];
+        _timer = nil;
+    }
+    if (_commandQueue) {
+        _commandQueue.suspended = YES;
+        _commandQueue = nil;
     }
-}
 
-- (void)dealloc {
-    [self close];
+    // 清空缓存的配置数据
+    [[SAVisualizedObjectSerializerManger sharedInstance] resetObjectSerializer];
+    [[SAVisualizedObjectSerializerManger sharedInstance] cleanVisualizedWebPageInfoCache];
 }
 
-- (void)setSessionObject:(id)object forKey:(NSString *)key {
-    NSParameterAssert(key != nil);
+- (BOOL)isVisualizedConnecting {
+    return _timer && _timer.valid;
 }
 
-- (id)sessionObjectForKey:(NSString *)key {
-    NSParameterAssert(key != nil);
-    return key;
+- (void)dealloc {
+    [self close];
 }
 
-- (void)sendMessage:(id<SAVisualizedAutoTrackMessage>)message {
+- (void)sendMessage:(id<SAVisualizedMessage>)message {
     if (_connected) {
         if (_featureCode == nil || _postUrl == nil) {
             return;
         }
-        NSString *jsonString = [[NSString alloc] initWithData:[message JSONData:_useGzip featuerCode:_featureCode] encoding:NSUTF8StringEncoding];
+        NSString *jsonString = [[NSString alloc] initWithData:[message JSONData:_useGzip featureCode:_featureCode] encoding:NSUTF8StringEncoding];
         NSURL *URL = [NSURL URLWithString:_postUrl];
         NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
         [request setHTTPMethod:@"POST"];
         [request setValue:@"text/plain" forHTTPHeaderField:@"Content-Type"];
         [request setHTTPBody:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
-        NSURLSessionDataTask *task = [[SensorsAnalyticsSDK sharedInstance].network dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSHTTPURLResponse * _Nullable response, NSError * _Nullable error) {
+        NSURLSessionDataTask *task = [[SensorsAnalyticsSDK sharedInstance].network dataTaskWithRequest:request completionHandler:^(NSData *_Nullable data, NSHTTPURLResponse *_Nullable response, NSError *_Nullable error) {
             NSString *urlResponseContent = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
             if (response.statusCode == 200) {
                 NSData *jsonData = [urlResponseContent dataUsingEncoding:NSUTF8StringEncoding];
@@ -105,16 +110,20 @@ - (void)sendMessage:(id<SAVisualizedAutoTrackMessage>)message {
                 }
             }
         }];
+
         [task resume];
     } else {
-        SADebug(@"Not sending message as we are not connected: %@", [message debugDescription]);
+        SALogWarn(@"Not sending message as we are not connected: %@", [message debugDescription]);
     }
 }
 
-- (id <SAVisualizedAutoTrackMessage>)designerMessageForMessage:(id)message {
-    NSParameterAssert([message isKindOfClass:[NSString class]] || [message isKindOfClass:[NSData class]]);
+- (id <SAVisualizedMessage>)designerMessageForMessage:(id)message {
+    if (![message isKindOfClass:[NSString class]] && ![message isKindOfClass:[NSData class]]) {
+        SALogError(@"message type error:%@",message);
+        return nil;
+    }
 
-    id <SAVisualizedAutoTrackMessage> designerMessage = nil;
+    id <SAVisualizedMessage> designerMessage = nil;
 
     NSData *jsonData = [message isKindOfClass:[NSString class]] ? [(NSString *)message dataUsingEncoding:NSUTF8StringEncoding] : message;
    // SADebug(@"%@ VTrack received message: %@", self, [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding]);
@@ -123,12 +132,13 @@ - (void)sendMessage:(id<SAVisualizedAutoTrackMessage>)message {
     id jsonObject = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:&error];
     if ([jsonObject isKindOfClass:[NSDictionary class]]) {
         NSDictionary *messageDictionary = (NSDictionary *)jsonObject;
+        //snapshot_request
         NSString *type = messageDictionary[@"type"];
         NSDictionary *payload = messageDictionary[@"payload"];
 
         designerMessage = [_typeToMessageClassMap[type] messageWithType:type payload:payload];
     } else {
-        SAError(@"Badly formed socket message expected JSON dictionary: %@", error);
+        SALogError(@"Badly formed socket message expected JSON dictionary: %@", error);
     }
 
     return designerMessage;
@@ -136,17 +146,17 @@ - (void)sendMessage:(id<SAVisualizedAutoTrackMessage>)message {
 
 #pragma mark -  Methods
 
-- (void)startVisualizedAutoTrackTimer:(id)message featureCode:(NSString *)featureCode postURL:(NSString *)postURL {
+- (void)startVisualizedTimer:(id)message featureCode:(NSString *)featureCode postURL:(NSString *)postURL {
     _featureCode = featureCode;
     _postUrl = (__bridge_transfer NSString *)CFURLCreateStringByReplacingPercentEscapesUsingEncoding(NULL, (__bridge CFStringRef)postURL, CFSTR(""),  CFStringConvertNSStringEncodingToEncoding(NSUTF8StringEncoding));
     _designerMessage = [self designerMessageForMessage:message];
 
-    if (timer) {
-        [timer invalidate];
-        timer = nil;
+    if (_timer) {
+        [_timer invalidate];
+        _timer = nil;
     }
 
-    timer = [NSTimer scheduledTimerWithTimeInterval:1
+    _timer = [NSTimer scheduledTimerWithTimeInterval:1
                                              target:self
                                            selector:@selector(handleMessage)
                                            userInfo:nil
@@ -162,19 +172,22 @@ - (void)handleMessage {
     }
 }
 
-- (void)startConnectionWithFeatureCode:(NSString *)featureCode url:(NSString *)urlStr {
+- (void)startConnectionWithFeatureCode:(NSString *)featureCode url:(NSString *)urlStr type:(NSString *)type {
     NSBundle *sensorsBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[SensorsAnalyticsSDK class]] pathForResource:@"SensorsAnalyticsSDK" ofType:@"bundle"]];
-    //文件路径
+    
+    /* type
+     heatmap 点击图
+     visualized 可视化全埋点
+     */
     NSString *jsonPath = [sensorsBundle pathForResource:@"sa_visualizedautotrack_path.json" ofType:nil];
+    if ([type isEqualToString:@"heatmap"]) { // 点击图
+        jsonPath = [sensorsBundle pathForResource:@"sa_headmap_path.json" ofType:nil];
+    }
     NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
     NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
     _commandQueue.suspended = NO;
-    if (!self->_connected) {
-        self->_connected = YES;
-        [self startVisualizedAutoTrackTimer:jsonString featureCode:featureCode postURL:urlStr];
-    } else {
-        [self startVisualizedAutoTrackTimer:jsonString featureCode:featureCode postURL:urlStr];
-    }
+    self->_connected = YES;
+    [self startVisualizedTimer:jsonString featureCode:featureCode postURL:urlStr];
 }
 
 @end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackMessage.h b/SensorsAnalyticsSDK/Visualized/SAVisualizedMessage.h
similarity index 70%
rename from SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackMessage.h
rename to SensorsAnalyticsSDK/Visualized/SAVisualizedMessage.h
index 0a83d6df..1d6757dc 100644
--- a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackMessage.h
+++ b/SensorsAnalyticsSDK/Visualized/SAVisualizedMessage.h
@@ -1,9 +1,9 @@
 //
-//  SAVisualizedAutoTrackMessage.h
+//  SAVisualizedMessage.h
 //  SensorsAnalyticsSDK
 //
 //  Created by 向作为 on 2018/9/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -20,17 +20,18 @@
 
 #import <Foundation/Foundation.h>
 
-@class SAVisualizedAutoTrackConnection;
+@class SAVisualizedConnection;
 
-@protocol SAVisualizedAutoTrackMessage <NSObject>
+@protocol SAVisualizedMessage <NSObject>
 
 @property (nonatomic, copy, readonly) NSString *type;
 
 - (void)setPayloadObject:(id)object forKey:(NSString *)key;
+
 - (id)payloadObjectForKey:(NSString *)key;
 
-- (NSData *)JSONData:(BOOL)useGzip featuerCode:(NSString *)fetureCode;
+- (NSData *)JSONData:(BOOL)useGzip featureCode:(NSString *)featureCode;
 
-- (NSOperation *)responseCommandWithConnection:(SAVisualizedAutoTrackConnection *)connection;
+- (NSOperation *)responseCommandWithConnection:(SAVisualizedConnection *)connection;
 
 @end
diff --git a/SensorsAnalyticsSDK/HeatMap/SAHeatMapSnapshotMessage.h b/SensorsAnalyticsSDK/Visualized/SAVisualizedSnapshotMessage.h
similarity index 77%
rename from SensorsAnalyticsSDK/HeatMap/SAHeatMapSnapshotMessage.h
rename to SensorsAnalyticsSDK/Visualized/SAVisualizedSnapshotMessage.h
index 3b86547c..528ca0b7 100644
--- a/SensorsAnalyticsSDK/HeatMap/SAHeatMapSnapshotMessage.h
+++ b/SensorsAnalyticsSDK/Visualized/SAVisualizedSnapshotMessage.h
@@ -1,8 +1,8 @@
 //
-//  SADesignerSnapshotMessage.h
+//  SAVisualizedSnapshotMessage.h
 //  SensorsAnalyticsSDK
 //
-//  Created by 王灼洲 on 8/1/17.
+//  Created by 向作为 on 2018/9/4.
 //  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,15 +21,15 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "SAAbstractHeatMapMessage.h"
+#import "SAVisualizedAbstractMessage.h"
 
 @class SAObjectSerializerConfig;
 
-extern NSString *const SAHeatMapSnapshotRequestMessageType;
+extern NSString *const SAVisualizedSnapshotRequestMessageType;
 
 #pragma mark -- Snapshot Request
 
-@interface SAHeatMapSnapshotRequestMessage : SAAbstractHeatMapMessage
+@interface SAVisualizedSnapshotRequestMessage : SAVisualizedAbstractMessage
 
 + (instancetype)message;
 
@@ -39,7 +39,7 @@ extern NSString *const SAHeatMapSnapshotRequestMessageType;
 
 #pragma mark -- Snapshot Response
 
-@interface SAHeatMapSnapshotResponseMessage : SAAbstractHeatMapMessage
+@interface SAVisualizedSnapshotResponseMessage : SAVisualizedAbstractMessage
 
 + (instancetype)message;
 
diff --git a/SensorsAnalyticsSDK/HeatMap/SAHeatMapSnapshotMessage.m b/SensorsAnalyticsSDK/Visualized/SAVisualizedSnapshotMessage.m
similarity index 54%
rename from SensorsAnalyticsSDK/HeatMap/SAHeatMapSnapshotMessage.m
rename to SensorsAnalyticsSDK/Visualized/SAVisualizedSnapshotMessage.m
index baa2c648..87837760 100644
--- a/SensorsAnalyticsSDK/HeatMap/SAHeatMapSnapshotMessage.m
+++ b/SensorsAnalyticsSDK/Visualized/SAVisualizedSnapshotMessage.m
@@ -1,9 +1,9 @@
 //
-//  SADesignerSnapshotMessage.m
+//  SAVisualizedSnapshotMessage.m
 //  SensorsAnalyticsSDK
 //
-//  Created by 王灼洲 on 8/1/17.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Created by 向作为 on 2018/9/4.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -25,24 +25,30 @@
 
 #import <CommonCrypto/CommonDigest.h>
 
-#import "SAHeatMapSnapshotMessage.h"
+#import "SAVisualizedSnapshotMessage.h"
 #import "SAApplicationStateSerializer.h"
 #import "SAObjectIdentityProvider.h"
 #import "SAObjectSerializerConfig.h"
-#import "SAHeatMapConnection.h"
+#import "SAVisualizedConnection.h"
 #import "SensorsAnalyticsSDK.h"
+#import "SAConstants+Private.h"
+#import "SAVisualizedObjectSerializerManger.h"
+
 
 #pragma mark -- Snapshot Request
 
-NSString * const SAHeatMapSnapshotRequestMessageType = @"snapshot_request";
+NSString * const SAVisualizedSnapshotRequestMessageType = @"snapshot_request";
 
 static NSString * const kSnapshotSerializerConfigKey = @"snapshot_class_descriptions";
-static NSString * const kObjectIdentityProviderKey = @"object_identity_provider";
 
-@implementation SAHeatMapSnapshotRequestMessage
+@interface SAVisualizedSnapshotRequestMessage()
+@property (nonatomic, copy) NSString *lastImageHash;
+@end
+
+@implementation SAVisualizedSnapshotRequestMessage
 
 + (instancetype)message {
-    return [(SAHeatMapSnapshotRequestMessage *)[self alloc] initWithType:SAHeatMapSnapshotRequestMessageType];
+    return [(SAVisualizedSnapshotRequestMessage *)[self alloc] initWithType:SAVisualizedSnapshotRequestMessageType];
 }
 
 - (SAObjectSerializerConfig *)configuration {
@@ -50,54 +56,42 @@ - (SAObjectSerializerConfig *)configuration {
     return config ? [[SAObjectSerializerConfig alloc] initWithDictionary:config] : nil;
 }
 
-- (NSOperation *)responseCommandWithConnection:(SAHeatMapConnection *)connection {
-    __block SAObjectSerializerConfig *serializerConfig = self.configuration;
-    __block NSString *imageHash = [self payloadObjectForKey:@"last_image_hash"];
 
-    __weak SAHeatMapConnection *weak_connection = connection;
+// 构建页面信息，包括截图和元素数据
+- (NSOperation *)responseCommandWithConnection:(SAVisualizedConnection *)connection {
+    SAObjectSerializerConfig *serializerConfig = self.configuration;
+
+    __weak SAVisualizedConnection *weak_connection = connection;
     NSOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
-        __strong SAHeatMapConnection *conn = weak_connection;
-        
-        // Update the class descriptions in the connection session if provided as part of the message.
-        if (serializerConfig) {
-            [connection setSessionObject:serializerConfig forKey:kSnapshotSerializerConfigKey];
-        } else if ([connection sessionObjectForKey:kSnapshotSerializerConfigKey]) {
-            // Get the class descriptions from the connection session store.
-            serializerConfig = [connection sessionObjectForKey:kSnapshotSerializerConfigKey];
-        } else {
-            // If neither place has a config, this is probably a stale message and we can't create a snapshot.
-            return;
-        }
+        __strong SAVisualizedConnection *conn = weak_connection;
 
         // Get the object identity provider from the connection's session store or create one if there is none already.
         SAObjectIdentityProvider *objectIdentityProvider = [[SAObjectIdentityProvider alloc] init];
 
-        SAApplicationStateSerializer *serializer = [[SAApplicationStateSerializer alloc] initWithApplication:[UIApplication sharedApplication]
-                                                                                               configuration:serializerConfig
-                                                                                      objectIdentityProvider:objectIdentityProvider];
+        SAApplicationStateSerializer *serializer = [[SAApplicationStateSerializer alloc] initWithApplication:[UIApplication sharedApplication] configuration:serializerConfig objectIdentityProvider:objectIdentityProvider];
 
-        SAHeatMapSnapshotResponseMessage *snapshotMessage = [SAHeatMapSnapshotResponseMessage message];
-        __block UIImage *screenshot = nil;
-        __block NSDictionary *serializedObjects = nil;
+        SAVisualizedSnapshotResponseMessage *snapshotMessage = [SAVisualizedSnapshotResponseMessage message];
 
-        dispatch_sync(dispatch_get_main_queue(), ^{
-            
-            screenshot = [serializer screenshotImageForWindow:UIApplication.sharedApplication.keyWindow];
-        });
-        snapshotMessage.screenshot = screenshot;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [serializer screenshotImageForAllWindowWithCompletionHandler:^(UIImage *image) {
+                snapshotMessage.screenshot = image;
 
-        if (imageHash && [imageHash isEqualToString:snapshotMessage.imageHash]) {
-            [conn sendMessage:[SAHeatMapSnapshotResponseMessage message]];
-            return;
-        }
-        
-        dispatch_sync(dispatch_get_main_queue(), ^{
-            serializedObjects = [serializer objectHierarchyForWindow:UIApplication.sharedApplication.keyWindow];
-        });
-        [connection setSessionObject:serializedObjects forKey:@"snapshot_hierarchy"];
-        snapshotMessage.serializedObjects = serializedObjects;
+                // imageHash 不变即截图相同，页面不变，则不再解析页面元素信息
+                if ([[SAVisualizedObjectSerializerManger sharedInstance].lastImageHash isEqualToString:snapshotMessage.imageHash]) {
+                    [conn sendMessage:[SAVisualizedSnapshotResponseMessage message]];
+                } else {
+                    // 重置页面配置信息
+                    [[SAVisualizedObjectSerializerManger sharedInstance] resetObjectSerializer];
+
+                    // 解析页面信息
+                    NSDictionary *serializedObjects = [serializer objectHierarchyForWindow:UIApplication.sharedApplication.keyWindow];
+                    snapshotMessage.serializedObjects = serializedObjects;
+                    [conn sendMessage:snapshotMessage];
 
-        [conn sendMessage:snapshotMessage];
+                    [[SAVisualizedObjectSerializerManger sharedInstance] resetLastImageHash:snapshotMessage.imageHash];
+                }
+            }];
+        });
     }];
 
     return operation;
@@ -107,15 +101,15 @@ - (NSOperation *)responseCommandWithConnection:(SAHeatMapConnection *)connection
 
 #pragma mark -- Snapshot Response
 
-@implementation SAHeatMapSnapshotResponseMessage
+@implementation SAVisualizedSnapshotResponseMessage
 
 + (instancetype)message {
-    return [(SAHeatMapSnapshotResponseMessage *)[self alloc] initWithType:@"snapshot_response"];
+    return [(SAVisualizedSnapshotResponseMessage *)[self alloc] initWithType:@"snapshot_response"];
 }
 
 - (void)setScreenshot:(UIImage *)screenshot {
     id payloadObject = nil;
-    id imageHash = nil;
+    NSString *imageHash = nil;
     if (screenshot) {
         NSData *jpegSnapshotImageData = UIImageJPEGRepresentation(screenshot, 0.5);
         if (jpegSnapshotImageData) {
@@ -123,8 +117,12 @@ - (void)setScreenshot:(UIImage *)screenshot {
             imageHash = [self imageHashWithData:jpegSnapshotImageData];
         }
     }
-    
-    _imageHash = imageHash;
+
+    if ([SAVisualizedObjectSerializerManger sharedInstance].imageHashUpdateMessage) {
+        imageHash = [imageHash stringByAppendingString:[SAVisualizedObjectSerializerManger sharedInstance].imageHashUpdateMessage];
+    }
+
+    self.imageHash = imageHash;
     [self setPayloadObject:(payloadObject ?: [NSNull null]) forKey:@"screenshot"];
     [self setPayloadObject:(imageHash ?: [NSNull null]) forKey:@"image_hash"];
 }
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAJSTouchEventView.h b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAJSTouchEventView.h
new file mode 100644
index 00000000..f686abd5
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAJSTouchEventView.h
@@ -0,0 +1,62 @@
+//
+// SAJSTouchEventView.h
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/2/20.
+// Copyright © 2020 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+#import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAJSTouchEventView : UIView
+
+/// 根据 web 页面元素信息构造对象
+- (instancetype)initWithWebView:(WKWebView *)webView webElementInfo:(NSDictionary *)elementInfo;
+
+// html 标签名称
+@property (nonatomic, copy) NSString *tagName;
+/// 是否为 H5 元素
+@property (nonatomic, assign) BOOL isFromH5;
+
+/// 元素选择器
+@property (nonatomic, copy) NSString *elementSelector;
+
+/// 元素内容
+@property (nonatomic, copy) NSString *elementContent;
+
+/// 元素是否可见
+@property (nonatomic, assign) BOOL visibility;
+
+/// 元素所在页面 url
+@property (nonatomic, copy) NSString *url;
+
+/// html 页面标题
+@property (nonatomic, copy) NSString *title;
+
+/// js 生成的 html 元素 id
+@property (nonatomic, copy) NSString *jsElementId;
+
+/// js 解析的 html 子元素 id
+@property (nonatomic, copy) NSArray<NSString *> *jsSubElementIds;
+
+/// js 解析的 html 子元素
+@property (nonatomic, copy) NSArray<SAJSTouchEventView *> *jsSubviews;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAJSTouchEventView.m b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAJSTouchEventView.m
new file mode 100644
index 00000000..38bb9df5
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAJSTouchEventView.m
@@ -0,0 +1,82 @@
+//
+// SAJSTouchEventView.m
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/2/20.
+// Copyright © 2020 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAJSTouchEventView.h"
+
+@interface SAJSTouchEventView()
+@end
+
+@implementation SAJSTouchEventView
+
+- (instancetype)initWithWebView:(WKWebView *)webView webElementInfo:(NSDictionary *)elementInfo {
+    self = [super init];
+    if (self) {
+        UIScrollView *scrollView = webView.scrollView;
+        /// webView 缩放系数
+        CGFloat zoomScale = scrollView.zoomScale;
+        // 位置偏移量
+        CGPoint contentOffset = scrollView.contentOffset;
+
+        // NSInteger scale = [pageData[@"scale"] integerValue];
+        CGFloat left = [elementInfo[@"left"] floatValue] * zoomScale;
+        CGFloat top = [elementInfo[@"top"] floatValue] * zoomScale;
+        CGFloat width = [elementInfo[@"width"] floatValue] * zoomScale;
+        CGFloat height = [elementInfo[@"height"] floatValue] * zoomScale;
+        CGFloat scrollX = [elementInfo[@"scrollX"] floatValue] * zoomScale;
+        CGFloat scrollY = [elementInfo[@"scrollY"] floatValue] * zoomScale;
+        BOOL visibility = [elementInfo[@"visibility"] boolValue];
+        NSArray <NSString *> *subelements = elementInfo[@"subelements"];
+
+        if (height <= 0 || !visibility) {
+            return nil;
+        }
+
+        CGRect webViewRect = [webView convertRect:webView.bounds toView:nil];
+        CGFloat realX = left + webViewRect.origin.x - contentOffset.x + scrollX;
+        CGFloat realY = top + webViewRect.origin.y - contentOffset.y + scrollY;
+
+        // H5 元素的显示位置
+        CGRect touchViewRect = CGRectMake(realX, realY, width, height);
+        // 计算 webView 和 H5 元素的交叉区域
+        CGRect validFrame = CGRectIntersection(webViewRect, touchViewRect);
+        if (CGRectIsNull(validFrame) || CGSizeEqualToSize(validFrame.size, CGSizeZero)) {
+            return nil;
+        }
+        [self setFrame:validFrame];
+
+        self.userInteractionEnabled = YES;
+        _elementContent = elementInfo[@"$element_content"];
+        _elementSelector = elementInfo[@"$element_selector"];
+        _visibility = visibility;
+        _url = elementInfo[@"$url"];
+        _tagName = elementInfo[@"tagName"];
+        _title = elementInfo[@"$title"];
+        _isFromH5 = YES;
+        _jsElementId = elementInfo[@"id"];
+        _jsSubElementIds = subelements;
+    }
+    return self;
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackAbstractMessage.m b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackAbstractMessage.m
deleted file mode 100644
index 567ea8cb..00000000
--- a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackAbstractMessage.m
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-//  SAVisualizedAutoTrackAbstractMessage.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 向作为 on 2018/9/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 "SAGzipUtility.h"
-#import "SAVisualizedAutoTrackAbstractMessage.h"
-#import "SensorsAnalyticsSDK.h"
-#import "SALogger.h"
-
-@interface SAVisualizedAutoTrackAbstractMessage ()
-
-@property (nonatomic, copy, readwrite) NSString *type;
-
-@end
-
-@implementation SAVisualizedAutoTrackAbstractMessage {
-    NSMutableDictionary *_payload;
-}
-
-+ (instancetype)messageWithType:(NSString *)type payload:(NSDictionary *)payload {
-    return [[self alloc] initWithType:type payload:payload];
-}
-
-- (instancetype)initWithType:(NSString *)type {
-    return [self initWithType:type payload:@{}];
-}
-
-- (instancetype)initWithType:(NSString *)type payload:(NSDictionary *)payload {
-    self = [super init];
-    if (self) {
-        _type = type;
-        _payload = [payload mutableCopy];
-    }
-
-    return self;
-}
-
-- (void)setPayloadObject:(id)object forKey:(NSString *)key {
-    _payload[key] = object ?: [NSNull null];
-}
-
-- (id)payloadObjectForKey:(NSString *)key {
-    id object = _payload[key];
-    return [object isEqual:[NSNull null]] ? nil : object;
-}
-
-- (NSDictionary *)payload {
-    return [_payload copy];
-}
-
-- (NSData *)JSONData:(BOOL)useGzip featuerCode:(NSString *)featureCode {
-    NSMutableDictionary *jsonObject = [[NSMutableDictionary alloc] init];
-    [jsonObject setObject:_type forKey:@"type"];
-    [jsonObject setObject:@"iOS" forKey:@"os"];
-    @try {
-        UIViewController *viewController = [[SensorsAnalyticsSDK sharedInstance] currentViewController];
-        if (viewController) {
-            [jsonObject setObject:NSStringFromClass([viewController class]) forKey:@"screen_name"];
-        }
-    } @catch (NSException *exception) {
-        SAError(@"%@ error: %@", self, exception);
-    }
-    [jsonObject setObject:[[NSBundle mainBundle] infoDictionary][@"CFBundleShortVersionString"] forKey:@"app_version"];
-    [jsonObject setObject:featureCode forKey:@"feature_code"];
-    if (useGzip) {
-        // 如果使用 GZip 压缩
-        NSError *error = nil;
-        
-        // 1. 序列化 Payload
-        NSData *jsonData = [NSJSONSerialization dataWithJSONObject:[_payload copy] options:0 error:&error];
-        NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-
-        // 2. 使用 GZip 进行压缩
-        NSData *zippedData = [SAGzipUtility gzipData:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
-
-        // 3. Base64 Encode
-        NSString *b64String = [zippedData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
-
-        [jsonObject setValue:b64String forKey:@"gzip_payload"];
-    } else {
-        [jsonObject setValue:[_payload copy] forKey:@"payload"];
-    }
-
-    NSError *error = nil;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonObject options:0 error:&error];
-    if (jsonData == nil && error) {
-        SAError(@"Failed to serialize test designer message: %@", error);
-    }
-
-    return jsonData;
-}
-
-- (NSOperation *)responseCommandWithConnection:(SAVisualizedAutoTrackConnection *)connection {
-    return nil;
-}
-
-- (NSString *)debugDescription {
-    return [NSString stringWithFormat:@"<%@:%p type='%@'>", NSStringFromClass([self class]), (__bridge void *)self, self.type];
-}
-
-@end
diff --git a/SensorsAnalyticsSDK/SADesignerMessage.h b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackObjectSerializer.h
similarity index 58%
rename from SensorsAnalyticsSDK/SADesignerMessage.h
rename to SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackObjectSerializer.h
index 1fd79e1c..4f0b121d 100644
--- a/SensorsAnalyticsSDK/SADesignerMessage.h
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackObjectSerializer.h
@@ -1,9 +1,9 @@
 //
-//  SADesignerMessage.h
+//  SAObjectSerializer.h
 //  SensorsAnalyticsSDK
 //
 //  Created by 雨晗 on 1/18/16.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -20,17 +20,15 @@
 
 #import <Foundation/Foundation.h>
 
-@class SADesignerConnection;
+@class SAClassDescription;
+@class SAObjectSerializerConfig;
+@class SAObjectIdentityProvider;
 
-@protocol SADesignerMessage <NSObject>
+@interface SAVisualizedAutoTrackObjectSerializer : NSObject
 
-@property (nonatomic, copy, readonly) NSString *type;
+- (instancetype)initWithConfiguration:(SAObjectSerializerConfig *)configuration
+               objectIdentityProvider:(SAObjectIdentityProvider *)objectIdentityProvider;
 
-- (void)setPayloadObject:(id)object forKey:(NSString *)key;
-- (id)payloadObjectForKey:(NSString *)key;
-
-- (NSData *)JSONData:(BOOL)useGzip;
-
-- (NSOperation *)responseCommandWithConnection:(SADesignerConnection *)connection;
+- (NSDictionary *)serializedObjectsWithRootObject:(id)rootObject;
 
 @end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackObjectSerializer.m b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackObjectSerializer.m
new file mode 100644
index 00000000..d3f0ebc6
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackObjectSerializer.m
@@ -0,0 +1,351 @@
+//
+//  SAObjectSerializer.m
+//  SensorsAnalyticsSDK
+//
+//  Created by 雨晗 on 1/18/16.
+//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <objc/runtime.h>
+#import <WebKit/WebKit.h>
+#import "NSInvocation+SAHelpers.h"
+#import "SAClassDescription.h"
+#import "SAEnumDescription.h"
+#import "SALog.h"
+#import "SAObjectIdentityProvider.h"
+#import "SAVisualizedAutoTrackObjectSerializer.h"
+#import "SAObjectSerializerConfig.h"
+#import "SAObjectSerializerContext.h"
+#import "SAPropertyDescription.h"
+#import "UIView+VisualizedAutoTrack.h"
+#import "SAAutoTrackProperty.h"
+#import "SAAutoTrackUtils.h"
+#import "SAJSTouchEventView.h"
+#import "SAVisualizedObjectSerializerManger.h"
+#import "SensorsAnalyticsSDK+Private.h"
+
+@interface SAVisualizedAutoTrackObjectSerializer ()
+@end
+
+@implementation SAVisualizedAutoTrackObjectSerializer {
+    SAObjectSerializerConfig *_configuration;
+    SAObjectIdentityProvider *_objectIdentityProvider;
+}
+
+- (instancetype)initWithConfiguration:(SAObjectSerializerConfig *)configuration
+               objectIdentityProvider:(SAObjectIdentityProvider *)objectIdentityProvider {
+    self = [super init];
+    if (self) {
+        _configuration = configuration;
+        _objectIdentityProvider = objectIdentityProvider;
+    }
+    
+    return self;
+}
+
+- (NSDictionary *)serializedObjectsWithRootObject:(id)rootObject {
+    NSParameterAssert(rootObject != nil);
+    
+    SAObjectSerializerContext *context = [[SAObjectSerializerContext alloc] initWithRootObject:rootObject];
+    
+    @try {// 遍历 _unvisitedObjects 中所有元素，解析元素信息
+        while ([context hasUnvisitedObjects]) {
+            [self visitObject:[context dequeueUnvisitedObject] withContext:context];
+        }
+    } @catch (NSException *e) {
+        SALogError(@"Failed to serialize objects: %@", e);
+    }
+
+    NSMutableDictionary *serializedObjects = [NSMutableDictionary dictionaryWithDictionary:@{
+        @"objects" : [context allSerializedObjects],
+        @"rootObject": [_objectIdentityProvider identifierForObject:rootObject]
+    }];
+    return [serializedObjects copy];
+}
+
+- (void)visitObject:(NSObject *)object withContext:(SAObjectSerializerContext *)context {
+    NSParameterAssert(object != nil);
+    NSParameterAssert(context != nil);
+
+    [context addVisitedObject:object];
+
+    // 获取构建单个元素的所有属性
+    NSMutableDictionary *propertyValues = [[NSMutableDictionary alloc] init];
+
+    // 获取当前类以及父类页面结构需要的 name,superclass、properties
+    SAClassDescription *classDescription = [self classDescriptionForObject:object];
+    if (classDescription) {
+        // 遍历自身和父类的所需的属性及类型，合并为当前类所有属性
+        for (SAPropertyDescription *propertyDescription in [classDescription propertyDescriptions]) {
+            if ([propertyDescription shouldReadPropertyValueForObject:object]) {
+                //  根据是否符号要求（是否显示等）构建属性，通过 KVC 和 NSInvocation 动态调用获取描述信息
+                id propertyValue = [self propertyValueForObject:object withPropertyDescription:propertyDescription context:context]; // $递增作为元素 id
+                propertyValues[propertyDescription.key] = propertyValue ? : [NSNull null];
+            }
+        }
+    }
+
+#ifndef SENSORS_ANALYTICS_DISABLE_UIWEBVIEW
+    if ([object isKindOfClass:UIWebView.class]) { // 暂不支持 UIWebView，添加弹框
+        [self addUIWebViewAlertInfo];
+    } else
+#endif
+    if ([object isKindOfClass:WKWebView.class]) {
+        // 针对 WKWebView 数据检查
+        WKWebView *webView = (WKWebView *)object;
+        [self checkWKWebViewInfoWithWebView:webView];
+    }
+
+    NSArray *classNames = [self classHierarchyArrayForObject:object];
+    if ([object isKindOfClass:SAJSTouchEventView.class]) {
+        SAJSTouchEventView *touchView = (SAJSTouchEventView *)object;
+        classNames = @[touchView.tagName];
+    }
+
+    // 记录当前可点击元素所在的 viewController
+    if ([object isKindOfClass:UIView.class] && [object respondsToSelector:@selector(sensorsdata_enableAppClick)] && [object respondsToSelector:@selector(sensorsdata_viewController)]) {
+        UIView <SAAutoTrackViewProperty> *view = (UIView <SAAutoTrackViewProperty> *)object;
+        UIViewController *viewController = [view sensorsdata_viewController];
+        if (viewController && view.sensorsdata_enableAppClick) {
+            [[SAVisualizedObjectSerializerManger sharedInstance] enterViewController:viewController];
+        }
+    }
+
+    propertyValues[@"element_level"] = @([context currentLevelIndex]);
+    NSDictionary *serializedObject = @{ @"id": [_objectIdentityProvider identifierForObject:object],
+                                        @"class": classNames, // 遍历获取父类名称
+                                        @"properties": propertyValues };
+
+    [context addSerializedObject:serializedObject];
+}
+
+- (NSArray *)classHierarchyArrayForObject:(NSObject *)object {
+    NSMutableArray *classHierarchy = [[NSMutableArray alloc] init];
+    
+    Class aClass = [object class];
+    while (aClass) {
+        [classHierarchy addObject:NSStringFromClass(aClass)];
+        aClass = [aClass superclass];
+    }
+    return [classHierarchy copy];
+}
+
+- (NSInvocation *)invocationForObject:(id)object
+              withSelectorDescription:(SAPropertySelectorDescription *)selectorDescription {
+    
+    SEL aSelector = NSSelectorFromString(selectorDescription.selectorName);
+    NSAssert(aSelector != nil, @"Expected non-nil selector!");
+    
+    NSMethodSignature *methodSignature = [object methodSignatureForSelector:aSelector];
+    NSInvocation *invocation = nil;
+    
+    if (methodSignature) {
+        NSAssert([methodSignature numberOfArguments] == 2, @"Unexpected number of arguments!");
+        
+        invocation = [NSInvocation invocationWithMethodSignature:methodSignature];
+        invocation.selector = aSelector;
+    }
+    return invocation;
+}
+
+- (id)propertyValue:(id)propertyValue
+propertyDescription:(SAPropertyDescription *)propertyDescription
+           context : (SAObjectSerializerContext *)context {
+    
+    if ([context isVisitedObject:propertyValue]) {
+        return [_objectIdentityProvider identifierForObject:propertyValue];
+    }
+
+    if ([self isNestedObjectType:propertyDescription.type]) {
+        [context enqueueUnvisitedObject:propertyValue];
+        return [_objectIdentityProvider identifierForObject:propertyValue];
+    }
+
+    if ([propertyValue isKindOfClass:[NSArray class]] || [propertyValue isKindOfClass:[NSSet class]]) {
+        NSMutableArray *arrayOfIdentifiers = [[NSMutableArray alloc] init];
+        if ([propertyValue isKindOfClass:[NSArray class]]) {
+            [context enqueueUnvisitedObjects:propertyValue];
+        } else if ([propertyValue isKindOfClass:[NSSet class]]) {
+            [context enqueueUnvisitedObjects:[(NSSet *)propertyValue allObjects]];
+        }
+
+        for (id value in propertyValue) {
+            [arrayOfIdentifiers addObject:[_objectIdentityProvider identifierForObject:value]];
+        }
+        propertyValue = [arrayOfIdentifiers copy];
+    }
+
+    return [propertyDescription.valueTransformer transformedValue:propertyValue];
+}
+
+- (id)propertyValueForObject:(NSObject *)object
+     withPropertyDescription:(SAPropertyDescription *)propertyDescription
+                    context : (SAObjectSerializerContext *)context {
+    SAPropertySelectorDescription *selectorDescription = propertyDescription.getSelectorDescription;
+    
+    // 使用 kvc 解析属性
+    if (propertyDescription.useKeyValueCoding) {
+        // the "fast" (also also simple) path is to use KVC
+        
+        id valueForKey = [object valueForKey:selectorDescription.selectorName];
+        
+        // 将获取到的属性属于 classes 中的元素添加到 _unvisitedObjects 中，递增生成当前元素唯一 Id
+        id value = [self propertyValue:valueForKey
+                   propertyDescription:propertyDescription
+                               context:context];
+        
+        return value;
+    } else {
+        // the "slow" NSInvocation path. Required in order to invoke methods that take parameters.
+        
+        // 通过 NSInvocation 构造并动态调用 selector，获取元素描述信息
+        NSInvocation *invocation = [self invocationForObject:object withSelectorDescription:selectorDescription];
+        if (invocation) {
+            [invocation sa_setArgumentsFromArray:@[]];
+            [invocation invokeWithTarget:object];
+            
+            id returnValue = [invocation sa_returnValue];
+            
+            id value = [self propertyValue:returnValue
+                       propertyDescription:propertyDescription
+                                   context:context];
+            if (value) {
+                return value;
+            }
+        }
+    }
+    return nil;
+}
+
+- (BOOL)isNestedObjectType:(NSString *)typeName {
+    return [_configuration classWithName:typeName] != nil;
+}
+
+- (SAClassDescription *)classDescriptionForObject:(NSObject *)object {
+    NSParameterAssert(object != nil);
+    
+    Class aClass = [object class];
+    while (aClass != nil) {
+        SAClassDescription *classDescription = [_configuration classWithName:NSStringFromClass(aClass)];
+        if (classDescription) {
+            return classDescription;
+        }
+        
+        aClass = [aClass superclass];
+    }
+    
+    return nil;
+}
+
+#pragma mark webview
+
+#ifndef SENSORS_ANALYTICS_DISABLE_UIWEBVIEW
+/// 添加 UIWebView 弹框信息
+- (void)addUIWebViewAlertInfo {
+    [[SAVisualizedObjectSerializerManger sharedInstance] enterWebViewPageWithWebInfo:nil];
+
+    NSMutableDictionary *alertInfo = [NSMutableDictionary dictionary];
+    alertInfo[@"title"] = @"当前页面无法进行可视化全埋点";
+    alertInfo[@"message"] = @"此页面包含 UIWebView，iOS App 内嵌 H5 可视化全埋点，只支持 WKWebView";
+    alertInfo[@"link_text"] = @"配置文档";
+    alertInfo[@"link_url"] = @"https://manual.sensorsdata.cn/sa/latest/enable_visualized_autotrack-7548675.html";
+    [[SAVisualizedObjectSerializerManger sharedInstance] registWebAlertInfos:@[alertInfo]];
+}
+#endif
+
+/// 检查 WKWebView 相关信息
+- (void)checkWKWebViewInfoWithWebView:(WKWebView *)webView {
+    SAVisualizedWebPageInfo *webPageInfo = [[SAVisualizedObjectSerializerManger sharedInstance] readWebPageInfoWithWebView:webView];
+
+    // H5 弹框信息
+    if (webPageInfo.alertSources) {
+        [[SAVisualizedObjectSerializerManger sharedInstance] registWebAlertInfos:webPageInfo.alertSources];
+    }
+
+    // H5 页面元素信息
+    if (webPageInfo) {
+        [[SAVisualizedObjectSerializerManger sharedInstance] enterWebViewPageWithWebInfo:webPageInfo];
+
+        // 如果包含 H5 页面信息，不需要动态通知和 JS SDK 检测
+        return;
+    }
+
+    // 当前 WKWebView 是否注入可视化全埋点 Bridge 标记
+    WKUserContentController *contentController = webView.configuration.userContentController;
+    NSArray<WKUserScript *> *userScripts = contentController.userScripts;
+    // 防止重复注入标记（js 发送数据，是异步的，防止 sensorsdata_visualized_mode 已经注入完成，但是尚未接收到 js 数据）
+    __block BOOL isContainVisualized = NO;
+    [userScripts enumerateObjectsUsingBlock:^(WKUserScript *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
+        if ([obj.source containsString:@"sensorsdata_visualized_mode"]) {
+            isContainVisualized = YES;
+            *stop = YES;
+        }
+    }];
+
+    // 注入 bridge 属性值，标记当前处于可视化全埋点调试
+    NSMutableString *javaScriptSource = [NSMutableString string];
+    if (!isContainVisualized) {
+        [javaScriptSource appendString:@"window.SensorsData_App_Visual_Bridge.sensorsdata_visualized_mode = true;"];
+    }
+    // 可能延迟开启可视化全埋点，未成功注入标记，通过调用 JS 方法，手动通知 JS SDK 发送数据
+    [javaScriptSource appendString:@"window.sensorsdata_app_call_js('visualized')"];
+    [webView evaluateJavaScript:javaScriptSource completionHandler:^(id _Nullable response, NSError *_Nullable error) {
+        if (error) {
+            /*
+             如果 JS SDK 尚未加载完成，可能方法不存在；
+             等到 JS SDK加载完成检测到 sensorsdata_visualized_mode 会尝试发送数据页面数据
+             */
+            SALogError(@"window.sensorsdata_app_call_js error：%@", error);
+        }
+    }];
+
+    // 只有包含可视化全埋点 Bridge 标记，才可能需要检测 JS SDK 集成情况
+    if (!isContainVisualized) {
+        return;
+    }
+
+    // 延时检测是否集成 JS SDK
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        // 延迟判断是否存在 js 发送数据
+        SAVisualizedWebPageInfo *currentWebPageInfo = [[SAVisualizedObjectSerializerManger sharedInstance] readWebPageInfoWithWebView:webView];
+        // 注入了 bridge 但是未接收到数据
+        if (!currentWebPageInfo) {
+            NSString *javaScript = @"window.sensorsdata_app_call_js('sensorsdata-check-jssdk')";
+            [webView evaluateJavaScript:javaScript completionHandler:^(id _Nullable response, NSError *_Nullable error) {
+                if (error) {
+                    NSDictionary *userInfo = error.userInfo;
+                    NSString *exceptionMessage = userInfo[@"WKJavaScriptExceptionMessage"];
+                    // js 环境未定义此方法，可能是未集成 JS SDK 或者 JS SDK 版本过低
+                    if (exceptionMessage && [exceptionMessage containsString:@"undefined is not a function"]) {
+                        NSMutableDictionary *alertInfo = [NSMutableDictionary dictionary];
+                        alertInfo[@"title"] = @"当前页面无法进行可视化全埋点";
+                        alertInfo[@"message"] = @"此页面未集成 Web JS SDK 或者 Web JS SDK 版本过低，请集成最新版 Web JS SDK";
+                        alertInfo[@"link_text"] = @"配置文档";
+                        alertInfo[@"link_url"] = @"https://manual.sensorsdata.cn/sa/latest/tech_sdk_client_web_use-7548173.html";
+                        NSDictionary *alertInfoMessage = @{ @"callType": @"app_alert", @"data": @[alertInfo] };
+                        [[SAVisualizedObjectSerializerManger sharedInstance] saveVisualizedWebPageInfoWithWebView:webView webPageInfo:alertInfoMessage];
+                    }
+                }
+            }];
+        }
+    });
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackSnapshotMessage.h b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackSnapshotMessage.h
deleted file mode 100644
index 1584fcab..00000000
--- a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackSnapshotMessage.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-//  SAVisualizedAutoTrackSnapshotMessage.h
-//  SensorsAnalyticsSDK
-//
-//  Created by 向作为 on 2018/9/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-#import "SAVisualizedAutoTrackAbstractMessage.h"
-
-@class SAObjectSerializerConfig;
-
-extern NSString *const SAVisualizedAutoTrackSnapshotRequestMessageType;
-
-#pragma mark -- Snapshot Request
-
-@interface SAVisualizedAutoTrackSnapshotRequestMessage : SAVisualizedAutoTrackAbstractMessage
-
-+ (instancetype)message;
-
-@property (nonatomic, readonly) SAObjectSerializerConfig *configuration;
-
-@end
-
-#pragma mark -- Snapshot Response
-
-@interface SAVisualizedAutoTrackSnapshotResponseMessage : SAVisualizedAutoTrackAbstractMessage
-
-+ (instancetype)message;
-
-@property (nonatomic, strong) UIImage *screenshot;
-@property (nonatomic, copy) NSDictionary *serializedObjects;
-@property (nonatomic, strong) NSString *imageHash;
-
-@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackSnapshotMessage.m b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackSnapshotMessage.m
deleted file mode 100644
index 7b88465c..00000000
--- a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedAutoTrackSnapshotMessage.m
+++ /dev/null
@@ -1,160 +0,0 @@
-//
-//  SAVisualizedAutoTrackSnapshotMessage.m
-//  SensorsAnalyticsSDK
-//
-//  Created by 向作为 on 2018/9/4.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-
-#if ! __has_feature(objc_arc)
-#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 <CommonCrypto/CommonDigest.h>
-
-#import "SAVisualizedAutoTrackSnapshotMessage.h"
-#import "SAApplicationStateSerializer.h"
-#import "SAObjectIdentityProvider.h"
-#import "SAObjectSerializerConfig.h"
-#import "SAVisualizedAutoTrackConnection.h"
-#import "SensorsAnalyticsSDK.h"
-
-#pragma mark -- Snapshot Request
-
-NSString * const SAVisualizedAutoTrackSnapshotRequestMessageType = @"snapshot_request";
-
-static NSString * const kSnapshotSerializerConfigKey = @"snapshot_class_descriptions";
-static NSString * const kObjectIdentityProviderKey = @"object_identity_provider";
-
-@implementation SAVisualizedAutoTrackSnapshotRequestMessage
-
-+ (instancetype)message {
-    return [(SAVisualizedAutoTrackSnapshotRequestMessage *)[self alloc] initWithType:SAVisualizedAutoTrackSnapshotRequestMessageType];
-}
-
-- (SAObjectSerializerConfig *)configuration {
-    NSDictionary *config = [self payloadObjectForKey:@"config"];
-    return config ? [[SAObjectSerializerConfig alloc] initWithDictionary:config] : nil;
-}
-
-- (NSOperation *)responseCommandWithConnection:(SAVisualizedAutoTrackConnection *)connection {
-    __block SAObjectSerializerConfig *serializerConfig = self.configuration;
-    __block NSString *imageHash = [self payloadObjectForKey:@"last_image_hash"];
-
-    __weak SAVisualizedAutoTrackConnection *weak_connection = connection;
-    NSOperation *operation = [NSBlockOperation blockOperationWithBlock:^{
-        __strong SAVisualizedAutoTrackConnection *conn = weak_connection;
-        
-        // Update the class descriptions in the connection session if provided as part of the message.
-        if (serializerConfig) {
-            [connection setSessionObject:serializerConfig forKey:kSnapshotSerializerConfigKey];
-        } else if ([connection sessionObjectForKey:kSnapshotSerializerConfigKey]) {
-            // Get the class descriptions from the connection session store.
-            serializerConfig = [connection sessionObjectForKey:kSnapshotSerializerConfigKey];
-        } else {
-            // If neither place has a config, this is probably a stale message and we can't create a snapshot.
-            return;
-        }
-
-        // Get the object identity provider from the connection's session store or create one if there is none already.
-        SAObjectIdentityProvider *objectIdentityProvider = [[SAObjectIdentityProvider alloc] init];
-
-        SAApplicationStateSerializer *serializer = [[SAApplicationStateSerializer alloc] initWithApplication:[UIApplication sharedApplication]
-                                                                                               configuration:serializerConfig
-                                                                                      objectIdentityProvider:objectIdentityProvider];
-
-        SAVisualizedAutoTrackSnapshotResponseMessage *snapshotMessage = [SAVisualizedAutoTrackSnapshotResponseMessage message];
-        __block UIImage *screenshot = nil;
-        __block NSDictionary *serializedObjects = nil;
-
-        dispatch_sync(dispatch_get_main_queue(), ^{
-            
-            screenshot = [serializer screenshotImageForWindow:UIApplication.sharedApplication.keyWindow];
-        });
-        snapshotMessage.screenshot = screenshot;
-
-        if (imageHash && [imageHash isEqualToString:snapshotMessage.imageHash]) {
-            [conn sendMessage:[SAVisualizedAutoTrackSnapshotResponseMessage message]];
-            return;
-        }
-        
-        dispatch_sync(dispatch_get_main_queue(), ^{
-            serializedObjects = [serializer objectHierarchyForWindow:UIApplication.sharedApplication.keyWindow];
-        });
-        [connection setSessionObject:serializedObjects forKey:@"snapshot_hierarchy"];
-        snapshotMessage.serializedObjects = serializedObjects;
-
-        [conn sendMessage:snapshotMessage];
-    }];
-
-    return operation;
-}
-
-@end
-
-#pragma mark -- Snapshot Response
-
-@implementation SAVisualizedAutoTrackSnapshotResponseMessage
-
-+ (instancetype)message {
-    return [(SAVisualizedAutoTrackSnapshotResponseMessage *)[self alloc] initWithType:@"snapshot_response"];
-}
-
-- (void)setScreenshot:(UIImage *)screenshot {
-    id payloadObject = nil;
-    id imageHash = nil;
-    if (screenshot) {
-        NSData *jpegSnapshotImageData = UIImageJPEGRepresentation(screenshot, 0.5);
-        if (jpegSnapshotImageData) {
-            payloadObject = [jpegSnapshotImageData base64EncodedStringWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
-            imageHash = [self imageHashWithData:jpegSnapshotImageData];
-        }
-    }
-    
-    _imageHash = imageHash;
-    [self setPayloadObject:(payloadObject ?: [NSNull null]) forKey:@"screenshot"];
-    [self setPayloadObject:(imageHash ?: [NSNull null]) forKey:@"image_hash"];
-}
-
-- (UIImage *)screenshot {
-    NSString *base64Image = [self payloadObjectForKey:@"screenshot"];
-    NSData *imageData =[[base64Image dataUsingEncoding:NSUTF8StringEncoding] base64EncodedDataWithOptions:NSDataBase64EncodingEndLineWithCarriageReturn];
-    return imageData ? [UIImage imageWithData:imageData] : nil;
-}
-
-- (void)setSerializedObjects:(NSDictionary *)serializedObjects {
-    [self setPayloadObject:serializedObjects forKey:@"serialized_objects"];
-}
-
-- (NSDictionary *)serializedObjects {
-    return [self payloadObjectForKey:@"serialized_objects"];
-}
-
-- (NSString *)imageHashWithData:(NSData *)imageData {
-    unsigned char result[CC_MD5_DIGEST_LENGTH];
-    CC_MD5(imageData.bytes, (uint)imageData.length, result);
-    NSString *imageHash = [NSString stringWithFormat:@"%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
-                           result[0], result[1], result[2], result[3],
-                           result[4], result[5], result[6], result[7],
-                           result[8], result[9], result[10], result[11],
-                           result[12], result[13], result[14], result[15]];
-    return imageHash;
-}
-
-@end
-
-
-
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedObjectSerializerManger.h b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedObjectSerializerManger.h
new file mode 100644
index 00000000..d4ad3319
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedObjectSerializerManger.h
@@ -0,0 +1,100 @@
+//
+// SAVisualizedObjectSerializerManger.h
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/4/23.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+#import <Foundation/Foundation.h>
+#import <WebKit/WebKit.h>
+#import <UIKit/UIKit.h>
+
+/// App 内嵌 H5 可视化全埋点相关信息
+@interface SAVisualizedWebPageInfo : NSObject
+
+/// H5 url
+@property (nonatomic, copy) NSString *url;
+
+/// H5 标题
+@property (nonatomic, copy) NSString *title;
+
+/// H5 可点击元素信息
+@property (nonatomic, copy) NSArray *elementSources;
+
+/// 弹框信息
+@property (nonatomic, copy) NSArray <NSDictionary *>* alertSources;
+@end
+
+
+/// 可视化全埋点 viewTree 外层数据管理
+@interface SAVisualizedObjectSerializerManger : NSObject
+
+/// 是否包含 webview
+@property (nonatomic, assign, readonly) BOOL isContainWebView;
+
+/// 当前页面
+@property (nonatomic, strong, readonly) UIViewController *currentViewController;
+
+/// 截图 hash 更新信息，如果存在，则添加到 image_hash 后缀
+@property (nonatomic, copy, readonly) NSString *imageHashUpdateMessage;
+
+/// 上次截图 hash
+@property (nonatomic, copy, readonly) NSString *lastImageHash;
+
+/// 当前 App 内嵌 H5 页面信息
+@property (nonatomic, strong, readonly) SAVisualizedWebPageInfo *webPageInfo;
+
+/// 弹框信息
+/* 数据结构
+ [{
+    "title": "弹框标题",
+    "message": "App SDK 与 Web SDK 没有进行打通，请联系贵方技术人员修正 Web SDK 的配置，详细信息请查看文档。",
+    "link_text": "配置文档"
+    "link_url": "https://manual.sensorsdata.cn/sa/latest/app-h5-1573913.html"
+ }]
+ */
+@property (nonatomic, strong, readonly) NSMutableArray *alertInfos;
+
++ (instancetype)sharedInstance;
+
+/// 重置解析配置
+- (void)resetObjectSerializer;
+
+/// 清除 web 页面信息缓存
+- (void)cleanVisualizedWebPageInfoCache;
+
+/// 缓存可视化全埋点相关 web 信息
+- (void)saveVisualizedWebPageInfoWithWebView:(WKWebView *)webview webPageInfo:(NSDictionary *)pageInfo;
+
+/// 读取当前 webView 页面信息
+- (SAVisualizedWebPageInfo *)readWebPageInfoWithWebView:(WKWebView *)webView;
+
+/// 进入 web 页面
+- (void)enterWebViewPageWithWebInfo:(SAVisualizedWebPageInfo *)webInfo;
+
+/// 进入页面
+- (void)enterViewController:(UIViewController *)viewController;
+
+/// 重置最后截图 hash
+- (void)resetLastImageHash:(NSString *)imageHash;
+
+/// 添加弹框
+- (void)registWebAlertInfos:(NSArray <NSDictionary *> *)infos;
+
+
+
+@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedObjectSerializerManger.m b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedObjectSerializerManger.m
new file mode 100644
index 00000000..0d548d0d
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedObjectSerializerManger.m
@@ -0,0 +1,269 @@
+//
+// SAVisualizedObjectSerializerManger.m
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/4/23.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAVisualizedObjectSerializerManger.h"
+#import "SAJSONUtil.h"
+#import "SALog.h"
+
+@implementation SAVisualizedWebPageInfo
+
+@end
+
+
+@interface SAVisualizedObjectSerializerManger()
+
+@property (nonatomic, strong) SAJSONUtil *jsonUtil;
+/// 是否包含 webview
+@property (nonatomic, assign, readwrite) BOOL isContainWebView;
+
+/// App 内嵌 H5 页面信息
+@property (nonatomic, strong, readwrite) SAVisualizedWebPageInfo *webPageInfo;
+
+/// 截图 hash 更新信息，如果存在，则添加到 image_hash 后缀
+@property (nonatomic, copy, readwrite) NSString *imageHashUpdateMessage;
+
+/// 上次截图 hash
+@property (nonatomic, copy, readwrite) NSString *lastImageHash;
+
+/// 保存不同 controller 可点击元素个数
+@property (nonatomic, copy) NSMapTable <UIViewController *, NSNumber *> *controllerCountMap;
+
+/// 弹框信息
+@property (nonatomic, strong, readwrite) NSMutableArray *alertInfos;
+
+///  App 内嵌 H5 页面 缓存
+/*
+ key:H5 页面 url
+ value:SAVisualizedWebPageInfo 对象
+ */
+@property (nonatomic, strong) NSMutableDictionary <NSString *,SAVisualizedWebPageInfo *>*webPageInfoCache;
+
+@end
+
+@implementation SAVisualizedObjectSerializerManger
+
++ (instancetype)sharedInstance {
+    static SAVisualizedObjectSerializerManger *manager = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[SAVisualizedObjectSerializerManger alloc] init];
+    });
+    return manager;
+}
+
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        [self initializeObjectSerializer];
+    }
+    return self;
+}
+
+- (void)initializeObjectSerializer {
+    _controllerCountMap = [NSMapTable weakToStrongObjectsMapTable];
+    _alertInfos = [NSMutableArray array];
+    _webPageInfoCache = [NSMutableDictionary dictionary];
+    _jsonUtil = [[SAJSONUtil alloc] init];
+    [self resetObjectSerializer];
+}
+
+/// 重置解析配置
+- (void)resetObjectSerializer {
+    self.isContainWebView = NO;
+    [self.controllerCountMap removeAllObjects];
+
+    self.webPageInfo = nil;
+    [self.alertInfos removeAllObjects];
+}
+
+- (void)cleanVisualizedWebPageInfoCache {
+    [self.webPageInfoCache removeAllObjects];
+
+    self.imageHashUpdateMessage = nil;
+    self.lastImageHash = nil;
+}
+
+/// 刷新截图 imageHash 信息
+- (void)refreshImageHashWithData:(id)obj {
+    /*
+      App 内嵌 H5 的可视化全埋点，可能页面加载完成，但是未及时接收到 Html 页面信息。
+      等接收到 JS SDK 发送的页面信息，由于页面截图不变，前端页面未重新加载解析 viewTree 信息，导致无法圈选。
+      所以，接收到 JS 的页面信息，在原有 imageHash 基础上拼接 html 页面数据 hash 值，使得前端重新加载页面信息
+      */
+    NSData *jsonData = nil;
+    @try {
+        jsonData = [self.jsonUtil JSONSerializeObject:obj];
+    } @catch (NSException *exception) {
+        SALogError(@"%@: %@", self, exception);
+    }
+
+    if (jsonData) {
+        NSUInteger hashCode = [jsonData hash];
+        self.imageHashUpdateMessage = [NSString stringWithFormat:@"%lu", (unsigned long)hashCode];
+    }
+}
+
+/// 缓存可视化全埋点相关 web 信息
+- (void)saveVisualizedWebPageInfoWithWebView:(WKWebView *)webview webPageInfo:(NSDictionary *)pageInfo {
+
+    NSString *callType = pageInfo[@"callType"];
+    if (([callType isEqualToString:@"visualized_track"])) {
+        // H5 页面可点击元素数据
+        NSArray *pageDatas = pageInfo[@"data"];
+        if ([pageDatas isKindOfClass:NSArray.class]) {
+            NSDictionary *elementInfo = [pageDatas firstObject];
+            NSString *url = elementInfo[@"$url"];
+            if (url) {
+                SAVisualizedWebPageInfo *webPageInfo = [[SAVisualizedWebPageInfo alloc] init];
+                // 是否包含当前 url 的页面信息
+                if ([self.webPageInfoCache objectForKey:url]) {
+                    webPageInfo = self.webPageInfoCache[url];
+
+                    // 更新 H5 元素信息，则可视化全埋点可用，此时清空弹框信息
+                    webPageInfo.alertSources = nil;
+                }
+                webPageInfo.elementSources = pageDatas;
+                self.webPageInfoCache[url] = webPageInfo;
+
+                // 刷新数据
+                [self refreshImageHashWithData:pageDatas];
+            }
+        }
+    } else if ([callType isEqualToString:@"app_alert"]) { // 弹框提示信息
+        /*
+         [{
+         "title": "弹框标题",
+         "message": "App SDK 与 Web SDK 没有进行打通，请联系贵方技术人员修正 Web SDK 的配置，详细信息请查看文档。",
+         "link_text": "配置文档"
+         "link_url": "https://manual.sensorsdata.cn/sa/latest/app-h5-1573913.html"
+         }]
+         */
+        NSArray <NSDictionary *> *alertDatas = pageInfo[@"data"];
+        NSString *url = webview.URL.absoluteString;
+        if ([alertDatas isKindOfClass:NSArray.class] && url) {
+            SAVisualizedWebPageInfo *webPageInfo = [[SAVisualizedWebPageInfo alloc] init];
+            // 是否包含当前 url 的页面信息
+            if ([self.webPageInfoCache objectForKey:url]) {
+                webPageInfo = self.webPageInfoCache[url];
+
+                // 如果 js 发送弹框信息，即 js 环境变化，可视化全埋点不可用，则清空页面信息
+                webPageInfo.elementSources = nil;
+                webPageInfo.url = nil;
+                webPageInfo.title = nil;
+            }
+            webPageInfo.alertSources = alertDatas;
+            self.webPageInfoCache[url] = webPageInfo;
+            // 刷新数据
+            [self refreshImageHashWithData:alertDatas];
+        }
+    } else if (([callType isEqualToString:@"page_info"])) { // h5 页面信息
+        NSDictionary *webInfo = pageInfo[@"data"];
+        NSString *url = webInfo[@"$url"];
+        if ([webInfo isKindOfClass:NSDictionary.class] && url) {
+            SAVisualizedWebPageInfo *webPageInfo = [[SAVisualizedWebPageInfo alloc] init];
+            // 是否包含当前 url 的页面信息
+            if ([self.webPageInfoCache objectForKey:url]) {
+                webPageInfo = self.webPageInfoCache[url];
+
+                // 更新 H5 页面信息，则可视化全埋点可用，此时清空弹框信息
+                webPageInfo.alertSources = nil;
+            }
+            webPageInfo.url = url;
+            webPageInfo.title = webInfo[@"$title"];
+            self.webPageInfoCache[url] = webPageInfo;
+            // 刷新数据
+            [self refreshImageHashWithData:webInfo];
+        }
+    }
+}
+
+/// 读取当前 webView 页面信息
+- (SAVisualizedWebPageInfo *)readWebPageInfoWithWebView:(WKWebView *)webView {
+    NSString *url = webView.URL.absoluteString;
+    SAVisualizedWebPageInfo *webPageInfo = [self.webPageInfoCache objectForKey:url];
+    return webPageInfo;
+}
+
+- (void)enterWebViewPageWithWebInfo:(SAVisualizedWebPageInfo *)webInfo; {
+    self.isContainWebView = YES;
+    if (webInfo) {
+        self.webPageInfo = webInfo;
+    }
+}
+
+/// 进入页面
+- (void)enterViewController:(UIViewController *)viewController {
+    NSNumber *countNumber = [self.controllerCountMap objectForKey:viewController];
+    if (countNumber) {
+        NSInteger countValue = [countNumber integerValue];
+        [self.controllerCountMap setObject:@(countValue + 1) forKey:viewController];
+    } else {
+        [self.controllerCountMap setObject:@(1) forKey:viewController];
+    }
+}
+
+- (void)resetLastImageHash:(NSString *)imageHash {
+    self.lastImageHash = imageHash;
+    self.imageHashUpdateMessage = nil;
+}
+
+- (UIViewController *)currentViewController {
+    NSArray <UIViewController *>*allViewControllers = NSAllMapTableKeys(self.controllerCountMap);
+    UIViewController *mostShowViewController = nil;
+    NSInteger mostShowCount = 1;
+    for (UIViewController *controller in allViewControllers) {
+        NSNumber *countNumber = [self.controllerCountMap objectForKey:controller];
+        if (countNumber.integerValue >= mostShowCount) {
+            mostShowCount = countNumber.integerValue;
+            mostShowViewController = controller;
+        }
+    }
+    return mostShowViewController;
+}
+
+- (void)registWebAlertInfos:(NSArray <NSDictionary *> *)infos {
+    if (infos.count == 0) {
+        return;
+    }
+    // 通过 Dictionary 构造所有不同 message 的弹框集合
+    NSMutableDictionary *alertMessageInfoDic = [NSMutableDictionary dictionary];
+    for (NSDictionary *alertInfo in self.alertInfos) {
+        NSString *message = alertInfo[@"message"];
+        if (message) {
+            alertMessageInfoDic[message] = alertInfo;
+        }
+    }
+
+    // 只添加 message 不重复的弹框信息
+    for (NSDictionary *alertInfo in infos) {
+        NSString *message = alertInfo[@"message"];
+        if (message && ![alertMessageInfoDic.allKeys containsObject:message]) {
+            [self.alertInfos addObject:alertInfo];
+        }
+    }
+
+    // 强制刷新数据
+    [self refreshImageHashWithData:infos];
+}
+@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedUtils.h b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedUtils.h
new file mode 100644
index 00000000..92e96b13
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedUtils.h
@@ -0,0 +1,37 @@
+//
+// SAVisualizedUtils.h
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/3/3.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SAVisualizedUtils : NSObject
+
+/// 判断一个 view 是否被覆盖
++ (BOOL) isCoveredForView:(UIView *)view;
+
+/// 解析构造 web 元素
++ (NSArray *)analysisWebElementWithWebView:(WKWebView *)webView;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedUtils.m b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedUtils.m
new file mode 100644
index 00000000..1fcfe790
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedUtils.m
@@ -0,0 +1,136 @@
+//
+// SAVisualizedUtils.m
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/3/3.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 "SAVisualizedUtils.h"
+#import "SAJSTouchEventView.h"
+#import "SAVisualizedViewPathProperty.h"
+#import "SAJSONUtil.h"
+#import "SAVisualizedObjectSerializerManger.h"
+
+
+@implementation SAVisualizedUtils
+
+
++ (BOOL)isCoveredForView:(UIView *)view {
+    BOOL covered = NO;
+    
+    // 最多查找 3 层
+    NSArray <UIView *> *allOtherViews = [self findAllPossibleCoverViews:view hierarchyCount:3];
+
+    // 遍历判断是否存在覆盖
+    CGRect rect = [view convertRect:view.bounds toView:nil];
+    // 视图可能超出屏幕，计算 keywindow 交集，即在屏幕显示的有效区域
+    CGRect keyWindowFrame = [UIApplication sharedApplication].keyWindow.frame;
+    rect = CGRectIntersection(keyWindowFrame, rect);
+
+    for (UIView *otherView in allOtherViews) {
+        CGRect otherRect = [otherView convertRect:otherView.bounds toView:nil];
+        if (CGRectContainsRect(otherRect, rect)) {
+            return YES;
+        }
+    }
+    return covered;
+}
+
+
+// 根据层数，查询一个 view 所有可能覆盖的 view
++ (NSArray *)findAllPossibleCoverViews:(UIView *)view hierarchyCount:(NSInteger)count {
+    NSMutableArray <UIView *> *allOtherViews = [NSMutableArray array];
+    NSInteger index = count;
+    UIView *currentView = view;
+    while (index > 0 && currentView) {
+        NSArray *allBrotherViews = [self findPossibleCoverAllBrotherViews:currentView];
+          if (allBrotherViews.count > 0) {
+              [allOtherViews addObjectsFromArray:allBrotherViews];
+          }
+        currentView = currentView.superview;
+        index--;
+    }
+    return [allOtherViews copy];
+}
+
+
+// 寻找一个 view 同级的后添加的 view
++ (NSArray *)findPossibleCoverAllBrotherViews:(UIView *)view {
+    __block NSMutableArray <UIView *> *otherViews = [NSMutableArray array];
+    UIView *superView = view.superview;
+    if (superView) {
+        // 逆序遍历
+        [superView.subviews enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(__kindof UIView *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
+            if (obj == view) {
+                *stop = YES;
+            } else if (obj.alpha > 0 && !obj.hidden && obj.userInteractionEnabled) { // userInteractionEnabled 为 YES 才有可能遮挡响应事件
+                [otherViews addObject:obj];
+            }
+        }];
+    }
+    return otherViews;
+}
+
++ (NSArray *)analysisWebElementWithWebView:(WKWebView <SAVisualizedExtensionProperty> *)webView {
+    SAVisualizedWebPageInfo *webPageInfo = [[SAVisualizedObjectSerializerManger sharedInstance] readWebPageInfoWithWebView:webView];
+    NSArray *webPageDatas = webPageInfo.elementSources;
+    if (webPageDatas.count == 0) {
+        return nil;
+    }
+
+    // 元素去重，去除 id 相同的重复元素
+    NSMutableArray <NSString *> *allNoRepeatElementIds = [NSMutableArray array];
+    NSMutableArray <SAJSTouchEventView *> *touchViewArray = [NSMutableArray array];
+    for (NSDictionary *pageData in webPageDatas) {
+        NSString *elementId = pageData[@"id"];
+        if (elementId) {
+            if ([allNoRepeatElementIds containsObject:elementId]) {
+                continue;
+            }
+            [allNoRepeatElementIds addObject:elementId];
+        }
+
+        SAJSTouchEventView *touchView = [[SAJSTouchEventView alloc] initWithWebView:webView webElementInfo:pageData];
+        if (touchView) {
+            [touchViewArray addObject:touchView];
+        }
+    }
+
+    // 构建子元素数组
+    for (SAJSTouchEventView *touchView1 in [touchViewArray copy]) {
+        //当前元素嵌套子元素
+        if (touchView1.jsSubElementIds.count > 0) {
+            NSMutableArray *jsSubElement = [NSMutableArray arrayWithCapacity:touchView1.jsSubElementIds.count];
+            // 根据子元素 id 查找对应子元素
+            for (NSString *elementId in touchView1.jsSubElementIds) {
+                for (SAJSTouchEventView *touchView2 in [touchViewArray copy]) {
+                    if ([elementId isEqualToString:touchView2.jsElementId]) {
+                        [jsSubElement addObject:touchView2];
+                        [touchViewArray removeObject:touchView2];
+                    }
+                }
+            }
+            touchView1.jsSubviews = [jsSubElement copy];
+        }
+    }
+    return [touchViewArray copy];
+}
+
+@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedViewPathProperty.h b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedViewPathProperty.h
new file mode 100644
index 00000000..eb87c46f
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/SAVisualizedViewPathProperty.h
@@ -0,0 +1,53 @@
+//
+// SAVisualizedViewPathProperty.h
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/3/28.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+#import <Foundation/Foundation.h>
+
+// 可视化全埋点上传页面信息相关协议
+@protocol SAVisualizedViewPathProperty <NSObject>
+
+@optional
+/// 当前元素，前端是否渲染成可交互
+@property (nonatomic, assign, readonly) BOOL sensorsdata_enableAppClick;
+
+/// 当前元素的有效内容
+@property (nonatomic, copy, readonly) NSString *sensorsdata_elementValidContent;
+
+/// 元素子视图
+@property (nonatomic, copy, readonly) NSArray *sensorsdata_subElements;
+
+/// 当前元素的相对路径
+@property (nonatomic, copy, readonly) NSString *sensorsdata_elementPath;
+
+/// 相对 keywindow 的坐标
+@property (nonatomic, assign, readonly) CGRect sensorsdata_frame;
+
+/// 是否为 Web 元素
+@property (nonatomic, assign) BOOL sensorsdata_isFromWeb;
+@end
+
+
+@protocol SAVisualizedExtensionProperty <NSObject>
+
+@optional
+/// 一个 view 可交互的有效尺寸
+@property (nonatomic, assign, readonly) CGRect sensorsdata_validFrame;
+@end
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/UIView+VisualizedAutoTrack.h b/SensorsAnalyticsSDK/VisualizedAutoTrack/UIView+VisualizedAutoTrack.h
new file mode 100644
index 00000000..5c515f75
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/UIView+VisualizedAutoTrack.h
@@ -0,0 +1,77 @@
+//
+// UIView+VisualizedAutoTrack.h
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/3/6.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import <WebKit/WebKit.h>
+#import "SAAutoTrackProperty.h"
+#import "SAJSTouchEventView.h"
+#import "SAVisualizedViewPathProperty.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UIView (VisualizedAutoTrack)<SAVisualizedViewPathProperty, SAVisualizedExtensionProperty>
+
+@end
+
+@interface UIScrollView (VisualizedAutoTrack)<SAVisualizedExtensionProperty>
+@end
+
+@interface UISwitch (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface UIStepper (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface UISlider (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface UIPageControl (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface WKWebView (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+
+@end
+
+@interface UIWindow (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface UITableView (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface UICollectionView (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface UITableViewCell (VisualizedAutoTrack)<SAAutoTrackViewProperty>
+@end
+
+@interface UICollectionViewCell (VisualizedAutoTrack)<SAAutoTrackViewProperty>
+@end
+
+@interface UITableViewHeaderFooterView (VisualizedAutoTrack)
+@end
+
+@interface SAJSTouchEventView (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+@interface UIViewController (VisualizedAutoTrack)<SAVisualizedViewPathProperty>
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SensorsAnalyticsSDK/VisualizedAutoTrack/UIView+VisualizedAutoTrack.m b/SensorsAnalyticsSDK/VisualizedAutoTrack/UIView+VisualizedAutoTrack.m
new file mode 100644
index 00000000..d90343b7
--- /dev/null
+++ b/SensorsAnalyticsSDK/VisualizedAutoTrack/UIView+VisualizedAutoTrack.m
@@ -0,0 +1,528 @@
+//
+// UIView+VisualizedAutoTrack.m
+// SensorsAnalyticsSDK
+//
+// Created by 储强盛 on 2020/3/6.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <objc/runtime.h>
+#import "UIView+VisualizedAutoTrack.h"
+#import "UIView+AutoTrack.h"
+#import "UIViewController+AutoTrack.h"
+#import "SAVisualizedUtils.h"
+#import "SAAutoTrackUtils.h"
+
+@implementation UIView (VisualizedAutoTrack)
+
+// 判断一个 view 是否显示
+- (BOOL)sensorsdata_isDisplayedInScreen {
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+    /* 忽略部分 view
+     _UIAlertControllerTextFieldViewCollectionCell，包含 UIAlertController 中输入框，忽略采集
+     */
+    if ([NSStringFromClass(self.class) isEqualToString:@"_UIAlertControllerTextFieldViewCollectionCell"]) {
+        return NO;
+    }
+
+    /* 特殊场景兼容
+     controller1.vew 上直接添加 controller2.view，在 controller2 添加 UITabBarController 或 UINavigationController 作为 childViewController；
+     此时如果 UITabBarController 或 UINavigationController 使用 presentViewController 弹出页面，则 UITabBarController.view (即为 UILayoutContainerView) 可能未 hidden，为了可以通过 UILayoutContainerView 找到 UITabBarController 的子元素，则这里特殊处理。
+       */
+    if ([NSStringFromClass(self.class) isEqualToString:@"UILayoutContainerView"] && [self.nextResponder isKindOfClass:UIViewController.class]) {
+        UIViewController *controller = (UIViewController *)[self nextResponder];
+        if (controller.presentedViewController) {
+            return YES;
+        }
+    }
+#endif
+
+    if (!(self.window && self.superview && self.alpha > 0) || self.hidden) {
+        return NO;
+    }
+    // 计算 view 在 keyWindow 上的坐标
+    CGRect rect = [self convertRect:self.frame toView:nil];
+    // 若 size 为 CGrectZero
+    // 部分 view 设置宽高为 0，但是子视图可见，取消 CGRectIsEmpty(rect) 判断
+    if (CGRectIsNull(rect) || CGSizeEqualToSize(rect.size, CGSizeZero)) {
+        return NO;
+    }
+
+    // RN 项目，view 覆盖层次比较多，被覆盖元素，可以直接屏蔽，防止被覆盖元素可圈选
+    BOOL isRNView =  [NSStringFromClass(self.class) hasPrefix:@"RCT"] || [NSStringFromClass(self.class) hasPrefix:@"RNC"];
+    if (isRNView && [SAVisualizedUtils isCoveredForView:self]) {
+        return NO;
+    }
+
+    return YES;
+}
+
+// 判断一个 view 是否会触发全埋点事件
+- (BOOL)sensorsdata_isAutoTrackAppClick {
+    // 判断是否被覆盖
+    if ([SAVisualizedUtils isCoveredForView:self]) {
+        return NO;
+    }
+
+    // 标记弹框
+    if ([SAAutoTrackUtils isAlertClickForView:self]) {
+        return YES;
+    }
+
+    // RN 可点击元素的区分
+    Class managerClass = NSClassFromString(@"SAReactNativeManager");
+    SEL sharedInstanceSEL = NSSelectorFromString(@"sharedInstance");
+    if (managerClass && [managerClass respondsToSelector:sharedInstanceSEL]) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+        id manager = [managerClass performSelector:sharedInstanceSEL];
+        SEL clickableSEL = NSSelectorFromString(@"clickableForView:");
+        if ([manager respondsToSelector:clickableSEL]) {
+            BOOL clickable = (BOOL)[manager performSelector:clickableSEL withObject:self];
+            if (clickable) {
+                return YES;
+            }
+        }
+#pragma clang diagnostic pop
+    }
+
+    if ([self isKindOfClass:UIControl.class]) {
+        // UISegmentedControl 高亮渲染内部嵌套的 UISegment
+        if ([self isKindOfClass:UISegmentedControl.class]) {
+            return NO;
+        }
+
+        // 部分控件，响应链中不采集 $AppClick 事件
+        if ([self isKindOfClass:UITextField.class]) {
+            return NO;
+        }
+
+        UIControl *control = (UIControl *)self;
+        BOOL userInteractionEnabled = control.userInteractionEnabled;
+        BOOL enabled = control.enabled;
+        UIControlEvents appClickEvents = UIControlEventTouchUpInside | UIControlEventValueChanged;
+        if (@available(iOS 9.0, *)) {
+            appClickEvents = appClickEvents | UIControlEventPrimaryActionTriggered;
+        }
+        BOOL containEvents = appClickEvents & control.allControlEvents;
+        if (containEvents && userInteractionEnabled && enabled) { // 可点击
+            return YES;
+        }
+    } else if ([self isKindOfClass:UIImageView.class] || [self isKindOfClass:UILabel.class]) { // 可能添加手势
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+        // UISegmentedControl 嵌套 UISegment 作为选项单元格，特殊处理
+        if ([NSStringFromClass(self.class) isEqualToString:@"UISegment"]) {
+            return YES;
+        }
+#endif
+        if (self.userInteractionEnabled && self.gestureRecognizers.count > 0) {
+            __block BOOL enableGestureClick = NO;
+            [self.gestureRecognizers enumerateObjectsUsingBlock:^(__kindof UIGestureRecognizer *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
+                // 目前 $AppClick 只采集 UITapGestureRecognizer 和 UILongPressGestureRecognizer
+                if ([obj isKindOfClass:UITapGestureRecognizer.class] || [obj isKindOfClass:UILongPressGestureRecognizer.class]) {
+                    *stop = YES;
+                    enableGestureClick = YES;
+                }
+            }];
+            return enableGestureClick;
+        } else {
+            return NO;
+        }
+    } else if ([self isKindOfClass:UITableViewCell.class]) {
+        UITableView *tableView = (UITableView *)[self superview];
+        do {
+            if ([tableView isKindOfClass:UITableView.class]) {
+                if (tableView.delegate && [tableView.delegate respondsToSelector:@selector(tableView:didSelectRowAtIndexPath:)]) {
+                    return YES;
+                }
+            }
+        } while ((tableView = (UITableView *)[tableView superview]));
+
+        return NO;
+    } else if ([self isKindOfClass:UICollectionViewCell.class]) {
+        UICollectionView *collectionView = (UICollectionView *)[self superview];
+        if ([collectionView isKindOfClass:UICollectionView.class]) {
+            if (collectionView.delegate && [collectionView.delegate respondsToSelector:@selector(collectionView:didSelectItemAtIndexPath:)]) {
+                return YES;
+            }
+        }
+        return NO;
+    }
+    return NO;
+}
+
+#pragma mark SAVisualizedViewPathProperty
+// 当前元素，前端是否渲染成可交互
+- (BOOL)sensorsdata_enableAppClick {
+    //是否在屏幕显示
+    BOOL isDisplayedInScreen = self.sensorsdata_isDisplayedInScreen;
+    // 是否触发 $AppClick 事件
+    BOOL isAutoTrackAppClick = self.sensorsdata_isAutoTrackAppClick;
+    BOOL enableAppClick = isDisplayedInScreen && isAutoTrackAppClick;
+    return enableAppClick;
+}
+
+- (NSString *)sensorsdata_elementValidContent {
+    return self.sensorsdata_elementContent;
+}
+
+/// 元素子视图
+- (NSArray *)sensorsdata_subElements {
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+    /* 特殊场景兼容
+     controller1.vew 上直接添加 controller2.view，
+     在 controller2 添加 UITabBarController 或 UINavigationController 作为 childViewController 场景兼容
+     */
+    if ([NSStringFromClass(self.class) isEqualToString:@"UILayoutContainerView"]) {
+        if ([[self nextResponder] isKindOfClass:UIViewController.class]) {
+            UIViewController *controller = (UIViewController *)[self nextResponder];
+            return controller.sensorsdata_subElements;
+        }
+    }
+#endif
+    NSMutableArray *newSubViews = [NSMutableArray array];
+    for (UIView *view in self.subviews) {
+        if (view.sensorsdata_isDisplayedInScreen) {
+            [newSubViews addObject:view];
+        }
+    }
+    return newSubViews;
+}
+
+- (NSString *)sensorsdata_elementPath {
+    // 处理特殊控件
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+    // UISegmentedControl 嵌套 UISegment 作为选项单元格，特殊处理
+    if ([NSStringFromClass(self.class) isEqualToString:@"UISegment"]) {
+        UISegmentedControl *segmentedControl = (UISegmentedControl *)[self superview];
+        if ([segmentedControl isKindOfClass:UISegmentedControl.class]) {
+            return [SAAutoTrackUtils viewSimilarPathForView:segmentedControl atViewController:segmentedControl.sensorsdata_viewController shouldSimilarPath:YES];
+        }
+    }
+#endif
+    if (self.sensorsdata_enableAppClick) {
+        return [SAAutoTrackUtils viewSimilarPathForView:self atViewController:self.sensorsdata_viewController shouldSimilarPath:YES];
+    } else {
+        return nil;
+    }
+}
+
+- (BOOL)sensorsdata_isFromWeb {
+    return NO;
+}
+
+- (CGRect)sensorsdata_frame {
+    CGRect showRect = [self convertRect:self.bounds toView:nil];
+    if (self.superview && self.sensorsdata_enableAppClick) {
+        CGRect validFrame = self.superview.sensorsdata_validFrame;
+        showRect = CGRectIntersection(showRect, validFrame);
+    }
+    return showRect;
+}
+
+- (CGRect)sensorsdata_validFrame {
+    CGRect validFrame = [UIApplication sharedApplication].keyWindow.frame;
+    if (self.superview) {
+        CGRect superViewValidFrame = [self.superview sensorsdata_validFrame];
+        validFrame = CGRectIntersection(validFrame, superViewValidFrame);
+    }
+ return validFrame;
+}
+
+@end
+
+
+@implementation UIScrollView (VisualizedAutoTrack)
+
+- (CGRect)sensorsdata_validFrame {
+    CGRect showRect = [self convertRect:self.bounds toView:nil];
+    if (self.superview) {
+        CGRect superViewValidFrame = [self.superview sensorsdata_validFrame];
+        showRect = CGRectIntersection(showRect, superViewValidFrame);
+    }
+    return showRect;
+}
+
+@end
+
+@implementation UISwitch (VisualizedAutoTrack)
+
+- (NSString *)sensorsdata_elementValidContent {
+    return nil;
+}
+
+@end
+
+@implementation UIStepper (VisualizedAutoTrack)
+
+- (NSString *)sensorsdata_elementValidContent {
+    return nil;
+}
+
+@end
+
+@implementation UISlider (VisualizedAutoTrack)
+
+- (NSString *)sensorsdata_elementValidContent {
+    return nil;
+}
+
+@end
+
+@implementation UIPageControl (VisualizedAutoTrack)
+
+- (NSString *)sensorsdata_elementValidContent {
+    return nil;
+}
+
+@end
+
+@implementation WKWebView (VisualizedAutoTrack)
+
+- (NSArray *)sensorsdata_subElements {
+    NSArray *subElements = [SAVisualizedUtils analysisWebElementWithWebView:self];
+    if (subElements.count > 0) {
+        return subElements;
+    }
+    return [super sensorsdata_subElements];
+}
+
+@end
+
+
+@implementation UIWindow (VisualizedAutoTrack)
+
+- (NSArray *)sensorsdata_subElements {
+    if (!self.rootViewController) {
+        return super.sensorsdata_subElements;
+    }
+
+    NSMutableArray *subElements = [NSMutableArray array];
+    [subElements addObject:self.rootViewController];
+
+    // 存在自定义弹框或浮层，位于 keyWindow
+    NSArray <UIView *> *subviews = self.subviews;
+    for (UIView *view in subviews) {
+        if (view != self.rootViewController.view && view.sensorsdata_isDisplayedInScreen) {
+            /*
+             keyWindow 设置 rootViewController 后，视图层级为 UIWindow -> UITransitionView -> UIDropShadowView -> rootViewController.view
+             */
+#ifndef SENSORS_ANALYTICS_DISABLE_PRIVATE_APIS
+            if ([NSStringFromClass(view.class) isEqualToString:@"UITransitionView"]) {
+                continue;
+            }
+#endif
+            [subElements addObject:view];
+
+            CGRect rect = [view convertRect:view.bounds toView:nil];
+            // 是否全屏
+            BOOL isFullScreenShow = CGPointEqualToPoint(rect.origin, CGPointMake(0, 0)) && CGSizeEqualToSize(rect.size, self.bounds.size);
+            // keyWindow 上存在全屏显示可交互的 view，此时 rootViewController 内元素不可交互
+            if (isFullScreenShow && view.userInteractionEnabled) {
+                [subElements removeObject:self.rootViewController];
+            }
+        }
+    }
+    return subElements;
+}
+
+@end
+
+@implementation UITableView (VisualizedAutoTrack)
+
+- (NSArray *)sensorsdata_subElements {
+    NSArray *subviews = self.subviews;
+    NSMutableArray *newSubviews = [NSMutableArray array];
+    NSArray *visibleCells = self.visibleCells;
+    for (UIView *view in subviews) {
+        if ([view isKindOfClass:UITableViewCell.class]) {
+            if ([visibleCells containsObject:view] && view.sensorsdata_isDisplayedInScreen) {
+                [newSubviews addObject:view];
+            }
+        } else if (view.sensorsdata_isDisplayedInScreen) {
+            [newSubviews addObject:view];
+        }
+    }
+    return newSubviews;
+}
+
+@end
+
+@implementation UICollectionView (VisualizedAutoTrack)
+
+- (NSArray *)sensorsdata_subElements {
+    NSArray *subviews = self.subviews;
+    NSMutableArray *newSubviews = [NSMutableArray array];
+    NSArray *visibleCells = self.visibleCells;
+    for (UIView *view in subviews) {
+        if ([view isKindOfClass:UICollectionViewCell.class]) {
+            if ([visibleCells containsObject:view] && view.sensorsdata_isDisplayedInScreen) {
+                [newSubviews addObject:view];
+            }
+        } else if (view.sensorsdata_isDisplayedInScreen) {
+            [newSubviews addObject:view];
+        }
+    }
+
+    // 根据位置排序
+    NSArray *rankResult = [newSubviews sortedArrayUsingComparator:^NSComparisonResult (UIView *obj1, UIView *obj2) {
+        if (obj2.frame.origin.y > obj1.frame.origin.y || obj2.frame.origin.x > obj1.frame.origin.x) {
+            return NSOrderedDescending;
+        }
+        return NSOrderedAscending;
+    }];
+
+    return rankResult;
+}
+
+@end
+
+@implementation UITableViewCell (VisualizedAutoTrack)
+
+- (NSString *)sensorsdata_elementPosition {
+    if (self.sensorsdata_IndexPath) {
+        return [[NSString alloc] initWithFormat:@"%ld:%ld", (long)self.sensorsdata_IndexPath.section, (long)self.sensorsdata_IndexPath.row];
+    }
+    return nil;
+}
+
+@end
+
+
+@implementation UICollectionViewCell (VisualizedAutoTrack)
+
+- (NSString *)sensorsdata_elementPosition {
+    if ([SAAutoTrackUtils isAlertClickForView:self]) {
+        return nil;
+    }
+
+    if (self.sensorsdata_IndexPath) {
+        return [[NSString alloc] initWithFormat:@"%ld:%ld", (long)self.sensorsdata_IndexPath.section, (long)self.sensorsdata_IndexPath.item];
+    }
+    return nil;
+}
+
+@end
+
+@implementation SAJSTouchEventView (VisualizedAutoTrack)
+
+- (NSString *)sensorsdata_elementPath {
+    return self.elementSelector;
+}
+
+- (NSString *)sensorsdata_elementValidContent {
+    return self.elementContent;
+}
+
+- (CGRect)sensorsdata_frame {
+    return self.frame;
+}
+
+- (BOOL)sensorsdata_enableAppClick {
+    return YES;
+}
+
+- (NSArray *)sensorsdata_subElements {
+    if (self.jsSubviews.count > 0) {
+        return self.jsSubviews;
+    }
+    return [super sensorsdata_subElements];
+}
+
+- (BOOL)sensorsdata_isFromWeb {
+    return YES;
+}
+
+@end
+
+@implementation UIViewController (VisualizedAutoTrack)
+
+- (NSArray *)sensorsdata_subElements {
+    __block NSMutableArray *subElements = [NSMutableArray array];
+    NSArray <UIViewController *> *childViewControllers = self.childViewControllers;
+    UIViewController *presentedViewController = self.presentedViewController;
+
+    if (presentedViewController) {
+        [subElements addObject:presentedViewController];
+        return subElements;
+    }
+
+    if ([self isKindOfClass:UINavigationController.class]) {
+        UINavigationController *nav = (UINavigationController *)self;
+        [subElements addObject:nav.topViewController];
+        if (self.isViewLoaded && nav.navigationBar.sensorsdata_isDisplayedInScreen) {
+            [subElements addObject:nav.navigationBar];
+        }
+        return subElements;
+    }
+
+    if ([self isKindOfClass:UITabBarController.class]) {
+        UITabBarController *tabBarVC = (UITabBarController *)self;
+        [subElements addObject:tabBarVC.selectedViewController];
+        // UITabBar 元素
+        if (self.isViewLoaded && tabBarVC.tabBar.sensorsdata_isDisplayedInScreen) {
+            [subElements addObject:tabBarVC.tabBar];
+        }
+        return subElements;
+    }
+
+    if (childViewControllers.count > 0 && ![self isKindOfClass:UIAlertController.class]) {
+        // UIAlertController 如果添加 TextField 也会嵌套 childViewController，直接返回 .view 即可
+
+        UIWindow *keyWindow = [UIApplication sharedApplication].keyWindow;
+        subElements = [NSMutableArray arrayWithArray:self.view.subviews];
+        // 是否包含全屏视图
+        __block BOOL isContainFullScreen = NO;
+        //逆序遍历
+        [childViewControllers enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(__kindof UIViewController *_Nonnull obj, NSUInteger idx, BOOL *_Nonnull stop) {
+            if (obj.isViewLoaded) {
+                UIView *objSuperview = obj.view;
+                if ([subElements containsObject:objSuperview]) {
+                    NSInteger index = [subElements indexOfObject:objSuperview];
+                    if (objSuperview.sensorsdata_isDisplayedInScreen && !isContainFullScreen) {
+                        [subElements replaceObjectAtIndex:index withObject:obj];
+                    } else {
+                        [subElements removeObject:objSuperview];
+                    }
+                }
+                CGRect rect = [obj.view convertRect:obj.view.bounds toView:nil];
+               // 是否全屏
+                BOOL isFullScreenShow = CGPointEqualToPoint(rect.origin, CGPointMake(0, 0)) && CGSizeEqualToSize(rect.size, keyWindow.bounds.size);
+               // 正在全屏显示
+                if (isFullScreenShow && obj.view.sensorsdata_isDisplayedInScreen) {
+                    isContainFullScreen = YES;
+                }
+            }
+        }];
+        return subElements;
+    }
+
+    if ([self isKindOfClass:UIPageViewController.class]) {
+        UIPageViewController *pageViewController = (UIPageViewController *)self;
+        [subElements addObject:pageViewController.viewControllers];
+    }
+
+    UIView *currentView = self.view;
+    if (currentView && self.isViewLoaded && currentView.sensorsdata_isDisplayedInScreen) {
+        [subElements addObject:currentView];
+    }
+    return subElements;
+}
+
+@end
diff --git a/SensorsAnalyticsTests/AutoTrack/ElementViewController.h b/SensorsAnalyticsTests/AutoTrack/ElementViewController.h
index e609f91c..ba15e523 100644
--- a/SensorsAnalyticsTests/AutoTrack/ElementViewController.h
+++ b/SensorsAnalyticsTests/AutoTrack/ElementViewController.h
@@ -3,7 +3,7 @@
 //  TestSensors
 //
 //  Created by MC on 2019/5/6.
-//  Copyright © 2019 SensorsData. All rights reserved.
+//  Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
diff --git a/SensorsAnalyticsTests/AutoTrack/ElementViewController.m b/SensorsAnalyticsTests/AutoTrack/ElementViewController.m
index 2b3eb995..f4b16368 100644
--- a/SensorsAnalyticsTests/AutoTrack/ElementViewController.m
+++ b/SensorsAnalyticsTests/AutoTrack/ElementViewController.m
@@ -3,7 +3,7 @@
 //  TestSensors
 //
 //  Created by MC on 2019/5/6.
-//  Copyright © 2019 SensorsData. All rights reserved.
+//  Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 
 #import "ElementViewController.h"
diff --git a/SensorsAnalyticsTests/AutoTrack/SAAutoTrackUtilsTest.m b/SensorsAnalyticsTests/AutoTrack/SAAutoTrackUtilsTest.m
index 35cf3ff5..83edc5cf 100644
--- a/SensorsAnalyticsTests/AutoTrack/SAAutoTrackUtilsTest.m
+++ b/SensorsAnalyticsTests/AutoTrack/SAAutoTrackUtilsTest.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsTests
 //
 //  Created by MC on 2019/5/5.
-//  Copyright © 2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2019-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ - (void)setUp {
 
     SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:@"" launchOptions:nil];
     options.autoTrackEventType = SensorsAnalyticsEventTypeAppStart | SensorsAnalyticsEventTypeAppEnd | SensorsAnalyticsEventTypeAppClick | SensorsAnalyticsEventTypeAppViewScreen;
-    [SensorsAnalyticsSDK sharedInstanceWithConfig:options];
+    [SensorsAnalyticsSDK startWithConfigOptions:options];
     [[SensorsAnalyticsSDK sharedInstance] enableHeatMap];
 }
 
@@ -247,6 +247,41 @@ - (void)testAutoTrackPropertiesWithTableView {
     XCTAssertTrue([dic[@"$element_selector"] isEqualToString:selector]);
 }
 
+- (void)testCategoryDelegateProperty {
+    UIView *view = [[UIView alloc]init];
+    NSObject *delegate = [[NSObject alloc]init];
+    view.sensorsAnalyticsDelegate = (NSObject<SAUIViewAutoTrackDelegate>*) delegate;
+    delegate = nil;
+    XCTAssertNil(view.sensorsAnalyticsDelegate);
+}
+
+- (void)testViewTypeIgnoredOfSubClass {
+    [[SensorsAnalyticsSDK sharedInstance] ignoreViewType:[UIControl class]];
+    BOOL buttonIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[UIButton class]];
+    XCTAssertTrue(buttonIgnored);
+
+    BOOL segmentedControlIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[UISegmentedControl class]];
+    XCTAssertTrue(segmentedControlIgnored);
+}
+
+- (void)testViewTypeIgnoredOfCurrentClass {
+    [[SensorsAnalyticsSDK sharedInstance] ignoreViewType:[UIControl class]];
+    BOOL controlIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[UIControl class]];
+    XCTAssertTrue(controlIgnored);
+}
+
+- (void)testViewTypeIgnoredOfSuperClass {
+    [[SensorsAnalyticsSDK sharedInstance] ignoreViewType:[UIControl class]];
+    BOOL viewIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[UIView class]];
+    XCTAssertFalse(viewIgnored);
+}
+
+- (void)testViewTypeIgnoredOfOtherClass {
+    [[SensorsAnalyticsSDK sharedInstance] ignoreViewType:[UIControl class]];
+    BOOL itemIgnored = [[SensorsAnalyticsSDK sharedInstance] isViewTypeIgnored:[UIBarButtonItem class]];
+    XCTAssertFalse(itemIgnored);
+}
+
 - (void)testPerformanceExample {
     [self measureBlock:^{
         [SAAutoTrackUtils propertiesWithAutoTrackObject:self.viewController.firstButton viewController:self.viewController];
diff --git a/SensorsAnalyticsTests/Resources/ca.der.cer b/SensorsAnalyticsTests/Resources/ca.der.cer
new file mode 100755
index 00000000..cb5ac45a
Binary files /dev/null and b/SensorsAnalyticsTests/Resources/ca.der.cer differ
diff --git a/SensorsAnalyticsTests/Resources/cert.outdate.cer b/SensorsAnalyticsTests/Resources/cert.outdate.cer
new file mode 100644
index 00000000..65b4b111
Binary files /dev/null and b/SensorsAnalyticsTests/Resources/cert.outdate.cer differ
diff --git a/SensorsAnalyticsTests/SAIdentifierTests.m b/SensorsAnalyticsTests/SAIdentifierTests.m
new file mode 100644
index 00000000..4db47b01
--- /dev/null
+++ b/SensorsAnalyticsTests/SAIdentifierTests.m
@@ -0,0 +1,149 @@
+//
+// SAIdentifierManagerTests.m
+// SensorsAnalyticsTests
+//
+// Created by 彭远洋 on 2020/3/26.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <XCTest/XCTest.h>
+#import "SAIdentifier.h"
+
+@interface SAIdentifierTests : XCTestCase
+
+@property (nonatomic, strong) SAIdentifier *identifier;
+@property (nonatomic, strong) dispatch_queue_t readWriteQueue;
+@property (nonatomic, copy) NSString *deviceId;
+@end
+
+@implementation SAIdentifierTests
+
+- (void)setUp {
+
+    NSString *label = [NSString stringWithFormat:@"sensorsdata.readWriteQueue.%p", self];
+    _readWriteQueue = dispatch_queue_create([label UTF8String], DISPATCH_QUEUE_SERIAL);
+    _identifier = [[SAIdentifier alloc] initWithQueue:_readWriteQueue];
+    [_identifier logout];
+    _deviceId = _identifier.anonymousId;
+}
+
+- (void)tearDown {
+    _identifier = nil;
+    _deviceId = nil;
+}
+
+- (void)testAnonymousIdAfterIdentify {
+    [_identifier identify:@"new_identifier"];
+    XCTAssertTrue([_identifier.anonymousId isEqualToString:@"new_identifier"]);
+}
+
+- (void)testDistinctIdAfterIdentify {
+    [_identifier identify:@"new_identifier"];
+    XCTAssertTrue([_identifier.distinctId isEqualToString:@"new_identifier"]);
+}
+
+- (void)testOriginalIdAfterIdentify {
+    [_identifier identify:@"new_identifier"];
+    XCTAssertTrue([_identifier.originalId isEqualToString:_deviceId]);
+}
+
+- (void)testAnonymousIdAfterIdentifyEmtpyString {
+    [_identifier identify:@""];
+    XCTAssertTrue([_identifier.anonymousId isEqualToString:_deviceId]);
+}
+
+- (void)testDistinctIdAfterIdentifyEmtpyString {
+    [_identifier identify:@""];
+    XCTAssertTrue([_identifier.distinctId isEqualToString:_deviceId]);
+}
+
+- (void)testOriginalIdAfterIdentifyEmtpyString {
+    [_identifier identify:@""];
+    XCTAssertNil(_identifier.originalId);
+}
+
+- (void)testAnonymousIdMaxLength {
+    // 长度超过 255 会有报错信息，但是可以设置成功
+    NSMutableString *str = [[NSMutableString alloc] initWithString:@""];
+    for (int i = 0; i < 300; i++) {
+        [str appendString:@"a"];
+    }
+    [_identifier identify:str];
+    XCTAssertTrue(_identifier.anonymousId.length == 300);
+}
+
+- (void)testLoginIdMaxLength {
+    NSMutableString *str = [[NSMutableString alloc] initWithString:@""];
+    for (int i = 0; i < 300; i++) {
+        [str appendString:@"a"];
+    }
+    XCTAssertFalse([_identifier isValidLoginId:str]);
+}
+
+- (void)testLoginWithLoginId {
+    [_identifier login:@"new_login_id"];
+    XCTAssertFalse([_identifier isValidLoginId:_identifier.loginId]);
+}
+
+- (void)testLoginWithAnonymousId {
+    XCTAssertFalse([_identifier isValidLoginId:_identifier.anonymousId]);
+}
+
+- (void)testLoginIdAfterLogin {
+    [_identifier login:@"new_login_id"];
+    XCTAssertTrue([_identifier.loginId isEqualToString:@"new_login_id"]);
+}
+
+- (void)testDistinctIdAfterLogin {
+    [_identifier login:@"new_login_id"];
+    XCTAssertTrue([_identifier.distinctId isEqualToString:@"new_login_id"]);
+}
+
+- (void)testOriginalIdAfterLogin {
+    [_identifier login:@"new_login_id"];
+    XCTAssertTrue([_identifier.originalId isEqualToString:_identifier.anonymousId]);
+}
+
+- (void)testLoginIdAfterLoginEmptyString {
+    [_identifier login:@""];
+    XCTAssertNil(_identifier.loginId);
+}
+
+- (void)testDistinctIdAfterLoginEmptyString {
+    [_identifier login:@""];
+    XCTAssertTrue([_identifier.distinctId isEqualToString:_identifier.anonymousId]);
+}
+
+- (void)testOriginalIdAfterLoginEmptyString {
+    [_identifier login:@""];
+    XCTAssertNil(_identifier.originalId);
+}
+
+- (void)testResetAnonymousId {
+    [_identifier resetAnonymousId];
+    XCTAssertTrue([_identifier.anonymousId isEqualToString:[SAIdentifier uniqueHardwareId]]);
+}
+
+- (void)testLogout {
+    [_identifier login:@"new_login_id"];
+    [_identifier logout];
+    XCTAssertNil(_identifier.loginId);
+}
+
+@end
diff --git a/SensorsAnalyticsTests/SALinkHandlerTests.m b/SensorsAnalyticsTests/SALinkHandlerTests.m
new file mode 100644
index 00000000..48994a03
--- /dev/null
+++ b/SensorsAnalyticsTests/SALinkHandlerTests.m
@@ -0,0 +1,236 @@
+//
+// SALinkHandlerTests.m
+// SensorsAnalyticsTests
+//
+// Created by 彭远洋 on 2020/1/16.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <XCTest/XCTest.h>
+#import "SALinkHandler.h"
+#import "SAConfigOptions.h"
+#import "SAFileStore.h"
+
+@interface SALinkHandlerTests : XCTestCase
+
+@property (nonatomic, strong) SALinkHandler *linkHandler;
+
+@end
+
+@implementation SALinkHandlerTests
+
+- (void)setUp {
+    NSString *urlString = @"https://www.sensorsdata.cn?utm_content=1&utm_campaign=1&utm_medium=1&utm_source=1&utm_term=1&channel=1&source=1&key=value";
+    NSURL *url = [NSURL URLWithString:urlString];
+    NSDictionary *launchOptions = @{UIApplicationLaunchOptionsURLKey: url};
+    SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:@"" launchOptions:launchOptions];
+    options.enableSaveDeepLinkInfo = YES;
+    options.sourceChannels = @[@"source", @"channel", @"device_id"];
+    _linkHandler = [[SALinkHandler alloc] initWithConfigOptions:options];
+}
+
+- (void)tearDown {
+
+}
+
+#pragma mark - positive case
+- (void)testURLValidity {
+    NSURL *invalid1 = [NSURL URLWithString:@"https://www.sensorsdata.cn"];
+    XCTAssertFalse([_linkHandler canHandleURL:invalid1]);
+
+    NSURL *invalid2 = [NSURL URLWithString:@"https://www.sensorsdata.cn?utm_test=test&key=value"];
+    XCTAssertFalse([_linkHandler canHandleURL:invalid2]);
+
+    NSURL *valid1 = [NSURL URLWithString:@"https://www.sensorsdata.cn?source=source"];
+    XCTAssertTrue([_linkHandler canHandleURL:valid1]);
+
+    NSURL *valid2 = [NSURL URLWithString:@"https://www.sensorsdata.cn?utm_content=content"];
+    XCTAssertTrue([_linkHandler canHandleURL:valid2]);
+}
+
+- (void)testLaunchOptions {
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 7);
+    XCTAssertTrue([latest[@"$latest_utm_content"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_campaign"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_medium"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_source"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_term"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"_latest_channel"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"_latest_source"] isEqualToString:@"1"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 7);
+    XCTAssertTrue([utm[@"$utm_content"] isEqualToString:@"1"]);
+    XCTAssertTrue([utm[@"$utm_campaign"] isEqualToString:@"1"]);
+    XCTAssertTrue([utm[@"$utm_medium"] isEqualToString:@"1"]);
+    XCTAssertTrue([utm[@"$utm_source"] isEqualToString:@"1"]);
+    XCTAssertTrue([utm[@"$utm_term"] isEqualToString:@"1"]);
+    XCTAssertTrue([utm[@"channel"] isEqualToString:@"1"]);
+    XCTAssertTrue([utm[@"source"] isEqualToString:@"1"]);
+}
+
+- (void)testClearUtmProperties {
+    [_linkHandler clearUtmProperties];
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 0);
+}
+
+- (void)testNormalURL {
+    NSURL *url = [NSURL URLWithString:@"https://www.sensorsdata.cn?utm_content=2&utm_campaign=2&channel=2&key=value"];
+    XCTAssertTrue([_linkHandler canHandleURL:url]);
+
+    [_linkHandler handleDeepLink:url];
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 3);
+    XCTAssertTrue([latest[@"$latest_utm_content"] isEqualToString:@"2"]);
+    XCTAssertTrue([latest[@"$latest_utm_campaign"] isEqualToString:@"2"]);
+    XCTAssertTrue([latest[@"_latest_channel"] isEqualToString:@"2"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 3);
+    XCTAssertTrue([utm[@"$utm_content"] isEqualToString:@"2"]);
+    XCTAssertTrue([utm[@"$utm_campaign"] isEqualToString:@"2"]);
+    XCTAssertTrue([utm[@"channel"] isEqualToString:@"2"]);
+}
+
+- (void)testEmptyContentOfPart {
+    NSURL *url = [NSURL URLWithString:@"https://www.sensorsdata.cn?utm_content=&utm_campaign=3&channel=&key=value"];
+    XCTAssertTrue([_linkHandler canHandleURL:url]);
+
+    [_linkHandler handleDeepLink:url];
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 1);
+    XCTAssertTrue([latest[@"$latest_utm_campaign"] isEqualToString:@"3"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 1);
+    XCTAssertTrue([utm[@"$utm_campaign"] isEqualToString:@"3"]);
+}
+
+- (void)testEmptyContentOfAll {
+    NSURL *url = [NSURL URLWithString:@"https://www.sensorsdata.cn?utm_content=&utm_campaign=&channel=&key=value"];
+    XCTAssertTrue([_linkHandler canHandleURL:url]);
+
+    [_linkHandler handleDeepLink:url];
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 0);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 0);
+}
+
+- (void)testNoQueryURL {
+    NSURL *url = [NSURL URLWithString:@"https://www.sensorsdata.cn"];
+    XCTAssertFalse([_linkHandler canHandleURL:url]);
+
+    [_linkHandler handleDeepLink:url];
+
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 7);
+    XCTAssertTrue([latest[@"$latest_utm_content"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_campaign"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_medium"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_source"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_term"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"_latest_channel"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"_latest_source"] isEqualToString:@"1"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 0);
+}
+
+- (void)testNormalAppStart {
+    // 重新初始化 handler 模拟自然启动
+    SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:@"" launchOptions:nil];
+    options.enableSaveDeepLinkInfo = YES;
+    options.sourceChannels = @[@"source", @"channel"];
+    _linkHandler = [[SALinkHandler alloc] initWithConfigOptions:options];
+
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 7);
+    XCTAssertTrue([latest[@"$latest_utm_content"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_campaign"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_medium"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_source"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_term"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"_latest_source"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"_latest_channel"] isEqualToString:@"1"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 0);
+}
+
+- (void)testVersionUpdate {
+    // 重新初始化 handler 模拟自然启动
+    SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:@"" launchOptions:nil];
+    options.enableSaveDeepLinkInfo = YES;
+    //升级版本修改 sourceChannels 后，会过滤本地获取到的自定义属性
+    options.sourceChannels = @[@"version", @"channel"];
+    _linkHandler = [[SALinkHandler alloc] initWithConfigOptions:options];
+
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 6);
+    XCTAssertTrue([latest[@"$latest_utm_content"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_campaign"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_medium"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_source"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_term"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"_latest_channel"] isEqualToString:@"1"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 0);
+}
+
+#pragma mark - reverse case
+- (void)testFilterReservedProperty {
+    NSURL *url = [NSURL URLWithString:@"https://www.sensorsdata.cn?utm_content=2&device_id=2"];
+    XCTAssertTrue([_linkHandler canHandleURL:url]);
+
+    [_linkHandler handleDeepLink:url];
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 1);
+    XCTAssertTrue([latest[@"$latest_utm_content"] isEqualToString:@"2"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 1);
+    XCTAssertTrue([utm[@"$utm_content"] isEqualToString:@"2"]);
+}
+
+- (void)testChangeSoureChannels {
+    // 重新初始化 handler 模拟自然启动
+    // 重新赋值 sourceChannels。当本地保存的自定义数据不在新的 sourceChannels 列表中时直接过滤掉
+    SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:@"" launchOptions:nil];
+    options.enableSaveDeepLinkInfo = YES;
+    options.sourceChannels = @[@"sourceChannel"];
+    _linkHandler = [[SALinkHandler alloc] initWithConfigOptions:options];
+
+    NSDictionary *latest = [_linkHandler latestUtmProperties];
+    XCTAssertTrue(latest.count == 5);
+    XCTAssertTrue([latest[@"$latest_utm_content"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_campaign"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_medium"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_source"] isEqualToString:@"1"]);
+    XCTAssertTrue([latest[@"$latest_utm_term"] isEqualToString:@"1"]);
+
+    NSDictionary *utm = [_linkHandler utmProperties];
+    XCTAssertTrue(utm.count == 0);
+}
+
+@end
diff --git a/SensorsAnalyticsTests/SANetworkTests.m b/SensorsAnalyticsTests/SANetworkTests.m
index ee143b9a..bb3b02ac 100644
--- a/SensorsAnalyticsTests/SANetworkTests.m
+++ b/SensorsAnalyticsTests/SANetworkTests.m
@@ -3,7 +3,7 @@
 //  SANetworkTests
 //
 //  Created by 张敏超 on 2019/3/12.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@
 #import <XCTest/XCTest.h>
 #import "SASecurityPolicy.h"
 #import "SANetwork.h"
-#import "SANetwork+URLUtils.h"
+#import "SAURLUtils.h"
+
 
 @interface SANetworkTests : XCTestCase
 @property (nonatomic, strong) NSURL *url;
@@ -51,7 +52,7 @@ - (void)testFixGetQueryItemsWithURLIsEncoded {
     NSString *event = @"event";
     NSString *eventValue = @"%7B%22server_url%22%3A%22http%3A%2F%2Fsdk-test.cloud.sensorsdata.cn%3A8006%2Fsa.gif%3Fproject%3Ddefault%26token%3D95c73ae661f85aa0%22%2C%22distinct_id%22%3A%2216a9a6af66b61-048f6185f2a9e5-34753c59-370944-16a9a6af66d0%22%2C%22lib%22%3A%7B%22%24lib%22%3A%22js%22%2C%22%24lib_method%22%3A%22code%22%2C%22%24lib_version%22%3A%221.9.7%22%7D%2C%22properties%22%3A%7B%22%24screen_height%22%3A896%2C%22%24screen_width%22%3A414%2C%22%24lib%22%3A%22js%22%2C%22%24lib_version%22%3A%221.9.7%22%2C%22%24referrer%22%3A%22%22%2C%22%24referrer_host%22%3A%22%22%2C%22%24url%22%3A%22file%3A%2F%2F%2FUsers%2Fminchao%2FLibrary%2FDeveloper%2FCoreSimulator%2FDevices%2FF412A5FF-7F06-4DDC-968C-D0A15F7FC91D%2Fdata%2FContainers%2FBundle%2FApplication%2F3F4101C3-48C2-4D6F-A4B9-FD2FB1B827C7%2FHelloSensorsAnalytics.app%2Ftest2.html%22%2C%22%24url_path%22%3A%22%2FUsers%2Fminchao%2FLibrary%2FDeveloper%2FCoreSimulator%2FDevices%2FF412A5FF-7F06-4DDC-968C-D0A15F7FC91D%2Fdata%2FContainers%2FBundle%2FApplication%2F3F4101C3-48C2-4D6F-A4B9-FD2FB1B827C7%2FHelloSensorsAnalytics.app%2Ftest2.html%22%2C%22%24title%22%3A%22Title%22%2C%22%24latest_referrer%22%3A%22%E5%8F%96%E5%80%BC%E5%BC%82%E5%B8%B8%22%2C%22%24latest_referrer_host%22%3A%22%E5%8F%96%E5%80%BC%E5%BC%82%E5%B8%B8%22%2C%22%24latest_search_keyword%22%3A%22%E5%8F%96%E5%80%BC%E5%BC%82%E5%B8%B8%22%2C%22%24latest_traffic_source_type%22%3A%22%E5%8F%96%E5%80%BC%E5%BC%82%E5%B8%B8%22%2C%22%24is_first_day%22%3Afalse%2C%22%24is_first_time%22%3Afalse%7D%2C%22type%22%3A%22track%22%2C%22event%22%3A%22%24pageview%22%2C%22_nocache%22%3A%22047035893734089%22%7D";
     NSString *urlString = [NSString stringWithFormat:@"sensorsanalytics://trackEvent?%@=%@", event, eventValue];
-    NSDictionary *items = [SANetwork queryItemsWithURLString:urlString];
+    NSDictionary *items = [SAURLUtils queryItemsWithURLString:urlString];
     BOOL isEqual = [items isEqualToDictionary:@{event: eventValue}];
     XCTAssertTrue(isEqual);
 }
@@ -72,44 +73,44 @@ - (void)testFixNullProjectWithH5UserAgentError {
 
 #pragma mark - URL Method
 - (void)testGetHostWithURL {
-    NSString *host = [SANetwork hostWithURL:_url];
+    NSString *host = [SAURLUtils hostWithURL:_url];
     XCTAssertEqualObjects(host, @"sdk-test.datasink.sensorsdata.cn");
 }
 
 - (void)testGetHostWithNilURL {
-    NSString *host = [SANetwork hostWithURL:nil];
+    NSString *host = [SAURLUtils hostWithURL:nil];
     XCTAssertNil(host);
 }
 
 - (void)testGetHostWithURLString {
-    NSString *host = [SANetwork hostWithURLString:@"https://www.google.com"];
+    NSString *host = [SAURLUtils hostWithURLString:@"https://www.google.com"];
     XCTAssertEqualObjects(host, @"www.google.com");
 }
 
 - (void)testGetHostWithMalformedURLString {
-    NSString *host = [SANetwork hostWithURLString:@"google.com"];
+    NSString *host = [SAURLUtils hostWithURLString:@"google.com"];
     XCTAssertNil(host);
 }
 
 - (void)testGetQueryItemsWithURL {
-    NSDictionary *items = [SANetwork queryItemsWithURL:_url];
+    NSDictionary *items = [SAURLUtils queryItemsWithURL:_url];
     BOOL isEqual = [items isEqualToDictionary:@{@"project": @"zhangminchao", @"token": @"95c73ae661f85aa0"}];
     XCTAssertTrue(isEqual);
 }
 
 - (void)testGetQueryItemsWithNilURL {
-    NSDictionary *items = [SANetwork queryItemsWithURL:nil];
+    NSDictionary *items = [SAURLUtils queryItemsWithURL:nil];
     XCTAssertNil(items);
 }
 
 - (void)testGetQueryItemsWithURLString {
-    NSDictionary *items = [SANetwork queryItemsWithURLString:@"https://sdk-test.datasink.sensorsdata.cn/sa?project=zhangminchao&token=95c73ae661f85aa0"];
+    NSDictionary *items = [SAURLUtils queryItemsWithURLString:@"https://sdk-test.datasink.sensorsdata.cn/sa?project=zhangminchao&token=95c73ae661f85aa0"];
     BOOL isEqual = [items isEqualToDictionary:@{@"project": @"zhangminchao", @"token": @"95c73ae661f85aa0"}];
     XCTAssertTrue(isEqual);
 }
 
 - (void)testGetQueryItemsWithNilURLString {
-    NSDictionary *items = [SANetwork queryItemsWithURLString:nil];
+    NSDictionary *items = [SAURLUtils queryItemsWithURLString:nil];
     XCTAssertNil(items);
 }
 
diff --git a/SensorsAnalyticsTests/SAPresetPropertyTests.m b/SensorsAnalyticsTests/SAPresetPropertyTests.m
new file mode 100644
index 00000000..0acd874d
--- /dev/null
+++ b/SensorsAnalyticsTests/SAPresetPropertyTests.m
@@ -0,0 +1,87 @@
+//
+// SAPresetPropertyTests.m
+// SensorsAnalyticsTests
+//
+// Created by wenquan on 2020/5/15.
+// Copyright © 2020 Sensors Data Co., Ltd. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <XCTest/XCTest.h>
+#import "SAPresetProperty.h"
+#import "SAConstants+Private.h"
+
+@interface SAPresetPropertyTests : XCTestCase
+
+@property (nonatomic, strong) SAPresetProperty *presetProperty;
+@property (nonatomic, strong) dispatch_queue_t readWriteQueue;
+
+@end
+
+@implementation SAPresetPropertyTests
+
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+    
+    NSString *label = [NSString stringWithFormat:@"sensorsdata.readWriteQueue.%p", self];
+    _readWriteQueue = dispatch_queue_create([label UTF8String], DISPATCH_QUEUE_SERIAL);
+    _presetProperty = [[SAPresetProperty alloc] initWithQueue:_readWriteQueue];
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    
+    _presetProperty = nil;
+}
+
+- (void)testAutomaticProperties {
+    NSDictionary *automaticProperties = _presetProperty.automaticProperties;
+    
+    XCTAssertTrue(automaticProperties.count > 0);
+}
+
+- (void)testAppVersion {
+    NSString *appVersion = _presetProperty.appVersion;
+    XCTAssertTrue(!appVersion || [appVersion isEqualToString:_presetProperty.automaticProperties[SA_EVENT_COMMON_PROPERTY_APP_VERSION]]);
+}
+
+- (void)testLib {
+    NSString *lib = _presetProperty.lib;
+    XCTAssertTrue([lib isEqualToString:_presetProperty.automaticProperties[SA_EVENT_COMMON_PROPERTY_LIB]]);
+}
+
+- (void)testLibVersion {
+    NSString *libVersion = _presetProperty.libVersion;
+    XCTAssertTrue([libVersion isEqualToString:_presetProperty.automaticProperties[SA_EVENT_COMMON_PROPERTY_LIB_VERSION]]);
+}
+
+- (void)testCurrentPresetProperties {
+    NSDictionary *currentPresetProperties = [_presetProperty currentPresetProperties];
+    
+    // 时区偏移
+    NSInteger hourOffsetGMT = [[NSTimeZone systemTimeZone] secondsFromGMTForDate:[NSDate date]] / 60;
+    NSNumber *timeZoneOfffset = currentPresetProperties[SA_EVENT_COMMON_PROPERTY_TIMEZONE_OFFSET];
+    XCTAssertTrue([timeZoneOfffset isEqualToNumber:@(hourOffsetGMT)]);
+    
+    // app_id
+    NSString *bundleIdentifier = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
+    NSString *appId = currentPresetProperties[SA_EVENT_COMMON_PROPERTY_APP_ID];
+    XCTAssertTrue([bundleIdentifier isEqualToString:appId]);
+}
+
+@end
diff --git a/SensorsAnalyticsTests/SATrackTimerTests.m b/SensorsAnalyticsTests/SATrackTimerTests.m
new file mode 100644
index 00000000..57606dda
--- /dev/null
+++ b/SensorsAnalyticsTests/SATrackTimerTests.m
@@ -0,0 +1,230 @@
+//
+// SATrackTimerTests.m
+// SensorsAnalyticsTests
+//
+// Created by 彭远洋 on 2020/1/3.
+// Copyright © 2020 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#if ! __has_feature(objc_arc)
+#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 <XCTest/XCTest.h>
+#import "SATrackTimer.h"
+
+#define second(x) (x * 1000)
+
+@interface SATrackTimerTests : XCTestCase
+
+@property (nonatomic, strong) SATrackTimer *timer;
+
+@end
+
+@implementation SATrackTimerTests
+
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+    _timer = [[SATrackTimer alloc] init];
+}
+
+- (void)tearDown {
+    // Put teardown code here. This method is called after the invocation of each test method in the class.
+}
+
+- (NSString *)simulateTrackTimerStart:(NSString *)event currentSysUpTime:(UInt64)currentSysUpTime {
+    NSString *eventId = [_timer generateEventIdByEventName:event];
+    [_timer trackTimerStart:eventId currentSysUpTime:currentSysUpTime];
+    return eventId;
+}
+
+#pragma mark - normal timer
+- (void)testNormalTimerEventDuration {
+    NSString *eventName = @"testTimer1";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventName currentSysUpTime:second(4)];
+    [_timer trackTimerResume:eventName currentSysUpTime:second(6)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 4, 0.1);
+}
+
+- (void)testNormalTimerEnterBackgroundAndBecomeActive {
+    NSString *eventName = @"testTimer2";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventName currentSysUpTime:second(4)];
+    [_timer pauseAllEventTimers:second(6)];
+    [_timer resumeAllEventTimers:second(8)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(10)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 2, 0.1);
+}
+
+- (void)testNormalTimerEnterBackgroundAndBecomeActive2 {
+    NSString *eventName = @"testTimer3";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer pauseAllEventTimers:second(4)];
+    [_timer resumeAllEventTimers:second(6)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 4, 0.1);
+}
+
+- (void)testNormalTimerMutipleInvokeStart {
+    NSString *eventName = @"testTimer4";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(4)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(6)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 2, 0.1);
+}
+
+- (void)testNormalTimerMutipleInvokePause {
+    NSString *eventName = @"testTimer5";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventName currentSysUpTime:second(4)];
+    [_timer trackTimerPause:eventName currentSysUpTime:second(6)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 2, 0.1);
+}
+
+- (void)testNormalTimerMutipleInvokeResume {
+    NSString *eventName = @"testTimer6";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventName currentSysUpTime:second(4)];
+    [_timer trackTimerResume:eventName currentSysUpTime:second(6)];
+    [_timer trackTimerResume:eventName currentSysUpTime:second(8)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(10)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 6, 0.1);
+}
+
+- (void)testNormalTimerMutipleInvokeEnd {
+    NSString *eventName = @"testTimer7";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(4)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 2, 0.1);
+    NSNumber *duration1 = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(6)];
+    XCTAssertNil(duration1);
+}
+
+- (void)testNormalTimerClearEvents {
+    NSString *eventName = @"testTimer8";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer clearAllEventTimers];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(4)];
+    XCTAssertNil(duration);
+    NSString *originalEventName = [_timer eventNameFromEventId:eventName];
+    XCTAssertTrue([originalEventName isEqualToString:eventName]);
+}
+
+#pragma mark - hybrid timer
+- (void)testHybridTimer {
+    NSString *eventName = @"testTimer9";
+    [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    NSString *eventId = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+
+    [_timer trackTimerPause:eventName currentSysUpTime:second(4)];
+    [_timer trackTimerPause:eventId currentSysUpTime:second(4)];
+
+    [_timer trackTimerResume:eventName currentSysUpTime:second(6)];
+    [_timer trackTimerResume:eventId currentSysUpTime:second(6)];
+
+    NSNumber *duration1 = [_timer eventDurationFromEventId:eventName currentSysUpTime:second(8)];
+    NSNumber *duration2 = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration1 floatValue], 4, 0.1);
+    XCTAssertEqualWithAccuracy([duration2 floatValue], 4, 0.1);
+}
+
+#pragma mark - cross timer
+- (void)testCrossTimerEventDuration {
+    NSString *eventName = @"testTimer10";
+    NSString *eventId1 = [self simulateTrackTimerStart:eventName currentSysUpTime:second(1)];
+    NSString *eventId2 = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventId1 currentSysUpTime:second(3)];
+    [_timer trackTimerPause:eventId2 currentSysUpTime:second(4)];
+    [_timer trackTimerResume:eventId1 currentSysUpTime:second(5)];
+    [_timer trackTimerResume:eventId2 currentSysUpTime:second(6)];
+    NSNumber *duration1 = [_timer eventDurationFromEventId:eventId1 currentSysUpTime:second(7)];
+    NSNumber *duration2 = [_timer eventDurationFromEventId:eventId2 currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration1 floatValue], 4, 0.1);
+    XCTAssertEqualWithAccuracy([duration2 floatValue], 4, 0.1);
+
+    XCTAssertTrue([[_timer eventNameFromEventId:eventId1] isEqualToString:eventName]);
+    XCTAssertTrue([[_timer eventNameFromEventId:eventId2] isEqualToString:eventName]);
+}
+
+- (void)testCrossTimerEnterBackgroundAndBecomeActive {
+    NSString *eventName = @"testTimer11";
+    NSString *eventId = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventId currentSysUpTime:second(4)];
+    [_timer pauseAllEventTimers:second(6)];
+    [_timer resumeAllEventTimers:second(8)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(10)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 2, 0.1);
+}
+
+- (void)testCrossTimerEnterBackgroundAndBecomeActive2 {
+    NSString *eventName = @"testTimer12";
+    NSString *eventId = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer pauseAllEventTimers:second(4)];
+    [_timer resumeAllEventTimers:second(6)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 4, 0.1);
+}
+- (void)testCrossTimerClearEvents {
+    NSString *eventName = @"testTimer13";
+    NSString *eventId = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer clearAllEventTimers];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(4)];
+    XCTAssertNil(duration);
+    NSString *originalEventName = [_timer eventNameFromEventId:eventId];
+    XCTAssertTrue([originalEventName isEqualToString:eventName]);
+}
+
+- (void)testCrossTimerMutipleInvokeStart {
+    NSString *eventName = @"testTimer14";
+    NSString *eventId1 = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    NSString *eventId2 = [self simulateTrackTimerStart:eventName currentSysUpTime:second(4)];
+    NSNumber *duration1 = [_timer eventDurationFromEventId:eventId1 currentSysUpTime:second(6)];
+    XCTAssertEqualWithAccuracy([duration1 floatValue], 4, 0.1);
+    NSNumber *duration2 = [_timer eventDurationFromEventId:eventId2 currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration2 floatValue], 4, 0.1);
+}
+
+- (void)testCrossTimerMutipleInvokePause {
+    NSString *eventName = @"testTimer15";
+    NSString *eventId = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventId currentSysUpTime:second(4)];
+    [_timer trackTimerPause:eventId currentSysUpTime:second(6)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(8)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 2, 0.1);
+}
+
+- (void)testCrossTimerMutipleInvokeResume {
+    NSString *eventName = @"testTimer16";
+    NSString *eventId = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    [_timer trackTimerPause:eventId currentSysUpTime:second(4)];
+    [_timer trackTimerResume:eventId currentSysUpTime:second(6)];
+    [_timer trackTimerResume:eventId currentSysUpTime:second(8)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(10)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 6, 0.1);
+}
+
+- (void)testCrossTimerMutipleInvokeEnd {
+    NSString *eventName = @"testTimer17";
+    NSString *eventId = [self simulateTrackTimerStart:eventName currentSysUpTime:second(2)];
+    NSNumber *duration = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(4)];
+    XCTAssertEqualWithAccuracy([duration floatValue], 2, 0.1);
+    NSNumber *duration1 = [_timer eventDurationFromEventId:eventId currentSysUpTime:second(6)];
+    XCTAssertNil(duration1);
+}
+
+@end
diff --git a/SensorsAnalyticsTests/SAUtilsTest.m b/SensorsAnalyticsTests/SAUtilsTest.m
new file mode 100644
index 00000000..29fc0c05
--- /dev/null
+++ b/SensorsAnalyticsTests/SAUtilsTest.m
@@ -0,0 +1,143 @@
+//
+// SAUtilsTest.m
+// SensorsAnalyticsTests
+//
+// Created by 储强盛 on 2019/10/26.
+// Copyright © 2019 SensorsData. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#import <XCTest/XCTest.h>
+#import "NSString+HashCode.h"
+
+@interface SAUtilsTest : XCTestCase
+@end
+
+@implementation SAUtilsTest
+
+- (void)setUp {
+    // Put setup code here. This method is called before the invocation of each test method in the class.
+
+}
+
+- (void)tearDown {
+
+}
+
+#pragma mark - NSString
+- (void)testSensorsdataHashCode {
+    NSString *text1 = @"1234rfsdvzfxbgtry6htge";
+    NSString *text2 = @"dawefrr45tredfsghbdf";
+
+    int code1= [text1 sensorsdata_hashCode];
+    int code2= [text1 sensorsdata_hashCode];
+    int code3= [text2 sensorsdata_hashCode];
+    BOOL equele1 = code1 == code2;
+    XCTAssertTrue(equele1);
+
+    BOOL different1 = code1!= code3;
+    XCTAssertTrue(different1);
+
+    NSString *text4 = @"^*&()%^)$*#!@#!#@";
+    NSString *text5 = @"<>??<_)_!@)@UWJKSJDJ";
+    int code4= [text4 sensorsdata_hashCode];
+    int code5= [text4 sensorsdata_hashCode];
+    int code6= [text5 sensorsdata_hashCode];
+    BOOL equele2 = code4 == code5;
+    XCTAssertTrue(equele2);
+
+    BOOL different2 = code4!= code6;
+    XCTAssertTrue(different2);
+
+    NSString *chTest6 = @"你好哈王入网她34q";
+    int code7= [chTest6 sensorsdata_hashCode];
+    int code8= [chTest6 sensorsdata_hashCode];
+    BOOL equele3 = code7 == code8;
+    XCTAssertTrue(equele3);
+
+    NSString *chTest7 = @"🔥sd🙂哈哈😆👌@#🐶";
+    int code9= [chTest7 sensorsdata_hashCode];
+    int code10= [chTest7 sensorsdata_hashCode];
+    BOOL equele4 = code9 == code10;
+    XCTAssertTrue(equele4);
+}
+
+- (void)testStrnlenFunction {
+// strlen 隐含高危漏洞，改为 strnlen
+    char* containEmpty1 = "casdv\0gndfb";
+    size_t emptyLenth1 = strnlen(containEmpty1, __INTMAX_MAX__);
+    size_t emptyLenth2 = strlen(containEmpty1);
+    BOOL emptyEquele1 = emptyLenth1 == emptyLenth2;
+    XCTAssertTrue(emptyEquele1);
+
+    char* letter1 = "casdv234555dfb4erwfdsc";
+    size_t letterLenth1 = strnlen(letter1, __INTMAX_MAX__);
+    size_t letterLenth2 = strlen(letter1);
+    BOOL letterEquele1 = letterLenth1 == letterLenth2;
+    XCTAssertTrue(letterEquele1);
+
+    char* endEmpty1 = "casdv435646gndfb\0";
+    size_t endLenth1 = strnlen(endEmpty1, __INTMAX_MAX__);
+    size_t endLenth2 = strlen(endEmpty1);
+    BOOL endEquele1 = endLenth1 == endLenth2;
+    XCTAssertTrue(endEquele1);
+
+    NSString *cnString = @"你好哇，继续测试234rwfss";
+    char *unicode = (char *)[cnString cStringUsingEncoding:NSUnicodeStringEncoding];;
+    size_t cnLenth1 = strnlen(unicode, __INTMAX_MAX__);
+    size_t cnLenth2 = strlen(unicode);
+    BOOL cnEquele1 = cnLenth1 == cnLenth2;
+    XCTAssertTrue(cnEquele1);
+
+    char array1[50] = {'1', 'a', 'a', 'a', 'f', '2', '\0'};
+    size_t arrayLenth1 = strnlen(array1, __INTMAX_MAX__);
+    size_t arrayLenth2 = strlen(array1);
+    BOOL arrayEquele1 = arrayLenth1 == arrayLenth2;
+    XCTAssertTrue(arrayEquele1);
+
+    char array2[50] = {'1', 'a', 'a','\0', 'a', 'f', '2'};
+    size_t arrayLenth3 = strnlen(array2, __INTMAX_MAX__);
+    size_t arrayLenth4 = strlen(array2);
+    BOOL arrayEquele2 = arrayLenth3 == arrayLenth4;
+    XCTAssertTrue(arrayEquele2);
+}
+
+- (void)testStrlcpyFunction {
+// memcpy 隐含高危漏洞，改为 strlcpy
+    char containEmpty1[50] = "casdv\0gndfb";
+    char containEmpty2[50];
+    char containEmpty3[50];
+    memcpy(containEmpty2, containEmpty1,sizeof(containEmpty2));
+    strlcpy(containEmpty3, containEmpty1, sizeof(containEmpty3));
+    BOOL emptyEquele1 = strcmp(containEmpty2, containEmpty3) == 0;
+    XCTAssertTrue(emptyEquele1);
+
+    char letter1[50] = "casdv234555dfb4erwfdsc";
+    char letter2[50];
+    char letter3[50];
+    memcpy(letter2, letter1,sizeof(letter2));
+    strlcpy(letter3, letter1, sizeof(letter3));
+    BOOL letterEquele1 = strcmp(letter2, letter3) == 0;
+    XCTAssertTrue(letterEquele1);
+
+    char endEmpty1[50] = "casdv435646gndfb\0";
+    char endEmpty2[50];
+    char endEmpty3[50];
+    memcpy(endEmpty2, endEmpty1,sizeof(endEmpty2));
+    strlcpy(endEmpty3, endEmpty1, sizeof(endEmpty3));
+    BOOL endEmptyEquele1 = strcmp(endEmpty2, endEmpty3) == 0;
+    XCTAssertTrue(endEmptyEquele1);
+}
+
+@end
diff --git a/SensorsAnalyticsTests/SensorsAnalyticsTests.m b/SensorsAnalyticsTests/SensorsAnalyticsTests.m
index 04a4d698..5c0b0e66 100644
--- a/SensorsAnalyticsTests/SensorsAnalyticsTests.m
+++ b/SensorsAnalyticsTests/SensorsAnalyticsTests.m
@@ -3,7 +3,7 @@
 //  SensorsAnalyticsTests
 //
 //  Created by 张敏超 on 2019/3/12.
-//  Copyright © 2015-2019 Sensors Data Inc. All rights reserved.
+//  Copyright © 2015-2020 Sensors Data Co., Ltd. All rights reserved.
 //
 //  Licensed under the Apache License, Version 2.0 (the "License");
 //  you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #import <XCTest/XCTest.h>
 #import "SAConfigOptions.h"
 #import "SensorsAnalyticsSDK.h"
+#import "SensorsAnalyticsSDK+Private.h"
 #import "MessageQueueBySqlite.h"
 
 @interface SensorsAnalyticsTests : XCTestCase
@@ -38,7 +39,7 @@ - (void)setUp {
     self.sensorsAnalytics = [SensorsAnalyticsSDK sharedInstance];
     if (!self.sensorsAnalytics) {
         SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:@"" launchOptions:nil];
-        [SensorsAnalyticsSDK sharedInstanceWithConfig:options];
+        [SensorsAnalyticsSDK startWithConfigOptions:options];
         self.sensorsAnalytics = [SensorsAnalyticsSDK sharedInstance];
     }
 }
@@ -63,7 +64,7 @@ - (void)testMultiThreadInitializedSDK {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         SAConfigOptions *options = [[SAConfigOptions alloc] initWithServerURL:@"" launchOptions:nil];
         // 捕获 NSInternalInconsistencyException 异常，是由 NSAssert 抛出的异常
-        XCTAssertThrowsSpecificNamed([SensorsAnalyticsSDK sharedInstanceWithConfig:options], NSException, NSInternalInconsistencyException, @"");
+        XCTAssertThrowsSpecificNamed([SensorsAnalyticsSDK startWithConfigOptions:options], NSException, NSInternalInconsistencyException, @"");
 
         [expectation fulfill];
     });
@@ -73,6 +74,21 @@ - (void)testMultiThreadInitializedSDK {
     }];
 }
 
+/**
+ trackAppCrash 接口在支持 configOptions 初始化开始过期
+ 但是该接口内未设置 enableTrackAppCrash 导致该接口不能正常开启崩溃采集
+
+ v1.11.14 修改 trackAppCrash 实现，增加 enableTrackAppCrash 设置
+*/
+- (void)testTrackAppCrashCanNotTrackCrash {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    [self.sensorsAnalytics trackAppCrash];
+#pragma clang diagnostic pop
+
+    XCTAssertTrue(self.sensorsAnalytics.configOptions.enableTrackAppCrash);
+}
+
 /**
  多次调用初始化方法会生成多个实例，不是一个单例对象，v1.11.7 修复
  */
@@ -267,4 +283,45 @@ - (void)testCheckAppEndEventDuration {
     }];
 }
 
+- (void)testCrossTrackTimer {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"异步操作timeout"];
+    __block NSString *timer1;
+    __block NSString *timer2;
+    dispatch_queue_t queue = dispatch_queue_create("sensorsData-Test", DISPATCH_QUEUE_SERIAL);
+    timer1 = [[SensorsAnalyticsSDK sharedInstance] trackTimerStart:@"testTimer"];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), queue, ^{
+        timer2 = [[SensorsAnalyticsSDK sharedInstance] trackTimerStart:@"testTimer"];
+    });
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), queue, ^{
+        [[SensorsAnalyticsSDK sharedInstance] trackTimerPause:timer1];
+    });
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(6 * NSEC_PER_SEC)), queue, ^{
+        [[SensorsAnalyticsSDK sharedInstance] trackTimerPause:timer2];
+    });
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(8 * NSEC_PER_SEC)), queue, ^{
+        [[SensorsAnalyticsSDK sharedInstance] trackTimerResume:timer1];
+    });
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(10 * NSEC_PER_SEC)), queue, ^{
+        [[SensorsAnalyticsSDK sharedInstance] trackTimerResume:timer2];
+    });
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(12 * NSEC_PER_SEC)), queue, ^{
+        [[SensorsAnalyticsSDK sharedInstance] trackTimerEnd:timer1];
+    });
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(14 * NSEC_PER_SEC)), queue, ^{
+        [[SensorsAnalyticsSDK sharedInstance] trackTimerEnd:timer2];
+    });
+ 
+    [[SensorsAnalyticsSDK sharedInstance] trackEventCallback:^BOOL (NSString *_Nonnull eventName, NSMutableDictionary<NSString *, id> *_Nonnull properties) {
+        if ([eventName isEqualToString:@"timerEvent"]) {
+            XCTAssertEqualWithAccuracy([properties[@"event_duration"] floatValue], 8, 0.1);
+        }
+        [expectation fulfill];
+        return NO;
+    }];
+
+    [self waitForExpectationsWithTimeout:30 handler:^(NSError *error) {
+        XCTAssertNil(error);
+    }];
+}
+
 @end
diff --git a/SensorsAnalyticsExtension/Info.plist b/SupportingFiles/SensorsAnalyticsExtension-Info.plist
similarity index 100%
rename from SensorsAnalyticsExtension/Info.plist
rename to SupportingFiles/SensorsAnalyticsExtension-Info.plist
diff --git a/SensorsAnalyticsSDK/Info.plist b/SupportingFiles/SensorsAnalyticsSDK-Info.plist
similarity index 100%
rename from SensorsAnalyticsSDK/Info.plist
rename to SupportingFiles/SensorsAnalyticsSDK-Info.plist
diff --git a/fastlane/.env b/fastlane/.env
new file mode 100644
index 00000000..637edf59
--- /dev/null
+++ b/fastlane/.env
@@ -0,0 +1,8 @@
+
+GITLAB_PATH="~/Documents/Git/sa-sdk-ios"
+GITHUB_PATH="~/Documents/GitHub/sa-sdk-ios"
+
+GITHUB_OWNER="minchaozhang"
+GITHUB_REPOSITORY="sa-sdk-ios"
+
+FRAMEWORK_NAME=SensorsAnalyticsSDK
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
new file mode 100644
index 00000000..ab93edb3
--- /dev/null
+++ b/fastlane/Fastfile
@@ -0,0 +1,174 @@
+# Customise this file, documentation can be found here:
+# https://github.com/fastlane/fastlane/tree/master/fastlane/docs
+# All available actions: https://docs.fastlane.tools/actions
+# can also be listed using the `fastlane actions` command
+
+# Change the syntax highlighting to Ruby
+# All lines starting with a # are ignored when running `fastlane`
+
+# If you want to automatically update fastlane if a new version is available:
+# update_fastlane
+
+# This is the minimum version number required.
+# Update this, if you use features of a newer version
+fastlane_version "2.28.3"
+
+default_platform :ios
+
+platform :ios do
+
+  desc "Runs all the tests"
+  lane :test do
+    scan
+  end
+
+  desc "Commit"
+  lane :commit do |options|
+    if !options[:version]
+      raise "No version specified!".red
+    end
+
+    git_add(
+      path: "."
+    )
+    
+    # commit the branch
+    git_commit(
+      path: ".",
+      message: "Release #{options[:version]}"
+    )
+
+    #push the branch
+    push_to_git_remote(
+      remote: options[:remote]
+    )
+  end
+
+  desc "Prepare release new version"
+  lane :prepare_release do |options|
+    if !options[:version]
+      raise "No version specified!".red
+    end
+
+    if options[:skip_modify_version] != true
+      sh("chmod 777 ./modify_version.sh")
+      sh("./modify_version.sh #{ENV["FRAMEWORK_NAME"]} #{options[:version]} #{options[:branch]}")
+
+      commit(
+        version: options[:version], 
+        remote: options[:remote]
+      )
+    end
+
+    if options[:skip_replace_code] != true
+      sh("chmod 777 ./replace_code.sh")
+      sh("./replace_code.sh #{ENV["GITLAB_PATH"]} #{ENV["GITHUB_PATH"]} #{options[:version]} #{options[:branch]}")
+    end
+  end
+
+
+  lane :github_tag do |options|
+    if !options[:version]
+      raise "No version specified!".red
+    end
+
+    # tag the repo
+    add_git_tag(
+      tag: "v#{options[:version]}"
+    )
+
+    # push the tag
+    if options[:skip_push_tags] != true
+      sa_push_git_tags_to_remote(
+        remote: options[:remote]
+      )
+    end
+  end
+
+  lane :github_release do |options|
+    if !options[:version]
+      raise "No version specified!".red
+    end
+    if !options[:api_token]
+      raise "No version specified!".red
+    end
+
+    file_path = options[:file_path] ? options[:file_path] : (ENV["GITHUB_RELEASE_NOTE"] ? ENV["GITHUB_RELEASE_NOTE"] : "fastlane/ReleaseNote.md")
+    body = sa_read_release_note(
+      file_path: file_path
+    )
+
+    owner=ENV["GITHUB_OWNER"]
+    repo=ENV["GITHUB_REPOSITORY"]
+    github_release = set_github_release(
+      repository_name: "#{owner}/#{repo}",
+      api_token: "#{options[:api_token]}",
+      name: "Release #{options[:version]}",
+      tag_name: "v#{options[:version]}",
+      description: body
+    )
+  end
+
+  lane :cocoapods_push do |options|
+    pod_push(
+      allow_warnings: options[:allow_warnings]
+    )
+  end
+
+  lane :github_push do |options|
+    if options[:skip_github_commit] != true
+      commit(
+        version: options[:version], 
+        remote: options[:remote]
+      )
+    end
+
+    if options[:skip_github_tag] != true
+      github_tag(
+        version: options[:version], 
+        remote: options[:remote],
+        skip_push_tags: options[:skip_push_tags]
+      )
+    end
+
+    if options[:skip_github_release] != true      
+      github_release(
+        version: options[:version], 
+        remote: options[:remote],
+        api_token: options[:api_token],
+      )
+    end
+
+    if options[:skip_pod_push] != true
+      cocoapods_push(
+        allow_warnings: options[:allow_warnings]
+      )
+    end
+  end
+
+  lane :release do |options|
+    if !options[:version]
+      raise "No version specified!".red
+    end
+
+    branch = options[:branch] ? options[:branch] : "master"
+    remote = options[:remote] ? options[:remote] : "origin"
+    prepare_release(
+      version: options[:version],
+      branch: branch,
+      remote: remote,
+      skip_modify_version: options[:skip_modify_version],
+      skip_replace_code: options[:skip_replace_code]
+    )
+    
+    skip_push_tags = options[:skip_push_tags] ? options[:skip_push_tags] : false
+    skip_github_commit = options[:skip_github_commit] ? options[:skip_github_commit] : false
+    skip_github_tag = options[:skip_github_tag] ? options[:skip_github_tag] : false
+    skip_github_release = options[:skip_github_release] ? options[:skip_github_release] : false
+    skip_pod_push = options[:skip_pod_push] ? options[:skip_pod_push] : false
+    allow_warnings = options[:allow_warnings] ? options[:allow_warnings] : true
+    sh("cd #{ENV["GITHUB_PATH"]} && fastlane github_push version:#{options[:version]} branch:#{branch} remote:#{remote} api_token:#{options[:api_token]} skip_push_tags:#{skip_push_tags} skip_github_commit:#{skip_github_commit} skip_github_tag:#{skip_github_tag} skip_github_release:#{skip_github_release} skip_pod_push:#{skip_pod_push} allow_warnings:#{allow_warnings}")
+  end
+end
+
+
diff --git a/fastlane/actions/sa_push_git_tags_to_remote.rb b/fastlane/actions/sa_push_git_tags_to_remote.rb
new file mode 100644
index 00000000..c921ee13
--- /dev/null
+++ b/fastlane/actions/sa_push_git_tags_to_remote.rb
@@ -0,0 +1,47 @@
+module Fastlane
+  module Actions
+    class SaPushGitTagsToRemoteAction < Action
+      def self.run(params)
+          commands = ["git", "push"]
+            
+          if params[:remote]
+            commands << "#{params[:remote]}"
+          end
+
+          commands << "--tags"
+
+          result = Actions.sh("#{commands.join(" ")}")
+          UI.success("Tags pushed to remote")
+          return result
+        end
+
+        #####################################################
+        # @!group Documentation
+        #####################################################
+
+        def self.description
+          "Push local tags to the remote - this will only push tags"
+        end
+
+        def self.available_options
+          [
+          FastlaneCore::ConfigItem.new(key: :remote,
+                                       env_name: "FL_PUSH_GIT_TAGS_REMOTE",
+                                       description: "The remote to push tags too",
+                                       is_string:true,
+                                       optional:true)
+          ]
+        end
+
+        def self.author
+          ['vittoriom']
+        end
+
+        def self.is_supported?(platform)
+          true
+        end
+      end
+    end
+  end
+
+        
diff --git a/fastlane/actions/sa_read_release_note.rb b/fastlane/actions/sa_read_release_note.rb
new file mode 100644
index 00000000..2e08166f
--- /dev/null
+++ b/fastlane/actions/sa_read_release_note.rb
@@ -0,0 +1,57 @@
+module Fastlane
+  module Actions
+
+    class SaReadReleaseNoteAction < Action
+      def self.replace(filepath, regexp, *args, &block)
+        content = File.read(filepath).gsub(regexp, *args, &block)
+        File.open(filepath, 'wb') { |file| file.write(content) }
+      end
+      
+      def self.run(params)
+        file = File.new("#{params[:file_path]}", "r")
+        if file
+          content = file.sysread(1000)
+          UI.success("#{params[:file_path]} content: \n #{content} \n")
+          return content.force_encoding('UTF-8')
+        else
+          raise "No ReleaseNote found in #{params[:file_path]}".red
+        end
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Read release note form a file"
+      end
+
+      def self.details
+        "Read release note form a file."
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :file_path,
+                                       description: "Path for the file",
+                                       is_string: true,
+                                       optional: false),
+        ]
+      end
+
+      def self.output
+      end
+
+      def self.return_value
+      end
+
+      def self.authors
+        ["minchaozhang"]
+      end
+
+      def self.is_supported?(platform)
+        return true
+      end
+    end
+  end
+end
diff --git a/fastlane/modify_version.sh b/fastlane/modify_version.sh
new file mode 100755
index 00000000..05e42015
--- /dev/null
+++ b/fastlane/modify_version.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+FRAMEWORK_NAME=$1
+VERSION=$2
+BRANCH=$3
+
+SRCROOT_PATH=..
+
+cd $SRCROOT_PATH
+git checkout $BRANCH
+git pull
+
+######################
+# Podspec version
+######################
+POD_PAHT=./${FRAMEWORK_NAME}.podspec
+if [[ $BRANCH == 'pre' ]]; then
+    POD_PAHT=./${FRAMEWORK_NAME}-pre.podspec
+fi
+
+POD_VERSION_CODE="  s.version      = "
+if [ `grep -c "\"${VERSION}\"" $POD_PAHT` == '0' ]; then
+    LINE=`grep -n "${POD_VERSION_CODE}" ${POD_PAHT} | head -1 | cut -d ":" -f 1`
+    LINE=$((${LINE} - 1))
+    echo "${POD_VERSION_CODE} at line: ${LINE}"
+
+    sed -i '' "/${POD_VERSION_CODE}/d" ${POD_PAHT}
+    sed -i '' "${LINE} a\ 
+    \\${POD_VERSION_CODE}\"${VERSION}\"
+    " ${POD_PAHT}
+fi
+
+######################
+# Lib version
+######################
+LIB_VERSION_PATH=${FRAMEWORK_NAME}/${FRAMEWORK_NAME}.m
+LIB_VERSION_CODE="#define VERSION @"
+if [ `grep -c "${LIB_VERSION_CODE}\"${VERSION}\"" ${LIB_VERSION_PATH}` == '0' ]; then
+    LINE=`grep -n "${LIB_VERSION_CODE}" ${LIB_VERSION_PATH} | head -1 | cut -d ":" -f 1`
+    LINE=$((${LINE} - 1))
+    echo "${LIB_VERSION_CODE} at line: ${LINE}"
+
+    sed -i '' "/${LIB_VERSION_CODE}/d" ${LIB_VERSION_PATH}
+    sed -i '' "${LINE} a\ 
+    \\${LIB_VERSION_CODE}\"${VERSION}\"
+    " ${LIB_VERSION_PATH}
+fi
+
+######################
+# GitLab
+######################
+# 提交版本修改代码
+#git add .
+#git commit -m "修改版本号为：${VERSION}"
+#git push
+
+exit 0
diff --git a/fastlane/replace_code.sh b/fastlane/replace_code.sh
new file mode 100755
index 00000000..c36f28c5
--- /dev/null
+++ b/fastlane/replace_code.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+GITLAB_PATH=$1
+GITHUB_PATH=$2
+
+VERSION=$3
+BRANCH=$4
+
+######################
+# Podspec version
+######################
+
+cd ${GITHUB_PATH}
+git checkout ${BRANCH}
+git pull
+
+rm -rf ${GITHUB_PATH}/*
+cp -rf ${GITLAB_PATH}/* ${GITHUB_PATH}
+
+exit 0