Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockItem.swift

@@ -28,7 +28,7 @@ class YHHomeKingKongBlockItem: UIView {
         let label = UILabel()
         label.text = "去香港"
         label.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
-        label.font = UIFont.PFSC_M(ofSize: 13)
+        label.font = UIFont.PFSC_M(ofSize: 12)
         label.lineBreakMode = .byTruncatingMiddle
         label.textAlignment = .center
         return label
@@ -57,7 +57,7 @@ private extension YHHomeKingKongBlockItem {
             make.centerX.equalToSuperview()
             make.left.equalTo(4)
             make.right.equalTo(-4)
-            make.height.equalTo(18)
+            make.height.equalTo(17)
             make.bottom.equalTo(-8)
         }
     }

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeKingKongBlockView.swift

@@ -9,9 +9,7 @@
 import UIKit
 
 class YHHomeKingKongBlockView: UIView {
-    
-    static let viewH : CGFloat = (KScreenWidth - 20 * 2 - 16 * 3) / 4.0
-    
+    static let viewH : CGFloat = 71.0
     override init(frame: CGRect) {
         super.init(frame: frame)
         initView()
@@ -31,8 +29,8 @@ class YHHomeKingKongBlockView: UIView {
 
 private extension YHHomeKingKongBlockView {
     func initView() {
-        let gap : CGFloat = 16.0
-        var offsetX : CGFloat = 0.0
+        let itemGap : CGFloat = (KScreenWidth - 16.0 * 2 - YHHomeKingKongBlockView.viewH * 4) / 3.0
+        var offsetX : CGFloat = 0
         for (index,item) in arrData.enumerated() {
             let view = YHHomeKingKongBlockItem()
             view.dataModel = item
@@ -42,11 +40,8 @@ private extension YHHomeKingKongBlockView {
                 make.left.equalTo(offsetX)
                 make.width.height.equalTo(YHHomeKingKongBlockView.viewH)
             }
-            
-            offsetX = offsetX + YHHomeKingKongBlockView.viewH + gap
-            
+            offsetX = offsetX + YHHomeKingKongBlockView.viewH + itemGap
             view.tag = index
-            
             let tap = UITapGestureRecognizer(target: self, action: #selector(tapView(gestureRecognizer:)))
             view.addGestureRecognizer(tap)
         }