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

@@ -60,6 +60,7 @@
 		044D0C002C21663300C5CF5E /* YHMyInformationItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0BFF2C21663300C5CF5E /* YHMyInformationItemCell.swift */; };
 		044D0C022C216AAF00C5CF5E /* YHInformationAuthorizeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0C012C216AAF00C5CF5E /* YHInformationAuthorizeViewModel.swift */; };
 		044D0C042C2180B700C5CF5E /* YHInformationAuthorizationStepTwoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0C032C2180B700C5CF5E /* YHInformationAuthorizationStepTwoViewController.swift */; };
+		044D0C062C22736F00C5CF5E /* YHSetExplainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0C052C22736F00C5CF5E /* YHSetExplainView.swift */; };
 		045EEE792B9F171A0022A143 /* YHPreviewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EED9A2B9F171A0022A143 /* YHPreviewViewModel.swift */; };
 		045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EED9C2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift */; };
 		045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EED9D2B9F171A0022A143 /* YHPersonInfoCellModel2.swift */; };
@@ -322,7 +323,7 @@
 		04F957452C1FEC4A003C631C /* YHMessageBellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F957442C1FEC4A003C631C /* YHMessageBellView.swift */; };
 		04F957472C203033003C631C /* YHMyGoodFriendsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */; };
 		04F9574B2C2032D8003C631C /* YHMyFriendsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9574A2C2032D8003C631C /* YHMyFriendsCell.swift */; };
-		04F9574D2C20644E003C631C /* YHFriendsRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9574C2C20644E003C631C /* YHFriendsRequestView.swift */; };
+		04F9574D2C20644E003C631C /* YHFriendsResponseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */; };
 		04FA8B2B2C06F59D00ABE43F /* YHAppleLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */; };
 		04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */; };
 		04FA8B302C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA8B2F2C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift */; };
@@ -333,6 +334,8 @@
 		04FD856C2C2153F000BEF9C5 /* YHMyEducationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD856B2C2153F000BEF9C5 /* YHMyEducationCell.swift */; };
 		04FD856E2C215DC900BEF9C5 /* YHMyWorkExperienceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD856D2C215DC900BEF9C5 /* YHMyWorkExperienceCell.swift */; };
 		04FD85702C21646200BEF9C5 /* YHMyInterestTopicCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD856F2C21646200BEF9C5 /* YHMyInterestTopicCell.swift */; };
+		04FD85722C21786900BEF9C5 /* YHNameCardInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD85712C21786900BEF9C5 /* YHNameCardInfoView.swift */; };
+		04FD85742C219CFD00BEF9C5 /* YHMatchPeopleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FD85732C219CFD00BEF9C5 /* YHMatchPeopleViewController.swift */; };
 		6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
 		A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
@@ -574,6 +577,7 @@
 		044D0BFF2C21663300C5CF5E /* YHMyInformationItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyInformationItemCell.swift; sourceTree = "<group>"; };
 		044D0C012C216AAF00C5CF5E /* YHInformationAuthorizeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationAuthorizeViewModel.swift; sourceTree = "<group>"; };
 		044D0C032C2180B700C5CF5E /* YHInformationAuthorizationStepTwoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationAuthorizationStepTwoViewController.swift; sourceTree = "<group>"; };
+		044D0C052C22736F00C5CF5E /* YHSetExplainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSetExplainView.swift; sourceTree = "<group>"; };
 		045EED9A2B9F171A0022A143 /* YHPreviewViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPreviewViewModel.swift; sourceTree = "<group>"; };
 		045EED9C2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPreviewForOtherInfoModel.swift; sourceTree = "<group>"; };
 		045EED9D2B9F171A0022A143 /* YHPersonInfoCellModel2.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPersonInfoCellModel2.swift; sourceTree = "<group>"; };
@@ -838,7 +842,7 @@
 		04F957442C1FEC4A003C631C /* YHMessageBellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMessageBellView.swift; sourceTree = "<group>"; };
 		04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyGoodFriendsVC.swift; sourceTree = "<group>"; };
 		04F9574A2C2032D8003C631C /* YHMyFriendsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFriendsCell.swift; sourceTree = "<group>"; };
-		04F9574C2C20644E003C631C /* YHFriendsRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendsRequestView.swift; sourceTree = "<group>"; };
+		04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendsResponseView.swift; sourceTree = "<group>"; };
 		04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAppleLoginManager.swift; sourceTree = "<group>"; };
 		04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
 		04FA8B2F2C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOneKeyLoginViewModel.swift; sourceTree = "<group>"; };
@@ -849,6 +853,8 @@
 		04FD856B2C2153F000BEF9C5 /* YHMyEducationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyEducationCell.swift; sourceTree = "<group>"; };
 		04FD856D2C215DC900BEF9C5 /* YHMyWorkExperienceCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyWorkExperienceCell.swift; sourceTree = "<group>"; };
 		04FD856F2C21646200BEF9C5 /* YHMyInterestTopicCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyInterestTopicCell.swift; sourceTree = "<group>"; };
+		04FD85712C21786900BEF9C5 /* YHNameCardInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNameCardInfoView.swift; sourceTree = "<group>"; };
+		04FD85732C219CFD00BEF9C5 /* YHMatchPeopleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMatchPeopleViewController.swift; sourceTree = "<group>"; };
 		19B28612265782F9DC1BE0B0 /* Pods-galaxy.testenv.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.testenv.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.testenv.xcconfig"; sourceTree = "<group>"; };
 		58C2405158A4A6632D0E7460 /* Pods-galaxy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.debug.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.debug.xcconfig"; sourceTree = "<group>"; };
 		987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_galaxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1189,6 +1195,7 @@
 				044D0BF12C20262100C5CF5E /* YHPeopleViewController.swift */,
 				04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */,
 				04FD85652C2124AF00BEF9C5 /* YHMyNameCardViewController.swift */,
+				04FD85732C219CFD00BEF9C5 /* YHMatchPeopleViewController.swift */,
 				044D0BFB2C21635B00C5CF5E /* YHInformationAuthorizationStepOneViewController.swift */,
 				044D0C032C2180B700C5CF5E /* YHInformationAuthorizationStepTwoViewController.swift */,
 			);
@@ -2029,8 +2036,10 @@
 				04FD856B2C2153F000BEF9C5 /* YHMyEducationCell.swift */,
 				04FD856D2C215DC900BEF9C5 /* YHMyWorkExperienceCell.swift */,
 				04FD856F2C21646200BEF9C5 /* YHMyInterestTopicCell.swift */,
-				04F9574C2C20644E003C631C /* YHFriendsRequestView.swift */,
+				04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */,
+				04FD85712C21786900BEF9C5 /* YHNameCardInfoView.swift */,
 				044D0BFF2C21663300C5CF5E /* YHMyInformationItemCell.swift */,
+				044D0C052C22736F00C5CF5E /* YHSetExplainView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2872,6 +2881,7 @@
 				049AB5EE2C0EF68700155DDF /* YHOrderTipsView.swift in Sources */,
 				045EEEB12B9F171A0022A143 /* YHClipperView.swift in Sources */,
 				A567E5962BD7643D00D5D5A0 /* YHConfigModel.swift in Sources */,
+				04FD85722C21786900BEF9C5 /* YHNameCardInfoView.swift in Sources */,
 				A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */,
 				A5EF21372BA6E2D1005027E6 /* YHQuestionAndAnswerModel.swift in Sources */,
 				A567E5A52BD7643D00D5D5A0 /* YHHomeCollectionLayout.swift in Sources */,
@@ -2882,6 +2892,7 @@
 				A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */,
 				045EEEF62B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift in Sources */,
 				044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
+				044D0C062C22736F00C5CF5E /* YHSetExplainView.swift in Sources */,
 				045EEF002B9F171A0022A143 /* YHFormItemEnterDetailCell.swift in Sources */,
 				A5ACE9362B4564F7002C94D2 /* YHNetworkStatusManager.swift in Sources */,
 				048787D52BCE880B0036E221 /* YHServiceOrderListViewController.swift in Sources */,
@@ -2955,7 +2966,7 @@
 				045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,
 				A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */,
 				044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */,
-				04F9574D2C20644E003C631C /* YHFriendsRequestView.swift in Sources */,
+				04F9574D2C20644E003C631C /* YHFriendsResponseView.swift in Sources */,
 				04F5F8702C1AC4C2004A463C /* YHHKEventWebViewController.swift in Sources */,
 				045EEE892B9F171A0022A143 /* YHPreviewBaseViewController.swift in Sources */,
 				045EEEA42B9F171A0022A143 /* YHImageResultViewController.swift in Sources */,
