home/Yep
2
0
Fork 0
mirror of https://github.com/wahyd4/Yep.git synced 2026-08-15 07:45:55 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug in Profile may cause skill text disappear by update my skills

Browse Source
This commit is contained in:
nixzhu
2015-11-02 13:16:05 +08:00
parent 940eb4ef54
commit 5acdc12b00
2 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Yep/Services/YepService.swift
-1
View File
@@ -1219,7 +1219,6 @@ let parseDiscoveredUser: JSONDictionary -> DiscoveredUser? = { userInfo in
var learningSkills: [Skill] = []
if let learningSkillsData = userInfo["learning_skills"] as? [JSONDictionary] {
learningSkills = skillsFromSkillsData(learningSkillsData)
}
Yep/ViewControllers/Profile/ProfileViewController.swift
+58 -29
View File
@@ -416,41 +416,51 @@ class ProfileViewController: UIViewController {
return introduction ?? NSLocalizedString("No Introduction yet.", comment: "")
}()
var masterSkills = [Skill]() {
didSet {
guard let realm = try? Realm() else {
return
}
var masterSkills = [Skill]()
if let
myUserID = YepUserDefaults.userID.value,
me = userWithUserID(myUserID, inRealm: realm) {
let _ = try? realm.write {
me.masterSkills.removeAll()
let userSkills = userSkillsFromSkills(self.masterSkills, inRealm: realm)
me.masterSkills.appendContentsOf(userSkills)
}
}
var learningSkills = [Skill]()
private func updateMyMasterSkills() {
guard let profileUser = profileUser where profileUser.isMe else {
return
}
}
var learningSkills = [Skill]() {
didSet {
guard let realm = try? Realm() else {
return
}
if let
myUserID = YepUserDefaults.userID.value,
me = userWithUserID(myUserID, inRealm: realm) {
let _ = try? realm.write {
me.learningSkills.removeAll()
let userSkills = userSkillsFromSkills(self.learningSkills, inRealm: realm)
me.learningSkills.appendContentsOf(userSkills)
}
}
guard let realm = try? Realm() else {
return
}
if let
myUserID = YepUserDefaults.userID.value,
me = userWithUserID(myUserID, inRealm: realm) {
let _ = try? realm.write {
me.masterSkills.removeAll()
let userSkills = userSkillsFromSkills(self.masterSkills, inRealm: realm)
me.masterSkills.appendContentsOf(userSkills)
}
}
}
private func updateMyLearningSkills() {
guard let profileUser = profileUser where profileUser.isMe else {
return
}
guard let realm = try? Realm() else {
return
}
if let
myUserID = YepUserDefaults.userID.value,
me = userWithUserID(myUserID, inRealm: realm) {
let _ = try? realm.write {
me.learningSkills.removeAll()
let userSkills = userSkillsFromSkills(self.learningSkills, inRealm: realm)
me.learningSkills.appendContentsOf(userSkills)
}
}
}
var dribbbleWork: DribbbleWork?
var instagramWork: InstagramWork?
@@ -888,6 +898,9 @@ class ProfileViewController: UIViewController {
self?.learningSkills = learningSkills
dispatch_async(dispatch_get_main_queue()) {
self?.updateMyMasterSkills()
self?.updateMyLearningSkills()
self?.updateProfileCollectionView()
}
}
@@ -1308,6 +1321,14 @@ extension ProfileViewController: UICollectionViewDataSource, UICollectionViewDel
cell.skill = profileUser?.cellSkillInSkillSet(.Master, atIndexPath: indexPath)
if cell.skill == nil {
if let profileUser = profileUser {
println("Master profileUser: \(profileUser)")
} else {
println("Master profileUser is nil")
}
}
cell.tapAction = { [weak self] skill in
//self?.performSegueWithIdentifier("showSkillHome", sender: ["skill": skill, "preferedSkillSet": SkillSet.Master.rawValue])
self?.performSegueWithIdentifier("showFeedsWithSkill", sender: ["skill": skill, "preferedSkillSet": SkillSet.Master.rawValue])
@@ -1320,6 +1341,14 @@ extension ProfileViewController: UICollectionViewDataSource, UICollectionViewDel
cell.skill = profileUser?.cellSkillInSkillSet(.Learning, atIndexPath: indexPath)
if cell.skill == nil {
if let profileUser = profileUser {
println("Learning profileUser: \(profileUser)")
} else {
println("Learning profileUser is nil")
}
}
cell.tapAction = { [weak self] skill in
//self?.performSegueWithIdentifier("showSkillHome", sender: ["skill": skill, "preferedSkillSet": SkillSet.Learning.rawValue])
self?.performSegueWithIdentifier("showFeedsWithSkill", sender: ["skill": skill, "preferedSkillSet": SkillSet.Learning.rawValue])