diff --git a/.DS_Store b/.DS_Store index 61cbc18..59fbdbd 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index cd76185..a4aa0d7 100644 Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 6af231b..35885a5 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -6,345 +6,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + startingLineNumber = "71" + endingLineNumber = "71" + offsetFromSymbolStart = "4017"> - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -356,61 +73,13 @@ shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" - filePath = "Vendoo/ListingPreviewViewController.swift" - timestampString = "494285108.864963" + filePath = "Vendoo/ServiceNotificationManager.swift" + timestampString = "494388796.589441" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "432" - endingLineNumber = "432" - landmarkName = "publishItem(_:)" - landmarkType = "5"> - - - - - - - - - - - - @@ -421,135 +90,15 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/EbayWebServiceManager.swift" - timestampString = "494033422.080596" + timestampString = "494390858.671323" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "576" - endingLineNumber = "576"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Vendoo/EbayWebServiceManager.swift b/Vendoo/EbayWebServiceManager.swift index 59d8111..4b579bb 100644 --- a/Vendoo/EbayWebServiceManager.swift +++ b/Vendoo/EbayWebServiceManager.swift @@ -40,6 +40,7 @@ class EbayWebServiceManager: NSObject { private var completion: ServiceResponse! private var isGettingSubCategories: Bool = false private var isRevisingListing: Bool = false + var isGettingNotification: Bool = false //---------------------------------------------// @@ -328,6 +329,27 @@ extension EbayWebServiceManager { self.catDetailLevel = detailLevel self.requestMaker(soapMessage, theRequest: theRequest) } + + func getListingInfo(listingID: String, onComplete: ServiceResponse?){ + var soapMessage = "" + + "" + + "" + + "\(self.xmlResponseDictionary["eBayAuthToken"] as! String)" + + "" + + soapMessage = soapMessage + + "\(listingID)" + + "" + + let url = NSURL(string: self.baseURL) + let theRequest = NSMutableURLRequest(URL: url!) + theRequest.addValue("GetItem", forHTTPHeaderField: "X-EBAY-API-CALL-NAME") + + self.completion = onComplete + self.isGettingNotification = true + self.requestMaker(soapMessage, theRequest: theRequest) + + } } extension EbayWebServiceManager: NSURLConnectionDelegate { @@ -478,26 +500,30 @@ extension EbayWebServiceManager: NSXMLParserDelegate { self.catLevel = string break case "CategoryName" : - if(!self.isGettingSubCategories) { - if((EbayWebServiceManager.settingsDictionary["categories"]) == nil) { - EbayWebServiceManager.settingsDictionary["categories"] = Dictionary>() - } - var dict: Dictionary> = (EbayWebServiceManager.settingsDictionary["categories"]!) as! Dictionary> - - dict[string] = ["cat_id": self.catID, "isLeaf": false, "level": self.catLevel] - EbayWebServiceManager.settingsDictionary["categories"] = dict - NSUserDefaults.standardUserDefaults().setObject(EbayWebServiceManager.settingsDictionary, forKey: "ebaySettings") - } - else { - if "\(self.catDetailLevel)" == self.catLevel { - if((self.subCategories[string] == nil )){ - self.subCategories[string] = ["cat_id": self.catID, "isLeaf": false, "level": self.catLevel] + if (!self.isGettingNotification) { + if(!self.isGettingSubCategories) { + if((EbayWebServiceManager.settingsDictionary["categories"]) == nil) { + EbayWebServiceManager.settingsDictionary["categories"] = Dictionary>() } + var dict: Dictionary> = (EbayWebServiceManager.settingsDictionary["categories"]!) as! Dictionary> + + dict[string] = ["cat_id": self.catID, "isLeaf": false, "level": self.catLevel] + EbayWebServiceManager.settingsDictionary["categories"] = dict + NSUserDefaults.standardUserDefaults().setObject(EbayWebServiceManager.settingsDictionary, forKey: "ebaySettings") } - - + else { + if "\(self.catDetailLevel)" == self.catLevel { + if((self.subCategories[string] == nil )){ + self.subCategories[string] = ["cat_id": self.catID, "isLeaf": false, "level": self.catLevel] + } + } + + + } + } + self.currentCategory = string break @@ -534,6 +560,14 @@ extension EbayWebServiceManager: NSXMLParserDelegate { self.isRevisingListing = true break + /* + Used for retrieving listing info for notifications + */ + case "ListingStatus": + print("ListingStatus: \(string)") + self.completion(string, nil) + self.isGettingNotification = false + break default: //print(string) print("\(self.currentElementName):\(string)") diff --git a/Vendoo/ItemImagePickerViewController.swift b/Vendoo/ItemImagePickerViewController.swift index 7a0f36e..55fd698 100644 --- a/Vendoo/ItemImagePickerViewController.swift +++ b/Vendoo/ItemImagePickerViewController.swift @@ -39,6 +39,8 @@ class ItemImagePickerViewController: UIViewController { private var imageIndex: Int! private var isEditing: Bool = false private var currentInformation: Dictionary! + + override func viewDidLoad() { super.viewDidLoad() diff --git a/Vendoo/ServiceNotificationManager.swift b/Vendoo/ServiceNotificationManager.swift index 4e6de8a..4401789 100644 --- a/Vendoo/ServiceNotificationManager.swift +++ b/Vendoo/ServiceNotificationManager.swift @@ -67,7 +67,13 @@ class ServiceNotificationManager: NSObject { //@TODO: Skeleton for Notfications Manager is set up. Need to implement listing request for each listing to retrieve relevant notifications for user such as if listing has ended if(ebayID != nil){ - + /*if self.ebayGraphManager.isAuthorized { + self.ebayGraphManager.getListingInfo(ebayID!, onComplete: { + (listingStatus, error) -> Void in + dispatch_group_leave(notificationGroup) + + }) + }*/ } if(facebookID != nil){