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/YHPeopleViewController.swift

@@ -74,11 +74,6 @@ class YHPeopleViewController: YHBaseViewController {
         createUI()
     }
     
-    override func viewDidDisappear(_ animated: Bool) {
-        super.viewDidDisappear(animated)
-        resetAnimation()
-    }
-    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         informationAuthorizeViewModel.requestUserInfo {[weak self] success, error in
@@ -232,8 +227,8 @@ extension YHPeopleViewController {
                     msg = errorMsg
                 }
                 YHHUD.flash(message: msg)
-                self.resetAnimation()
             }
+            self.resetAnimation()
         }
     }
     

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/YHAddFriendCardCell.swift

@@ -71,8 +71,9 @@ class YHAddFriendCardCell: UITableViewCell {
     }()
     
     lazy var headImgV:UIImageView = {
-        let view = UIImageView()
+        let view = UIImageView(image: UIImage(named: "people_head_default"))
         view.layer.cornerRadius = 23.0
+        view.clipsToBounds = true
         return view
     }()
     
@@ -165,11 +166,11 @@ class YHAddFriendCardCell: UITableViewCell {
     }
     
     @objc func didIgnoreBtnClicked() {
-        self.acceptBlock?(true)
+        self.acceptBlock?(false)
     }
     
     @objc func didAcceptBtnClicked() {
-        self.acceptBlock?(false)
+        self.acceptBlock?(true)
     }
     
     func createUI() {
@@ -265,7 +266,7 @@ class YHAddFriendCardCell: UITableViewCell {
         self.secondCardView.snp.makeConstraints { make in
             make.left.equalTo(self.cardView).offset(5)
             make.right.equalTo(self.cardView).offset(-5)
-            make.height.equalTo(50)
+            make.height.equalTo(6)
             make.bottom.equalTo(self.thirdCardView).offset(-6)
         }
         
@@ -273,7 +274,7 @@ class YHAddFriendCardCell: UITableViewCell {
             make.left.equalTo(self.cardView).offset(10)
             make.right.equalTo(self.cardView).offset(-10)
             make.bottom.equalToSuperview()
-            make.height.equalTo(50)
+            make.height.equalTo(6)
         }
     }
     

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
         }
     }
     
@@ -43,7 +43,7 @@ class YHFriendRequestView: UIView {
     }()
     
     lazy var headImgV:UIImageView = {
-        let view = UIImageView()
+        let view = UIImageView(image: UIImage(named: "people_head_default"))
         view.layer.cornerRadius = 23.0
         view.clipsToBounds = true
         return view
@@ -120,6 +120,17 @@ class YHFriendRequestView: UIView {
         return btn
     }()
     
+    lazy var placeHolderLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.placeHolderColor
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.text = "请输入发送申请信息"
+        label.numberOfLines = 0
+        label.isHidden = false
+        return label
+    }()
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         createUI()
@@ -147,11 +158,20 @@ class YHFriendRequestView: UIView {
     }
     
     @objc func didSendBtnClicked() {
+        
         if isEmptyString(self.textView.text) {
-            YHHUD.flash(message: "请输入好友申请信息")
+            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()
     }
     
@@ -182,6 +202,7 @@ class YHFriendRequestView: UIView {
         
         cardView.addSubview(msgContentView)
         msgContentView.addSubview(textView)
+        msgContentView.addSubview(placeHolderLabel)
         msgContentView.addSubview(textCountLabel)
         
         cardView.addSubview(cancelBtn)
@@ -233,14 +254,20 @@ class YHFriendRequestView: UIView {
         }
         
         self.textView.snp.makeConstraints { make in
-            make.left.top.equalTo(16)
-            make.right.equalTo(-16)
+            make.left.top.equalTo(10)
+            make.right.equalTo(-10)
+        }
+        
+        self.placeHolderLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.textView.snp.top).offset(7)
+            make.left.equalTo(self.textView.snp.left).offset(7)
+            make.right.equalTo(self.textView)
         }
         
         self.textCountLabel.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)
-            make.top.equalTo(self.textView.snp.bottom).offset(16)
+            make.top.equalTo(self.textView.snp.bottom).offset(10)
             make.height.equalTo(16)
             make.bottom.equalToSuperview().offset(-16)
         }
@@ -267,7 +294,7 @@ class YHFriendRequestView: UIView {
             guard let keyboardFrame = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as AnyObject).cgRectValue else {return }
 
             let isKeyboardShow = notification.name == UIResponder.keyboardWillShowNotification
-            let bottomMargin = (isKeyboardShow ? keyboardFrame.height+10 : (KScreenHeight-YHFriendRequestView.cardHeight)/2.0)
+            let bottomMargin = (isKeyboardShow ? keyboardFrame.height+20 : (KScreenHeight-YHFriendRequestView.cardHeight)/2.0)
             self.cardView.snp.updateConstraints { make in
                 make.bottom.equalToSuperview().offset(-bottomMargin)
             }
@@ -281,6 +308,7 @@ extension YHFriendRequestView: UITextViewDelegate {
     
     func textViewDidChange(_ textView: UITextView) {
         self.textCountLabel.text = "\(textView.text.count)/\(self.textMaxCount)"
+        self.placeHolderLabel.isHidden = !textView.text.isEmpty
     }
     
     func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {

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

@@ -25,7 +25,7 @@ class YHMyFriendsCell: UITableViewCell {
     }
     
     lazy var headImgV:UIImageView = {
-        let view = UIImageView()
+        let view = UIImageView(image: UIImage(named: "people_head_default"))
         view.layer.cornerRadius = 23.0
         view.clipsToBounds = true
         return view

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

@@ -26,7 +26,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
                 self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
             }
             
-            let city = self.userModel.address.city + "市"
+            let city = self.userModel.address.city
             self.cityLabel.text = city
             let cityWidth = self.getWith(font: self.cityLabel.font, height: 20, string: city)
             self.cityLabel.frame = CGRectMake(0, 0, cityWidth+8, 20)
@@ -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,21 +214,21 @@ 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)
         }
         
         self.nameTextView.snp.makeConstraints { make in
-            make.left.equalTo(16)
+            make.left.equalTo(10)
             make.right.equalTo(-16)
-            make.top.equalTo(headWidth/2.0+10.0)
+            make.top.equalTo(headWidth/2.0)
         }
         
         self.professionalLabel.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)
 //            make.height.equalTo(20)
-            make.top.equalTo(self.nameTextView.snp.bottom).offset(8)
+            make.top.equalTo(self.nameTextView.snp.bottom).offset(0)
         }
         
         self.detailLabel.snp.makeConstraints { make in
@@ -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/Modules/Community(社区)/VM/YHMatchUserViewModel.swift

@@ -15,7 +15,7 @@ class YHMatchUserViewModel: NSObject {
     var friendListModel:YHFriendListModel = YHFriendListModel()
     
     func getMatchUserlist(_ callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
-        let params = ["page_size" : 5]
+        let params = ["page_size" : 20]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.matchUserListApi
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) {
             [weak self] json, code 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: