// 人脉

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMyNameCardViewController.swift

@@ -32,6 +32,12 @@ class YHMyNameCardViewController: YHBaseViewController {
         return tableView
     }()
     
+    var isCurrentUser: Bool {
+        get {
+           return (!self.userId.isEmpty && self.userId == YHLoginManager.shared.userModel?.id)
+        }
+    }
+    
     lazy var bgImgView:UIImageView = {
         let view = UIImageView(image: UIImage(named: "people_card_bg"))
         return view
@@ -220,31 +226,37 @@ extension YHMyNameCardViewController {
             
             let model1 = YHUserNameCardInfo()
             model1.type = .avatar
+            model1.isCurrentUser = self.isCurrentUser
             model1.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model1)
             
             let model2 = YHUserNameCardInfo()
             model2.type = .introduce
+            model2.isCurrentUser = self.isCurrentUser
             model2.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model2)
 
             let model3 = YHUserNameCardInfo()
             model3.type = .education
+            model3.isCurrentUser = self.isCurrentUser
             model3.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model3)
 
             let model4 = YHUserNameCardInfo()
             model4.type = .workExperience
+            model4.isCurrentUser = self.isCurrentUser
             model4.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model4)
 
             let model5 = YHUserNameCardInfo()
             model5.type = .honor
+            model5.isCurrentUser = self.isCurrentUser
             model5.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model5)
 
             let model6 = YHUserNameCardInfo()
             model6.type = .topics
+            model6.isCurrentUser = self.isCurrentUser
             model6.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model6)
             

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHPeopleViewController.swift

