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

Last remaining fixes for swift 3

Browse Source
This commit is contained in:
Charles Magahern
2017-09-04 18:31:34 -07:00
parent 091af0844a
commit d295b80eab
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
XIONControlPanel.xcodeproj/project.pbxproj
View File

@@ -247,7 +247,7 @@
TargetAttributes = { TargetAttributes = {
0C3CAEA31C3350C800B856AD = { 0C3CAEA31C3350C800B856AD = {
CreatedOnToolsVersion = 7.2; CreatedOnToolsVersion = 7.2;
DevelopmentTeam = 64S2YWUDC5; DevelopmentTeam = FZ6BMA5HA9;
LastSwiftMigration = 0810; LastSwiftMigration = 0810;
}; };
}; };
@@ -421,6 +421,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = FZ6BMA5HA9;
INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
@@ -443,6 +444,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = FZ6BMA5HA9;
INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist"; INFOPLIST_FILE = "$(SRCROOT)/XIONControlPanel/SupportingFiles/Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (

2
XIONControlPanel/Controllers/VisualizationViewController.swift
View File

@@ -34,7 +34,7 @@ class VisualizationViewController: UIViewController
override func loadView() override func loadView()
{ {
let opts = [SCNView.Option.preferredRenderingAPI.rawValue : SCNRenderingAPI.openGLES2] let opts = [SCNView.Option.preferredRenderingAPI.rawValue : SCNRenderingAPI.openGLES2.rawValue]
let view = SCNView(frame: UIScreen.main.bounds, options: opts) let view = SCNView(frame: UIScreen.main.bounds, options: opts)
view.backgroundColor = UIColor.black view.backgroundColor = UIColor.black
view.scene = _scene view.scene = _scene

6
XIONControlPanel/Controllers/WemoServer.swift
View File

@@ -156,14 +156,14 @@ internal class FetchDevicesOperation : WemoOperation
{ {
let semaphore = Semaphore(value: 0) let semaphore = Semaphore(value: 0)
let url = self.baseURL.appendingPathComponent("api/environment") let url = self.baseURL.appendingPathComponent("api/environment")
let task = self.session.dataTask(with: url, completionHandler: { (data: Data?, response: URLResponse?, error: NSError?) -> Void in let task = self.session.dataTask(with: url, completionHandler: { (data: Data?, response: URLResponse?, error: Error?) -> Void in
if (data != nil) { if (data != nil) {
self.devices = self._parseDevices(data!) self.devices = self._parseDevices(data!)
} else { } else {
self.error = NSError.xionError(.connectionError, underlying: error) self.error = error
} }
semaphore.signal() semaphore.signal()
} as! (Data?, URLResponse?, Error?) -> Void) })
task.resume() task.resume()
semaphore.wait() semaphore.wait()
} }