@@ -3293,6 +3304,7 @@
 				043B0A352C1190C6008A9BBA /* YHSelectFileSheetView.swift in Sources */,
 				04F5F8662C197FFF004A463C /* YHHKControllerHoldViewController.swift in Sources */,
 				A5ACE92D2B4564F7002C94D2 /* YHLoginPrivacyView.swift in Sources */,
+				04FD85742C219CFD00BEF9C5 /* YHMatchPeopleViewController.swift in Sources */,
 				045EEEB72B9F171A0022A143 /* YHWorkItemAddView.swift in Sources */,
 				A5ACE9372B4564F7002C94D2 /* YHBaseUrlManager.swift in Sources */,
 				04EA230A2BB5172F009DA928 /* YHDocumentPromptTableViewCell.swift in Sources */,

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

@@ -13,7 +13,9 @@ class YHActivityViewController: YHBaseViewController {
 // MARK: - 生命周期方法
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+        self.view.backgroundColor = .clear
+        gk_navigationBar.isHidden = true
+
     }
 }
 

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

@@ -15,17 +15,23 @@ class YHCommunityViewController: YHBaseViewController {
     let arrItemTitles = ["人脉","活动"]
     
     var arrItemVCs : [YHBaseViewController] = []
-    var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48))
+    
+    lazy var segmentedView : JXSegmentedView = {
+       let view = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48))
+        view.backgroundColor = .clear
+        return view
+    }()
+    
     lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
         let dataSource = JXSegmentedTitleDataSource()
         dataSource.isTitleColorGradientEnabled = true
         dataSource.titles = arrItemTitles
         
         dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 15)
-        dataSource.titleNormalColor = .labelTextColor2
+        dataSource.titleNormalColor = UIColor(hex: 0xFFFFFF, alpha: 0.6)
         
         dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
-        dataSource.titleSelectedColor = .mainTextColor
+        dataSource.titleSelectedColor = .white
         
         dataSource.isItemSpacingAverageEnabled = false
         dataSource.itemWidth = JXSegmentedViewAutomaticDimension
@@ -33,20 +39,46 @@ class YHCommunityViewController: YHBaseViewController {
         return dataSource
     }()
     
+    lazy var bgImgV:UIImageView = {
+        let bg = UIImageView(image: UIImage(named: "people_match_bg"))
+        return bg
+    }()
+    
     //分类title 所对应的VC
     lazy var listContainerView: JXSegmentedListContainerView! = {
-        return JXSegmentedListContainerView(dataSource: self, type: .scrollView)
+        let view = JXSegmentedListContainerView(dataSource: self, type: .scrollView)
+        view.backgroundColor = .clear
+        return view
+    }()
+    
+    lazy var friendsBtn:UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "people_friends_btn"), for: .normal)
+        btn.setTitle("好友", for: .normal)
+        btn.setTitleColor(UIColor.white, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize:15)
+        btn.addTarget(self, action: #selector(didFriendsBtnClicked), for: .touchUpInside)
+        return btn
     }()
 
     @objc func didBackBtnClicked() {
         self.navigationController?.popViewController(animated: true)
     }
     
