feat: event add timezoneOffset property

Example/GrowingAnalyticsTests/Helper/ManualTrackHelper.m

@@ -256,7 +256,8 @@ + (NSArray *)context {
         @"platform",     @"platformVersion", @"deviceId",    @"sessionId",   @"eventType",
         @"timestamp",    @"domain",          @"urlScheme",   @"appState",    @"eventSequenceId",
         @"networkState", @"screenHeight",    @"screenWidth", @"deviceBrand", @"deviceModel",
-        @"deviceType",   @"appVersion",      @"appName",     @"language",    @"sdkVersion"
+        @"deviceType",   @"appVersion",      @"appName",     @"language",    @"sdkVersion",
+        @"timezoneOffset"
     ];
     return context;
 }

Example/GrowingAnalyticsTests/ModulesTests/ProtobufTests/ProtobufDatabaseTest.m

@@ -146,6 +146,7 @@ - (void)testDatabaseEventIO {
                                                            .setSdkVersion(@"3.3.3")
                                                            .setUserKey(@"iPhone")
                                                            .setDataSourceId(@"1234567890")
+                                                           .setTimezoneOffset(-480)
                                                            .build);
     NSString *uuid = [NSUUID UUID].UUIDString;
     GrowingEventProtobufPersistence *persistenceIn = [GrowingEventProtobufPersistence persistenceEventWithEvent:event
@@ -203,6 +204,8 @@ - (void)testDatabaseEventIO {
     XCTAssertEqual(GrowingPBEventType_Custom, protobuf.eventType);
     XCTAssertEqualObjects(event.eventName ?: @"", protobuf.eventName);
     XCTAssertEqualObjects(event.attributes ?: @{}, protobuf.attributes);
+    // 4.0.0
+    XCTAssertEqual(event.timezoneOffset, protobuf.timezoneOffset);
 }
 
 - (GrowingEventProtobufPersistence *)customEventPersistence {

Example/GrowingAnalyticsTests/ModulesTests/ProtobufTests/ProtobufEventsTest.m

@@ -536,6 +536,8 @@ - (void)contrastOfDefaultParamter:(GrowingBaseEvent *)event protobuf:(GrowingPBE
     XCTAssertEqualObjects(event.sdkVersion ?: @"", protobuf.sdkVersion);
     // 3.3.0
     XCTAssertEqualObjects(event.userKey ?: @"", protobuf.userKey);
+    // 4.0.0
+    XCTAssertEqual(event.timezoneOffset, protobuf.timezoneOffset);
 }
 
 @end

Example/GrowingAnalyticsTests/ServicesTests/CompressionTests/CompressionTest.m

@@ -54,6 +54,7 @@ - (void)setUp {
                     .setUserId(@"zhangsan")
                     .setUserKey(@"phone")
                     .setDeviceId(@"testdeviceID")
+                    .setTimezoneOffset(-480)
                     .build.toDictionary;
 }
 

Example/GrowingAnalyticsTests/ServicesTests/DatabaseTests/JSONDatabaseTest.m

@@ -140,6 +140,7 @@ - (void)testDatabaseEventIO {
                                                            .setSdkVersion(@"3.3.3")
                                                            .setUserKey(@"iPhone")
                                                            .setDataSourceId(@"1234567890")
+                                                           .setTimezoneOffset(-480)
                                                            .build);
     NSString *uuid = [NSUUID UUID].UUIDString;
     GrowingEventJSONPersistence *persistenceIn = [GrowingEventJSONPersistence persistenceEventWithEvent:event
@@ -196,6 +197,8 @@ - (void)testDatabaseEventIO {
     // CUSTOM
     XCTAssertEqualObjects(event.eventName ?: @"", jsonObject[@"eventName"]);
     XCTAssertEqualObjects(event.attributes ?: @{}, jsonObject[@"attributes"]);
+    // 4.0.0
+    XCTAssertEqual(event.timezoneOffset, ((NSNumber *)(jsonObject[@"timezoneOffset"])).intValue);
 }
 
 - (GrowingEventJSONPersistence *)customEventPersistence {

Example/GrowingAnalyticsTests/ServicesTests/EncryptionTests/EncryptionTest.m

@@ -55,6 +55,7 @@ - (void)setUp {
                     .setUserId(@"zhangsan")
                     .setUserKey(@"phone")
                     .setDeviceId(@"testdeviceID")
+                    .setTimezoneOffset(-480)
                     .build.toDictionary;
 }
 

Example/GrowingAnalyticsTests/TrackerCoreTests/DatabaseTests/DatabaseTest.m

@@ -70,6 +70,7 @@ - (void)setUp {
                      .setUserId(@"zhangsan")
                      .setUserKey(@"phone")
                      .setDeviceId(@"testdeviceID")
+                     .setTimezoneOffset(-480)
                      .build;
 }
 

Example/GrowingAnalyticsTests/TrackerCoreTests/EventTests/EventTest.m

@@ -94,7 +94,8 @@ - (void)testGrowingVisitEvent {
         .setTimestamp(12345678)
         .setUserId(@"zhangsan")
         .setUserKey(@"phone")
-        .setDeviceId(@"testdeviceID");
+        .setDeviceId(@"testdeviceID")
+        .setTimezoneOffset(-480);
 
     GrowingBaseBuilder *builder = GrowingVisitEvent.builder;
     [GrowingEventManager.sharedInstance postEventBuilder:builder];

GrowingTrackerCore/Event/Base/GrowingBaseEvent.m

@@ -58,6 +58,7 @@ - (instancetype)initWithBuilder:(GrowingBaseBuilder *)builder {
         _longitude = builder.longitude;
         _sdkVersion = builder.sdkVersion;
         _userKey = builder.userKey;
+        _timezoneOffset = builder.timezoneOffset;
     }
     return self;
 }
@@ -100,6 +101,7 @@ - (NSDictionary *)toDictionary {
     dataDict[@"longitude"] = ABS(self.longitude) > 0 ? @(self.longitude) : nil;
     dataDict[@"sdkVersion"] = self.sdkVersion;
     dataDict[@"userKey"] = self.userKey.length > 0 ? self.userKey : nil;
+    dataDict[@"timezoneOffset"] = @(self.timezoneOffset);
     return [dataDict copy];
 }
 
@@ -148,6 +150,7 @@ - (void)readPropertyInTrackThread {
     _appName = deviceInfo.displayName;
     _appVersion = deviceInfo.appVersion;
     _language = deviceInfo.language;
+    _timezoneOffset = -([[NSTimeZone defaultTimeZone] secondsFromGMT] / 60);
 }
 
 - (GrowingBaseBuilder * (^)(NSString *value))setDataSourceId {
@@ -332,6 +335,13 @@ - (void)readPropertyInTrackThread {
     };
 }
 
+- (GrowingBaseBuilder * (^)(NSInteger value))setTimezoneOffset {
+    return ^(NSInteger value) {
+        self->_timezoneOffset = value;
+        return self;
+    };
+}
+
 - (GrowingBaseEvent *)build {
     @throw [NSException
         exceptionWithName:NSInternalInconsistencyException

GrowingTrackerCore/Public/GrowingBaseEvent.h

@@ -60,6 +60,7 @@ typedef NS_OPTIONS(NSUInteger, GrowingEventSendPolicy) {
 @property (nonatomic, assign, readonly) double longitude;
 @property (nonatomic, copy, readonly) NSString *sdkVersion;
 @property (nonatomic, copy, readonly, nullable) NSString *userKey;
+@property (nonatomic, assign, readonly) NSInteger timezoneOffset;
 @property (nonatomic, assign) GrowingEventSendPolicy sendPolicy;
 
 - (NSDictionary *_Nonnull)toDictionary;
@@ -102,6 +103,7 @@ typedef NS_OPTIONS(NSUInteger, GrowingEventSendPolicy) {
 @property (nonatomic, assign, readonly) double longitude;
 @property (nonatomic, copy, readonly) NSString *sdkVersion;
 @property (nonatomic, copy, readonly, nullable) NSString *userKey;
+@property (nonatomic, assign, readonly) NSInteger timezoneOffset;
 
 // 赋值属性，eg:deviceId,userId,sessionId,eventSequenceId
 - (void)readPropertyInTrackThread;
@@ -132,6 +134,7 @@ typedef NS_OPTIONS(NSUInteger, GrowingEventSendPolicy) {
 - (GrowingBaseBuilder * (^)(NSString *value))setSdkVersion;
 - (GrowingBaseBuilder * (^)(NSString *value))setUserKey;
 - (GrowingBaseBuilder * (^)(NSString *value))setEventType;
+- (GrowingBaseBuilder * (^)(NSInteger value))setTimezoneOffset;
 - (GrowingBaseEvent *)build;
 
 @end

Services/Protobuf/Catagory/GrowingBaseEvent+Protobuf.m

@@ -51,6 +51,7 @@ - (GrowingPBEventV3Dto *)toProtobuf {
     dto.longitude = self.longitude;
     dto.sdkVersion = self.sdkVersion;
     dto.userKey = self.userKey;
+    dto.timezoneOffset = (int)self.timezoneOffset;
 
     __weak typeof(self) weakSelf = self;
     NSString * (^stringBlock)(NSString *) = ^(NSString *selectorString) {

Services/Protobuf/Catagory/GrowingPBEventV3Dto+GrowingHelper.m

@@ -180,6 +180,7 @@ - (id)growingHelper_jsonObject {
     if (self.userKey.length > 0) {
         [dic setObject:self.userKey forKey:@"userKey"];
     }
+    [dic setObject:@(self.timezoneOffset) forKey:@"timezoneOffset"];
 
     return dic;
 }
@@ -227,7 +228,8 @@ + (nullable instancetype)growingHelper_parseFromJsonObject:(NSDictionary *)jsonO
     dto.referralPage = jsonObject[@"referralPage"];
     dto.protocolType = jsonObject[@"protocolType"];
     dto.eventName = jsonObject[@"eventName"];
-
+    dto.timezoneOffset = ((NSNumber *)jsonObject[@"timezoneOffset"]).intValue;
+
     return dto;
 }
 

Services/Protobuf/Proto/event_v3.proto

@@ -62,6 +62,7 @@ message EventV3Dto {
     int64 send_time = 54;
     string user_key = 55;
     string xcontent = 56;
+    int32 timezone_offset = 57;
 }
 
 message ResourceItem {

Services/SwiftProtobuf/SwiftProtobuf.swift

@@ -88,6 +88,7 @@ public class SwiftProtobufWrapper: NSObject {
         dto.referralPage = jsonObject["referralPage"] as? String ?? ""
         dto.protocolType = jsonObject["protocolType"] as? String ?? ""
         dto.eventName = jsonObject["eventName"] as? String ?? ""
+        dto.timezoneOffset = (jsonObject["timezoneOffset"] as? NSNumber)?.int32Value ?? 0
 
         return SwiftProtobufWrapper(dto)
     }
@@ -200,6 +201,7 @@ extension GrowingBaseEvent {
         dto.longitude = self.longitude
         dto.sdkVersion = self.sdkVersion
         dto.userKey = self.userKey ?? ""
+        dto.timezoneOffset = Int32(self.timezoneOffset)
 
         dto.eventType = SwiftProtobufWrapper.eventType(self.eventType)
         dto.idfa = idfa()

Services/SwiftProtobuf/event_v3.pb.swift

@@ -365,6 +365,11 @@ struct Io_Growing_Tunnel_Protocol_EventV3Dto {
     set {_uniqueStorage()._xcontent = newValue}
   }
 
+  var timezoneOffset: Int32 {
+    get {return _storage._timezoneOffset}
+    set {_uniqueStorage()._timezoneOffset = newValue}
+  }
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
@@ -482,6 +487,7 @@ extension Io_Growing_Tunnel_Protocol_EventV3Dto: SwiftProtobuf.Message, SwiftPro
     54: .standard(proto: "send_time"),
     55: .standard(proto: "user_key"),
     56: .same(proto: "xcontent"),
+    57: .standard(proto: "timezone_offset"),
   ]
 
   fileprivate class _StorageClass {
@@ -536,6 +542,7 @@ extension Io_Growing_Tunnel_Protocol_EventV3Dto: SwiftProtobuf.Message, SwiftPro
     var _sendTime: Int64 = 0
     var _userKey: String = String()
     var _xcontent: String = String()
+    var _timezoneOffset: Int32 = 0
 
     static let defaultInstance = _StorageClass()
 
@@ -593,6 +600,7 @@ extension Io_Growing_Tunnel_Protocol_EventV3Dto: SwiftProtobuf.Message, SwiftPro
       _sendTime = source._sendTime
       _userKey = source._userKey
       _xcontent = source._xcontent
+      _timezoneOffset = source._timezoneOffset
     }
   }
 
@@ -662,6 +670,7 @@ extension Io_Growing_Tunnel_Protocol_EventV3Dto: SwiftProtobuf.Message, SwiftPro
         case 54: try { try decoder.decodeSingularInt64Field(value: &_storage._sendTime) }()
         case 55: try { try decoder.decodeSingularStringField(value: &_storage._userKey) }()
         case 56: try { try decoder.decodeSingularStringField(value: &_storage._xcontent) }()
+        case 57: try { try decoder.decodeSingularInt32Field(value: &_storage._timezoneOffset) }()
         default: break
         }
       }
@@ -827,6 +836,9 @@ extension Io_Growing_Tunnel_Protocol_EventV3Dto: SwiftProtobuf.Message, SwiftPro
       if !_storage._xcontent.isEmpty {
         try visitor.visitSingularStringField(value: _storage._xcontent, fieldNumber: 56)
       }
+      if _storage._timezoneOffset != 0 {
+        try visitor.visitSingularInt32Field(value: _storage._timezoneOffset, fieldNumber: 57)
+      }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -887,6 +899,7 @@ extension Io_Growing_Tunnel_Protocol_EventV3Dto: SwiftProtobuf.Message, SwiftPro
         if _storage._sendTime != rhs_storage._sendTime {return false}
         if _storage._userKey != rhs_storage._userKey {return false}
         if _storage._xcontent != rhs_storage._xcontent {return false}
+        if _storage._timezoneOffset != rhs_storage._timezoneOffset {return false}
         return true
       }
       if !storagesAreEqual {return false}