From 484fd047686f19e5a31d92a181424adcc445a315 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Thu, 14 May 2015 18:13:56 +0800 Subject: [PATCH] profileUser's instagram --- Yep/Services/YepService.swift | 2 +- Yep/Services/YepServiceSync.swift | 2 +- Yep/ViewControllers/Profile/ProfileViewController.swift | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift index 7652044c..b767b994 100644 --- a/Yep/Services/YepService.swift +++ b/Yep/Services/YepService.swift @@ -1361,7 +1361,7 @@ struct InstagramWork { func instagramWorkOfUserWithUserID(userID: String, #failureHandler: ((Reason, String?) -> Void)?, #completion: InstagramWork -> Void) { let parse: JSONDictionary -> InstagramWork? = { data in - println("instagramData:\(data)") + //println("instagramData:\(data)") if let mediaData = data["media"] as? [JSONDictionary] { var medias = Array() diff --git a/Yep/Services/YepServiceSync.swift b/Yep/Services/YepServiceSync.swift index f626bb10..d631ceda 100644 --- a/Yep/Services/YepServiceSync.swift +++ b/Yep/Services/YepServiceSync.swift @@ -155,7 +155,7 @@ func userSkillsFromSkillsData(skillsData: [JSONDictionary], inRealm realm: Realm func syncFriendshipsAndDoFurtherAction(furtherAction: () -> Void) { friendships { allFriendships in - println("\n allFriendships: \(allFriendships)") + //println("\n allFriendships: \(allFriendships)") // 先整理出所有的 friend 的 userID var remoteUerIDSet = Set() diff --git a/Yep/ViewControllers/Profile/ProfileViewController.swift b/Yep/ViewControllers/Profile/ProfileViewController.swift index c86382ca..0b45c663 100644 --- a/Yep/ViewControllers/Profile/ProfileViewController.swift +++ b/Yep/ViewControllers/Profile/ProfileViewController.swift @@ -241,6 +241,13 @@ class ProfileViewController: CustomNavigationBarViewController { vc.socialAccount = SocialAccount(rawValue: item) vc.profileUser = profileUser } + + } else if segue.identifier == "showSocialWorkInstagram" { + if let item = sender as? Int { + let vc = segue.destinationViewController as! SocialWorkInstagramViewController + vc.socialAccount = SocialAccount(rawValue: item) + vc.profileUser = profileUser + } } }