Skip to content

Commit 6a6ea5b

Browse files
author
王洋洋
committed
Release 4.5.7
1 parent ec3f650 commit 6a6ea5b

File tree

8 files changed

+68
-53
lines changed

8 files changed

+68
-53
lines changed

‎Example/Example.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@
513513
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
514514
GCC_WARN_UNUSED_FUNCTION = YES;
515515
GCC_WARN_UNUSED_VARIABLE = YES;
516-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
516+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
517517
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
518518
MTL_FAST_MATH = YES;
519519
ONLY_ACTIVE_ARCH = YES;
@@ -566,7 +566,7 @@
566566
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
567567
GCC_WARN_UNUSED_FUNCTION = YES;
568568
GCC_WARN_UNUSED_VARIABLE = YES;
569-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
569+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
570570
MTL_ENABLE_DEBUG_INFO = NO;
571571
MTL_FAST_MATH = YES;
572572
SDKROOT = iphoneos;
@@ -583,7 +583,7 @@
583583
CODE_SIGN_STYLE = Automatic;
584584
DEVELOPMENT_TEAM = 75FYWDWHL5;
585585
INFOPLIST_FILE = "$(SRCROOT)/SensorsData/Info.plist";
586-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
586+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
587587
LD_RUNPATH_SEARCH_PATHS = (
588588
"$(inherited)",
589589
"@executable_path/Frameworks",
@@ -603,7 +603,7 @@
603603
CODE_SIGN_STYLE = Automatic;
604604
DEVELOPMENT_TEAM = 75FYWDWHL5;
605605
INFOPLIST_FILE = "$(SRCROOT)/SensorsData/Info.plist";
606-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
606+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
607607
LD_RUNPATH_SEARCH_PATHS = (
608608
"$(inherited)",
609609
"@executable_path/Frameworks",
@@ -622,7 +622,7 @@
622622
CODE_SIGN_STYLE = Automatic;
623623
DEVELOPMENT_TEAM = 75FYWDWHL5;
624624
INFOPLIST_FILE = SensorsDataSwift/Info.plist;
625-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
625+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
626626
LD_RUNPATH_SEARCH_PATHS = (
627627
"$(inherited)",
628628
"@executable_path/Frameworks",
@@ -644,7 +644,7 @@
644644
CODE_SIGN_STYLE = Automatic;
645645
DEVELOPMENT_TEAM = 75FYWDWHL5;
646646
INFOPLIST_FILE = SensorsDataSwift/Info.plist;
647-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
647+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
648648
LD_RUNPATH_SEARCH_PATHS = (
649649
"$(inherited)",
650650
"@executable_path/Frameworks",

‎SensorsAnalyticsSDK.podspec‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22
s.name = "SensorsAnalyticsSDK"
3-
s.version = "4.5.6"
3+
s.version = "4.5.7"
44
s.summary = "The official iOS SDK of Sensors Analytics."
55
s.homepage = "http://www.sensorsdata.cn"
66
s.source = { :git => 'https://github.com/sensorsdata/sa-sdk-ios.git', :tag => "v#{s.version}" }
77
s.license = { :type => "Apache License, Version 2.0" }
88
s.author = { "Yuhan ZOU" => "[email protected]" }
9-
s.ios.deployment_target = '8.0'
9+
s.ios.deployment_target = '9.0'
1010
s.osx.deployment_target = '10.10'
1111
s.default_subspec = 'Core'
1212
s.frameworks = 'Foundation', 'SystemConfiguration'
@@ -47,7 +47,7 @@ Pod::Spec.new do |s|
4747

4848
# 全埋点
4949
s.subspec 'AutoTrack' do |g|
50-
g.ios.deployment_target = '8.0'
50+
g.ios.deployment_target = '9.0'
5151
g.dependency 'SensorsAnalyticsSDK/Common'
5252
g.source_files = "SensorsAnalyticsSDK/AutoTrack/**/*.{h,m}"
5353
g.public_header_files = 'SensorsAnalyticsSDK/AutoTrack/SensorsAnalyticsSDK+SAAutoTrack.h', 'SensorsAnalyticsSDK/AutoTrack/SAConfigOptions+AutoTrack.h'
@@ -56,15 +56,15 @@ Pod::Spec.new do |s|
5656

5757
# 可视化相关功能，包含可视化全埋点和点击图
5858
s.subspec 'Visualized' do |f|
59-
f.ios.deployment_target = '8.0'
59+
f.ios.deployment_target = '9.0'
6060
f.dependency 'SensorsAnalyticsSDK/AutoTrack'
6161
f.source_files = "SensorsAnalyticsSDK/Visualized/**/*.{h,m}"
6262
f.public_header_files = 'SensorsAnalyticsSDK/Visualized/SensorsAnalyticsSDK+Visualized.h', 'SensorsAnalyticsSDK/Visualized/SAConfigOptions+Visualized.h'
6363
end
6464

6565
# 开启 GPS 定位采集
6666
s.subspec 'Location' do |f|
67-
f.ios.deployment_target = '8.0'
67+
f.ios.deployment_target = '9.0'
6868
f.frameworks = 'CoreLocation'
6969
f.dependency 'SensorsAnalyticsSDK/Core'
7070
f.source_files = "SensorsAnalyticsSDK/Location/**/*.{h,m}"
@@ -73,7 +73,7 @@ Pod::Spec.new do |s|
7373

7474
# 开启设备方向采集
7575
s.subspec 'DeviceOrientation' do |f|
76-
f.ios.deployment_target = '8.0'
76+
f.ios.deployment_target = '9.0'
7777
f.dependency 'SensorsAnalyticsSDK/Core'
7878
f.source_files = 'SensorsAnalyticsSDK/DeviceOrientation/**/*.{h,m}'
7979
f.public_header_files = 'SensorsAnalyticsSDK/DeviceOrientation/SensorsAnalyticsSDK+DeviceOrientation.h'
@@ -82,31 +82,31 @@ Pod::Spec.new do |s|
8282

8383
# 推送点击
8484
s.subspec 'AppPush' do |f|
85-
f.ios.deployment_target = '8.0'
85+
f.ios.deployment_target = '9.0'
8686
f.dependency 'SensorsAnalyticsSDK/Core'
8787
f.source_files = "SensorsAnalyticsSDK/AppPush/**/*.{h,m}"
8888
f.public_header_files = 'SensorsAnalyticsSDK/AppPush/SAConfigOptions+AppPush.h'
8989
end
9090

9191
# 使用崩溃事件采集
9292
s.subspec 'Exception' do |e|
93-
e.ios.deployment_target = '8.0'
93+
e.ios.deployment_target = '9.0'
9494
e.dependency 'SensorsAnalyticsSDK/Common'
9595
e.source_files = "SensorsAnalyticsSDK/Exception/**/*.{h,m}"
9696
e.public_header_files = 'SensorsAnalyticsSDK/Exception/SAConfigOptions+Exception.h'
9797
end
9898

9999
# 基于 UA，使用 UIWebView 或者 WKWebView 进行打通
100100
s.subspec 'WebView' do |w|
101-
w.ios.deployment_target = '8.0'
101+
w.ios.deployment_target = '9.0'
102102
w.dependency 'SensorsAnalyticsSDK/Core'
103103
w.source_files = "SensorsAnalyticsSDK/WebView/**/*.{h,m}"
104104
w.public_header_files = 'SensorsAnalyticsSDK/WebView/SensorsAnalyticsSDK+WebView.h'
105105
end
106106

107107
# 基于 UA，使用 WKWebView 进行打通
108108
s.subspec 'WKWebView' do |w|
109-
w.ios.deployment_target = '8.0'
109+
w.ios.deployment_target = '9.0'
110110
w.dependency 'SensorsAnalyticsSDK/Core'
111111
w.source_files = "SensorsAnalyticsSDK/WKWebView/**/*.{h,m}"
112112
w.public_header_files = 'SensorsAnalyticsSDK/WKWebView/SensorsAnalyticsSDK+WKWebView.h'
@@ -119,14 +119,14 @@ Pod::Spec.new do |s|
119119
end
120120

121121
s.subspec 'DeprecatedCellClick' do |d|
122-
d.ios.deployment_target = '8.0'
122+
d.ios.deployment_target = '9.0'
123123
d.dependency 'SensorsAnalyticsSDK/Core'
124124
d.source_files = 'CellClick_HookDelegate_Deprecated/*.{h,m}'
125125
d.project_header_files = 'CellClick_HookDelegate_Deprecated/*.h'
126126
end
127127

128128
s.subspec 'Exposure' do |h|
129-
h.ios.deployment_target = '8.0'
129+
h.ios.deployment_target = '9.0'
130130
h.dependency 'SensorsAnalyticsSDK/Common'
131131
h.source_files = 'SensorsAnalyticsSDK/Exposure/**/*.{h,m}'
132132
h.public_header_files = 'SensorsAnalyticsSDK/Exposure/SAConfigOptions+Exposure.h', 'SensorsAnalyticsSDK/Exposure/SAExposureConfig.h', 'SensorsAnalyticsSDK/Exposure/SAExposureData.h', 'SensorsAnalyticsSDK/Exposure/SensorsAnalyticsSDK+Exposure.h', 'SensorsAnalyticsSDK/Exposure/UIView+ExposureIdentifier.h'

‎SensorsAnalyticsSDK.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3044,7 +3044,7 @@
30443044
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
30453045
GCC_WARN_UNUSED_FUNCTION = YES;
30463046
GCC_WARN_UNUSED_VARIABLE = YES;
3047-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3047+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
30483048
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
30493049
MTL_FAST_MATH = YES;
30503050
ONLY_ACTIVE_ARCH = YES;
@@ -3100,7 +3100,7 @@
31003100
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
31013101
GCC_WARN_UNUSED_FUNCTION = YES;
31023102
GCC_WARN_UNUSED_VARIABLE = YES;
3103-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3103+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
31043104
MTL_ENABLE_DEBUG_INFO = NO;
31053105
MTL_FAST_MATH = YES;
31063106
SDKROOT = iphoneos;
@@ -3126,7 +3126,7 @@
31263126
GENERATE_MASTER_OBJECT_FILE = YES;
31273127
INFOPLIST_FILE = "$(SRCROOT)/SupportingFiles/SensorsAnalyticsSDK-Info.plist";
31283128
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3129-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3129+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
31303130
LD_RUNPATH_SEARCH_PATHS = (
31313131
"$(inherited)",
31323132
"@executable_path/Frameworks",
@@ -3161,7 +3161,7 @@
31613161
GENERATE_MASTER_OBJECT_FILE = YES;
31623162
INFOPLIST_FILE = "$(SRCROOT)/SupportingFiles/SensorsAnalyticsSDK-Info.plist";
31633163
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
3164-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3164+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
31653165
LD_RUNPATH_SEARCH_PATHS = (
31663166
"$(inherited)",
31673167
"@executable_path/Frameworks",
@@ -3187,7 +3187,7 @@
31873187
DEVELOPMENT_TEAM = 75FYWDWHL5;
31883188
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
31893189
INFOPLIST_FILE = SensorsAnalyticsTests/Info.plist;
3190-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3190+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
31913191
LD_RUNPATH_SEARCH_PATHS = (
31923192
"$(inherited)",
31933193
"@executable_path/Frameworks",
@@ -3205,7 +3205,7 @@
32053205
CODE_SIGN_STYLE = Automatic;
32063206
DEVELOPMENT_TEAM = 75FYWDWHL5;
32073207
INFOPLIST_FILE = SensorsAnalyticsTests/Info.plist;
3208-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
3208+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
32093209
LD_RUNPATH_SEARCH_PATHS = (
32103210
"$(inherited)",
32113211
"@executable_path/Frameworks",

‎SensorsAnalyticsSDK/Core/Builder/EventObject/SAPropertyValidator.m‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,15 @@ - (void)sensorsdata_isValidPropertyKeyWithError:(NSError *__autoreleasing _Null
3636
}
3737

3838
- (id)sensorsdata_propertyValueWithKey:(NSString *)key error:(NSError *__autoreleasing _Nullable *)error {
39-
NSUInteger length = [self lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
40-
if (length > kSAPropertyValueMaxLength) {
41-
SALogWarn(@"%@'s length is longer than %ld", self, kSAPropertyValueMaxLength);
39+
NSInteger maxLength = kSAPropertyValueMaxLength;
40+
if ([key isEqualToString:@"app_crashed_reason"]) {
41+
maxLength = maxLength * 2;
42+
}
43+
if (self.length >= maxLength) {
44+
SALogWarn(@"%@'s length is longer than %ld", self, maxLength);
45+
NSMutableString *tempString = [NSMutableString stringWithString:[self substringToIndex:maxLength - 1]];
46+
[tempString appendString:@"$"];
47+
return [tempString copy];
4248
}
4349
return self;
4450
}

‎SensorsAnalyticsSDK/Core/Interceptor/Flush/SARepeatFlushInterceptor.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#import "SARepeatFlushInterceptor.h"
2626
#import "SAFlowManager.h"
2727

28-
static NSInteger const kSAFlushMaxRepeatCount = 100;
28+
static NSInteger const kSAFlushMaxRepeatCount = 40;
2929

3030
@interface SARepeatFlushInterceptor ()
3131
@end

‎SensorsAnalyticsSDK/Core/Network/SACarrierNamePropertyPlugin.m‎

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#import "SAConstants+Private.h"
2929
#import "SALimitKeyManager.h"
3030
#import "SAValidator.h"
31+
#import "SACoreResources.h"
3132

3233
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
3334
#import <CoreTelephony/CTTelephonyNetworkInfo.h>
@@ -40,6 +41,7 @@
4041
@interface SACarrierNamePropertyPlugin()
4142
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
4243
@property (nonatomic, strong) CTTelephonyNetworkInfo *networkInfo;
44+
@property (nonatomic, strong) CTCarrier *carrier;
4345
#endif
4446
@end
4547
@implementation SACarrierNamePropertyPlugin
@@ -71,24 +73,16 @@ - (NSString *)currentCarrierName {
7173
NSString *carrierName = nil;
7274

7375
@try {
74-
CTCarrier *carrier = nil;
75-
76-
#ifdef __IPHONE_12_0
77-
if (@available(iOS 12.1, *)) {
78-
// 排序
79-
NSArray *carrierKeysArray = [self.networkInfo.serviceSubscriberCellularProviders.allKeys sortedArrayUsingSelector:@selector(compare:)];
80-
carrier = self.networkInfo.serviceSubscriberCellularProviders[carrierKeysArray.firstObject];
81-
if (!carrier.mobileNetworkCode) {
82-
carrier = self.networkInfo.serviceSubscriberCellularProviders[carrierKeysArray.lastObject];
76+
if (self.carrier != nil) {
77+
NSString *networkCode = nil;
78+
if ([self.carrier respondsToSelector:@selector(mobileNetworkCode)]) {
79+
networkCode = [self.carrier mobileNetworkCode];
80+
}
81+
82+
NSString *countryCode = nil;
83+
if ([self.carrier respondsToSelector:@selector(mobileCountryCode)]) {
84+
countryCode = [self.carrier mobileCountryCode];
8385
}
84-
}
85-
#endif
86-
if (!carrier) {
87-
carrier = self.networkInfo.subscriberCellularProvider;
88-
}
89-
if (carrier != nil) {
90-
NSString *networkCode = [carrier mobileNetworkCode];
91-
NSString *countryCode = [carrier mobileCountryCode];
9286

9387
// 中国运营商 mcc 标识
9488
NSString *carrierChinaMCC = @"460";
@@ -116,12 +110,7 @@ - (NSString *)currentCarrierName {
116110
carrierName = SALocalizedString(@"SAPresetPropertyCarrierTietong");
117111
}
118112
} else if (countryCode && networkCode) { //国外运营商解析
119-
//加载当前 bundle
120-
NSBundle *sensorsBundle = [NSBundle bundleWithPath:[[NSBundle bundleForClass:[self class]] pathForResource:@"SensorsAnalyticsSDK" ofType:@"bundle"]];
121-
//文件路径
122-
NSString *jsonPath = [sensorsBundle pathForResource:@"sa_mcc_mnc_mini.json" ofType:nil];
123-
NSData *jsonData = [NSData dataWithContentsOfFile:jsonPath];
124-
NSDictionary *dicAllMcc = [SAJSONUtil JSONObjectWithData:jsonData];
113+
NSDictionary *dicAllMcc = [SACoreResources mcc];
125114
if (dicAllMcc) {
126115
NSString *mccMncKey = [NSString stringWithFormat:@"%@%@", countryCode, networkCode];
127116
carrierName = dicAllMcc[mccMncKey];
@@ -133,6 +122,26 @@ - (NSString *)currentCarrierName {
133122
}
134123
return carrierName;
135124
}
125+
126+
- (CTCarrier *)carrier {
127+
if (!_carrier) {
128+
#ifdef __IPHONE_12_0
129+
if (@available(iOS 12.1, *)) {
130+
// 排序
131+
NSArray *carrierKeysArray = [self.networkInfo.serviceSubscriberCellularProviders.allKeys sortedArrayUsingSelector:@selector(compare:)];
132+
_carrier = self.networkInfo.serviceSubscriberCellularProviders[carrierKeysArray.firstObject];
133+
if (![_carrier respondsToSelector:@selector(mobileNetworkCode)] || !_carrier.mobileNetworkCode) {
134+
_carrier = self.networkInfo.serviceSubscriberCellularProviders[carrierKeysArray.lastObject];
135+
}
136+
}
137+
#endif
138+
if (!_carrier && [self.networkInfo respondsToSelector:@selector(subscriberCellularProvider)]) {
139+
_carrier = self.networkInfo.subscriberCellularProvider;
140+
}
141+
}
142+
return _carrier;
143+
}
144+
136145
#endif
137146

138147
#pragma mark - SAPropertyPlugin method

‎SensorsAnalyticsSDK/Core/SAConstants.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void sensorsdata_dispatch_safe_sync(dispatch_queue_t queue,DISPATCH_NOESCAPE dis
188188

189189
//event name、property key、value max length
190190
NSInteger kSAEventNameMaxLength = 100;
191-
NSInteger kSAPropertyValueMaxLength = 1024;
191+
NSInteger kSAPropertyValueMaxLength = 8192;
192192

193193
#pragma mark - SA Visualized
194194
/// 埋点校验中，$WebClick 匹配可视化全埋点的事件名（集合）

‎SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
#import "SALimitKeyManager.h"
6565
#import "NSDictionary+SACopyProperties.h"
6666

67-
#define VERSION @"4.5.6"
67+
#define VERSION @"4.5.7"
6868

6969
void *SensorsAnalyticsQueueTag = &SensorsAnalyticsQueueTag;
7070

0 commit comments

Comments
 (0)