Created
October 11, 2016 16:42
-
-
Save autonome/d09f60664ed65f212e8772dba6f7d1e4 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -U 8 Carthage/Checkouts.bak/magnet-scanner-ios/MagnetScannerIOS/ScannerBle.swift Carthage/Checkouts/magnet-scanner-ios/MagnetScannerIOS/ScannerBle.swift | |
--- Carthage/Checkouts.bak/magnet-scanner-ios/MagnetScannerIOS/ScannerBle.swift 2016-10-10 20:59:47.000000000 -0700 | |
+++ Carthage/Checkouts/magnet-scanner-ios/MagnetScannerIOS/ScannerBle.swift 2016-10-10 22:37:29.000000000 -0700 | |
@@ -48,17 +48,17 @@ | |
centralManager.stopScan() | |
} | |
deinit { | |
stop() | |
} | |
func centralManagerDidUpdateState(central: CBCentralManager) { | |
- if central.state == CBCentralManagerState.PoweredOn && self.shouldBeScanning { | |
+ if central.state == .PoweredOn && self.shouldBeScanning { | |
start() | |
} | |
} | |
func centralManager(central: CBCentralManager, didDiscoverPeripheral peripheral: CBPeripheral, advertisementData: [String : AnyObject], RSSI: NSNumber) { | |
guard let serviceData = advertisementData[CBAdvertisementDataServiceDataKey] as? [NSObject : AnyObject] else { return } | |
guard isUrlType(serviceData) else { return } | |
guard let frame = getFrameData(serviceData) else { return } | |
@@ -71,17 +71,17 @@ | |
callback([ | |
"url": url, | |
"distance": distance | |
]) | |
} | |
private func startScanningSynchronized() { | |
dispatch_async(self.beaconOperationsQueue) { | |
- if self.centralManager.state != CBCentralManagerState.PoweredOn { | |
+ if self.centralManager.state != .PoweredOn { | |
debugPrint("CentralManager state is %d, cannot start scan", self.centralManager.state.rawValue) | |
self.shouldBeScanning = true | |
} else { | |
debugPrint("=== Starting to scan for Eddystone URLs ===") | |
let services = [CBUUID(string: "FEAA"), CBUUID(string: "FED8")] | |
let options = [CBCentralManagerScanOptionAllowDuplicatesKey : true] | |
self.centralManager.scanForPeripheralsWithServices(services, options: options) | |
} | |
@@ -139,17 +139,17 @@ | |
} | |
if (isUrl(result)) { return result } | |
else { return nil } | |
} | |
private func isUrl(url: String) -> Bool { | |
guard let url = NSURL(string: url) else { return false } | |
- return !url.scheme.isEmpty | |
+ return !url.scheme!.isEmpty | |
} | |
private func getDistance(bytes: [UInt8], rssi: Double) -> Double { | |
if rssi == 0 { return -1 } | |
let txPower = Int8(bitPattern: bytes[1]) | |
return pow(10, ((Double(txPower) - rssi) - 41) / 20); | |
} | |
diff -U 8 Carthage/Checkouts.bak/magnet-scanner-ios/MagnetScannerIOS/ScannerNetwork.swift Carthage/Checkouts/magnet-scanner-ios/MagnetScannerIOS/ScannerNetwork.swift | |
--- Carthage/Checkouts.bak/magnet-scanner-ios/MagnetScannerIOS/ScannerNetwork.swift 2016-10-10 20:59:47.000000000 -0700 | |
+++ Carthage/Checkouts/magnet-scanner-ios/MagnetScannerIOS/ScannerNetwork.swift 2016-10-10 22:38:17.000000000 -0700 | |
@@ -38,11 +38,11 @@ | |
} | |
func netServiceBrowser(aNetServiceBrowser: NSNetServiceBrowser, didRemoveService aNetService: NSNetService, moreComing: Bool) { | |
print("lost service: \(aNetService.name)") | |
} | |
private func isUrl(url: String) -> Bool { | |
guard let url = NSURL(string: url) else { return false } | |
- return !url.scheme.isEmpty | |
+ return !url.scheme!.isEmpty | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment