From c94cdc1369775c5247126f34869dc5ba9160c42d Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Wed, 30 May 2018 08:56:57 -0500 Subject: [PATCH] Code cleanup --- pocloud.xcodeproj/project.pbxproj | 2 + .../ChannelDetailViewController.swift | 46 ---------- .../DeviceDetailViewController.swift | 90 ------------------- 3 files changed, 2 insertions(+), 136 deletions(-) diff --git a/pocloud.xcodeproj/project.pbxproj b/pocloud.xcodeproj/project.pbxproj index f3e712b..a5eb362 100644 --- a/pocloud.xcodeproj/project.pbxproj +++ b/pocloud.xcodeproj/project.pbxproj @@ -485,6 +485,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = JNP6SX52H9; INFOPLIST_FILE = pocloud/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -504,6 +505,7 @@ CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = JNP6SX52H9; INFOPLIST_FILE = pocloud/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 11.3; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/pocloud/Controller/ChannelDetailViewController.swift b/pocloud/Controller/ChannelDetailViewController.swift index ee8f331..691fd16 100644 --- a/pocloud/Controller/ChannelDetailViewController.swift +++ b/pocloud/Controller/ChannelDetailViewController.swift @@ -121,50 +121,4 @@ class ChannelDetailViewController: UIViewController, UITableViewDelegate, UITabl present(alert, animated: true, completion: nil) } - - -// func writeChannelValue(value : String) -> Promise { -// let timestamp: Int = Int(Date().timeIntervalSince1970) -// let channelName = thisChannel?.name -// var channelJson : JSON = JSON() -// channelJson["name"].string = channelName -// channelJson["timestamp"].int = timestamp -// channelJson["value"].string = value -// -// var listJson = JSON() -// listJson.arrayObject = [channelJson] -// -// let url = "\(baseURL)/devices/\(thisDevice!.id)/values" -// let headers : HTTPHeaders = [ -// "Authorization": user!.authToken -// ] -// -// -// -// return Promise { promise in -// Alamofire.request(url, method: .put, parameters: [:], encoding: listJson.rawString()!, headers: headers) -// .response { response in -// if response.response?.statusCode == 200 { -// promise.fulfill(true) -// } else { -// promise.reject(String(response.response!.statusCode) as! Error) -// } -// } -// } -// -// } - - - } - -//extension String: ParameterEncoding { -// -// public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest { -// var request = try urlRequest.asURLRequest() -// request.httpBody = data(using: .utf8, allowLossyConversion: false) -// return request -// } -// -//} - diff --git a/pocloud/Controller/DeviceDetailViewController.swift b/pocloud/Controller/DeviceDetailViewController.swift index 7fdda54..349b9a8 100644 --- a/pocloud/Controller/DeviceDetailViewController.swift +++ b/pocloud/Controller/DeviceDetailViewController.swift @@ -107,96 +107,6 @@ class DeviceDetailViewController: UITableViewController { } } - - //MARK: - Data Methods - -// func getChannels(deviceTypeId: Int) -> Promise { -// let url = "\(baseURL)/devicetypes/\(deviceTypeId)/channels" -// let headers : HTTPHeaders = [ -// "Authorization": user!.authToken -// ] -// -// return Promise { seal in -// Alamofire.request(url, method: .get, headers: headers) -// .responseJSON { response in -// switch response.result { -// -// case .success: -// let channelsJSON : JSON = JSON(response.result.value!) -// for(_, json) : (String, JSON) in channelsJSON { -// do { -// try self.realm.write { -// let ch = Channel() -// ch.channelType = json["channelType"].intValue -// ch.dataType = json["dataType"].intValue -// ch.defaultValue = json["defaultValue"].stringValue -// ch.deviceTypeId = json["deviceTypeId"].intValue -// ch.fromMe = json["fromMe"].boolValue -// ch.helpExplanation = json["helpExplanation"].stringValue -// ch.id = json["id"].intValue -// ch.io = json["io"].boolValue -// ch.name = json["name"].stringValue -// ch.regex = json["regex"].stringValue -// ch.regexErrMsg = json["regexErrMsg"].stringValue -// ch.subTitle = json["subTitle"].stringValue -// -// let pDeviceType = self.deviceTypes?.filter("id == %d", ch.deviceTypeId).first -// -// self.realm.add(ch, update: true) -// pDeviceType?.channels.append(ch) -// -// } -// } catch { -// seal.reject(error) -// } -// } -// seal.fulfill(true) -// case .failure(let error): -// seal.reject(error) -// } -// } -// } -// } - -// func getChannelValues(deviceId: Int) -> Promise { -// let url = "\(baseURL)/devices/\(deviceId)/values" -// let headers : HTTPHeaders = [ -// "Authorization": user!.authToken -// ] -// -// return Promise { prom in -// Alamofire.request(url, method: .get, headers: headers) -// .responseJSON { response in -// switch response.result { -// -// case .success: -// let channelValJSON : JSON = JSON(response.result.value!) -// -// for(chName, json) : (String, JSON) in channelValJSON { -// do { -// try self.realm.write { -// let chv = ChanValue() -// chv.uid = "\(deviceId).\(chName)" -// chv.name = chName -// chv.value = json["value"].stringValue -// chv.timestamp = json["timestamp"].intValue -// -// self.realm.add(chv, update: true) -// self.thisDevice!.values.append(chv) -// -// } -// } catch { -// prom.reject(error) -// } -// } -// prom.fulfill(true) -// case .failure(let error): -// prom.reject(error) -// } -// } -// } -// } - func loadData() -> Promise { return Promise { promise in deviceTypes = realm.objects(DeviceType.self)