+    @objc func didFriendsBtnClicked() {
+        let vc = YHMyGoodFriendsVC()
+        self.navigationController?.pushViewController(vc)
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navBarAlpha = 0
         gk_navigationBar.isHidden = true
-        view.backgroundColor = .white
+        
+        self.view.addSubview(bgImgV)
+        self.bgImgV.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
         
         for i in 0..<arrItemTitles.count {
             if i != 0 {
@@ -60,7 +92,6 @@ class YHCommunityViewController: YHBaseViewController {
         
         //segmentedViewDataSource一定要通过属性强持有！！！！！！！！！
         segmentedView.dataSource = segmentedDataSource
-        segmentedView.collectionView.backgroundColor = .white
         view.addSubview(segmentedView)
 
         segmentedView.listContainer = listContainerView
@@ -74,11 +105,17 @@ class YHCommunityViewController: YHBaseViewController {
         //配置指示器
         let indicator = JXSegmentedIndicatorLineView()
         indicator.indicatorWidth = 16
-        indicator.indicatorColor = UIColor.brandMainColor
+        indicator.indicatorColor = UIColor.white
         segmentedView.indicators = [indicator]
-        segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
-        
         segmentedView.defaultSelectedIndex = defaltIndex
+        
+        self.view.addSubview(friendsBtn)
+        friendsBtn.snp.makeConstraints { make in
+            make.width.equalTo(82.0)
+            make.height.equalTo(48)
+            make.right.equalToSuperview()
+            make.top.equalTo(k_Height_safeAreaInsetsTop())
+        }
     }
     
     override func viewWillAppear(_ animated: Bool) {

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

+//
+//  YHMatchPeopleViewController.swift
+//  galaxy
+//
+//  Created by edy on 2024/6/18.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHMatchPeopleViewController: YHBaseViewController {
+
+    
+    var matchArr:[String] = ["", "", ""]
+    
+    lazy var bgImgV:UIImageView = {
+        let bg = UIImageView(image: UIImage(named: "people_match_result_bg"))
+        return bg
+    }()
+    
+    lazy var topLabel:UILabel = {
+        let label = UILabel()
+        label.textAlignment = .center
+        label.textColor = UIColor.white
+        label.font = UIFont.PFSC_R(ofSize:16)
+        label.text = "为您匹配适合您的优质人脉"
+        return label
+    }()
+    
+    lazy var changeBtn:UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "people_match_change"), for: .normal)
+        btn.setTitle("换一换", for: .normal)
+        btn.setTitleColor(UIColor.white, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize:15)
+
+        return btn
+    }()
+    
+    lazy var myCardBtn:UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "people_match_nameCard"), for: .normal)
+        btn.setTitle("我的名片", for: .normal)
+        btn.setTitleColor(UIColor.white, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize:15)
+        return btn
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        createUI()
+    }
+    
+    func createUI() {
+        self.view.addSubview(bgImgV)
+        self.view.addSubview(topLabel)
+        self.view.addSubview(changeBtn)
+        self.view.addSubview(myCardBtn)
+        let lineView = UIView()
+        lineView.backgroundColor = UIColor(hex: 0xFFFFFF, alpha: 0.3)
+        self.view.addSubview(lineView)
+        
+        let wingLeftImgV = UIImageView(image: UIImage(named: "people_match_wing_left"))
+        self.view.addSubview(wingLeftImgV)
+        
+        let wingRightImgV = UIImageView(image: UIImage(named: "people_match_wing_right"))
+        self.view.addSubview(wingRightImgV)
+
+        
+        self.bgImgV.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        self.topLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(50+k_Height_NavigationtBarAndStatuBar)
+            make.height.equalTo(22)
+        }
+        self.changeBtn.snp.makeConstraints { make in
+            make.height.equalTo(60)
+            make.width.equalTo(130)
+            make.bottom.equalToSuperview().offset(-80)
+            make.right.equalTo(self.view.snp.centerX)
+        }
+        self.myCardBtn.snp.makeConstraints { make in
+            make.height.equalTo(60)
+            make.width.equalTo(140)
+            make.bottom.equalToSuperview().offset(-80)
+            make.left.equalTo(self.view.snp.centerX)
+        }
+        lineView.snp.makeConstraints { make in
+            make.width.equalTo(1)
+            make.height.equalTo(13)
+            make.centerX.equalToSuperview()
+            make.centerY.equalTo(self.changeBtn)
+        }
+        
+        wingLeftImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(19)
+            make.right.equalTo(self.topLabel.snp.left)
+            make.centerY.equalTo(self.topLabel)
+        }
+        wingRightImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(19)
+            make.left.equalTo(self.topLabel.snp.right)
+            make.centerY.equalTo(self.topLabel)
+        }
+        animaiton()
+    }
+    
+    func animaiton() {
+        
+        let view1 = YHNameCardInfoView.createCardView()
+        view1.y = -YHNameCardInfoView.height
+        view1.x = 38
+        let view2 = YHNameCardInfoView.createCardView()
+        view2.cardView.backgroundColor = UIColor.init(hex: 0xE7EBF3)
+        view2.y = -YHNameCardInfoView.height
+        view2.x = 38+5
+        view2.width = YHNameCardInfoView.width-5*2
+        let view3 = YHNameCardInfoView.createCardView()
+        view3.cardView.backgroundColor = UIColor.init(hex: 0xC4CEE3)
+        view3.y = -YHNameCardInfoView.height
+        view3.x = 38+10
+        view3.width = YHNameCardInfoView.width-5*4
+        
+        self.view.addSubview(view3)
+        self.view.addSubview(view2)
+        self.view.addSubview(view1)
+
+        UIView.animate(withDuration: 0.5, delay: 0, options: [.curveEaseInOut]) {
+            view3.y = 102+k_Height_NavigationtBarAndStatuBar+5*2
+        } completion: { finish in }
+        
+        UIView.animate(withDuration: 0.5, delay: 0.1, options: [.curveEaseInOut]) {
+            view2.y = 102+k_Height_NavigationtBarAndStatuBar+5
+        } completion: { finish in }
+        
+        UIView.animate(withDuration: 0.5, delay: 0.1, options: [.curveEaseInOut]) {
+            view1.y = 102+k_Height_NavigationtBarAndStatuBar
+        } completion: { finish in }
+        
+    }
+}

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

