buzzert/Xaibatsu-Control-Panel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix miscellaneous bugs

Browse Source
This commit is contained in:
Charles Magahern
2016-01-01 15:48:34 -08:00
parent 80696898ef
commit 29b70d32ce
4 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
XIONControlPanel/Controllers/SwitchesViewController.swift
View File

@@ -88,20 +88,13 @@ class SwitchesViewController: UIViewController,
{
didSet
{
// sort devices by name
self.devices.sortInPlace({ (d1: WemoDevice, d2: WemoDevice) -> Bool in
return (d1.name.compare(d2.name) == .OrderedAscending)
})
let hash = self.devices.reduce(0, combine: {$0 ^ $1.hashValue})
if (hash != _currentDevicesHash) {
// sort by name
self.devices.sortInPlace({ (d1: WemoDevice, d2: WemoDevice) -> Bool in
return (d1.name.compare(d2.name) == .OrderedAscending)
})
// replace "Dance Dance Revolution" names with "DDR" to save space
for device in self.devices {
if let range = device.name.rangeOfString("Dance Dance Revolution") {
device.name.replaceRange(range, with: "DDR")
}
}
let previousSet = NSOrderedSet(array: oldValue)
let newSet = NSOrderedSet(array: self.devices)
var insertedIndexPaths: [NSIndexPath] = []
@@ -174,11 +167,10 @@ class SwitchesViewController: UIViewController,
let reuseID = SwitchesViewController.collectionViewDeviceSwitchCellReuseIdentifier
let cell = collectionView.dequeueReusableCellWithReuseIdentifier(reuseID, forIndexPath: indexPath) as! WemoDeviceCellView
let deviceIdx = indexPath.item - ActionCell.count
let device = self.devices[deviceIdx]
cell.device = device
let device = _deviceAtIndexPath(indexPath)
cell.deviceName = device.name
cell.toggled = (device.state == .On)
cell.ordinal = deviceIdx + 1
cell.ordinal = indexPath.item - ActionCell.count + 1
return cell
}
@@ -224,8 +216,7 @@ class SwitchesViewController: UIViewController,
let cell = collectionView.cellForItemAtIndexPath(indexPath) as! WemoDeviceCellView
cell.toggled = !cell.toggled
let deviceIdx = indexPath.item - ActionCell.count
let device = self.devices[deviceIdx]
let device = _deviceAtIndexPath(indexPath)
device.state = (cell.toggled ? .On : .Off)
self.delegate?.switchesViewControllerDidToggleDevices(self, devices: [device])
@@ -249,4 +240,13 @@ class SwitchesViewController: UIViewController,
return true
}
}
// MARK: Internal
internal func _deviceAtIndexPath(indexPath: NSIndexPath) -> WemoDevice
{
let deviceIdx = indexPath.item - ActionCell.count
let device = self.devices[deviceIdx]
return device
}
}