mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-13 07:40:58 +00:00
Changed closure declarations for swift 2.2 support
This commit is contained in:
1 parent
2ed571a54d
commit
675caca961
4 files changed
+17
-17
No files matched your search
@@ -63,7 +63,7 @@ public class APIManager: NSObject {
|
|||||||
|
|
||||||
// set up reachability
|
// set up reachability
|
||||||
let operationQueue = manager!.operationQueue
|
let operationQueue = manager!.operationQueue
|
||||||
manager!.reachabilityManager.setReachabilityStatusChangeBlock({(AFNetworkReachabilityStatus status) -> Void in
|
manager!.reachabilityManager.setReachabilityStatusChangeBlock({(status) -> Void in
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case AFNetworkReachabilityStatus.ReachableViaWWAN, AFNetworkReachabilityStatus.ReachableViaWiFi:
|
case AFNetworkReachabilityStatus.ReachableViaWWAN, AFNetworkReachabilityStatus.ReachableViaWiFi:
|
||||||
operationQueue?.suspended = false
|
operationQueue?.suspended = false
|
||||||
@@ -106,7 +106,7 @@ public class APIManager: NSObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public func teamImage(competitorId: String!, result: (imageUrl: String?) -> Void) {
|
public func teamImage(competitorId: String!, result: (imageUrl: String?) -> Void) {
|
||||||
getTeam(competitorId, success: { (AFHTTPRequestOperation operation, AnyObject teamResponseObject) -> Void in
|
getTeam(competitorId, success: { (operation, teamResponseObject) -> Void in
|
||||||
|
|
||||||
if let team = teamResponseObject as? [String: AnyObject],
|
if let team = teamResponseObject as? [String: AnyObject],
|
||||||
let imageUrl = team["imageUri"] as? String {
|
let imageUrl = team["imageUri"] as? String {
|
||||||
@@ -115,7 +115,7 @@ public class APIManager: NSObject {
|
|||||||
result(imageUrl: nil)
|
result(imageUrl: nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
}, failure: { (AFHTTPRequestOperation operation, NSError error) -> Void in
|
}, failure: { (operation, error) -> Void in
|
||||||
// No image & that's ok
|
// No image & that's ok
|
||||||
result(imageUrl: nil)
|
result(imageUrl: nil)
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -96,17 +96,17 @@ class QRCodeManager : NSObject, UIAlertViewDelegate {
|
|||||||
|
|
||||||
// get event
|
// get event
|
||||||
APIManager.sharedManager.getEvent(qrcodeData!.eventId,
|
APIManager.sharedManager.getEvent(qrcodeData!.eventId,
|
||||||
success: { (AFHTTPRequestOperation operation, AnyObject eventResponseObject) -> Void in
|
success: { (operation, eventResponseObject) -> Void in
|
||||||
self.eventDictionary = eventResponseObject as? [String: AnyObject]
|
self.eventDictionary = eventResponseObject as? [String: AnyObject]
|
||||||
APIManager.sharedManager.getLeaderBoard(self.qrcodeData!.leaderBoardName,
|
APIManager.sharedManager.getLeaderBoard(self.qrcodeData!.leaderBoardName,
|
||||||
|
|
||||||
// get leader board
|
// get leader board
|
||||||
success: { (AFHTTPRequestOperation operation, AnyObject leaderBoardResponseObject) -> Void in
|
success: { (operation, leaderBoardResponseObject) -> Void in
|
||||||
self.leaderBoardDictionary = leaderBoardResponseObject as? [String: AnyObject]
|
self.leaderBoardDictionary = leaderBoardResponseObject as? [String: AnyObject]
|
||||||
APIManager.sharedManager.getCompetitor(self.qrcodeData!.competitorId,
|
APIManager.sharedManager.getCompetitor(self.qrcodeData!.competitorId,
|
||||||
|
|
||||||
// get competitor
|
// get competitor
|
||||||
success: { (AFHTTPRequestOperation operation, AnyObject competitorResponseObject) -> Void in
|
success: { (operation, competitorResponseObject) -> Void in
|
||||||
|
|
||||||
APIManager.sharedManager.teamImage(self.qrcodeData!.competitorId, result: { (imageUrl) -> Void in
|
APIManager.sharedManager.teamImage(self.qrcodeData!.competitorId, result: { (imageUrl) -> Void in
|
||||||
|
|
||||||
@@ -125,14 +125,14 @@ class QRCodeManager : NSObject, UIAlertViewDelegate {
|
|||||||
alertView.show()
|
alertView.show()
|
||||||
})
|
})
|
||||||
|
|
||||||
}, failure: { (AFHTTPRequestOperation operation, NSError error) -> Void in
|
}, failure: { (operation, error) -> Void in
|
||||||
self.delegate.activityIndicatorView?.stopAnimating()
|
self.delegate.activityIndicatorView?.stopAnimating()
|
||||||
let title = String(format: NSLocalizedString("Couldn't get competitor %@", comment: ""), self.qrcodeData!.competitorId!)
|
let title = String(format: NSLocalizedString("Couldn't get competitor %@", comment: ""), self.qrcodeData!.competitorId!)
|
||||||
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
||||||
alertView.tag = AlertView.ServerError.rawValue;
|
alertView.tag = AlertView.ServerError.rawValue;
|
||||||
alertView.show()
|
alertView.show()
|
||||||
|
|
||||||
}) }, failure: { (AFHTTPRequestOperation operation, NSError error) -> Void in
|
}) }, failure: { (operation, error) -> Void in
|
||||||
self.delegate.activityIndicatorView?.stopAnimating()
|
self.delegate.activityIndicatorView?.stopAnimating()
|
||||||
let title = String(format: NSLocalizedString("Couldn't get leader board %@", comment: ""), self.qrcodeData!.leaderBoardName!)
|
let title = String(format: NSLocalizedString("Couldn't get leader board %@", comment: ""), self.qrcodeData!.leaderBoardName!)
|
||||||
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
||||||
@@ -140,7 +140,7 @@ class QRCodeManager : NSObject, UIAlertViewDelegate {
|
|||||||
alertView.show()
|
alertView.show()
|
||||||
})
|
})
|
||||||
|
|
||||||
}, failure: { (AFHTTPRequestOperation operation, NSError error) -> Void in
|
}, failure: { (operation, error) -> Void in
|
||||||
self.delegate.activityIndicatorView?.stopAnimating()
|
self.delegate.activityIndicatorView?.stopAnimating()
|
||||||
let title = String(format: NSLocalizedString("Couldn't get event %@", comment: ""), self.qrcodeData!.eventId!)
|
let title = String(format: NSLocalizedString("Couldn't get event %@", comment: ""), self.qrcodeData!.eventId!)
|
||||||
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
||||||
@@ -185,7 +185,7 @@ class QRCodeManager : NSObject, UIAlertViewDelegate {
|
|||||||
checkIn.imageUrl = teamImageURL
|
checkIn.imageUrl = teamImageURL
|
||||||
|
|
||||||
APIManager.sharedManager.checkIn(leaderBoardName, competitorId: competitorId, deviceUuid: DeviceUDIDManager.UDID, pushDeviceId: "", fromMillis: fromMillis,
|
APIManager.sharedManager.checkIn(leaderBoardName, competitorId: competitorId, deviceUuid: DeviceUDIDManager.UDID, pushDeviceId: "", fromMillis: fromMillis,
|
||||||
success: { (AFHTTPRequestOperation operation, AnyObject eventResponseObject) -> Void in
|
success: { (operation, eventResponseObject) -> Void in
|
||||||
|
|
||||||
// create core data objects
|
// create core data objects
|
||||||
let event = DataManager.sharedManager.newEvent(checkIn)
|
let event = DataManager.sharedManager.newEvent(checkIn)
|
||||||
@@ -197,7 +197,7 @@ class QRCodeManager : NSObject, UIAlertViewDelegate {
|
|||||||
DataManager.sharedManager.saveContext()
|
DataManager.sharedManager.saveContext()
|
||||||
|
|
||||||
self.delegate.qrCodeOK?()
|
self.delegate.qrCodeOK?()
|
||||||
}, failure: { (AFHTTPRequestOperation operation, NSError error) -> Void in
|
}, failure: { (operation, error) -> Void in
|
||||||
self.delegate.activityIndicatorView?.stopAnimating()
|
self.delegate.activityIndicatorView?.stopAnimating()
|
||||||
let title = String(format:NSLocalizedString("Couldn't check-in to %@", comment: ""), leaderBoardName);
|
let title = String(format:NSLocalizedString("Couldn't check-in to %@", comment: ""), leaderBoardName);
|
||||||
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
let alertView = UIAlertView(title: title, message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
||||||
|
|||||||
@@ -281,7 +281,7 @@ class RegattaViewController : UIViewController, UIActionSheetDelegate, UINavigat
|
|||||||
DataManager.sharedManager.selectedCheckIn!.userImage = jpegData
|
DataManager.sharedManager.selectedCheckIn!.userImage = jpegData
|
||||||
APIManager.sharedManager.postTeamImage(DataManager.sharedManager.selectedCheckIn!.competitorId,
|
APIManager.sharedManager.postTeamImage(DataManager.sharedManager.selectedCheckIn!.competitorId,
|
||||||
imageData: jpegData,
|
imageData: jpegData,
|
||||||
success: { (AnyObject responseObject) -> Void in
|
success: { (responseObject) -> Void in
|
||||||
// http://wiki.sapsailing.com/wiki/tracking-app/api-v1#Competitor-Information-%28in-general%29
|
// http://wiki.sapsailing.com/wiki/tracking-app/api-v1#Competitor-Information-%28in-general%29
|
||||||
// "Additional Notes: Competitor profile image left out for now."
|
// "Additional Notes: Competitor profile image left out for now."
|
||||||
let responseDictionary = responseObject as![String: AnyObject]
|
let responseDictionary = responseObject as![String: AnyObject]
|
||||||
@@ -291,7 +291,7 @@ class RegattaViewController : UIViewController, UIActionSheetDelegate, UINavigat
|
|||||||
NSUserDefaults.standardUserDefaults().setBool(false, forKey: self.uploadKey)
|
NSUserDefaults.standardUserDefaults().setBool(false, forKey: self.uploadKey)
|
||||||
NSUserDefaults.standardUserDefaults().synchronize()
|
NSUserDefaults.standardUserDefaults().synchronize()
|
||||||
},
|
},
|
||||||
failure: { (NSError error) -> Void in
|
failure: { (error) -> Void in
|
||||||
let alertView = UIAlertView(title: NSLocalizedString("Failed to upload image", comment: ""), message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
let alertView = UIAlertView(title: NSLocalizedString("Failed to upload image", comment: ""), message: error.localizedDescription, delegate: self, cancelButtonTitle: NSLocalizedString("Cancel", comment: ""))
|
||||||
alertView.tag = AlertView.UploadFailed.rawValue;
|
alertView.tag = AlertView.UploadFailed.rawValue;
|
||||||
alertView.show()
|
alertView.show()
|
||||||
@@ -325,9 +325,9 @@ class RegattaViewController : UIViewController, UIActionSheetDelegate, UINavigat
|
|||||||
competitorId: DataManager.sharedManager.selectedCheckIn!.competitorId,
|
competitorId: DataManager.sharedManager.selectedCheckIn!.competitorId,
|
||||||
deviceUuid: DeviceUDIDManager.UDID,
|
deviceUuid: DeviceUDIDManager.UDID,
|
||||||
toMillis: toMillis,
|
toMillis: toMillis,
|
||||||
success: { (AFHTTPRequestOperation operation, AnyObject competitorResponseObject) -> Void in
|
success: { (operation, competitorResponseObject) -> Void in
|
||||||
},
|
},
|
||||||
failure: { (AFHTTPRequestOperation operation, NSError error) -> Void in
|
failure: { (operation, error) -> Void in
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
DataManager.sharedManager.deleteCheckIn(DataManager.sharedManager.selectedCheckIn!)
|
DataManager.sharedManager.deleteCheckIn(DataManager.sharedManager.selectedCheckIn!)
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ class SendGPSFixController: NSObject {
|
|||||||
APIManager.sharedManager.initManager(serverUrl)
|
APIManager.sharedManager.initManager(serverUrl)
|
||||||
if APIManager.sharedManager.networkAvailable {
|
if APIManager.sharedManager.networkAvailable {
|
||||||
APIManager.sharedManager.postGPSFixes(DeviceUDIDManager.UDID, gpsFixes: gpsFixes,
|
APIManager.sharedManager.postGPSFixes(DeviceUDIDManager.UDID, gpsFixes: gpsFixes,
|
||||||
success: { (AFHTTPRequestOperation operation, AnyObject competitorResponseObject) -> Void in
|
success: { (operation, competitorResponseObject) -> Void in
|
||||||
print("sent GPS fixes")
|
print("sent GPS fixes")
|
||||||
for gpsFix in gpsFixes {
|
for gpsFix in gpsFixes {
|
||||||
DataManager.sharedManager.managedObjectContext!.deleteObject(gpsFix)
|
DataManager.sharedManager.managedObjectContext!.deleteObject(gpsFix)
|
||||||
@@ -88,7 +88,7 @@ class SendGPSFixController: NSObject {
|
|||||||
let notification = NSNotification(name: NotificationType.gpsFixesSynced, object: self)
|
let notification = NSNotification(name: NotificationType.gpsFixesSynced, object: self)
|
||||||
NSNotificationQueue.defaultQueue().enqueueNotification(notification, postingStyle: NSPostingStyle.PostASAP)
|
NSNotificationQueue.defaultQueue().enqueueNotification(notification, postingStyle: NSPostingStyle.PostASAP)
|
||||||
},
|
},
|
||||||
failure: { (AFHTTPRequestOperation operation, NSError error) -> Void in
|
failure: { (operation, error) -> Void in
|
||||||
print("error sending GPS fixes")
|
print("error sending GPS fixes")
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user