@@ -20,14 +20,14 @@ class YHMyGoodFriendsVC: YHBaseViewController {
         tableView.backgroundColor = UIColor(hex: 0xF8FAFB)
         tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
         tableView.register(YHMyFriendsCell.self, forCellReuseIdentifier: YHMyFriendsCell.cellReuseIdentifier)
-        tableView.contentInset = UIEdgeInsets(top: YHFriendsRequestView.height+16, left: 0, bottom: 0, right: 0)
+        tableView.contentInset = UIEdgeInsets(top: YHFriendsResponseView.height+16, left: 0, bottom: 0, right: 0)
         tableView.addSubview(self.friendRequestView)
         tableView.backgroundView = self.emptyDataTipsView
         return tableView
     }()
     
-    lazy var friendRequestView:YHFriendsRequestView = {
-        let view = YHFriendsRequestView(frame: CGRectMake(0, -16-YHFriendsRequestView.height, KScreenWidth-16*2, YHFriendsRequestView.height))
+    lazy var friendRequestView:YHFriendsResponseView = {
+        let view = YHFriendsResponseView(frame: CGRectMake(0, -16-YHFriendsResponseView.height, KScreenWidth-16*2, YHFriendsResponseView.height))
         view.acceptBlock = {
             [weak self] accept in
             guard let self = self else { return }

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

@@ -10,17 +10,79 @@ import UIKit
 import JXSegmentedView
 
 class YHPeopleViewController: YHBaseViewController {
-// MARK: - 生命周期方法
+    
+    lazy var topLabel:UILabel = {
+        let label = UILabel()
+        label.textAlignment = .center
+        label.textColor = UIColor.white
+        label.font = UIFont.PFSC_R(ofSize:16)
+        label.text = "为您匹配适合您的优质人脉"
+        return label
+    }()
+    
+    lazy var bottomBtn:UIButton = {
+        let btn = UIButton()
+        btn.backgroundColor = .brandMainColor
+        btn.setTitle("AI人脉雷达匹配", for: .normal)
+        btn.setTitleColor(.white, for: .normal)
+        btn.titleLabel?.font = .PFSC_M(ofSize: 15)
+        btn.layer.cornerRadius = 3.0
+        return btn
+    }()
+
     override func viewDidLoad() {
         super.viewDidLoad()
+        gk_navigationBar.isHidden = true
+        self.view.backgroundColor = .clear
+        createUI()
+    }
+    
+    func createUI() {
+        
+        let wingLeftImgV = UIImageView(image: UIImage(named: "people_match_wing_left"))
+        self.view.addSubview(wingLeftImgV)
+        
+        let wingRightImgV = UIImageView(image: UIImage(named: "people_match_wing_right"))
+        self.view.addSubview(wingRightImgV)
         
-        let tap = UITapGestureRecognizer(target: self, action: #selector(abc))
-        self.view.addGestureRecognizer(tap)
+        self.view.addSubview(topLabel)
+        self.view.addSubview(self.bottomBtn)
+        
+        self.topLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(50)
+            make.height.equalTo(22)
+        }
+        
+        self.bottomBtn.snp.makeConstraints { make in
+            make.left.equalTo(24)
+            make.right.equalTo(-24)
+            make.height.equalTo(48.0)
+            make.bottom.equalTo(-k_Height_safeAreaInsetsBottom()-48-60)
+        }
+        
+        wingLeftImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(19)
+            make.right.equalTo(self.topLabel.snp.left)
+            make.centerY.equalTo(self.topLabel)
+        }
+        wingRightImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(19)
+            make.left.equalTo(self.topLabel.snp.right)
+            make.centerY.equalTo(self.topLabel)
+        }
     }
     
     @objc func abc() {
-        let vc = YHMyGoodFriendsVC()
+        
+        let vc = YHMatchPeopleViewController()
         self.navigationController?.pushViewController(vc)
+        
+//        let view = YHNameCardInfoView.createCardView()
+//        view.show()
+        
+//        let vc = YHMyGoodFriendsVC()
+//        self.navigationController?.pushViewController(vc)
     }
 }
 

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHFriendsRequestView.swift → galaxy/galaxy/Classes/Modules/Community(社区)/V/YHFriendsResponseView.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHFriendsRequestView: UIView {
+class YHFriendsResponseView: UIView {
     
     var acceptBlock:((Bool)->())?
     

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

@@ -55,6 +55,18 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         return nameLabel
     }()
     
+    lazy var cityLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.brandMainColor
+        label.textAlignment = .center
+        label.font = UIFont.PFSC_M(ofSize:12)
+        label.backgroundColor = .brandMainColor8
+        label.layer.cornerRadius = 3.0
+        label.clipsToBounds = true
+        label.text = "上海市"
+        return label
+    }()
+    
     lazy var professionalLabel:UILabel = {
         let label = UILabel()
         label.textColor = UIColor.mainTextColor
@@ -93,6 +105,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         self.contentView.addSubview(self.signImgV)
         
         cardView.addSubview(self.nameLabel)
+        cardView.addSubview(self.cityLabel)
         cardView.addSubview(self.professionalLabel)
         cardView.addSubview(self.detailLabel)
         cardView.addSubview(self.editBtn)
@@ -131,6 +144,14 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             make.height.equalTo(25)
         }
         
+        self.cityLabel.snp.makeConstraints { make in
+            make.left.equalTo(self.nameLabel.snp.right).offset(10)
+            make.centerY.equalTo(self.nameLabel)
+            make.height.equalTo(21)
+            make.width.equalTo(44)
+        }
+
+        
         self.professionalLabel.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)

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

+//
+//  YHNameCardInfoView.swift
+//  galaxy
+//
+//  Created by edy on 2024/6/18.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHNameCardInfoView: UIView {
+
+    static let height = 456.0
+    static let width = KScreenWidth-36.0*2
+    
+    lazy var cardView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = 3.0
+        view.clipsToBounds = true
+        return view
+    }()
+    
+    lazy var bgImgV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "people_card_head_bg")
+        view.backgroundColor = .red
+        return view
+    }()
+    
+    lazy var headImgV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "")
+        view.layer.cornerRadius = 98.0/2.0
+        view.backgroundColor = .green
+        return view
+    }()
+    
+    lazy var signImgV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "people_sign")
+        return view
+    }()
+    
+    lazy var nameLabel:UILabel = {
+        let nameLabel = UILabel()
+        nameLabel.textAlignment = .center
+        nameLabel.textColor = UIColor.mainTextColor
+        nameLabel.font = UIFont.PFSC_B(ofSize:18)
+        return nameLabel
+    }()
+    
+    lazy var professionalLabel:UILabel = {
+        let label = UILabel()
+        label.textAlignment = .center
+        label.textColor = UIColor.mainTextColor
+        label.font = UIFont.PFSC_R(ofSize:14)
+        label.numberOfLines = 0
+        return label
+    }()
+    
+    lazy var grayContentView:UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0xF4F6FA)
+        view.layer.cornerRadius = 3.0
+        return view
+    }()
+    
+    lazy var detailLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor50
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize:13)
+        label.numberOfLines = 0
+        return label
+    }()
+    
+    lazy var bottomBtn:UIButton = {
+        let btn = UIButton()
+        btn.backgroundColor = .brandMainColor
+        btn.setTitle("交换名片", for: .normal)
+        btn.setTitleColor(.white, for: .normal)
+        btn.titleLabel?.font = .PFSC_M(ofSize: 15)
+        btn.layer.cornerRadius = 3.0
+        return btn
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    static func createCardView() -> YHNameCardInfoView {
+        let view = YHNameCardInfoView(frame: CGRect(x: 0, y: 0, width: Self.width, height: Self.height))
+        return view
+    }
+    
+    func show() {
+        self.center = CGPointMake(KScreenWidth/2.0, KScreenHeight/2.0)
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+        
+    }
+    
+    func createUI() {
+        self.addSubview(self.cardView)
+        cardView.addSubview(self.bgImgV)
+        cardView.addSubview(self.headImgV)
+        cardView.addSubview(self.signImgV)
+        cardView.addSubview(self.nameLabel)
+        cardView.addSubview(self.professionalLabel)
+        cardView.addSubview(self.grayContentView)
+        grayContentView.addSubview(self.detailLabel)
+        cardView.addSubview(self.bottomBtn)
+        
+        nameLabel.text = "阿斯顿法师打发沙发上"
+        professionalLabel.text = "啊发沙发沙发沙发沙发沙发三大发沙发的算法的算法的沙发沙发萨达1"
+        detailLabel.text = "阿萨法法师懂法守法萨芬沙发沙发发说法发生发顺丰"
+        
+        self.cardView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        self.bgImgV.snp.makeConstraints { make in
+            make.left.top.right.equalToSuperview()
+            make.height.equalTo(180)
+        }
+        
+        self.headImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(98)
+            make.centerX.equalToSuperview()
+            make.bottom.equalTo(self.bgImgV).offset(30)
+        }
+        
+        self.signImgV.snp.makeConstraints { make in
+            make.centerX.equalTo(self.headImgV)
+            make.width.equalTo(49)
+            make.height.equalTo(17)
+            make.bottom.equalTo(self.headImgV)
+        }
+        
+        self.nameLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.height.equalTo(30)
+            make.top.equalTo(self.signImgV.snp.bottom).offset(10)
+            make.centerX.equalToSuperview()
+        }
+        
+        self.professionalLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.height.equalTo(20)
+            make.top.equalTo(self.nameLabel.snp.bottom).offset(8)
+        }
+        
+        self.grayContentView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.height.equalTo(72)
+            make.top.equalTo(self.professionalLabel.snp.bottom).offset(10)
+        }
+        
+        self.detailLabel.snp.makeConstraints { make in
+            make.left.top.equalTo(16)
+            make.right.bottom.equalTo(-16)
+        }
+
+        self.bottomBtn.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.height.equalTo(46)
+            make.top.equalTo(self.grayContentView.snp.bottom).offset(32)
+
+        }
+    }
+}

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

