Update SDK to version 3.1.2

danielctull-forks · Dec 6, 2012 · 785f1e7 · 785f1e7
1 parent 8bafafb
commit 785f1e7
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 40 deletions.
diff --git a/ADMS_Measurement.h b/ADMS_Measurement.h
@@ -273,6 +273,8 @@ typedef enum {
 
 @property(nonatomic, retain) NSMutableDictionary *persistentContextData;	///< Persistent context data to include with every hit.
 
+@property(nonatomic) NSTimeInterval lifecycleSessionTimeout;
+
 /**
  *	@brief Comma-delimited list of variables to send with a trackLink or trackEvent call
  *

diff --git a/Examples/TrackingHelper.m b/Examples/TrackingHelper.m
@@ -5,7 +5,7 @@
 
 #import "TrackingHelper.h"
 #import "ADMS_Measurement.h"
-//#import "ADMS_MediaMeasurement.h"
+#import "ADMS_MediaMeasurement.h"
 
 #define TRACKING_RSID		@"YOUR_RSID_HERE"
 #define TRACKING_SERVER		@"YOUR_SERVER_HERE"
@@ -18,53 +18,56 @@ + (void)configureAppMeasurement{
 										 trackingServer:TRACKING_SERVER];
 
 	//Set Additional Configuration Variables Here
-	//	measurement.ssl = NO;
-	//	measurement.debugLogging = YES;
+	measurement.ssl = NO;
+	measurement.debugLogging = YES;
 
 
 	//(optional)Disable Autotracking Here
-	//[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsLifecycle | ADMS_AutoTrackOptionsNavigation];	//LifeCycle and Navigation auto tracking enabled
-	//[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsLifecycle];			//only LifeCycle auto tracking enabled (default)
-	//[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsNavigation];			//only Navigation auto tracking enabled
-	//[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsNone];				//fully disable auto tracking
+	[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsLifecycle | ADMS_AutoTrackOptionsNavigation];	//LifeCycle and Navigation auto tracking enabled
+//	[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsLifecycle];                                    //only LifeCycle auto tracking enabled (default)
+//	[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsNavigation];                                   //only Navigation auto tracking enabled
+//	[measurement setAutoTrackingOptions:ADMS_AutoTrackOptionsNone];                                         //fully disable auto tracking
 
 }
 
-//Examples of Custom Event and AppState Tracking
-//+ (void)trackCustomEvents:(NSString *)events {
-//	NSMutableDictionary *contextData = [NSMutableDictionary dictionary];
-//	[contextData setObject:@"value" forKey:@"contextKey"];
-//	
-//	[[ADMS_Measurement sharedInstance] trackEvents:events withContextData:contextData];
-//}
-//
-//+ (void)trackCustomAppState:(NSString *)appState {	
-//	NSMutableDictionary *contextData = [NSMutableDictionary dictionary];
-//	[contextData setObject:@"value" forKey:@"contextKey"];
-//	
-//	[[ADMS_Measurement sharedInstance] trackAppState:appState withContextData:contextData];
-//}
+// track custom event(s)
++ (void)trackCustomEvents:(NSString *)events {
+    ADMS_Measurement *measurement = [ADMS_Measurement sharedInstance];
+
+	NSMutableDictionary *contextData = [NSMutableDictionary dictionary];
+	[contextData setObject:@"value" forKey:@"contextKey"];
+
+	[measurement trackEvents:events withContextData:contextData];
+}
+
+// track custom app state(s)
++ (void)trackCustomAppState:(NSString *)appState {	
+	NSMutableDictionary *contextData = [NSMutableDictionary dictionary];
+	[contextData setObject:@"value" forKey:@"contextKey"];
+
+	[[ADMS_Measurement sharedInstance] trackAppState:appState withContextData:contextData];
+}
 
 + (void)configureMediaMeasurement{
-//	ADMS_MediaMeasurement *mediaMeasurement = [ADMS_MediaMeasurement sharedInstance];
-//    
-//    //Configure ContextDataMapping(required)	
-//    mediaMeasurement.contextDataMapping = [NSDictionary dictionaryWithObjectsAndKeys:
-//                                           @"eVar2,prop2",@"a.media.name",
-//                                           @"eVar3",@"a.media.segment",
-//                                           @"eVar1",@"a.contentType",
-//                                           @"event3",@"a.media.timePlayed",
-//                                           @"event1",@"a.media.view",
-//                                           @"event2",@"a.media.segmentView",
-//                                           @"event7",@"a.media.complete",
-//                                           nil];
-//    
-//    //Enable MPMoviePlayer Autotracking
-//    [mediaMeasurement setAutoTrackingOptions:ADMS_MediaAutoTrackOptionsMPMoviePlayer];
-//    
-//    //Configure optional settings
-//    mediaMeasurement.trackMilestones = @"25,50,75";
-//    mediaMeasurement.segmentByMilestones = YES;
+	ADMS_MediaMeasurement *mediaMeasurement = [ADMS_MediaMeasurement sharedInstance];
+
+    //Configure ContextDataMapping(required)	
+    mediaMeasurement.contextDataMapping = [@{
+        @"a.media.name":@"eVar2,prop2",
+        @"a.media.segment":@"eVar3",
+        @"a.contentType":@"eVar1",
+        @"a.media.timePlayed":@"event3",
+        @"a.media.view":@"event1",
+        @"a.media.segmentView":@"event2",
+        @"a.media.complete":@"event7"
+    } mutableCopy];
+
+    //Enable MPMoviePlayer Autotracking
+    [mediaMeasurement setAutoTrackingOptions:ADMS_MediaAutoTrackOptionsMPMoviePlayer];
+
+    //Configure optional settings
+    mediaMeasurement.trackMilestones = @"25,50,75";
+    mediaMeasurement.segmentByMilestones = YES;
 }
 
 @end
diff --git a/Readme.txt b/Readme.txt
@@ -11,6 +11,12 @@ http://microsite.omniture.com/t2/help/en_US/beta/ios/index.html#
 For a full migration guide to convert to version 3.0 please visit:
 http://microsite.omniture.com/t2/help/en_US/beta/ios/index.html#Migration_Guide
 
+3.1.2
+
+- Added ability to set lifecycleSessionTimeouts (used for calculating session lengths).  Defaults to 300 seconds.
+- Added FB referrer tracking to default install hit.
+- Fixed potential exception in media measurement if trackVars or trackEvents was set to nil.
+
 3.1.1
 
 - Fixed an issue where regular measurement events were not coming through in media measurement hits.

diff --git a/admsAppLibrary.a b/admsAppLibrary.a
diff --git a/documentation.html b/documentation.html
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="refresh" content="0;url=http://microsite.omniture.com/t2/help/en_US/sc/appmeasurement/ios/index.html">
+    <script language="javascript">
+        window.location.href = "http://microsite.omniture.com/t2/help/en_US/sc/appmeasurement/ios/index.html"
+    </script>
+    <title>Page Redirection</title>
+</head>
+<body>
+<p>The latest documentation is available online at <a href="http://microsite.omniture.com/t2/help/en_US/sc/appmeasurement/ios/index.html">http://microsite.omniture.com/t2/help/en_US/sc/appmeasurement/ios/index.html.</a></p>>
+</body>
+</html>