Release 1.3.7

1. 优化可视化埋点通信协议
sensorsdata · Mar 23, 2016 · 73b5bc5 · 73b5bc5
1 parent aeb50f6
commit 73b5bc5
Show file tree

Hide file tree

Showing 13 changed files with 147 additions and 116 deletions.
diff --git a/SensorsAnalyticsSDK/HelloSensorsAnalytics/DemoController.m b/SensorsAnalyticsSDK/HelloSensorsAnalytics/DemoController.m
@@ -28,9 +28,9 @@ - (void)didReceiveMemoryWarning {
 }
 
 - (void)testInit {
-    [SensorsAnalyticsSDK sharedInstanceWithServerURL:@"http://{sa_host}:8006/sa?token={token}"
-                                     andConfigureURL:@"http://{sa_host}:8007/api/vtrack/config"
-                                        andDebugMode:SensorsAnalyticsDebugOff];
+    [SensorsAnalyticsSDK sharedInstanceWithServerURL:@"http://${service_name}.cloud.sensorsdata.cn:8006/sa?token=${token}"
+                                     andConfigureURL:@"http://${service_name}.cloud.sensorsdata.cn/api/vtrack/config/"
+                                        andDebugMode:SensorsAnalyticsDebugAndTrack];
 }
 
 - (void)testTrack {

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK.podspec b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "SensorsAnalyticsSDK"
-  s.version      = "1.3.5"
+  s.version      = "1.3.6"
   s.summary      = "The offical 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/SensorsAnalyticsSDK.xcodeproj/project.pbxproj b/SensorsAnalyticsSDK/SensorsAnalyticsSDK.xcodeproj/project.pbxproj
@@ -587,7 +587,7 @@
 				INFOPLIST_FILE = HelloSensorsAnalytics/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.sensorsdata.sdk.HelloSensorsAnalytics;
+				PRODUCT_BUNDLE_IDENTIFIER = com.sensorsdata.sdk;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -602,7 +602,7 @@
 				INFOPLIST_FILE = HelloSensorsAnalytics/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.sensorsdata.sdk.HelloSensorsAnalytics;
+				PRODUCT_BUNDLE_IDENTIFIER = com.sensorsdata.sdk;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SAAbstractDesignerMessage.h b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SAAbstractDesignerMessage.h
@@ -25,6 +25,6 @@
 - (id)payloadObjectForKey:(NSString *)key;
 - (NSDictionary *)payload;
 
-- (NSData *)JSONData;
+- (NSData *)JSONData:(BOOL)useGzip;
 
 @end
diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SAAbstractDesignerMessage.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SAAbstractDesignerMessage.m
@@ -8,6 +8,8 @@
 /// Copyright (c) 2014 Mixpanel. All rights reserved.
 //
 
+#import "LFCGzipUtility.h"
+#import "NSData+SABase64.h"
 #import "SAAbstractDesignerMessage.h"
 #import "SALogger.h"
 
@@ -52,8 +54,29 @@ - (NSDictionary *)payload {
     return [_payload copy];
 }
 
-- (NSData *)JSONData {
-    NSDictionary *jsonObject = @{ @"type" : _type, @"payload" : [_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 = [LFCGzipUtility gzipData:[jsonString dataUsingEncoding:NSUTF8StringEncoding]];
+
+        // 3. Base64 Encode
+        NSString *b64String = [zippedData sa_base64EncodedString];
+
+        [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];

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerConnection.h b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerConnection.h
@@ -17,6 +17,7 @@
 
 @property (nonatomic, readonly) BOOL connected;
 @property (nonatomic, assign) BOOL sessionEnded;
+@property (nonatomic, assign) BOOL useGzip;
 
 - (instancetype)initWithURL:(NSURL *)url;
 - (instancetype)initWithURL:(NSURL *)url keepTrying:(BOOL)keepTrying connectCallback:(void (^)())connectCallback disconnectCallback:(void (^)())disconnectCallback;

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerConnection.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerConnection.m
@@ -58,6 +58,7 @@ - (instancetype)initWithURL:(NSURL *)url
         _open = NO;
         _connected = NO;
         _sessionEnded = NO;
+        _useGzip = NO;
         _session = [[NSMutableDictionary alloc] init];
         _url = url;
         _connectCallback = connectCallback;
@@ -147,7 +148,8 @@ - (id)sessionObjectForKey:(NSString *)key {
 
 - (void)sendMessage:(id<SADesignerMessage>)message {
     if (_connected) {
-        NSString *jsonString = [[NSString alloc] initWithData:[message JSONData] encoding:NSUTF8StringEncoding];
+
+        NSString *jsonString = [[NSString alloc] initWithData:[message JSONData:_useGzip] encoding:NSUTF8StringEncoding];
         SADebug(@"%@ VTrack sending message: %@", self, [message description]);
         [_webSocket send:jsonString];
     } else {

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerDeviceInfoMessage.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerDeviceInfoMessage.m
@@ -42,6 +42,10 @@ - (NSOperation *)responseCommandWithConnection:(SADesignerConnection *)connectio
         SADesignerDeviceInfoResponseMessage *deviceInfoResponseMessage = [SADesignerDeviceInfoResponseMessage message];
 
         dispatch_sync(dispatch_get_main_queue(), ^{
+            // 服务端是否支持 Payload 压缩
+            id supportGzip = [self payloadObjectForKey:@"support_gzip"];
+            conn.useGzip = (supportGzip == nil) ? NO : [supportGzip boolValue];
+
             UIDevice *currentDevice = [UIDevice currentDevice];
             struct CGSize size = [UIScreen mainScreen].bounds.size;
 

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerEventBindingMessage.h b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerEventBindingMessage.h
@@ -34,7 +34,6 @@ extern NSString *const SADesignerEventBindingRequestMessageType;
 
 @interface SADesignerTrackMessage : SAAbstractDesignerMessage
 
-+ (instancetype)message;
 + (instancetype)messageWithPayload:(NSDictionary *)payload;
 
 @end

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerEventBindingMesssage.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerEventBindingMesssage.m
@@ -78,31 +78,8 @@ @implementation SADesignerTrackMessage {
     NSDictionary *_payload;
 }
 
-+ (instancetype)message {
-    return [[self alloc] initWithType:@"debug_track" andPayload:@{}];
-}
-
 + (instancetype)messageWithPayload:(NSDictionary *)payload {
-    return[[self alloc] initWithType:@"debug_track" andPayload:payload];
-}
-
-- (instancetype)initWithType:(NSString *)type andPayload:(NSDictionary *)payload {
-    if (self = [super initWithType:type]) {
-        _payload = payload;
-    }
-    return self;
-}
-
-- (NSData *)JSONData {
-    NSDictionary *jsonObject = @{ @"type" : self.type, @"payload" : [_payload copy] };
-
-    NSError *error = nil;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonObject options:0 error:&error];
-    if (error) {
-        NSLog(@"Failed to serialize test designer message: %@", error);
-    }
-
-    return jsonData;
+    return[[self alloc] initWithType:@"debug_track" payload:payload];
 }
 
 @end

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerMessage.h b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerMessage.h
@@ -19,7 +19,7 @@
 - (void)setPayloadObject:(id)object forKey:(NSString *)key;
 - (id)payloadObjectForKey:(NSString *)key;
 
-- (NSData *)JSONData;
+- (NSData *)JSONData:(BOOL)useGzip;
 
 - (NSOperation *)responseCommandWithConnection:(SADesignerConnection *)connection;
 

diff --git a/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerSnapshotMessage.m b/SensorsAnalyticsSDK/SensorsAnalyticsSDK/SADesignerSnapshotMessage.m
@@ -31,8 +31,7 @@ + (instancetype)message {
 }
 
 - (SAObjectSerializerConfig *)configuration {
-    NSDictionary *config =
-    [self payloadObjectForKey:@"config"];
+    NSDictionary *config = [self payloadObjectForKey:@"config"];
     return config ? [[SAObjectSerializerConfig alloc] initWithDictionary:config] : nil;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     @interface SADesignerTrackMessage : SAAbstractDesignerMessage
-    + (instancetype)message;
     + (instancetype)messageWithPayload:(NSDictionary *)payload;
     @end
@@ Expand Down @@