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.xcodeproj/project.pbxproj

@@ -310,6 +310,7 @@
 		04EA376D2BEA06EF00DBAF64 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376C2BEA06EF00DBAF64 /* WebKit.framework */; };
 		04EA376F2BEA071600DBAF64 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376E2BEA070500DBAF64 /* libc++.tbd */; };
 		04EA37742BEA0A3400DBAF64 /* YHShareManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */; };
+		04EC2F812C22888E002907D7 /* YHFriendRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */; };
 		04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */; };
 		04F5F8602C1944D5004A463C /* YHHKCenterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F5F85F2C1944D5004A463C /* YHHKCenterViewController.swift */; };
 		04F5F8622C1945C0004A463C /* YHHKIdentityCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F5F8612C1945C0004A463C /* YHHKIdentityCardViewController.swift */; };
@@ -829,6 +830,7 @@
 		04EA376C2BEA06EF00DBAF64 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		04EA376E2BEA070500DBAF64 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareManager.swift; sourceTree = "<group>"; };
+		04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendRequestView.swift; sourceTree = "<group>"; };
 		04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateSheetView.swift; sourceTree = "<group>"; };
 		04F5F85F2C1944D5004A463C /* YHHKCenterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKCenterViewController.swift; sourceTree = "<group>"; };
 		04F5F8612C1945C0004A463C /* YHHKIdentityCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKIdentityCardViewController.swift; sourceTree = "<group>"; };
@@ -2037,6 +2039,7 @@
 				04FD856B2C2153F000BEF9C5 /* YHMyEducationCell.swift */,
 				04FD856D2C215DC900BEF9C5 /* YHMyWorkExperienceCell.swift */,
 				04FD856F2C21646200BEF9C5 /* YHMyInterestTopicCell.swift */,
+				04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */,
 				04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */,
 				04FD85712C21786900BEF9C5 /* YHNameCardInfoView.swift */,
 				044D0BFF2C21663300C5CF5E /* YHMyInformationItemCell.swift */,
@@ -2995,6 +2998,7 @@
 				045EEF042B9F171A0022A143 /* YHIdentityCardCell.swift in Sources */,
 				045EEEB42B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift in Sources */,
 				045EEF132B9F171A0022A143 /* YHCountryMessage.swift in Sources */,
+				04EC2F812C22888E002907D7 /* YHFriendRequestView.swift in Sources */,
 				045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,
 				A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */,
 				044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */,

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

@@ -27,6 +27,7 @@ class YHPeopleViewController: YHBaseViewController {
         btn.setTitleColor(.white, for: .normal)
         btn.titleLabel?.font = .PFSC_M(ofSize: 15)
         btn.layer.cornerRadius = 3.0
+        btn.addTarget(self, action: #selector(didMatchBtnClicked), for: .touchUpInside)
         return btn
     }()
 
@@ -73,7 +74,7 @@ class YHPeopleViewController: YHBaseViewController {
         }
     }
     
