// 卡片动效

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

@@ -11,7 +11,6 @@ import DragCardContainer
 
 class YHMatchPeopleViewController: YHBaseViewController {
 
-    
     var matchCardsArr:[String] = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""]
     
     lazy var bgImgV:UIImageView = {
@@ -19,6 +18,25 @@ class YHMatchPeopleViewController: YHBaseViewController {
         return bg
     }()
     
+    lazy var navBar: YHCustomNavigationBar = {
+        let bar = YHCustomNavigationBar.navBar()
+        bar.backgroundColor = .clear
+        bar.title = "AI人脉雷达"
+        bar.titleColor = .white
+        bar.backButton.setImage(UIImage(named: "back_icon_for_code_input"), for: .normal)
+        bar.backBlock = {
+            [weak self] in
+            guard let self = self else { return }
+            self.navigationController?.popViewController(animated: true)
+        }
+        bar.rightBtnClick = {
+            [weak self] in
+            guard let self = self else { return }
+            
+        }
+        return bar
+    }()
+    
     lazy var topLabel:UILabel = {
         let label = UILabel()
         label.textAlignment = .center
@@ -34,7 +52,7 @@ class YHMatchPeopleViewController: YHBaseViewController {
         btn.setTitle("换一换", for: .normal)
         btn.setTitleColor(UIColor.white, for: .normal)
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize:15)
-
+        btn.addTarget(self, action: #selector(didchangeBtnClicked), for: .touchUpInside)
         return btn
     }()
     
@@ -44,6 +62,7 @@ class YHMatchPeopleViewController: YHBaseViewController {
         btn.setTitle("我的名片", for: .normal)
         btn.setTitleColor(UIColor.white, for: .normal)
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize:15)
+        btn.addTarget(self, action: #selector(didMyCardBtnClicked), for: .touchUpInside)
         return btn
     }()
     
@@ -80,13 +99,29 @@ class YHMatchPeopleViewController: YHBaseViewController {
         return cardContainer
     }()
     
+    lazy var cardActionView:UIView = {
+        let view = UIView()
+        return view
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         createUI()
     }
     
+    @objc func didchangeBtnClicked() {
+        self.cardContainer.swipeTopCard(to: .right)
+    }
+    
+    @objc func didMyCardBtnClicked() {
+        let vc = YHMyNameCardViewController()
+        self.navigationController?.pushViewController(vc)
+    }
+    
     func createUI() {
+        gk_navigationBar.isHidden = true
         self.view.addSubview(bgImgV)
+        self.view.addSubview(self.cardActionView)
         self.view.addSubview(topLabel)
         self.view.addSubview(changeBtn)
         self.view.addSubview(myCardBtn)
@@ -100,11 +135,18 @@ class YHMatchPeopleViewController: YHBaseViewController {
         let wingRightImgV = UIImageView(image: UIImage(named: "people_match_wing_right"))
         self.view.addSubview(wingRightImgV)
         
-        self.view.addSubview(cardContainer)
+        self.cardActionView.addSubview(cardContainer)
+        self.view.addSubview(navBar)
 
         self.bgImgV.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
+        
+        self.navBar.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.height.equalTo(k_Height_NavContentBar)
+        }
         self.topLabel.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.top.equalTo(50+k_Height_NavigationtBarAndStatuBar)
@@ -140,12 +182,16 @@ class YHMatchPeopleViewController: YHBaseViewController {
             make.centerY.equalTo(self.topLabel)
         }
         
-        cardContainer.snp.makeConstraints { make in
+        self.cardActionView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        self.cardContainer.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.left.equalTo(36)
             make.right.equalTo(-36)
             make.top.equalToSuperview().offset(102+k_Height_NavigationtBarAndStatuBar)
-            make.height.equalTo(456.0)
+            make.height.equalTo(466.0)
         }
         animaiton()
     }
@@ -154,16 +200,16 @@ class YHMatchPeopleViewController: YHBaseViewController {
         
         let view1 = YHNameCardInfoView.createCardView()
         view1.y = -YHNameCardInfoView.height
-        view1.x = 38
+        view1.x = 36
         let view2 = YHNameCardInfoView.createCardView()
         view2.cardView.backgroundColor = UIColor.init(hex: 0xE7EBF3)
         view2.y = -YHNameCardInfoView.height
-        view2.x = 38+5
+        view2.x = 36+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.x = 36+10
         view3.width = YHNameCardInfoView.width-5*4
         
         self.view.addSubview(view3)
@@ -184,9 +230,9 @@ class YHMatchPeopleViewController: YHBaseViewController {
             [weak self] finish in
             guard let self = self else { return }
             self.cardContainer.isHidden = false
-            view1.isHidden = true
-            view2.isHidden = true
-            view3.isHidden = true
+            view1.removeFromSuperview()
+            view2.removeFromSuperview()
+            view3.removeFromSuperview()
         }
     }
 }
@@ -216,6 +262,10 @@ extension YHMatchPeopleViewController: DragCardDataSource {
 extension YHMatchPeopleViewController: DragCardDelegate {
     public func dragCard(_ dragCard: DragCardContainer, displayTopCardAt index: Int, with cardView: DragCardView) {
         print("displayTopCardAt: \(index)")
+        if cardView is YHNameCardInfoView {
+            let cardInfoView = cardView as! YHNameCardInfoView
+            cardInfoView.cardView.backgroundColor = .white
+        }
     }
     
     public func dragCard(_ dragCard: DragCardContainer, didRemovedTopCardAt index: Int, direction: Direction, with cardView: DragCardView) {

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

@@ -138,7 +138,7 @@ class YHNameCardInfoView: DragCardView {
         self.headImgV.snp.makeConstraints { make in
             make.width.height.equalTo(98)
             make.centerX.equalToSuperview()
-            make.bottom.equalTo(self.bgImgV).offset(30)
+            make.bottom.equalTo(self.bgImgV).offset(20)
         }
         
         self.signImgV.snp.makeConstraints { make in