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:
  //  UI
  //  UI更改
  标题修改
  // tabUI

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

@@ -30,12 +30,12 @@ class YHCommunityViewController: YHBaseViewController {
         dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 15)
         dataSource.titleNormalColor = UIColor(hex: 0xFFFFFF, alpha: 0.6)
         
-        dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
+        dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 21)
         dataSource.titleSelectedColor = .white
         
         dataSource.isItemSpacingAverageEnabled = false
         dataSource.itemWidth = JXSegmentedViewAutomaticDimension
-        dataSource.itemSpacing = 30
+        dataSource.itemSpacing = 24
         return dataSource
     }()
     
@@ -157,6 +157,8 @@ class YHCommunityViewController: YHBaseViewController {
         //配置指示器
         let indicator = JXSegmentedIndicatorLineView()
         indicator.indicatorWidth = 16
+        indicator.indicatorHeight = 2
+        indicator.indicatorCornerRadius = 0.0
         indicator.indicatorColor = UIColor.white
         segmentedView.indicators = [indicator]
         segmentedView.defaultSelectedIndex = defaltIndex
@@ -231,6 +233,8 @@ extension YHCommunityViewController: JXSegmentedViewDelegate {
             segmentedDataSource.titleSelectedColor = .white
             let indicator = JXSegmentedIndicatorLineView()
             indicator.indicatorWidth = 16
+            indicator.indicatorHeight = 2
+            indicator.indicatorCornerRadius = 0.0
             indicator.indicatorColor = UIColor.white
             segmentedView.indicators = [indicator]
         } else {
@@ -240,6 +244,8 @@ extension YHCommunityViewController: JXSegmentedViewDelegate {
             segmentedDataSource.titleSelectedColor = UIColor.mainTextColor
             let indicator = JXSegmentedIndicatorLineView()
             indicator.indicatorWidth = 16
+            indicator.indicatorHeight = 2
+            indicator.indicatorCornerRadius = 0.0
             indicator.indicatorColor = UIColor.brandMainColor
             segmentedView.indicators = [indicator]
         }

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

@@ -46,7 +46,7 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
     }
     
     func setView() {
-        gk_navTitle = "设置"
+        gk_navTitle = "信息授权"
         view.backgroundColor = .white
         
         stepOneView = {
@@ -123,7 +123,7 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
             button.backgroundColor =  UIColor.brandMainColor.withAlphaComponent(0.4)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
-            button.setTitle("下一步", for: .normal)
+            button.setTitle("提交", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
             button.layer.cornerRadius = kCornerRadius3
             button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)

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

@@ -37,7 +37,7 @@ class YHInformationAuthorizationStepTwoViewController: UIViewController {
     }
     
     func setView() {
-        gk_navTitle = "设置"
+        gk_navTitle = "信息授权"
         view.backgroundColor = .white
         
         stepOneView = {

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

@@ -53,6 +53,16 @@ class YHMatchResultListViewController: YHBaseViewController {
         return label
     }()
     
+    lazy var wingLeftImgV: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "people_match_wing_left"))
+        return view
+    }()
+    
+    lazy var wingRightImgV: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "people_match_wing_right"))
+        return view
+    }()
+    
     lazy var guideView:YHMatchCardUsageGuideView = {
         let view = YHMatchCardUsageGuideView.createView()
         view.isHidden = true
@@ -79,6 +89,12 @@ class YHMatchResultListViewController: YHBaseViewController {
         return btn
     }()
     
+    lazy var lineView: UIView = {
+        let lineView = UIView()
+        lineView.backgroundColor = UIColor(hex: 0xFFFFFF, alpha: 0.3)
+        return lineView
+    }()
+    
     lazy var rematchBtn:UIButton = {
        let btn = UIButton()
         btn.isHidden = true
@@ -100,6 +116,7 @@ class YHMatchResultListViewController: YHBaseViewController {
             self.rematchBtn.isHidden = true
             self.changeBtn.isHidden = false
             self.myCardBtn.isHidden = false
+            self.lineView.isHidden = false
             self.cardContainer.reloadData(forceReset: true)
         }
         return view
@@ -194,16 +211,10 @@ class YHMatchResultListViewController: YHBaseViewController {
         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.view.addSubview(self.wingLeftImgV)
+        self.view.addSubview(self.wingRightImgV)
         
         self.view.addSubview(self.cardActionView)
         self.cardActionView.addSubview(cardContainer)
@@ -237,19 +248,19 @@ class YHMatchResultListViewController: YHBaseViewController {
             make.bottom.equalToSuperview().offset(-80)
             make.left.equalTo(self.view.snp.centerX)
         }
-        lineView.snp.makeConstraints { make in
+        self.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
+        self.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
+        self.wingRightImgV.snp.makeConstraints { make in
             make.width.height.equalTo(19)
             make.left.equalTo(self.topLabel.snp.right)
             make.centerY.equalTo(self.topLabel)
@@ -441,6 +452,7 @@ extension YHMatchResultListViewController: DragCardDelegate {
             self.rematchBtn.isHidden = false
             self.changeBtn.isHidden = true
             self.myCardBtn.isHidden = true
+            self.lineView.isHidden = true
         })
     }
 

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

@@ -44,9 +44,7 @@ class YHMatchUserViewController: YHBaseViewController {
         btn.addTarget(self, action: #selector(didMatchBtnClicked), for: .touchUpInside)
         return btn
     }()
-    
-    var isBottomBtnEnabled = true
-    
+        
     lazy var headLottieView: LottieAnimationView = {
         let view = LottieAnimationView(name: "people_head")
         view.loopMode = .loop
@@ -227,6 +225,7 @@ class YHMatchUserViewController: YHBaseViewController {
         self.wingLeftImgV.isHidden = false
         self.wingRightImgV.isHidden = false
         self.topLabel.isHidden = false
+        self.bottomBtn.isHidden = false
     }
 }
 
@@ -238,12 +237,7 @@ extension YHMatchUserViewController: JXSegmentedListContainerViewListDelegate {
 
 extension YHMatchUserViewController: YHMatchProtocol {
     func startMatchUsers() {
-        
-        if !self.isBottomBtnEnabled {
-            return
-        }
-        
-        self.isBottomBtnEnabled = false
+        self.bottomBtn.isHidden = true
         self.headLottieView.isHidden = true
         self.launchLottieView.isHidden = false
         self.topLabel.isHidden = true
@@ -268,7 +262,6 @@ extension YHMatchUserViewController {
     func requestMatchUserList() {
         self.viewModel.getMatchUserlist { 
             success, error in
-            self.isBottomBtnEnabled = true
             if success, self.viewModel.matchUserArr.count > 0 {
                 let vc = YHMatchResultListViewController()
                 vc.delegate = self

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

@@ -13,7 +13,7 @@ class YHFriendRequestView: UIView {
     var sendBlock:((String?)->())?
     static let cardHeight = 313.0
     let textMaxCount = 200
-    let placeHolderStr = "在银河相遇，期待与你共话未来，互学互鉴，盼成为好友，谢谢~"
+    let defaultStr = "在银河相遇，期待与你共话未来，互学互鉴，盼成为好友，谢谢~"
     var userModel:YHMatchUserInfo = YHMatchUserInfo()  {
         didSet {
             if let url = URL(string: self.userModel.avatar) {
@@ -88,7 +88,7 @@ class YHFriendRequestView: UIView {
     
     lazy var msgContentView:UIView = {
         let view = UIView()
-        view.backgroundColor = UIColor(hex: 0xF4F6FA)
+        view.backgroundColor = UIColor(hex: 0xF8F8F8)
         view.layer.cornerRadius = 3.0
         return view
     }()
@@ -98,6 +98,7 @@ class YHFriendRequestView: UIView {
         view.textColor = .mainTextColor70
         view.font = UIFont.PFSC_R(ofSize: 14)
         view.backgroundColor = .clear
+        view.text = self.defaultStr
         view.delegate = self
         return view
     }()
@@ -107,7 +108,7 @@ class YHFriendRequestView: UIView {
         label.textColor = UIColor.mainTextColor30
         label.textAlignment = .right
         label.font = UIFont.PFSC_R(ofSize:14)
-        label.text = "0/\(self.textMaxCount)"
+        label.text = "\(self.defaultStr.count)/\(self.textMaxCount)"
         return label
     }()
     
@@ -140,7 +141,6 @@ class YHFriendRequestView: UIView {
         label.textColor = UIColor.placeHolderColor
         label.textAlignment = .left
         label.font = UIFont.PFSC_R(ofSize: 14)
-        label.text = self.placeHolderStr
         label.numberOfLines = 0
         label.isHidden = false
         return label
@@ -175,7 +175,7 @@ class YHFriendRequestView: UIView {
     @objc func didSendBtnClicked() {
         var text = self.textView.text
         if isEmptyString(text) {
-            text = self.placeHolderStr
+            text = self.defaultStr
         }
         self.sendBlock?(text)
         dismiss()
@@ -208,7 +208,7 @@ class YHFriendRequestView: UIView {
         
         cardView.addSubview(msgContentView)
         msgContentView.addSubview(textView)
-        msgContentView.addSubview(placeHolderLabel)
+//        msgContentView.addSubview(placeHolderLabel)
         msgContentView.addSubview(textCountLabel)
         
         cardView.addSubview(cancelBtn)
@@ -264,11 +264,11 @@ class YHFriendRequestView: UIView {
             make.right.equalTo(-10)
         }
         
-        self.placeHolderLabel.snp.makeConstraints { make in
-            make.top.equalTo(self.textView.snp.top).offset(7)
-            make.left.equalTo(self.textView.snp.left).offset(7)
-            make.right.equalTo(self.textView)
-        }
+//        self.placeHolderLabel.snp.makeConstraints { make in
+//            make.top.equalTo(self.textView.snp.top).offset(7)
+//            make.left.equalTo(self.textView.snp.left).offset(7)
+//            make.right.equalTo(self.textView)
+//        }
         
         self.textCountLabel.snp.makeConstraints { make in
             make.left.equalTo(16)

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

@@ -106,7 +106,7 @@ class YHNameCardInfoView: DragCardView {
         let nameLabel = UILabel()
         nameLabel.textAlignment = .center
         nameLabel.textColor = UIColor.mainTextColor
-        nameLabel.font = UIFont.PFSC_B(ofSize:18)
+        nameLabel.font = UIFont.PFSC_M(ofSize:21)
         return nameLabel
     }()
     
@@ -137,7 +137,7 @@ class YHNameCardInfoView: DragCardView {
     
     lazy var bottomBtn:UIButton = {
         let btn = UIButton()
-        btn.backgroundColor = .brandMainColor
+        btn.setBackgroundImage(UIImage(named: "people_exchange_btn"), for: .normal)
         btn.setTitle("交换名片", for: .normal)
         btn.setTitleColor(.white, for: .normal)
         btn.titleLabel?.font = .PFSC_M(ofSize: 15)
@@ -180,7 +180,7 @@ class YHNameCardInfoView: DragCardView {
     
     private func initUI() {
         self.backgroundColor = .white
-        self.layer.cornerRadius = 3.0
+        self.layer.cornerRadius = 6.0
         self.clipsToBounds = true
     }
     

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

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