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 修改
  //  tab

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityDetailCell1.swift

@@ -108,13 +108,17 @@ extension YHActivityDetailCell1 {
             totalImgHeight += item.height
             self.imgsContentView.addSubview(item.imgView)
             item.imgView.snp.remakeConstraints { make in
+                var gap = 0.0
                 if index == 0 {
-                    make.top.equalTo(self.imgsContentView.snp.top).offset(item.height > 0 ? 24.0 : 0.0)
+                    gap = item.height > 0 ? 24.0 : 0.0
+                    make.top.equalTo(self.imgsContentView.snp.top).offset(gap)
                 } else {
                     if let lastView = theLastView {
-                        make.top.equalTo(lastView.snp.bottom).offset(item.height > 0 ? 24.0 : 0.0)
+                        gap = item.height > 0 ? 24.0 : 0.0
+                        make.top.equalTo(lastView.snp.bottom).offset(gap)
                     }
                 }
+                totalImgHeight += gap
                 make.height.equalTo(item.height)
                 make.left.right.equalToSuperview()
             }

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

@@ -35,7 +35,7 @@ class YHCommunityViewController: YHBaseViewController {
         
         dataSource.isItemSpacingAverageEnabled = false
         dataSource.itemWidth = JXSegmentedViewAutomaticDimension
-        dataSource.itemSpacing = 24
+        dataSource.itemSpacing = 28.0
         return dataSource
     }()
     

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

@@ -72,6 +72,16 @@ class YHMatchUserViewController: YHBaseViewController {
         return label
     }()
     
+    lazy var matchTipsLabel:UILabel = {
+        let label = UILabel()
+        label.text = "AI 人脉雷达正在为您智能匹配..."
+        label.textAlignment = .center
+        label.textColor = UIColor.white
+        label.font = UIFont.PFSC_R(ofSize:16)
+        label.isHidden = true
+        return label
+    }()
+    
     lazy var firstImageView: UIImageView = {
         let imageView = UIImageView()
         imageView.image = UIImage(named: "people_first_bg_image")
@@ -143,6 +153,7 @@ class YHMatchUserViewController: YHBaseViewController {
         self.view.addSubview(launchLottieView)
         self.view.addSubview(rotateLottieView)
         self.view.addSubview(headLottieView)
+        self.view.addSubview(matchTipsLabel)
         self.headLottieView.play()
 
         launchLottieView.snp.makeConstraints { make in
@@ -159,17 +170,19 @@ class YHMatchUserViewController: YHBaseViewController {
             make.center.equalTo(launchLottieView)
         }
         
-        firstImageView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.height.equalTo(547)
-            make.bottom.equalTo(-k_Height_safeAreaInsetsBottom())
-        }
         self.topLabel.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.top.equalTo(50)
             make.height.equalTo(22)
         }
         
+        firstImageView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.height.equalTo(547)
+            make.width.equalTo(375)
+            make.top.equalTo(topLabel.snp.bottom).offset(30)
+        }
+        
         self.bottomBtn.snp.makeConstraints { make in
             make.left.equalTo(24)
             make.right.equalTo(-24)
@@ -184,6 +197,13 @@ class YHMatchUserViewController: YHBaseViewController {
             make.top.equalTo(self.bottomBtn.snp.bottom).offset(12)
         }
         
+        self.matchTipsLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(self.launchLottieView.snp.bottom).offset(20)
+            make.height.equalTo(18.0)
+        }
+        
+        
         self.wingLeftImgV.snp.makeConstraints { make in
             make.width.height.equalTo(19)
             make.right.equalTo(self.topLabel.snp.left)
@@ -233,6 +253,8 @@ class YHMatchUserViewController: YHBaseViewController {
         self.wingRightImgV.isHidden = false
         self.topLabel.isHidden = false
         self.bottomBtn.isHidden = false
+        self.matchTipsLabel.isHidden = true
+
     }
 }
 
@@ -246,6 +268,7 @@ extension YHMatchUserViewController: YHMatchProtocol {
     @objc func startMatchUsers() {
         self.isStartMatch = true
         self.bottomBtn.isHidden = true
+        self.matchTipsLabel.isHidden = false
         self.headLottieView.isHidden = true
         self.launchLottieView.isHidden = false
         self.topLabel.isHidden = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/C/YHSelectCountryViewController.swift

@@ -39,7 +39,6 @@ class YHSelectCountryViewController: YHBaseViewController {
             searchBar.backgroundColor = UIColor.contentBkgColor
             searchBar.keyboardType = .default
             searchBar.delegate = self
-            searchBar.layer.cornerRadius = 21
             searchBar.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 16, height: 42))
             searchBar.leftViewMode = .always
             return searchBar

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHAddressPicker/YHAddressPickView.swift

@@ -147,7 +147,7 @@ class YHAddressPickView: UIView {
             button.setTitleColor(UIColor.mainTextColor, for: .normal)
             button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
             button.addTarget(self, action: #selector(onClickHotCity(sender:)), for: .touchUpInside)
-            button.layer.cornerRadius = 16
+            button.layer.cornerRadius = kCornerRadius3
             button.backgroundColor = UIColor.contentBkgColor
             button.tag = i
             view.addSubview(button)
@@ -212,7 +212,7 @@ class YHAddressPickView: UIView {
             button.setBackgroundColor(color: UIColor.brandMainColor.withAlphaComponent(0.08), forState: .selected)
             button.layer.borderColor = UIColor.brandMainColor.cgColor
             button.layer.borderWidth = 0
-            button.layer.cornerRadius = 16
+            button.layer.cornerRadius = kCornerRadius3
             button.addTarget(self, action: #selector(onClickTitlebutton(sender:)), for: .touchUpInside)
             if i == 1 {
                 button.isSelected = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHCountryHotView.swift

@@ -58,7 +58,7 @@ class YHCountryHotView: UIView {
             button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
             button.setBackgroundColor(color: UIColor.tipsColor.withAlphaComponent(0.08), forState: .highlighted)
             button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
-            button.layer.cornerRadius = 16
+            button.layer.cornerRadius = kCornerRadius3
             button.tag = 3000 + i
             button.addTarget(self, action: #selector(exampleClick(sender:)), for: .touchUpInside)
             addSubview(button)