+//
+//  YHSetExplainView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/6/19.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHSetExplainView: UIView {
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var closeButton: UIButton!
+    var lineView: UIView!
+    var messageLabel: UILabel!
+    var topImageView: UIImageView!
+    var bottomImageView: UIImageView!
+    var bottomButton: UIButton!
+    var type: YHSettingType? {
+        didSet {
+            guard let type = type else { return }
+            switch type {
+            case .normal: break
+            case .people:
+                titleLabel.text = "授权AI人脉匹配"
+                messageLabel.text = "启动该功能后，您将能够使用AI人脉雷达来高效匹配新人脉，申请交换名片并成功成为好友后，双方可互相查看名片。信息准确度越高，匹配结果越精准"
+                topImageView.image = UIImage(named: "set_example_people")
+            case .school:
+                titleLabel.text = "允许向好友公开您的教育经历"
+                messageLabel.text = "授权开启后，您的个人主页将展示最高学历信息，仅对好友人脉开放查看权限，保护您的隐私安全"
+                topImageView.image = UIImage(named: "set_example_school")
+            case .work:
+                titleLabel.text = "允许向好友公开您的工作经历"
+                messageLabel.text = "授权开启后，您的个人主页将展示最新工作信息，仅对好友人脉开放查看权限，保护您的隐私安全"
+                topImageView.image = UIImage(named: "set_example_work")
+            }
+        }
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = UIColor(white: 0.5, alpha: 0.1)
+        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+        tap.delegate = self
+        addGestureRecognizer(tap)
+        setView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setView() {
+        backgroundColor = UIColor(hex: 0x000000, alpha: 0.5)
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(592)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.text = "身份证示例模板"
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            label.textAlignment = .center
+            return label
+        }()
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+            make.height.equalTo(21)
+            make.top.equalTo(16)
+        }
+        
+        closeButton = {
+            let button = UIButton(type: .custom)
+            button.setBackgroundImage(UIImage(named: "service_card_close"), for: .normal)
+            button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(closeButton)
+        closeButton.snp.makeConstraints { make in
+            make.right.equalTo(-21)
+            make.width.height.equalTo(24)
+            make.top.equalTo(16)
+        }
+        
+        lineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        centerView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(52)
+            make.height.equalTo(1)
+            make.right.equalTo(-18)
+        }
+        
+        messageLabel = {
+            let label = UILabel()
+            label.text = "须使用二代身份证"
+            label.font = UIFont.PFSC_R(ofSize: 14)
+            label.textColor = UIColor.placeHolderColor
+            label.textAlignment = .left
+            label.numberOfLines = 0
+            return label
+        }()
+        centerView.addSubview(messageLabel)
+        messageLabel.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+            make.top.equalTo(426)
+        }
+        
+        topImageView = {
+            let imageView = UIImageView()
+            imageView.image = UIImage(named: "service_card_id_back")
+            imageView.layer.cornerRadius = kCornerRadius6
+            imageView.clipsToBounds = true
+            return imageView
+        }()
+        centerView.addSubview(topImageView)
+        topImageView.snp.makeConstraints { make in
+            make.left.equalTo(21)
+            make.right.equalTo(-21)
+            make.height.equalTo(333)
+            make.top.equalTo(73)
+        }
+        
+        bottomButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor(hex:0x4d9ffb)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("知道了", for: .normal)
+            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.clipsToBounds = true
+            button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(bottomButton)
+        bottomButton.snp.makeConstraints { make in
+            make.right.equalTo(-21)
+            make.left.equalTo(21)
+            make.bottom.equalTo(-42)
+            make.height.equalTo(48)
+        }
+        bottomButton.layoutIfNeeded()
+        
+        bottomButton.addYinHeGradualLayer()
+    }
+    
+    @objc private func handleTap(_ sender: AnyObject?) {
+        print("处理点击手势")
+        dismiss()
+    }
+    
+    @objc func dismiss() {
+        removeFromSuperview()
+    }
+}
+
+extension YHSetExplainView: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer:UIGestureRecognizer, shouldReceive touch:UITouch) -> Bool {
+        if touch.view == self {
+            return true
+        }
+        return false
+    }
+}

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

