Commit bfeb9d77 authored by Matthijs van der Kroon's avatar Matthijs van der Kroon

Merge branch 'feature/oct25' into 'dev'

Feature/oct25

See merge request !13
parents 281164c6 c4205891
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
Primed.sharedInstance.debug = YES; Primed.sharedInstance.debug = YES;
// Create Primed instance // Create Primed instance
[Primed.sharedInstance initWithPublicKey:@"mypubkey" secretKey:@"mysecretkey" connectionString:@"https://gw.staging.primed.io:443"]; [Primed.sharedInstance initWithPublicKey:@"mypubkey" secretKey:@"mysecretkey" connectionString:@"http://url.here"];
} }
-(void)didReceiveMemoryWarning { -(void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; [super didReceiveMemoryWarning];
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#pragma mark - IBActions #pragma mark - IBActions
-(IBAction)onBtnTrackView:(UIButton *)sender{ -(IBAction)onBtnTrackView:(UIButton *)sender{
// [PrimedTracker.sharedInstance trackView:@"Test View Example"]; // [PrimedTracker.sharedInstance trackView:@"Test View Example"];
[PrimedTracker.sharedInstance trackView:@"Test View Example" customProperties:@{@"id":@"33"}]; [PrimedTracker.sharedInstance trackView:@"Test View Example" customProperties:@{@"id":@"33"}];
} }
-(IBAction)onBtnTrackEnterViewPort:(UIButton *)sender{ -(IBAction)onBtnTrackEnterViewPort:(UIButton *)sender{
...@@ -55,17 +54,13 @@ ...@@ -55,17 +54,13 @@
CGPoint point = [aTouch locationInView:self.view]; CGPoint point = [aTouch locationInView:self.view];
//[PrimedTracker.sharedInstance trackClick:point.x y:point.y]; //[PrimedTracker.sharedInstance trackClick:point.x y:point.y];
[PrimedTracker.sharedInstance trackClick:point.x y:point.y interactionType:InteractionType_LEFT]; [PrimedTracker.sharedInstance trackClick:point.x y:point.y interactionType:InteractionType_LEFT];
} }
-(void)viewDidLoad { -(void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Enable debug
//PrimedTracker.sharedInstance.debug = YES;
// Create PrimedTracker instance // Create PrimedTracker instance
[PrimedTracker.sharedInstance initWithPublicKey:@"mypubkey" secretKey:@"mysecretkey" connectionString:@"https://gw.staging.primed.io:443" trackingConnectionString:@"http://18.191.69.104:5001/v1" heartbeatInterval:10 eventQueueRetryInterval:10]; [PrimedTracker.sharedInstance initWithPublicKey:@"mypubkey" secretKey:@"mysecretkey" connectionString:@"http://url.here" trackingConnectionString:@"http://url.here" heartbeatInterval:10 eventQueueRetryInterval:10];
[NSTimer scheduledTimerWithTimeInterval:10 repeats:YES block:^(NSTimer * _Nonnull timer) { [NSTimer scheduledTimerWithTimeInterval:10 repeats:YES block:^(NSTimer * _Nonnull timer) {
PIOAppDelegate *appDelegate = (PIOAppDelegate *)[[UIApplication sharedApplication] delegate]; PIOAppDelegate *appDelegate = (PIOAppDelegate *)[[UIApplication sharedApplication] delegate];
......
...@@ -31,7 +31,6 @@ typedef NS_ENUM(NSUInteger, ScrollDirection) { ...@@ -31,7 +31,6 @@ typedef NS_ENUM(NSUInteger, ScrollDirection) {
NSMutableArray *savedPayloads; NSMutableArray *savedPayloads;
NSString *sid; NSString *sid;
NSString *did; NSString *did;
CLLocation *currLocation;
NSString *externalIPAddress; NSString *externalIPAddress;
} }
......
...@@ -201,7 +201,6 @@ ...@@ -201,7 +201,6 @@
[self emitPayload:payload]; [self emitPayload:payload];
} }
-(void)trackPositionChange:(CLLocation *)location{ -(void)trackPositionChange:(CLLocation *)location{
currLocation = location;
NSDictionary *payload = [self basicEventProperties:@"positionchange" eventObject:@{@"latitude":@(location.coordinate.latitude), NSDictionary *payload = [self basicEventProperties:@"positionchange" eventObject:@{@"latitude":@(location.coordinate.latitude),
@"longitude":@(location.coordinate.longitude), @"longitude":@(location.coordinate.longitude),
@"accuracy":@(location.horizontalAccuracy) @"accuracy":@(location.horizontalAccuracy)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment