From 32eb26915feef3f0c61488e7ec93852aff671c55 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 18 Nov 2013 11:42:59 -0600 Subject: [PATCH] Fix #24 --- .../xcdebugger/Breakpoints_v2.xcbkptlist | 88 +++++++++---------- SwitchaBLE/KSSDevicesViewController.m | 15 +++- 2 files changed, 55 insertions(+), 48 deletions(-) diff --git a/SwitchaBLE.xcodeproj/xcuserdata/Drew.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwitchaBLE.xcodeproj/xcuserdata/Drew.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 1d4082b..162d72a 100644 --- a/SwitchaBLE.xcodeproj/xcuserdata/Drew.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwitchaBLE.xcodeproj/xcuserdata/Drew.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406405112.667965" + timestampString = "406489203.152026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "188" - endingLineNumber = "188" + startingLineNumber = "195" + endingLineNumber = "195" landmarkName = "-numberOfSectionsInTableView:" landmarkType = "5"> @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406405112.667965" + timestampString = "406489203.152026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "143" - endingLineNumber = "143" + startingLineNumber = "150" + endingLineNumber = "150" landmarkName = "-bluetoothController:didConnectToPeripheral:" landmarkType = "5"> @@ -90,7 +90,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" - timestampString = "406405869.236335" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "92" @@ -106,11 +106,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406405112.667965" + timestampString = "406489203.152026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "131" - endingLineNumber = "131" + startingLineNumber = "138" + endingLineNumber = "138" landmarkName = "-bluetoothController:didConnectToPeripheral:" landmarkType = "5"> @@ -394,11 +394,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSBluetoothController.m" - timestampString = "406403218.370331" + timestampString = "406488528.497725" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "161" - endingLineNumber = "161" + startingLineNumber = "158" + endingLineNumber = "158" landmarkName = "-peripheral:didUpdateValueForCharacteristic:error:" landmarkType = "5"> @@ -410,11 +410,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSBluetoothController.m" - timestampString = "406403218.370331" + timestampString = "406488528.497725" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "105" - endingLineNumber = "105" + startingLineNumber = "102" + endingLineNumber = "102" landmarkName = "-centralManager:didDisconnectPeripheral:error:" landmarkType = "5"> @@ -426,7 +426,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" - timestampString = "406405869.236335" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "122" @@ -442,7 +442,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" - timestampString = "406405869.236335" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "119" @@ -458,7 +458,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" - timestampString = "406406169.196403" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "176" @@ -474,7 +474,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" - timestampString = "406406169.196403" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "171" @@ -506,11 +506,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406405112.667965" + timestampString = "406489203.152026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "220" - endingLineNumber = "220" + startingLineNumber = "227" + endingLineNumber = "227" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -522,11 +522,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406405112.667965" + timestampString = "406489203.152026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "195" - endingLineNumber = "195" + startingLineNumber = "202" + endingLineNumber = "202" landmarkName = "-tableView:numberOfRowsInSection:" landmarkType = "5"> @@ -538,7 +538,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" - timestampString = "406405869.236335" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "155" @@ -554,12 +554,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406403531.598139" + timestampString = "406489203.152026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "73" - endingLineNumber = "73" - landmarkName = "-deviceDetailsViewController:didFinishSavingDevice:" + startingLineNumber = "309" + endingLineNumber = "309" + landmarkName = "-prepareForSegue:sender:" landmarkType = "5"> @@ -570,12 +570,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406405112.667965" + timestampString = "406489203.152026" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "302" - endingLineNumber = "302" - landmarkName = "-prepareForSegue:sender:" + startingLineNumber = "127" + endingLineNumber = "127" + landmarkName = "-deviceDetailsViewController:didFinishForgettingDevice:" landmarkType = "5"> @@ -585,13 +585,13 @@ shouldBeEnabled = "No" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "SwitchaBLE/KSSDevicesViewController.m" - timestampString = "406405112.667965" + filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "120" - endingLineNumber = "120" - landmarkName = "-deviceDetailsViewController:didFinishForgettingDevice:" + startingLineNumber = "167" + endingLineNumber = "167" + landmarkName = "-textFieldShouldReturn:" landmarkType = "5"> @@ -602,12 +602,12 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "SwitchaBLE/KSSDeviceDetailsViewController.m" - timestampString = "406406169.196403" + timestampString = "406489147.373485" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "167" - endingLineNumber = "167" - landmarkName = "-textFieldShouldReturn:" + startingLineNumber = "113" + endingLineNumber = "113" + landmarkName = "-alertView:clickedButtonAtIndex:" landmarkType = "5"> diff --git a/SwitchaBLE/KSSDevicesViewController.m b/SwitchaBLE/KSSDevicesViewController.m index 1a63ac9..535693a 100644 --- a/SwitchaBLE/KSSDevicesViewController.m +++ b/SwitchaBLE/KSSDevicesViewController.m @@ -52,7 +52,6 @@ - (void)viewDidLoad appDelegate.bluetoothController = [[KSSBluetoothController alloc] init]; } - // NEEDS TO BE TESTED appDelegate.bluetoothController.deviceListDelegate = self; for (CBPeripheral *peripheral in appDelegate.bluetoothController.connectedPeripherals) { [self bluetoothController:appDelegate.bluetoothController didConnectToPeripheral:peripheral]; @@ -70,9 +69,9 @@ - (void)didReceiveMemoryWarning - (void)deviceDetailsViewController:(KSSDeviceDetailsViewController *)controller didFinishSavingDevice:(Device *)device { Device *tempDevice = [nearbyArray filteredArrayUsingPredicate:[NSPredicate predicateWithFormat:@"uuid=%@", device.uuid]].firstObject; + NSIndexPath *destinationPath = [NSIndexPath indexPathForRow:0 inSection:1]; if (tempDevice != nil) { NSIndexPath *sourcePath = [NSIndexPath indexPathForRow:[nearbyArray indexOfObject:tempDevice] inSection:0]; - NSIndexPath *destinationPath = [NSIndexPath indexPathForRow:0 inSection:1]; [nearbyArray removeObject:tempDevice]; [savedArray insertObject:device atIndex:0]; [self.tableView beginUpdates]; @@ -82,9 +81,17 @@ - (void)deviceDetailsViewController:(KSSDeviceDetailsViewController *)controller [self.tableView insertRowsAtIndexPaths:@[sourcePath] withRowAnimation:UITableViewRowAnimationAutomatic]; } if (savedArray.count == 1) { - [self.tableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:0 inSection:1]] withRowAnimation:UITableViewRowAnimationAutomatic]; + [self.tableView deleteRowsAtIndexPaths:@[destinationPath] withRowAnimation:UITableViewRowAnimationAutomatic]; } [self.tableView endUpdates]; + } else { + [savedArray insertObject:device atIndex:0]; + [self.tableView beginUpdates]; + if (savedArray.count == 1) { + [self.tableView deleteRowsAtIndexPaths:@[destinationPath] withRowAnimation:UITableViewRowAnimationAutomatic]; + } + [self.tableView insertRowsAtIndexPaths:@[destinationPath] withRowAnimation:UITableViewRowAnimationAutomatic]; + [self.tableView endUpdates]; } } @@ -236,7 +243,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N cell.device = (Device *)[[self arrayForSection:indexPath.section] objectAtIndex:indexPath.row]; - if (cell.device.peripheral != nil) { + if (cell.device.peripheral.state == CBPeripheralStateConnected) { cell.statusLabel.text = @"Connected"; cell.statusLabel.enabled = cell.nameLabel.enabled = YES; } else {