Add object detection, tracking, mobile notifications, and search to any security camera.
v2 live devices api
roryclear58a47bbed7d2
diff --git a/ios/clearcam/LiveViewController.m b/ios/clearcam/LiveViewController.mindex c9b8636..e0e5ac5 100644--- a/ios/clearcam/LiveViewController.m+++ b/ios/clearcam/LiveViewController.m@@ -118,46 +118,64 @@];NSURL *url = components.URL;- NSLog(@"Final URL: %@", url);-NSURLSessionDataTask *task = [self.session dataTaskWithURL:url completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {dispatch_async(dispatch_get_main_queue(), ^{[self.refreshControl endRefreshing];});+if (error) return;+ if (!data) return;+NSError *jsonError;- NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonError];+ id jsonObj = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonError];if (jsonError) return;+ NSArray *devices = nil;+ if ([jsonObj isKindOfClass:[NSDictionary class]]) {+ NSDictionary *json = (NSDictionary *)jsonObj;+ if ([json[@"devices"] isKindOfClass:[NSArray class]]) {+ devices = json[@"devices"];+ } else if ([json[@"device_names"] isKindOfClass:[NSArray class]] &&+ [json[@"alerts_on"] isKindOfClass:[NSArray class]]) {+ NSArray *names = json[@"device_names"];+ NSArray *alerts = json[@"alerts_on"];+ NSMutableArray *converted = [NSMutableArray array];+ for (NSInteger i = 0; i < names.count; i++) {+ NSString *name = names[i];+ BOOL alertsOn = (i < alerts.count) ? [alerts[i] boolValue] : NO;+ [converted addObject:@{@"name": name, @"alerts_on": @(alertsOn)}];+ }+ devices = converted;+ }+ }- NSArray<NSString *> *deviceNames = json[@"device_names"];- NSArray<NSNumber *> *alertsOnArray = json[@"alerts_on"];-- if (deviceNames) {- dispatch_async(dispatch_get_main_queue(), ^{- [self.deviceNames removeAllObjects];- [self.alertsOnStates removeAllObjects];+ if (![devices isKindOfClass:[NSArray class]]) return;++ dispatch_async(dispatch_get_main_queue(), ^{+ [self.deviceNames removeAllObjects];+ [self.alertsOnStates removeAllObjects];++ for (NSDictionary *device in devices) {+ NSString *name = device[@"name"];+ NSNumber *alertsOnValue = device[@"alerts_on"];- for (NSInteger i = 0; i < deviceNames.count; i++) {- NSString *decodedName = [deviceNames[i] stringByRemovingPercentEncoding];- if (decodedName) {- [self.deviceNames addObject:decodedName];- // If alerts_on array is valid and has a matching index- BOOL alertsOn = NO;- if (alertsOnArray && i < alertsOnArray.count) {- alertsOn = [alertsOnArray[i] boolValue];- }- [self.alertsOnStates addObject:@(alertsOn)];- }+ if ([name isKindOfClass:[NSString class]]) {+ NSString *decodedName = [name stringByRemovingPercentEncoding];+ [self.deviceNames addObject:decodedName ?: name];++ BOOL alertsOn = [alertsOnValue boolValue];+ [self.alertsOnStates addObject:@(alertsOn)];}- [self.tableView reloadData];- [self updateTableViewBackground];- });- }-+ }++ [self.tableView reloadData];+ [self updateTableViewBackground];+ });}];+[task resume];}+#pragma mark - UITableViewDataSource- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {