// 人脉API

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

@@ -9,12 +9,15 @@
 import UIKit
 import DragCardContainer
 
+protocol YHMatchProtocol: NSObjectProtocol  {
+    func startMatchUsers()
+}
 
 class YHMatchPeopleViewController: YHBaseViewController {
 
     let viewModel = YHMatchUserViewModel()
     var matchUsersArr:[YHMatchUserInfo?] = []
-    
+    weak var delegate: YHMatchProtocol?
     lazy var bgImgV:UIImageView = {
         let bg = UIImageView(image: UIImage(named: "people_match_result_bg"))
         return bg
@@ -154,6 +157,8 @@ class YHMatchPeopleViewController: YHBaseViewController {
     
     @objc func didRematchBtnClicked() {
         
+        self.delegate?.startMatchUsers()
+        self.navigationController?.popViewController(animated: true)
     }
     
     func createUI() {

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

@@ -149,17 +149,7 @@ class YHPeopleViewController: YHBaseViewController {
     @objc func didMatchBtnClicked() {
         
         if true {
-            self.headLottieView.isHidden = true
-            self.launchLottieView.loopMode = .playOnce
-            self.launchLottieView.play {
-                [weak self] completed in
-                guard let self = self else { return }
-                self.launchLottieView.isHidden = true
-                self.rotateLottieView.isHidden = false
-                self.rotateLottieView.loopMode = .loop
-                self.rotateLottieView.play()
-                self.requestMatchUserList()
-            }
+            startMatchUsers()
             return
         }
         
@@ -183,6 +173,22 @@ extension YHPeopleViewController: JXSegmentedListContainerViewListDelegate {
     }
 }
 
+extension YHPeopleViewController: YHMatchProtocol {
+    func startMatchUsers() {
+        self.headLottieView.isHidden = true
+        self.launchLottieView.loopMode = .playOnce
+        self.launchLottieView.play {
+            [weak self] completed in
+            guard let self = self else { return }
+            self.launchLottieView.isHidden = true
+            self.rotateLottieView.isHidden = false
+            self.rotateLottieView.loopMode = .loop
+            self.rotateLottieView.play()
+            self.requestMatchUserList()
+        }
+    }
+}
+
 extension YHPeopleViewController {
     func requestMatchUserList() {
         self.viewModel.getMatchUserlist { 
@@ -190,6 +196,7 @@ extension YHPeopleViewController {
             
             self.rotateLottieView.stop()
             let vc = YHMatchPeopleViewController()
+            vc.delegate = self
             vc.matchUsersArr = self.viewModel.matchUserArr
             self.navigationController?.pushViewController(vc)
         }

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 = false
+    var isSign: Int = 0
     var address: YHMatchUserAddress = YHMatchUserAddress()
     var signature: String = ""
     

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

@@ -42,7 +42,7 @@ class YHAddFriendCardCell: UITableViewCell {
     var friendModel: YHFriendModel = YHFriendModel() {
         didSet {
             if let url = URL(string: self.friendModel.avatar) {
-                self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: ""))
+                self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
             }
             self.nameLabel.text = self.friendModel.username
             self.professionalLabel.text = self.friendModel.position

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

@@ -13,6 +13,18 @@ class YHFriendRequestView: UIView {
     var sendBlock:((String?)->())?
     static let cardHeight = 313.0
     let textMaxCount = 200
+    
+    var userModel:YHMatchUserInfo = YHMatchUserInfo()  {
+        didSet {
+            if let url = URL(string: self.userModel.avatar) {
+                self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
+            }
+            self.nameLabel.text = self.userModel.username
+            self.professionalLabel.text = self.userModel.position
+            self.signImgV.isHidden = (self.userModel.isSign != 1)
+        }
+    }
+    
     // 底层蒙版
     lazy var blackMaskView: UIView = {
         let view = UIView()
@@ -174,10 +186,6 @@ class YHFriendRequestView: UIView {
         cardView.addSubview(cancelBtn)
         cardView.addSubview(sendBtn)
         
-        self.headImgV.backgroundColor = .red
-        self.nameLabel.text = "XASAFSDFASDXASAFSDFASDXASAFSDFASDXASAFSDFASD"
-        self.professionalLabel.text = "咨询副总监 | 资讯科技及电讯"
-        
         blackMaskView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }

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

@@ -15,7 +15,7 @@ class YHMyFriendsCell: UITableViewCell {
     var friendModel: YHFriendModel = YHFriendModel() {
         didSet {
             if let url = URL(string: self.friendModel.avatar) {
-                self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "mine_head_logout"))
+                self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
             }
             self.nameLabel.text = self.friendModel.username
             self.professionalLabel.text = self.friendModel.position

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

@@ -17,14 +17,13 @@ class YHNameCardInfoView: DragCardView {
 
     var userModel:YHMatchUserInfo = YHMatchUserInfo()  {
         didSet {
-            
             if let url = URL(string: self.userModel.avatar) {
-                self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "mine_head_logout"))
+                self.headImgV.kf.setImage(with: url, placeholder: UIImage(named: "people_head_default"))
             }
             self.nameLabel.text = self.userModel.username
             self.professionalLabel.text = self.userModel.position
             self.detailLabel.text = self.userModel.signature
-            self.signImgV.isHidden = !self.userModel.isSign
+            self.signImgV.isHidden = (self.userModel.isSign != 1)
 
             if self.userModel.isSendRequest {
                 self.bottomBtn.setTitle("已发送好友申请", for: .normal)
@@ -41,7 +40,6 @@ class YHNameCardInfoView: DragCardView {
     lazy var bgImgV:UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "people_card_head_bg")
-        view.backgroundColor = .red
         return view
     }()
     
@@ -49,7 +47,7 @@ class YHNameCardInfoView: DragCardView {
         let view = UIImageView()
         view.image = UIImage(named: "")
         view.layer.cornerRadius = 98.0/2.0
-        view.backgroundColor = .green
+        view.clipsToBounds = true
         return view
     }()
     
@@ -115,6 +113,7 @@ class YHNameCardInfoView: DragCardView {
     
     @objc func didBottomBtnClicked() {
        let view = YHFriendRequestView.createView()
+       view.userModel = self.userModel
        view.sendBlock = {
            [weak self] text in
            guard let self = self else { return }

galaxy/galaxy/Res/Assets.xcassets/People/people_head_default.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "默认头像图@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "默认头像图@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}