Merge branch '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into 630-dev

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  我的名片
  授权逻辑
  //  我的名片
  //  我的名片
  //  人脉
  //  人脉
  编辑页面细节同步
  //  人脉
  //  人脉

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

@@ -152,8 +152,8 @@ class YHMatchPeopleViewController: YHBaseViewController {
     
     @objc func didMyCardBtnClicked() {
         let vc = YHMyNameCardViewController()
-        if let userId = YHLoginManager.shared.userModel?.userid {
-            vc.userId = "\(userId)"
+        if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
+            vc.userId = userId
         }
         self.navigationController?.pushViewController(vc)
 
@@ -400,5 +400,12 @@ extension YHMatchPeopleViewController: DragCardDelegate {
     public func dragCard(_ dragCard: DragCardContainer, didSelectTopCardAt index: Int, with cardView: DragCardView) {
         print("didSelectTopCardAt: \(index)")
         
+        if 0 <= index && index < self.matchUsersArr.count {
+            if let userModel = self.matchUsersArr[index] {
+                let vc = YHMyNameCardViewController()
+                vc.userId = userModel.yhId
+                self.navigationController?.pushViewController(vc)
+            }
+        }
     }
 }

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
@@ -73,7 +79,11 @@ class YHMyNameCardViewController: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        requestNameCardInfo()
+        if isCurrentUser {
+            requestAuthorization()
+        } else {
+            requestNameCardInfo()
+        }
     }
     
     func createUI() {
@@ -115,9 +125,21 @@ extension YHMyNameCardViewController: UITableViewDelegate, UITableViewDataSource
         if 0 <= indexPath.section && indexPath.section < self.cardInfoArr.count {
             let cardInfo = self.cardInfoArr[indexPath.section]
             
+            if cardInfo.type == .avatar {
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHMyNameCardAvatarInfoCell.cellReuseIdentifier, for: indexPath) as! YHMyNameCardAvatarInfoCell
+                cell.userModel = cardInfo
+                cell.editBlock = { [weak self] in
+                    guard let self = self else { return }
+                    let vc = YHEditBaseUserInfoViewController()
+                    vc.model = self.viewModel.nameCardInfo
+                    self.navigationController?.pushViewController(vc)
+                }
+                return cell
+            }
+            
             if cardInfo.type == .honor || cardInfo.type == .introduce {
                 let introCell = tableView.dequeueReusableCell(withIdentifier: YHMyIntroductionCell.cellReuseIdentifier, for: indexPath) as! YHMyIntroductionCell
-                introCell.userModel = self.viewModel.nameCardInfo
+                introCell.userModel = cardInfo
                 introCell.editBlock = { [weak self] in
                     guard let self = self else { return }
                     if cardInfo.type == .honor {
@@ -135,7 +157,7 @@ extension YHMyNameCardViewController: UITableViewDelegate, UITableViewDataSource
             
             if cardInfo.type == .education {
                 let eduCell = tableView.dequeueReusableCell(withIdentifier: YHMyEducationCell.cellReuseIdentifier, for: indexPath) as! YHMyEducationCell
-                eduCell.userModel = self.viewModel.nameCardInfo
+                eduCell.userModel = cardInfo
                 eduCell.editBlock = { [weak self] in
                     guard let self = self else { return }
                     let vc = YHEditSchoolViewController()
@@ -147,7 +169,7 @@ extension YHMyNameCardViewController: UITableViewDelegate, UITableViewDataSource
             
             if cardInfo.type == .workExperience {
                 let workCell = tableView.dequeueReusableCell(withIdentifier: YHMyWorkExperienceCell.cellReuseIdentifier, for: indexPath) as! YHMyWorkExperienceCell
-                workCell.userModel = self.viewModel.nameCardInfo
+                workCell.userModel = cardInfo
                 workCell.editBlock = { [weak self] in
                     guard let self = self else { return }
                     let vc = YHEditWorkViewController()
@@ -159,7 +181,7 @@ extension YHMyNameCardViewController: UITableViewDelegate, UITableViewDataSource
             
             if cardInfo.type == .topics {
                 let topicCell = tableView.dequeueReusableCell(withIdentifier: YHMyInterestTopicCell.cellReuseIdentifier, for: indexPath) as! YHMyInterestTopicCell
-                topicCell.userModel = self.viewModel.nameCardInfo
+                topicCell.userModel = cardInfo
                 topicCell.editBlock = { [weak self] in
                     guard let self = self else { return }
                     let vc = YHEditInterestViewController()
@@ -170,15 +192,8 @@ extension YHMyNameCardViewController: UITableViewDelegate, UITableViewDataSource
             }
         }
         
-        let cell = tableView.dequeueReusableCell(withIdentifier: YHMyNameCardAvatarInfoCell.cellReuseIdentifier, for: indexPath) as! YHMyNameCardAvatarInfoCell
-        cell.userModel = self.viewModel.nameCardInfo
-        cell.editBlock = { [weak self] in
-            guard let self = self else { return }
-            let vc = YHEditBaseUserInfoViewController()
-            vc.model = self.viewModel.nameCardInfo
-            self.navigationController?.pushViewController(vc)
-        }
-        return cell
+        let defaultCell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath)
+        return defaultCell
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -208,7 +223,21 @@ extension YHMyNameCardViewController {
     
     func requestAuthorization() {
         self.authorModel.requestUserAuthorization { success, error in
-            self.requestNameCardInfo()
+            if self.authorModel.setModel.isclick_card != 2 {
+                YHCommonAlertView.show("", "授权信息同步至您的名片并对您的好友可见", "取消", "确认",fullGuestureEnable: false) {
+                    self.authorModel.requestInformationToCardSubmit(agress: 1) { success, error in
+                        self.requestNameCardInfo()
+                    }
+                } callBack: {
+                    self.authorModel.requestInformationToCardSubmit(agress: 2) { success, error in
+                        self.authorModel.requestBusinessCardAuthorize { success, error in
+                            self.requestNameCardInfo()
+                        }
+                    }
+                }
+            } else {
+                self.requestNameCardInfo()
+            }
         }
     }
     
@@ -220,31 +249,57 @@ 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.updateModel(self.viewModel.nameCardInfo)
-            self.cardInfoArr.append(model3)
-
-            let model4 = YHUserNameCardInfo()
-            model4.type = .workExperience
-            model4.updateModel(self.viewModel.nameCardInfo)
-            self.cardInfoArr.append(model4)
-
+            if !self.isCurrentUser {
+                if !self.viewModel.nameCardInfo.isHiddenEducation {
+                    let model3 = YHUserNameCardInfo()
+                    model3.type = .education
+                    model3.isCurrentUser = self.isCurrentUser
+                    model3.updateModel(self.viewModel.nameCardInfo)
+                    self.cardInfoArr.append(model3)
+                }
+            } else {
+                let model3 = YHUserNameCardInfo()
+                model3.type = .education
+                model3.isCurrentUser = self.isCurrentUser
+                model3.updateModel(self.viewModel.nameCardInfo)
+                self.cardInfoArr.append(model3)
+            }
+            
+            if !self.isCurrentUser {
+                if !self.viewModel.nameCardInfo.isHiddenWorkExperience {
+                    let model4 = YHUserNameCardInfo()
+                    model4.type = .workExperience
+                    model4.isCurrentUser = self.isCurrentUser
+                    model4.updateModel(self.viewModel.nameCardInfo)
+                    self.cardInfoArr.append(model4)
+                }
+            } else {
+                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,21 @@ 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 isHiddenEducation : Bool {
+        get {
+            return self.authorization.educationExperience != 2
+        }
+    }
+    var isHiddenWorkExperience: Bool {
+        get {
+            return self.authorization.educationExperience != 2
+        }
+    }
+    var isCurrentUser = false
     
     required init() {
         
@@ -110,11 +135,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,38 @@ class YHMyEducationCell: UITableViewCell {
     
     var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
         didSet {
-            self.collegeLabel.text = self.userModel.college
-            self.detailLabel.text = self.userModel.background
+            
+            self.editBtn.isHidden = !self.userModel.isCurrentUser
+            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
+
+                }
+            }
+            
+            if self.userModel.isCurrentUser {
+                self.hiddenBtn.isHidden = (self.userModel.authorization.educationExperience == 1)
+                
+            } else {
+                self.hiddenBtn.isHidden = true
+            }
         }
     }
     
@@ -39,7 +69,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
@@ -65,6 +95,7 @@ class YHMyEducationCell: UITableViewCell {
     
     lazy var hiddenBtn:UIButton = {
         let btn = UIButton()
+        btn.isHidden = true
         btn.backgroundColor = UIColor.init(hex: 0xF4F6FA)
         btn.layer.cornerRadius = 3.0
         btn.setImage(UIImage(named: "people_card_hidden"), for: .normal)

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

@@ -116,14 +116,6 @@ class YHMyInformationItemCell: UITableViewCell {
         titleLabel.attributedText = questionAttrStr
         messageTextField.placeholder = dataSource.prompts
         messageTextField.text = dataSource.message
-        if dataSource.type == .constellation {
-            let arr = YHConstantArrayData.arrDegreeConstellation
-            arr.forEach { item in
-                if item["id"] == dataSource.message {
-                    messageTextField.text = item["title"]
-                }
-            }
-        }
         if dataSource.isUserKeyBoard ?? false {
             nextStepImageView.isHidden = true
             centerButton.isHidden = true
@@ -183,7 +175,7 @@ class YHMyInformationItemCell: UITableViewCell {
         case .constellation:
             YHOtherPickerView.show(type: .constellation, selectTitle: self.dataSource?.message ?? "") { item in
                 print(item)
-                self.dataSource?.message = item.index
+                self.dataSource?.message = item.title
                 self.updateAllViews()
                 if let block = self.block {
                     block(self.dataSource ?? YHUserInformationModel())

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

@@ -54,11 +54,54 @@ 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)
+            
+            self.editBtn.isHidden = !self.userModel.isCurrentUser
+
+            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 +149,16 @@ class YHMyInterestTopicCell: UITableViewCell {
         return collectView
     }()
     
+    lazy var detailLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor30
+        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 +177,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 +205,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

@@ -15,13 +15,35 @@ class YHMyIntroductionCell: UITableViewCell {
     
     var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
         didSet {
+            
+            self.editBtn.isHidden = !self.userModel.isCurrentUser
+
             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
+                    }
+                }
             }
         }
     }
@@ -74,8 +96,6 @@ class YHMyIntroductionCell: UITableViewCell {
         self.backgroundColor = .clear
         self.contentView.backgroundColor = .clear
         
-        detailLabel.text = "拥有超过十年的互联网行业经验，目前担任某知名科技公司的高级产品经理。成功领导并推动了多个产品的上线与迭代，赢得了业界和用户的广泛认可。"
-        
         self.contentView.addSubview(self.cardView)
         cardView.addSubview(self.titleLabel)
         cardView.addSubview(self.detailLabel)

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

@@ -17,6 +17,11 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
     let headWidth = 74.0
     var userModel:YHUserNameCardInfo = YHUserNameCardInfo() {
         didSet {
+            
+            self.professionalLabel.textColor = UIColor.mainTextColor
+            self.detailLabel.textColor = UIColor.mainTextColor50
+            self.editBtn.isHidden = !self.userModel.isCurrentUser
+
             if let url = URL(string: self.userModel.avatar) {
                 self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
             }
@@ -27,33 +32,45 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             self.cityLabel.frame = CGRectMake(0, 0, cityWidth+8, 20)
             self.zodiacLabel.text = self.userModel.zodiac
             
-            if self.userModel.address.city.isEmpty && self.userModel.zodiac.isEmpty {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18)))
-                """
-            } else if self.userModel.zodiac.isEmpty {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18))) \(.view(self.cityLabel, .original(.center)))
-                """
-            } else if self.userModel.address.city.isEmpty {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18))) \(.view(self.zodiacLabel, .original(.center)))
-                """
+            var name:ASAttributedString = .init(string:self.userModel.username, .font(UIFont.PFSC_B(ofSize: 18)), .foreground(UIColor.mainTextColor))
+            let cityTag: ASAttributedString = "  \(.view(self.cityLabel, .original(.center)))"
+            let zodiacTag: ASAttributedString = "  \(.view(self.zodiacLabel, .original(.center)))"
+            
+            if !self.userModel.address.city.isEmpty {
+                name += cityTag
+            }
+            if !self.userModel.zodiac.isEmpty {
+                name += zodiacTag
+            }
+            self.nameTextView.attributed.text = name
+            
+            if !self.userModel.position.isEmpty {
+                self.professionalLabel.text = self.userModel.position
+            } else {
+                self.professionalLabel.text = ""
+                if self.userModel.isCurrentUser {
+                    self.professionalLabel.textColor = UIColor.mainTextColor30
+                    self.professionalLabel.text = "填写职位 | 填写所属行业"
+                }
+            }
+            
+            if !self.userModel.signature.isEmpty {
+                self.detailLabel.text = self.userModel.signature
             } else {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18))) \(.view(self.cityLabel, .original(.center))) \(.view(self.zodiacLabel, .original(.center)))
-                """
+                self.detailLabel.text = ""
+                if self.userModel.isCurrentUser {
+                    self.detailLabel.textColor = UIColor.mainTextColor30
+                    self.detailLabel.text = "填写个性签名，展现真我风采，彰显独特身份"
+                }
             }
             
-            self.professionalLabel.text = self.userModel.position
-            self.detailLabel.text = self.userModel.signature
             self.signImgV.isHidden = !self.userModel.isSigned
         }
     }
     
     lazy var headImgV:UIImageView = {
         let view = UIImageView()
-        view.image = UIImage(named: "")
+        view.image = UIImage(named: "people_head_default")
         view.layer.cornerRadius = 74.0/2.0
         view.clipsToBounds = true
         return view
@@ -67,16 +84,16 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
     
     lazy var cardView: UIView = {
         let view = UIView()
-        view.backgroundColor = .white
-        let bgImgView = UIImageView(image: UIImage(named: "people_add_friend_bg"))
-        view.addSubview(bgImgView)
-        bgImgView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
-        }
         view.layer.cornerRadius = 3.0
+        view.backgroundColor = .white
         return view
     }()
     
+    lazy var bgImgV:UIImageView = {
+        let bgImgView = UIImageView(image: UIImage(named: "people_add_friend_bg"))
+        return bgImgView
+    }()
+    
     lazy var editBtn:UIButton = {
         let btn = UIButton()
         btn.setImage(UIImage(named: "people_card_edit"), for: .normal)
@@ -152,21 +169,25 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         self.backgroundColor = .clear
         self.contentView.backgroundColor = .clear
         
+//        self.contentView.addSubview(self.bgImgV)
         self.contentView.addSubview(self.cardView)
         self.contentView.addSubview(self.headImgV)
         self.contentView.addSubview(self.signImgV)
         
         cardView.addSubview(self.nameTextView)
-        cardView.addSubview(self.cityLabel)
         cardView.addSubview(self.professionalLabel)
         cardView.addSubview(self.detailLabel)
         cardView.addSubview(self.editBtn)
         
         self.cardView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.top.equalTo(self.headImgV.snp.centerY)
+            make.top.equalTo(headWidth/2.0)
         }
         
+//        self.bgImgV.snp.makeConstraints { make in
+//            make.edges.equalTo(self.cardView)
+//        }
+        
         self.editBtn.snp.makeConstraints { make in
             make.width.height.equalTo(20)
             make.right.equalTo(-16)
@@ -188,13 +209,14 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         
         self.nameTextView.snp.makeConstraints { make in
             make.left.equalTo(16)
+            make.right.equalTo(-16)
             make.top.equalTo(headWidth/2.0+10.0)
         }
         
         self.professionalLabel.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)
-            make.height.equalTo(20)
+//            make.height.equalTo(20)
             make.top.equalTo(self.nameTextView.snp.bottom).offset(8)
         }
         
@@ -202,7 +224,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             make.left.equalTo(16)
             make.right.equalTo(-16)
             make.top.equalTo(self.professionalLabel.snp.bottom).offset(8)
-            make.height.equalTo(18)
+//            make.height.equalTo(18)
             make.bottom.equalTo(-16)
         }
         

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,27 +60,48 @@ 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
             
-            self.companyView.isHidden = self.userModel.companyName.isEmpty
-            self.professionView.isHidden = self.userModel.position.isEmpty
-            self.industryView.isHidden = self.userModel.industry.isEmpty
+            self.editBtn.isHidden = !self.userModel.isCurrentUser
             
-            let companyHeight =  self.userModel.companyName.isEmpty ? 0.0 : 20
-            self.companyView.snp.updateConstraints { make in
-                make.height.equalTo(companyHeight)
+            self.companyView.detailLabel.textColor = UIColor.mainTextColor70
+            self.professionView.detailLabel.textColor = UIColor.mainTextColor70
+            self.industryView.detailLabel.textColor = UIColor.mainTextColor70
+
+            if !self.userModel.companyName.isEmpty {
+                self.companyView.detailLabel.text = self.userModel.companyName
+            } else {
+                self.companyView.detailLabel.text = ""
+                if self.userModel.isCurrentUser {
+                    self.companyView.detailLabel.textColor = UIColor.mainTextColor30
+                    self.companyView.detailLabel.text = "请填写最近一份工作经历"
+                }
+            }
+            
+            if !self.userModel.position.isEmpty {
+                self.professionView.detailLabel.text = self.userModel.position
+            } else {
+                self.professionView.detailLabel.text = ""
+                if self.userModel.isCurrentUser {
+                    self.professionView.detailLabel.textColor = UIColor.mainTextColor30
+                    self.professionView.detailLabel.text = "请填写最近一份工作经历"
+                }
             }
             
-            let positionHeight =  self.userModel.position.isEmpty ? 0.0 : 20
-            self.professionView.snp.updateConstraints { make in
-                make.height.equalTo(positionHeight)
+            if !self.userModel.industry.isEmpty {
+                self.industryView.detailLabel.text = self.userModel.industry
+            } else {
+                self.industryView.detailLabel.text = ""
+                if self.userModel.isCurrentUser {
+                    self.industryView.detailLabel.textColor = UIColor.mainTextColor30
+                    self.industryView.detailLabel.text = "请填写最近一份工作经历"
+                }
             }
             
-            let industryHeight =  self.userModel.industry.isEmpty ? 0.0 : 20
-            self.industryView.snp.updateConstraints { make in
-                make.height.equalTo(industryHeight)
+            if self.userModel.isCurrentUser {
+                self.hiddenBtn.isHidden = (self.userModel.authorization.workExperience == 1)
+                
+            } else {
+                self.hiddenBtn.isHidden = true
             }
         }
     }
@@ -109,6 +131,21 @@ class YHMyWorkExperienceCell: UITableViewCell {
         return btn
     }()
     
+    lazy var hiddenBtn:UIButton = {
+        let btn = UIButton()
+        btn.isHidden = true
+        btn.backgroundColor = UIColor.init(hex: 0xF4F6FA)
+        btn.layer.cornerRadius = 3.0
+        btn.setImage(UIImage(named: "people_card_hidden"), for: .normal)
+        btn.setTitle("已隐藏", for: .normal)
+        btn.setTitleColor(UIColor.mainTextColor50, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize:10)
+        btn.titleEdgeInsets = UIEdgeInsets(top: 0, left: -11, bottom: 0, right: 11)
+        btn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 31, bottom: 0, right: -31)
+        return btn
+    }()
+
+    
     lazy var companyView:YHExperienceItemView = {
         let view = YHExperienceItemView()
         view.titleLabel.text = "所在企业"
@@ -144,6 +181,7 @@ class YHMyWorkExperienceCell: UITableViewCell {
         
         self.contentView.addSubview(self.cardView)
         cardView.addSubview(self.titleLabel)
+        cardView.addSubview(self.hiddenBtn)
         cardView.addSubview(self.editBtn)
         cardView.addSubview(self.companyView)
         cardView.addSubview(self.professionView)
@@ -165,6 +203,14 @@ class YHMyWorkExperienceCell: UITableViewCell {
             make.centerY.equalTo(titleLabel)
         }
         
+        hiddenBtn.snp.makeConstraints { make in
+            make.width.equalTo(50)
+            make.height.equalTo(18)
+            make.centerY.equalTo(self.titleLabel)
+            make.left.equalTo(self.titleLabel.snp.right).offset(8)
+            make.right.lessThanOrEqualTo(self.editBtn.snp.left).offset(-15)
+        }
+        
         companyView.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)

galaxy/galaxy/Classes/Modules/Community(社区)/VM/YHInformationAuthorizeViewModel.swift

@@ -204,4 +204,38 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
             callBackBlock(false, err)
         }
     }
+    
+    func requestInformationToCardSubmit(agress: Int, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
+        let params: [String: Any] = ["information_to_card": agress,
+                                     "isclick_card": 2]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.authorizationSubmit
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let _ = self else { return }
+            if json.code == 200 {
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
+    
+    func requestBusinessCardAuthorize(callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.businessCardAuthorize
+        let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let _ = self else { return }
+            if json.code == 200 {
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHAllowUseMyInfoViewController.swift

@@ -73,7 +73,10 @@ class YHAllowUseMyInfoViewController: YHBaseViewController {
         }
         viewModel.requestAuthorizationSubmit(agress: open) {[weak self] success, error in
             guard let self = self else { return }
-            self.dismiss(animated: true)
+            viewModel.requestBusinessCardAuthorize {[weak self] success, error in
+                guard let self = self else { return }
+                self.dismiss(animated: true)
+            }
         }
     }
 }

galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift

@@ -10,6 +10,7 @@ import UIKit
 import SmartCodable
 
 struct YHUserModel: SmartCodable {
+    var id:String = ""
     var userid: Int?
     var nickname: String?
     var mobile: String?

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHUserInfoSettingViewModel.swift

@@ -67,4 +67,20 @@ class YHUserInfoSettingViewModel: YHBaseViewModel {
             callBackBlock(false, err)
         }
     }
+    
+    func requestBusinessCardAuthorize(callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.businessCardAuthorize
+        let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let _ = self else { return }
+            if json.code == 200 {
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -288,8 +288,8 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         switch item.type {
         case .myCard://我的名片
             let vc = YHMyNameCardViewController()
-            if let userId = YHLoginManager.shared.userModel?.userid {
-                vc.userId = "\(userId)"
+            if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
+                vc.userId = userId
             }
             self.navigationController?.pushViewController(vc)
         case .myMessage://我的消息

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditBaseUserInfoViewController.swift

@@ -28,6 +28,9 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
     func getData() {
         viewModel.model = model
         items = viewModel.getBaseDataSource()
+        let url = URL(string: self.viewModel.model.avatar)
+        photoImageView.kf.setImage(with: url)
+        footView.dataSource = self.viewModel.model.signature
         tableView.reloadData()
     }
     

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditHonorViewController.swift

@@ -24,7 +24,12 @@ class YHEditHonorViewController: YHBaseViewController {
     
     func getData() {
         viewModel.model = model
-
+        messageTextField.text = model.honor
+        if messageTextField.text.count != 0 {
+            promptsLabel.isHidden = true
+        } else {
+            promptsLabel.isHidden = false
+        }
     }
     
     func setView() {

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditInterestViewController.swift

@@ -390,6 +390,5 @@ class YHEditInterestViewCell: UICollectionViewCell {
                 deleteButton.isHidden = false
             }
         }
-        
     }
 }

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditPersonalProfileViewController.swift

@@ -24,7 +24,12 @@ class YHEditPersonalProfileViewController: YHBaseViewController {
     
     func getData() {
         viewModel.model = model
-
+        messageTextField.text = model.bio
+        if messageTextField.text.count != 0 {
+            promptsLabel.isHidden = true
+        } else {
+            promptsLabel.isHidden = false
+        }
     }
     
     func setView() {

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -338,6 +338,7 @@ class YHAllApiName {
         static let userInfo = "super-app/user-base/info"
         static let userAuthorization = "super-app/user/authorization"
         static let cardSave = "super-app/business-card/save"
+        static let businessCardAuthorize = "super-app/business-card/authorize"
     }
     
 }