// 人脉

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

@@ -17,7 +17,7 @@ class YHMatchUserInfo: SmartCodable {
     var avatar: String = ""
     var position: String = ""
     var industry: String = ""
-    var isSign: Int = 0
+    var isSign: Bool = false
     var address: YHMatchUserAddress = YHMatchUserAddress()
     var signature: String = ""
     

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

@@ -21,7 +21,7 @@ class YHFriendRequestView: UIView {
             }
             self.nameLabel.text = self.userModel.username
             self.professionalLabel.text = self.userModel.position
-            self.signImgV.isHidden = (self.userModel.isSign != 1)
+            self.signImgV.isHidden = !self.userModel.isSign
         }
     }
     
@@ -158,11 +158,20 @@ class YHFriendRequestView: UIView {
     }
     
     @objc func didSendBtnClicked() {
+        
         if isEmptyString(self.textView.text) {
             YHHUD.flash(message: "请输入发送申请信息")
             return
         }
-        self.sendBlock?(self.textView.text)
+        // 去除两端的空格
+        if var text = self.textView.text {
+            text = text.trimmingCharacters(in: .whitespaces)
+            if text.isEmpty {
+                YHHUD.flash(message: "请输入发送申请信息")
+                return
+            }
+            self.sendBlock?(text)
+        }
         dismiss()
     }
     

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

@@ -76,6 +76,12 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         return view
     }()
     
+    lazy var headBgImgV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "people_user_head_bg")
+        return view
+    }()
+    
     lazy var signImgV:UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "people_sign")
@@ -171,6 +177,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         
 //        self.contentView.addSubview(self.bgImgV)
         self.contentView.addSubview(self.cardView)
+        self.contentView.addSubview(self.headBgImgV)
         self.contentView.addSubview(self.headImgV)
         self.contentView.addSubview(self.signImgV)
         
@@ -194,6 +201,10 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             make.top.equalTo(16)
         }
         
+        self.headBgImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(headWidth+6)
+            make.center.equalTo(self.headImgV)
+        }
         self.headImgV.snp.makeConstraints { make in
             make.width.height.equalTo(headWidth)
             make.left.equalTo(10)
@@ -203,7 +214,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         self.signImgV.snp.makeConstraints { make in
             make.width.equalTo(49)
             make.height.equalTo(17)
-            make.bottom.equalTo(self.headImgV)
+            make.bottom.equalTo(self.headBgImgV)
             make.centerX.equalTo(self.headImgV)
         }
         
@@ -238,7 +249,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
     func getWith(font: UIFont, height: CGFloat, string: String) -> CGFloat {
         let size = CGSize.init(width: CGFloat(MAXFLOAT), height: height)
         let dic = [NSAttributedString.Key.font: font] // swift 4.2
-        var strSize = string.boundingRect(with: size, options: [.usesLineFragmentOrigin], attributes: dic, context:nil).size
+        let strSize = string.boundingRect(with: size, options: [.usesLineFragmentOrigin], attributes: dic, context:nil).size
         return CGSizeMake(ceil(strSize.width), strSize.height).width
     }
     

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

@@ -59,7 +59,7 @@ class YHNameCardInfoView: DragCardView {
             self.detailLabel.snp.updateConstraints { make in
                 make.height.equalTo(detailHeight)
             }
-            self.signImgV.isHidden = (self.userModel.isSign != 1)
+            self.signImgV.isHidden = !self.userModel.isSign
 
             if self.userModel.isSendRequest {
                 self.bottomBtn.setTitle("已发送好友申请", for: .normal)
@@ -91,7 +91,6 @@ class YHNameCardInfoView: DragCardView {
     lazy var headBgImgV:UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "people_user_head_bg")
-        view.layer.cornerRadius = (98.0+10)/2.0
         return view
     }()
     
@@ -216,7 +215,7 @@ class YHNameCardInfoView: DragCardView {
             make.centerX.equalTo(self.headImgV)
             make.width.equalTo(49)
             make.height.equalTo(17)
-            make.bottom.equalTo(self.headImgV)
+            make.bottom.equalTo(self.headBgImgV)
         }
         
         self.nameLabel.snp.makeConstraints { make in

galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift

@@ -79,7 +79,7 @@ class YHWholeScreenTipsView: UIView {
         case .nameCardEducation:
             return "该栏目已对好友隐藏，若需重新开启，请前往信息授权处更新设置"
         case .nameCardWorkExperience:
-            return "可先填写用人单位名称，选择指定的用人单位后，系统将为您自动填写单位官网"
+            return "该栏目已对好友隐藏，若需重新开启，请前往信息授权处更新设置"
         case .hkPlanQ1:
             return "请以不超过100字简介你的主要事业成就，包括你在主要工作项目上曾担当的角色、你工作期间曾服务的知名机构/单位或你对有关工作项目及机构的重大贡献"
         case .hkPlanQ2: