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

@@ -249,6 +249,8 @@ extension YHMyGoodFriendsVC {
             self.friendRequestArr.removeAll()
             if self.viewModel.friendListModel.friends.count > 0 {
                 self.friendsArr.append(contentsOf: self.viewModel.friendListModel.friends)
+            }
+            if self.viewModel.friendListModel.applyFriends.count > 0 {
                 self.friendRequestArr.append(contentsOf: self.viewModel.friendListModel.applyFriends)
             }
             self.tableView.reloadData()

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

@@ -46,6 +46,23 @@ class YHMatchUserAddress: SmartCodable {
     required init() {
         
     }
+    
+    func showCity() -> String {
+        var cityStr = ""
+        if self.country.contains("中国") {
+            cityStr = self.city
+            let specialArea = ["北京市", "上海市", "天津市", "重庆市", "香港", "澳门", "台湾"]
+            for provinceName in specialArea {
+                if self.province.contains(provinceName) {
+                    cityStr = self.province
+                    break
+                }
+            }
+        } else { // 非中国 显示国家
+            cityStr = self.country
+        }
+        return cityStr
+    }
 }
 
 class YHAuthorizationModel: SmartCodable {

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

@@ -47,10 +47,22 @@ class YHAddFriendCardCell: UITableViewCell {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             self.nameLabel.text = self.friendModel.username
-            self.professionalLabel.text = self.friendModel.position
             self.msgLabel.text = self.friendModel.verifyInfo
             self.signImgV.isHidden = !self.friendModel.isSign
             
+            var text1 = ""
+            var text1Arr:[String] = []
+            if !self.friendModel.position.isEmpty {
+                text1Arr.append(self.friendModel.position)
+            }
+            if !self.friendModel.industry.isEmpty {
+                text1Arr.append(self.friendModel.industry)
+            }
+            if text1Arr.count > 0 {
+                text1 = text1Arr.joined(separator: " | ")
+            }
+            self.professionalLabel.text = text1
+            
             self.scrollView.snp.updateConstraints { make in
                 let msgHeight = self.getHeight(text: self.friendModel.verifyInfo, font: self.msgLabel.font!, width: KScreenWidth-40.0*2)
                 make.height.equalTo(msgHeight >= 55.0 ? 52+12 : msgHeight+12)
@@ -75,6 +87,7 @@ class YHAddFriendCardCell: UITableViewCell {
     lazy var headImgV:UIImageView = {
         let view = UIImageView(image: UIImage(named: "people_head_default"))
         view.layer.cornerRadius = 23.0
+        view.contentMode = .scaleAspectFill
         view.clipsToBounds = true
         return view
     }()

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

@@ -27,6 +27,13 @@ class YHFriendRequestView: UIView {
         }
     }
     
+    var isSendBtnEnabled = false {
+        didSet {
+            self.sendBtn.backgroundColor = (isSendBtnEnabled ?  UIColor.brandMainColor : UIColor.brandMainColor30)
+            self.sendBtn.isUserInteractionEnabled = isSendBtnEnabled
+        }
+    }
+    
     // 底层蒙版
     lazy var blackMaskView: UIView = {
         let view = UIView()
@@ -48,6 +55,7 @@ class YHFriendRequestView: UIView {
         let view = UIImageView(image: UIImage(named: "people_head_default"))
         view.layer.cornerRadius = 23.0
         view.clipsToBounds = true
+        view.contentMode = .scaleAspectFill
         return view
     }()
     
@@ -167,7 +175,7 @@ class YHFriendRequestView: UIView {
         }
         // 去除两端的空格
         if var text = self.textView.text {
-            text = text.trimmingCharacters(in: .whitespaces)
+            text = text.getRealString()
             if text.isEmpty {
                 YHHUD.flash(message: "请输入发送申请信息")
                 return
@@ -209,6 +217,7 @@ class YHFriendRequestView: UIView {
         
         cardView.addSubview(cancelBtn)
         cardView.addSubview(sendBtn)
+        self.isSendBtnEnabled = false
         
         blackMaskView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
@@ -311,6 +320,7 @@ extension YHFriendRequestView: UITextViewDelegate {
     func textViewDidChange(_ textView: UITextView) {
         self.textCountLabel.text = "\(textView.text.count)/\(self.textMaxCount)"
         self.placeHolderLabel.isHidden = !textView.text.isEmpty
+        self.isSendBtnEnabled = !textView.text.isYHEmpty()
     }
     
     func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {

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

@@ -20,15 +20,29 @@ class YHMyFriendsCell: UITableViewCell {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             self.nameLabel.text = self.friendModel.username
-            self.professionalLabel.text = self.friendModel.position
             self.detailLabel.text = self.friendModel.bio
             self.signImgV.isHidden = !self.friendModel.isSign
+            
+            var text1 = ""
+            var text1Arr:[String] = []
+            if !self.friendModel.position.isEmpty {
+                text1Arr.append(self.friendModel.position)
+            }
+            if !self.friendModel.industry.isEmpty {
+                text1Arr.append(self.friendModel.industry)
+            }
+            if text1Arr.count > 0 {
+                text1 = text1Arr.joined(separator: " | ")
+            }
+            self.professionalLabel.text = text1
+
         }
     }
     
     lazy var headImgV:UIImageView = {
         let view = UIImageView(image: UIImage(named: "people_head_default"))
         view.layer.cornerRadius = 23.0
+        view.contentMode = .scaleAspectFill
         view.clipsToBounds = true
         return view
     }()

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

@@ -28,14 +28,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             
-            var cityStr = self.userModel.address.city
-            let specialArea = ["北京市", "上海市", "天津市", "重庆市", "香港", "澳门", "台湾"]
-            for provinceName in specialArea {
-                if self.userModel.address.province.contains(provinceName) {
-                    cityStr = self.userModel.address.province
-                    break
-                }
-            }
+            var cityStr = self.userModel.address.showCity()
             self.cityLabel.text = cityStr
             let cityWidth = self.getWith(font: self.cityLabel.font, height: 20, string: cityStr)
             self.cityLabel.frame = CGRectMake(0, 0, cityWidth+8, 20)

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

@@ -26,14 +26,7 @@ class YHNameCardInfoView: DragCardView {
             var resultArr:[String] = []
             
             // 城市文字
-            var cityStr = self.userModel.address.city
-            var specialArea = ["北京市", "上海市", "天津市", "重庆市", "香港", "澳门", "台湾"]
-            for provinceName in specialArea {
-                if self.userModel.address.province.contains(provinceName) {
-                    cityStr = self.userModel.address.province
-                    break
-                }
-            }
+            var cityStr = self.userModel.address.showCity()
             if !cityStr.isEmpty {
                 resultArr.append(cityStr)
             }
@@ -92,6 +85,7 @@ class YHNameCardInfoView: DragCardView {
         let view = UIImageView()
         view.image = UIImage(named: "people_head_default")
         view.layer.cornerRadius = 98.0/2.0
+        view.contentMode = .scaleAspectFill
         view.clipsToBounds = true
         return view
     }()

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

@@ -54,6 +54,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     let likeViewModel: YHMyLikeViewModel = YHMyLikeViewModel()
     let msgViewModel: YHMsgViewModel = YHMsgViewModel()
     let loginViewModel = YHLoginViewModel()
+    let userViewModel = YHInformationAuthorizeViewModel()
 
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style:.grouped)
@@ -153,6 +154,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         getTotalUnreadMsgCount()
         checkSettingRedPoint()
         self.headerView.updateAvatar()
+        requstUserBasicInfo()
     }
     
     @objc func clickBtn() {
@@ -397,5 +399,19 @@ extension YHMyViewController {
         requestLikeCollectionCount()
         getTotalUnreadMsgCount()
         checkSettingRedPoint()
+        requstUserBasicInfo()
+    }
+    
+    func requstUserBasicInfo() {
+        if YHLoginManager.shared.isLogin() {
+            userViewModel.requestUserInfo {[weak self] success, error in
+                guard let self = self else { return }
+                let url = URL(string: self.userViewModel.model.avatar)
+                self.headerView.avarImgView.kf.setImage(with: url, placeholder: UIImage(named: "mine_head_default"))
+                
+            }
+        } else {
+            headerView.updateAvatar()
+        }
     }
 }

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -34,11 +34,14 @@ class YHUserInfoHeaderView: UIView {
         }
     }
 
-    private lazy var avarImgView:UIImageView = {
+    lazy var avarImgView:UIImageView = {
         let imgView = UIImageView(image: UIImage(named: "mine_head_logout"))
         imgView.isUserInteractionEnabled = true
         let tap = UITapGestureRecognizer(target: self, action: #selector(didAvarImgViewTapped))
         imgView.addGestureRecognizer(tap)
+        imgView.layer.cornerRadius = 36.0
+        imgView.contentMode = .scaleAspectFill
+        imgView.clipsToBounds = true
         return imgView
     }()