-    @objc func abc() {
+    @objc func didMatchBtnClicked() {
         
         let vc = YHMatchPeopleViewController()
         self.navigationController?.pushViewController(vc)

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

+//
+//  YHFriendRequestView.swift
+//  galaxy
+//
+//  Created by edy on 2024/6/19.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFriendRequestView: UIView {
+
+    // 底层蒙版
+    lazy var blackMaskView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .alertMaskColor
+        return view
+    }()
+    
+    lazy var cardView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = 3.0
+        view.clipsToBounds = true
+        return view
+    }()
+    
+    lazy var headImgV:UIImageView = {
+        let view = UIImageView()
+        view.layer.cornerRadius = 23.0
+        return view
+    }()
+    
+    lazy var nameLabel:UILabel = {
+        let nameLabel = UILabel()
+        nameLabel.textColor = UIColor.mainTextColor
+        nameLabel.textAlignment = .left
+        nameLabel.font = UIFont.PFSC_B(ofSize:16)
+        return nameLabel
+    }()
+    
+    lazy var signImgV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "people_sign")
+        return view
+    }()
+    
+    lazy var professionalLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor70
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize:13)
+        return label
+    }()
+    
+    lazy var msgContentView:UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0xF4F6FA)
+        view.layer.cornerRadius = 3.0
+        return view
+    }()
+    
+    lazy var msgLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor50
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize:13)
+        return label
+    }()
+    
+    lazy var cancelBtn:UIButton = {
+       let btn = UIButton()
+        btn.setTitle("取消", for: .normal)
+        btn.backgroundColor = .white
+        btn.setTitleColor(.brandMainColor, for: .normal)
+        btn.titleLabel?.font = .PFSC_M(ofSize: 14)
+        btn.layer.cornerRadius = 3
+        btn.addTarget(self, action: #selector(didCancelBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
+    lazy var sendBtn:UIButton = {
+       let btn = UIButton()
+        btn.setTitle("发送申请", for: .normal)
+        btn.backgroundColor = UIColor.brandMainColor
+        btn.setTitleColor(UIColor.white, for: .normal)
+        btn.titleLabel?.font = .PFSC_M(ofSize: 14)
+        btn.layer.cornerRadius = 3
+        btn.addTarget(self, action: #selector(didSendBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    static func createView() -> YHFriendRequestView {
+        let view = YHFriendRequestView(frame: UIScreen.main.bounds)
+        return view
+    }
+    
+    func show() {
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+    }
+    
+    func dismiss() {
+        self.removeFromSuperview()
+    }
+    
+    @objc func didCancelBtnClicked() {
+        
+    }
+    
+    @objc func didSendBtnClicked() {
+    }
+    
+    func createUI() {
+        
+        self.addSubview(self.blackMaskView)
+        self.addSubview(cardView)
+        cardView.addSubview(headImgV)
+        cardView.addSubview(nameLabel)
+        cardView.addSubview(signImgV)
+        cardView.addSubview(professionalLabel)
+        
+        cardView.addSubview(msgContentView)
+        msgContentView.addSubview(msgLabel)
+        
+        cardView.addSubview(cancelBtn)
+        cardView.addSubview(sendBtn)
+        
+        self.headImgV.backgroundColor = .red
+        self.nameLabel.text = "XASAFSDFASDXASAFSDFASDXASAFSDFASDXASAFSDFASD"
+        self.professionalLabel.text = "咨询副总监 | 资讯科技及电讯"
+        self.msgLabel.text = "sdfasdfasdfasfasfasfasfasdfasdfas"
+        
+        blackMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        cardView.snp.makeConstraints { make in
+            make.left.equalTo(38)
+            make.right.equalTo(-38)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(313)
+        }
+        
+        headImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(46.0)
+            make.left.equalTo(21)
+            make.top.equalTo(30)
+        }
+        
+        self.nameLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.headImgV.snp.right).offset(10)
+            make.height.equalTo(22.0)
+            make.top.equalTo(self.headImgV)
+        }
+        
+        self.signImgV.snp.makeConstraints { make in
+            make.width.equalTo(49)
+            make.height.equalTo(16)
+            make.centerY.equalTo(self.nameLabel)
+            make.left.equalTo(self.nameLabel.snp.right).offset(8)
+            make.right.lessThanOrEqualToSuperview().offset(-16)
+        }
+        
+        self.professionalLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.nameLabel)
+            make.right.equalTo(-16)
+            make.top.equalTo(self.nameLabel.snp.bottom).offset(6)
+            make.height.equalTo(18)
+        }
+        
+        self.msgContentView.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.top.equalTo(self.headImgV.snp.bottom).offset(16)
+            make.height.equalTo(140)
+        }
+        
+        self.msgLabel.snp.makeConstraints { make in
+            make.left.top.equalTo(6)
+            make.right.bottom.equalTo(-6)
+        }
+        
+        self.cancelBtn.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.top.equalTo(self.msgContentView.snp.bottom).offset(20)
+            make.width.equalTo(self.sendBtn)
+            make.height.equalTo(45)
+        }
+        
+        self.sendBtn.snp.makeConstraints { make in
+            make.left.equalTo(self.cancelBtn.snp.right).offset(10)
+            make.right.equalTo(-16)
+            make.centerY.equalTo(self.cancelBtn)
+            make.height.equalTo(45)
+        }
+    }
+}

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

@@ -82,6 +82,7 @@ class YHNameCardInfoView: UIView {
         btn.setTitleColor(.white, for: .normal)
         btn.titleLabel?.font = .PFSC_M(ofSize: 15)
         btn.layer.cornerRadius = 3.0
+        btn.addTarget(self, action: #selector(didBottomBtnClicked), for: .touchUpInside)
         return btn
     }()
     
@@ -94,6 +95,10 @@ class YHNameCardInfoView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
     
+    @objc func didBottomBtnClicked() {
+        YHFriendRequestView.createView().show()
+    }
+    
     static func createCardView() -> YHNameCardInfoView {
         let view = YHNameCardInfoView(frame: CGRect(x: 0, y: 0, width: Self.width, height: Self.height))
         return view