From 24dba39b3a1186cf5b96bd109fd41ffca3aad96f Mon Sep 17 00:00:00 2001
From: jg zhu <>
Date: Wed, 23 Mar 2022 15:15:22 +0800
Subject: [PATCH] Release 4.2.5

---
 SensorsAnalyticsSDK.podspec                    |  2 +-
 SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m |  2 +-
 .../Core/Utils/SADateFormatter.m               |  1 +
 .../Utils/SADateFormatterTest.m                | 18 ++++++++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/SensorsAnalyticsSDK.podspec b/SensorsAnalyticsSDK.podspec
index 5c75a086..459b24a6 100644
--- a/SensorsAnalyticsSDK.podspec
+++ b/SensorsAnalyticsSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "4.2.4"
+  s.version      = "4.2.5"
   s.summary      = "The official iOS SDK of Sensors Analytics."
   s.homepage     = "http://www.sensorsdata.cn"
   s.source       = { :git => 'https://github.com/sensorsdata/sa-sdk-ios.git', :tag => "v#{s.version}" }
diff --git a/SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m b/SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m
index 725263e5..dbde9334 100755
--- a/SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m
+++ b/SensorsAnalyticsSDK/Core/SensorsAnalyticsSDK.m
@@ -53,7 +53,7 @@
 #import "SAUserDefaultsStorePlugin.h"
 #import "SASessionProperty.h"
 
-#define VERSION @"4.2.4"
+#define VERSION @"4.2.5"
 
 void *SensorsAnalyticsQueueTag = &SensorsAnalyticsQueueTag;
 
diff --git a/SensorsAnalyticsSDK/Core/Utils/SADateFormatter.m b/SensorsAnalyticsSDK/Core/Utils/SADateFormatter.m
index f7c98834..4abe5878 100644
--- a/SensorsAnalyticsSDK/Core/Utils/SADateFormatter.m
+++ b/SensorsAnalyticsSDK/Core/Utils/SADateFormatter.m
@@ -33,6 +33,7 @@ + (NSDateFormatter *)dateFormatterFromString:(NSString *)string {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         dateFormatter = [[NSDateFormatter alloc] init];
+        dateFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
     });
     if (dateFormatter) {
         [dateFormatter setDateFormat:string];
diff --git a/SensorsAnalyticsTests/Utils/SADateFormatterTest.m b/SensorsAnalyticsTests/Utils/SADateFormatterTest.m
index f3af801a..d77c393c 100644
--- a/SensorsAnalyticsTests/Utils/SADateFormatterTest.m
+++ b/SensorsAnalyticsTests/Utils/SADateFormatterTest.m
@@ -50,6 +50,24 @@ - (void)testDateFormatterWithNilString {
 //   NSString *current = [dateFormatter stringFromDate:[NSDate date]];
 }
 
+- (void)testLocaleIdentifier {
+    // 修复 iOS 15.4 中国大陆地区在 12 小时制格式化日期时包含 AM/PM 问题
+    NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:@""];
+    XCTAssertTrue([dateFormatter.locale.localeIdentifier isEqualToString:@"en_US_POSIX"]);
+}
+
+- (void)testDateFormatter {
+    NSString *formatter = @"yyyy-MM-dd HH:mm:ss";
+    NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:formatter];
+    XCTAssertTrue([dateFormatter.dateFormat isEqualToString:formatter]);
+}
+
+-(void)testDateFromString {
+    NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:@"yyyy-MM-dd HH:mm:ss"];
+    NSString *dateString = @"2022-03-21 18:07:09";
+    XCTAssertNotNil([dateFormatter dateFromString:dateString]);
+}
+
 - (void)testDateFormatterWithNotDateFormatterString {
     NSDateFormatter *dateFormatter = [SADateFormatter dateFormatterFromString:@"jjjj"];
     NSString *current = [dateFormatter stringFromDate:[NSDate date]];