// 人脉

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

@@ -131,7 +131,7 @@ class YHCommunityViewController: YHBaseViewController {
                 let vc = YHActivityListViewController()
                 arrItemVCs.append(vc)
             } else {
-                let vc = YHPeopleViewController()
+                let vc = YHMatchUserViewController()
                 arrItemVCs.append(vc)
             }
         }

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

@@ -13,7 +13,7 @@ protocol YHMatchProtocol: NSObjectProtocol  {
     func startMatchUsers()
 }
 
-class YHMatchPeopleViewController: YHBaseViewController {
+class YHMatchResultListViewController: YHBaseViewController {
 
     let viewModel = YHMatchUserViewModel()
     let loginViewModel = YHLoginViewModel()
@@ -159,7 +159,7 @@ class YHMatchPeopleViewController: YHBaseViewController {
         }
         
         if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
-            let vc = YHMyNameCardViewController()
+            let vc = YHNameCardViewController()
             vc.userId = userId
             self.navigationController?.pushViewController(vc)
         } else {
@@ -170,7 +170,7 @@ class YHMatchPeopleViewController: YHBaseViewController {
                 guard let self = self else { return }
                 if !uid.isEmpty {
                     YHLoginManager.shared.userModel?.id = uid
-                    let vc = YHMyNameCardViewController()
+                    let vc = YHNameCardViewController()
                     vc.userId = uid
                     self.navigationController?.pushViewController(vc)
                 }
@@ -347,7 +347,7 @@ class YHMatchPeopleViewController: YHBaseViewController {
     }
 }
 
-extension YHMatchPeopleViewController: DragCardDataSource {
+extension YHMatchResultListViewController: DragCardDataSource {
     
     public func numberOfCards(_ dragCard: DragCardContainer) -> Int {
         return matchUsersArr.count
@@ -384,7 +384,7 @@ extension YHMatchPeopleViewController: DragCardDataSource {
     }
 }
 
-extension YHMatchPeopleViewController: DragCardDelegate {
+extension YHMatchResultListViewController: DragCardDelegate {
     public func dragCard(_ dragCard: DragCardContainer, displayTopCardAt index: Int, with cardView: DragCardView) {
         
         print("displayTopCardAt: \(index)")

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

@@ -10,7 +10,7 @@ import UIKit
 import JXSegmentedView
 import Lottie
 
-class YHPeopleViewController: YHBaseViewController {
+class YHMatchUserViewController: YHBaseViewController {
     let viewModel = YHMatchUserViewModel()
     var informationAuthorizeViewModel: YHInformationAuthorizeViewModel = YHInformationAuthorizeViewModel()
 
@@ -186,13 +186,13 @@ class YHPeopleViewController: YHBaseViewController {
     }
 }
 
-extension YHPeopleViewController: JXSegmentedListContainerViewListDelegate {
+extension YHMatchUserViewController: JXSegmentedListContainerViewListDelegate {
     func listView() -> UIView {
         return view
     }
 }
 
-extension YHPeopleViewController: YHMatchProtocol {
+extension YHMatchUserViewController: YHMatchProtocol {
     func startMatchUsers() {
         self.headLottieView.isHidden = true
         self.launchLottieView.isHidden = false
@@ -209,13 +209,13 @@ extension YHPeopleViewController: YHMatchProtocol {
     }
 }
 
-extension YHPeopleViewController {
+extension YHMatchUserViewController {
     func requestMatchUserList() {
         self.viewModel.getMatchUserlist { 
             success, error in
             
             if success, self.viewModel.matchUserArr.count > 0 {
-                let vc = YHMatchPeopleViewController()
+                let vc = YHMatchResultListViewController()
                 vc.delegate = self
                 vc.matchUsersArr = self.viewModel.matchUserArr
                 self.navigationController?.pushViewController(vc)

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

@@ -151,7 +151,7 @@ extension YHMyGoodFriendsVC: UITableViewDelegate, UITableViewDataSource {
         if indexPath.section == 1 {
             if 0 <= indexPath.row && indexPath.row < friendsArr.count {
                 let friend = self.friendsArr[indexPath.row]
-                let vc = YHMyNameCardViewController()
+                let vc = YHNameCardViewController()
                 vc.userId = friend.yhId
                 self.navigationController?.pushViewController(vc)
             }

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMyNameCardViewController.swift → galaxy/galaxy/Classes/Modules/Community(社区)/C/YHNameCardViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHMyNameCardViewController: YHBaseViewController {
+class YHNameCardViewController: YHBaseViewController {
 
     var userId: String = ""
     var cardInfoArr:[YHUserNameCardInfo] = []
@@ -46,7 +46,7 @@ class YHMyNameCardViewController: YHBaseViewController {
     lazy var navBar: YHCustomNavigationBar = {
         let bar = YHCustomNavigationBar.navBar()
         bar.backgroundColor = .clear
-        bar.title = "我的名片"
+        bar.title = self.isCurrentUser ? "我的名片" : "好友名片"
         bar.titleColor = .white
         bar.rightButton.setImage(UIImage(named: "people_card_authorized"), for: .normal)
         bar.rightButton.setTitle("授权", for: .normal)
@@ -111,7 +111,7 @@ class YHMyNameCardViewController: YHBaseViewController {
     }
 }
 
-extension YHMyNameCardViewController: UITableViewDelegate, UITableViewDataSource {
+extension YHNameCardViewController: UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return self.cardInfoArr.count
@@ -230,7 +230,7 @@ extension YHMyNameCardViewController: UITableViewDelegate, UITableViewDataSource
 
 }
 
-extension YHMyNameCardViewController {
+extension YHNameCardViewController {
     
     func requestAuthorization() {
         self.authorModel.requestUserAuthorization { success, error in
@@ -258,18 +258,21 @@ extension YHMyNameCardViewController {
             
             self.cardInfoArr.removeAll()
             
+            // 姓名头像信息
             let model1 = YHUserNameCardInfo()
             model1.type = .avatar
             model1.isCurrentUser = self.isCurrentUser
             model1.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model1)
             
+            // 个人简介信息
             let model2 = YHUserNameCardInfo()
             model2.type = .introduce
             model2.isCurrentUser = self.isCurrentUser
             model2.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model2)
 
+            // 教育经历信息
             if !self.isCurrentUser {
                 if !self.viewModel.nameCardInfo.isHiddenEducation {
                     let model3 = YHUserNameCardInfo()
@@ -286,6 +289,8 @@ extension YHMyNameCardViewController {
                 self.cardInfoArr.append(model3)
             }
             
+            
+            // 工作经历信息
             if !self.isCurrentUser {
                 if !self.viewModel.nameCardInfo.isHiddenWorkExperience {
                     let model4 = YHUserNameCardInfo()
@@ -302,12 +307,14 @@ extension YHMyNameCardViewController {
                 self.cardInfoArr.append(model4)
             }
             
+            // 荣誉奖项信息
             let model5 = YHUserNameCardInfo()
             model5.type = .honor
             model5.isCurrentUser = self.isCurrentUser
             model5.updateModel(self.viewModel.nameCardInfo)
             self.cardInfoArr.append(model5)
 
+            // 兴趣话题
             let model6 = YHUserNameCardInfo()
             model6.type = .topics
             model6.isCurrentUser = self.isCurrentUser

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

@@ -289,7 +289,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         switch item.type {
         case .myCard://我的名片
             if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
-                let vc = YHMyNameCardViewController()
+                let vc = YHNameCardViewController()
                 vc.userId = userId
                 self.navigationController?.pushViewController(vc)
             } else {
@@ -300,7 +300,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                     guard let self = self else { return }
                     if !uid.isEmpty {
                         YHLoginManager.shared.userModel?.id = uid
-                        let vc = YHMyNameCardViewController()
+                        let vc = YHNameCardViewController()
                         vc.userId = uid
                         self.navigationController?.pushViewController(vc)
                     }