@@ -65,8 +65,8 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
 
     func getBaseSetDataSource() -> [YHSettingItem] {
         let item1 = YHSettingItem(type: .people, title: "授权AI人脉匹配", subTitle: "开启后，您的信息将用于AI人脉匹配，为您构建高质量的人脉网络", isSelect: setModel.isRea, isShowAlert: true)
-        let item2 = YHSettingItem(type: .people, title: "允许向好友公开您的教育经历", subTitle: "开启后，您的教育经历将在您的个人名片上对已交换名片的好友可见", isSelect: setModel.isSchool, isShowAlert: true)
-        let item3 = YHSettingItem(type: .people, title: "允许向好友公开您的工作经历", subTitle: "开启后，您的工作经历将在您的个人名片上对已交换名片的好友可见", isSelect: setModel.isWork, isShowAlert: true)
+        let item2 = YHSettingItem(type: .school, title: "允许向好友公开您的教育经历", subTitle: "开启后，您的教育经历将在您的个人名片上对已交换名片的好友可见", isSelect: setModel.isSchool, isShowAlert: true)
+        let item3 = YHSettingItem(type: .work, title: "允许向好友公开您的工作经历", subTitle: "开启后，您的工作经历将在您的个人名片上对已交换名片的好友可见", isSelect: setModel.isWork, isShowAlert: true)
         return [item1, item2, item3]
     }
     

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHAllowSettingTableViewCell.swift

@@ -104,7 +104,11 @@ class YHAllowSettingTableViewCell: UITableViewCell {
     }
     
     @objc func exampleClick() {
-        
+        guard let model = item else { return }
+        let view = YHSetExplainView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
+        view.type = model.type
+        let window = UIApplication.shared.yhKeyWindow()
+        window?.addSubview(view)
     }
     
     @objc func switchViewChange() {

galaxy/galaxy/Res/Assets.xcassets/MyCard/set_example_people.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/MyCard/set_example_school.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/MyCard/set_example_work.imageset/Contents.json

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

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

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Mask group@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Mask group@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 2033194953@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 2033194953@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

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

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

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 2033194953@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 2033194953@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 2033194953@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 2033194953@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

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

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

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Mask group@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Mask group@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Mask group@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Mask group@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}