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

@@ -12,6 +12,7 @@ import DragCardContainer
 
 class YHMatchPeopleViewController: YHBaseViewController {
 
+    let viewModel = YHMatchUserViewModel()
     var matchUsersArr:[YHMatchUserInfo?] = []
     
     lazy var bgImgV:UIImageView = {
@@ -310,7 +311,21 @@ extension YHMatchPeopleViewController: DragCardDataSource {
             if let userModel = self.matchUsersArr[index] {
                 cardView.userModel = userModel
                 cardView.sendBlock = {
-                    userModel.isSendRequest = true
+                    [weak self] text in
+                    guard let self = self else { return }
+                    YHHUD.show(.progress(message: "加载中..."))
+                    self.viewModel.addFriendWithText(text!, yhId: userModel.yhId) {
+                        [weak self] success, error in
+                        guard let self = self else { return }
+                        if success {
+                            YHHUD.hide()
+                            YHHUD.flash(message: "已发送好友申请")
+                            cardView.bottomBtn.setTitle("已发送好友申请", for: .normal)
+                            cardView.bottomBtn.backgroundColor = .brandMainColor30
+                            cardView.bottomBtn.isUserInteractionEnabled = false
+                            userModel.isSendRequest = true
+                        }
+                    }
                 }
             }
         }

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

@@ -134,6 +134,10 @@ class YHFriendRequestView: UIView {
     }
     
     @objc func didSendBtnClicked() {
+        if isEmptyString(self.textView.text) {
+            YHHUD.flash(message: "请输入好友申请信息")
+            return
+        }
         self.sendBlock?(self.textView.text)
         dismiss()
     }

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

@@ -13,7 +13,7 @@ class YHNameCardInfoView: DragCardView {
 
     static let height = 456.0
     static let width = KScreenWidth-36.0*2
-    var sendBlock:(()->())?
+    var sendBlock:((String?)->())?
 
     var userModel:YHMatchUserInfo = YHMatchUserInfo()  {
         didSet {
@@ -114,10 +114,7 @@ class YHNameCardInfoView: DragCardView {
        view.sendBlock = {
            [weak self] text in
            guard let self = self else { return }
-           self.bottomBtn.setTitle("已发送好友申请", for: .normal)
-           self.bottomBtn.backgroundColor = .brandMainColor30
-           self.bottomBtn.isUserInteractionEnabled = false
-           self.sendBlock?()
+           self.sendBlock?(text)
        }
        view.show()
     }

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

@@ -14,7 +14,7 @@ class YHMatchUserViewModel: NSObject {
     
     func getMatchUserlist(_ callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
         let params = ["page_size" : 5]
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.matchUserList
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.matchUserListApi
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) {
             [weak self] json, code in
             //1. json字符串 转 对象
@@ -43,4 +43,26 @@ class YHMatchUserViewModel: NSObject {
             callBack(false, err)
         }
     }
+    
+    func addFriendWithText(_ text: String, yhId: String, callBack: @escaping (_ success: Bool,_ error: YHErrorModel?)->()) {
+        
+        let params = ["verify_info" : text,
+                      "yh_id": yhId] as [String : Any]
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.addFriendApi
+        let _ = YHNetRequest.postRequest(url: strUrl, params: params) {
+            [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else { return }
+            printLog(json)
+            
+            if json.code == 200 {
+                callBack(true, nil)
+            }  else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBack(false, error)
+            }
+        } failBlock: { err in
+            callBack(false, err)
+        }
+    }
 }

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

@@ -309,6 +309,10 @@ class YHAllApiName {
     struct People {
         
         // 匹配用户
-        static let matchUserList = "super-app/radar/list"
+        static let matchUserListApi = "super-app/radar/list"
+        // 添加好友
+        static let addFriendApi = "super-app/community/friend-application"
+        // 接收好友请求
+        static let receiveFriendRequestApi = "super-app/community/process-friend-requests"
     }
 }