@@ -148,10 +148,10 @@ class YHPeopleViewController: YHBaseViewController {
     
     @objc func didMatchBtnClicked() {
         
-//        if true {
-//            startMatchUsers()
-//            return
-//        }
+        if true {
+            startMatchUsers()
+            return
+        }
         
         let vc = YHInformationAuthorizationStepOneViewController()
         self.navigationController?.pushViewController(vc)

galaxy/galaxy/Classes/Modules/Community(社区)/M/YHMatchUserInfo.swift

@@ -48,6 +48,21 @@ class YHMatchUserAddress: SmartCodable {
     }
 }
 
+class YHAuthorizationModel: SmartCodable {
+    
+    var educationExperience: Int = 0
+    var workExperience = 0
+    
+    required init() {
+        
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case educationExperience = "public_education_experience"
+        case workExperience = "public_work_experience"
+    }
+}
+
 enum YHNameCardInfoType:Int {
     case unknown = -1
     case avatar = 0
@@ -76,11 +91,13 @@ class YHUserNameCardInfo: SmartCodable {
     var industry: String = ""
     var honor: String = ""
     var topics: [String] = []
+    var authorization: YHAuthorizationModel = YHAuthorizationModel()
     
     // 自定义属性
     var type:YHNameCardInfoType = .unknown
     var isHiddenEducation = false
     var isHiddenWorkExperience = false
+    var isCurrentUser = false
     
     required init() {
         
@@ -110,11 +127,9 @@ class YHUserNameCardInfo: SmartCodable {
     }
 
     enum CodingKeys: String, CodingKey {
-        case id
         case yhId = "yh_id"
         case isSigned = "is_signed"
-        case avatar, username, address, zodiac, signature, bio, college, major, background
+        case id, avatar, username, address, zodiac, signature, bio, college, major, background, authorization, position, industry, honor, topics
         case companyName = "company_name"
-        case position, industry, honor, topics
     }
 }

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyEducationCell.swift

@@ -15,8 +15,29 @@ class YHMyEducationCell: UITableViewCell {
     
     var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
         didSet {
-            self.collegeLabel.text = self.userModel.college
-            self.detailLabel.text = self.userModel.background
+            self.collegeLabel.textColor = UIColor.mainTextColor
+            self.detailLabel.textColor = UIColor.mainTextColor70
+            
+            if !self.userModel.college.isEmpty {
+                self.collegeLabel.text = self.userModel.college
+            } else {
+                self.collegeLabel.text = ""
+                if self.userModel.isCurrentUser {
+                    self.collegeLabel.text = "填写院校名称"
+                    self.collegeLabel.textColor = UIColor.mainTextColor30
+                }
+            }
+            
+            if !self.userModel.background.isEmpty {
+                self.detailLabel.text = self.userModel.background
+            } else {
+                self.detailLabel.text = ""
+                if self.userModel.isCurrentUser {
+                    self.detailLabel.text = "填写专业 · 填写学位"
+                    self.detailLabel.textColor = UIColor.mainTextColor30
+
+                }
+            }
         }
     }
     
@@ -39,7 +60,7 @@ class YHMyEducationCell: UITableViewCell {
     
     lazy var collegeLabel:UILabel = {
         let label = UILabel()
-        label.textColor = UIColor.mainTextColor70
+        label.textColor = UIColor.mainTextColor
         label.textAlignment = .left
         label.font = UIFont.PFSC_M(ofSize:14)
         label.numberOfLines = 0

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyInterestTopicCell.swift

@@ -54,11 +54,52 @@ class YHMyInterestTopicCell: UITableViewCell {
     var topicArr:[String] = []
     var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
         didSet {
-            self.topicArr.removeAll()
-            if self.userModel.topics.count > 0 {
-                self.topicArr.append(contentsOf: self.userModel.topics)
+            
+            var isShowList = true
+            if self.userModel.isCurrentUser {
+                if self.topicArr.count <= 0 {
+                    isShowList = false
+                }
+            }
+            self.collectionView.isHidden = !isShowList
+            self.detailLabel.isHidden = isShowList
+            
+            if isShowList {
+                
+                self.topicArr.removeAll()
+                if self.userModel.topics.count > 0 {
+                    self.topicArr.append(contentsOf: self.userModel.topics)
+                }
+                self.collectionView.snp.remakeConstraints { make in
+                    make.left.equalTo(16)
+                    make.right.equalTo(-16)
+                    make.bottom.equalTo(-16)
+                    make.height.equalTo(24)
+                    make.top.equalTo(titleLabel.snp.bottom).offset(12)
+                }
+                
+                self.detailLabel.snp.remakeConstraints { make in
+                    make.edges.equalTo(self.collectionView)
+                }
+                
+                self.collectionView.reloadData {
+                    let height = self.collectionView.contentSize.height
+                    self.collectionView.snp.updateConstraints { make in
+                        make.height.equalTo(height)
+                    }
+                }
+            } else {
+                
+                self.detailLabel.snp.remakeConstraints { make in
+                    make.left.equalTo(16)
+                    make.right.equalTo(-16)
+                    make.bottom.equalTo(-16)
+                    make.top.equalTo(titleLabel.snp.bottom).offset(12)
+                }
+                self.collectionView.snp.remakeConstraints { make in
+                    make.edges.equalTo(self.detailLabel)
+                }
             }
-            self.collectionView.reloadData()
         }
     }
 
@@ -106,6 +147,16 @@ class YHMyInterestTopicCell: UITableViewCell {
         return collectView
     }()
     
+    lazy var detailLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor70
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize:14)
+        label.numberOfLines = 0
+        label.text = "填写你的兴趣爱好，与志同道合的人畅聊共同话题，如MBTI人格测试、艺术、运动、技术等方面。"
+        return label
+    }()
+    
     required init?(coder: NSCoder) {
         super.init(coder: coder)
     }
@@ -124,6 +175,7 @@ class YHMyInterestTopicCell: UITableViewCell {
         self.contentView.addSubview(self.cardView)
         cardView.addSubview(self.titleLabel)
         cardView.addSubview(collectionView)
+        cardView.addSubview(detailLabel)
         
         cardView.addSubview(self.editBtn)
         
@@ -151,11 +203,8 @@ class YHMyInterestTopicCell: UITableViewCell {
             make.top.equalTo(titleLabel.snp.bottom).offset(12)
         }
         
-        collectionView.reloadData {
-            let height = self.collectionView.contentSize.height
-            self.collectionView.snp.updateConstraints { make in
-                make.height.equalTo(height)
-            }
+        detailLabel.snp.makeConstraints { make in
+            make.edges.equalTo(self.collectionView)
         }
     }
     

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyIntroductionCell.swift

@@ -17,11 +17,30 @@ class YHMyIntroductionCell: UITableViewCell {
         didSet {
             if userModel.type == .introduce {
                 self.titleLabel.text =  "个人简介"
-                self.detailLabel.text = self.userModel.bio
+                self.detailLabel.textColor = UIColor.mainTextColor70
+                if !self.userModel.bio.isEmpty {
+                    self.detailLabel.text = self.userModel.bio
+                } else {
+                    self.detailLabel.text = ""
+                    if self.userModel.isCurrentUser {
+                        self.detailLabel.text = "快来完善你的个人简介，用简洁的文字描绘你的独特魅力。"
+                        self.detailLabel.textColor = UIColor.mainTextColor30
+                    }
+                }
+                
 
             } else if userModel.type == .honor {
                 self.titleLabel.text =  "荣誉奖项"
-                self.detailLabel.text = self.userModel.honor
+                self.detailLabel.textColor = UIColor.mainTextColor70
+                if !self.userModel.honor.isEmpty {
+                    self.detailLabel.text = self.userModel.honor
+                } else {
+                    self.detailLabel.text = ""
+                    if self.userModel.isCurrentUser {
+                        self.detailLabel.text = "展示你的辉煌时刻，让更多人见证你的卓越成就！"
+                        self.detailLabel.textColor = UIColor.mainTextColor30
+                    }
+                }
             }
         }
     }

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyNameCardAvatarInfoCell.swift

@@ -28,8 +28,8 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             self.zodiacLabel.text = self.userModel.zodiac
             
             var name:ASAttributedString = .init(string:self.userModel.username, .font(UIFont.PFSC_B(ofSize: 18)), .foreground(UIColor.mainTextColor))
-            var cityTag: ASAttributedString = "  \(.view(self.cityLabel, .original(.center)))"
-            var zodiacTag: ASAttributedString = "  \(.view(self.zodiacLabel, .original(.center)))"
+            let cityTag: ASAttributedString = "  \(.view(self.cityLabel, .original(.center)))"
+            let zodiacTag: ASAttributedString = "  \(.view(self.zodiacLabel, .original(.center)))"
             
             if !self.userModel.address.city.isEmpty {
                 name += cityTag
@@ -37,9 +37,9 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             if !self.userModel.zodiac.isEmpty {
                 name += zodiacTag
             }
-            self.nameTextView.attributed.text = name + "ASDFASFSDFASFDASFASFDASFASDFASDFASDFASFASFASFDAFAFASDFASDF"
-            self.professionalLabel.text = self.userModel.position + "dfasdfasdfasfasdfasdfasfdasdfasdfasdfsadfasdfas"
-            self.detailLabel.text = self.userModel.signature + "asdfasfdasdfasdfasdfasdgfasdgewrgqrgegvsvdfvfgbsdfbvdfbvsdfvasdvadsvasvda"
+            self.nameTextView.attributed.text = name
+            self.professionalLabel.text = self.userModel.position
+            self.detailLabel.text = self.userModel.signature
             self.signImgV.isHidden = !self.userModel.isSigned
         }
     }

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyWorkExperienceCell.swift

@@ -23,6 +23,7 @@ class YHExperienceItemView: UIView {
         label.textColor = UIColor.mainTextColor70
         label.textAlignment = .left
         label.font = UIFont.PFSC_R(ofSize:14)
+        label.text = "填写最近一份工作经验"
         return label
     }()
     
@@ -59,6 +60,7 @@ class YHMyWorkExperienceCell: UITableViewCell {
     
     var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
         didSet {
+            
             self.companyView.detailLabel.text = self.userModel.companyName
             self.professionView.detailLabel.text = self.userModel.position
             self.industryView.detailLabel.text = self.userModel.industry