首页分类完成

RainbowPlanet/RainbowPlanet/Macro/ColorMacro.swift

@@ -76,6 +76,8 @@ let kf7f7faColor = UIColor(hexString: "f7f7fa")
 
 let kf7f8faColor = UIColor(hexString: "f7f8fa")
 
+let kf7f8fdColor = UIColor(hexString: "f7f8fd")
+
 let kf0f0f0Color = UIColor(hexString: "f0f0f0")
 
 let kf1f1f1Color = UIColor(hexString: "f1f1f1")

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/Banner/CommunityBannerFSPagerViewCell.swift

@@ -28,6 +28,8 @@ class CommunityBannerFSPagerViewCell: FSPagerViewCell {
     //MARK: - 初始化
     override init(frame: CGRect) {
         super.init(frame: frame)
+        self.cornerRadius = 4
+        self.masksToBounds = true
         setupViews()
         setupLayouts()
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/Banner/CommunityBannerTableViewCell.swift

@@ -39,24 +39,29 @@ class CommunityBannerTableViewCell: UITableViewCell {
     //MRAK: - 设置View
     private func setupViews() {
         self.selectionStyle = .none
-        backgroundColor = kf7f8faColor
+        backgroundColor = UIColor.white
         addSubview(pagerView)
-        addSubview(pageControl)
+        pagerView.addSubview(pageControl)
     }
     
     private func setupLayouts() {
         pagerView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
+            make.top.equalTo(kScaleValue(value: 10))
+            make.left.right.bottom.equalToSuperview()
+            make.bottom.equalTo(kScaleValue(value: -10))
+
         }
         
     }
     
     private lazy var pagerView: FSPagerView = {
         let pagerView = FSPagerView(frame: CGRect.zero)
-        pagerView.backgroundColor = kf7f8faColor
+        pagerView.backgroundColor = UIColor.white
         pagerView.delegate = self
         pagerView.dataSource = self
         pagerView.scrollDirection = .horizontal
+        pagerView.interitemSpacing = kScaleValue(value: 14)
+        pagerView.itemSize = CGSize(width: (kScreenWidth-(28 * kScaleWidth)), height: 140 * kScaleWidth)
         return pagerView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendSuperViewController.swift

@@ -24,6 +24,8 @@ class CommunityRecommnendSuperViewController: BaseViewController {
     override func setupViews() {
         view.addSubview(segmentedView)
         view.addSubview(listContainerView)
+        segmentedView.addSubview(onelineView)
+        segmentedView.addSubview(twolineView)
     }
     
     override func setupLayouts() {
@@ -31,7 +33,7 @@ class CommunityRecommnendSuperViewController: BaseViewController {
         segmentedView.snp.makeConstraints { (make) in
             make.left.equalToSuperview()
             make.right.equalToSuperview()
-            make.height.equalTo(44)
+            make.height.equalTo(40)
             make.top.equalTo(0)
         }
         
@@ -39,6 +41,15 @@ class CommunityRecommnendSuperViewController: BaseViewController {
             make.top.equalTo(segmentedView.snp.bottom)
             make.left.right.bottom.equalToSuperview()
         }
+        
+        onelineView.snp.makeConstraints { (make) in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(0.5)
+        }
+        twolineView.snp.makeConstraints { (make) in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(0.8)
+        }
     }
     
     override func setupData() {
@@ -92,8 +103,9 @@ class CommunityRecommnendSuperViewController: BaseViewController {
     //1.初始化JXSegmentedViewx
     private lazy var segmentedView: JXSegmentedView = {
         let segmentedView = JXSegmentedView()
+        segmentedView.backgroundColor = UIColor.white
         segmentedView.delegate = self
-        segmentedView.indicators = [indicator]
+//        segmentedView.indicators = [indicator]
         segmentedView.contentScrollView = listContainerView.scrollView
         segmentedView.contentEdgeInsetLeft = 14
         segmentedView.contentEdgeInsetRight = 14
@@ -106,23 +118,23 @@ class CommunityRecommnendSuperViewController: BaseViewController {
         segmentedDataSource.isTitleColorGradientEnabled = true
         segmentedDataSource.isItemSpacingAverageEnabled = false
         segmentedDataSource.isTitleZoomEnabled = true
-        segmentedDataSource.titleNormalColor = kbbbbbbColor
-        segmentedDataSource.titleSelectedColor = k333333Color
-        segmentedDataSource.titleNormalFont = kBoldFont16
-        segmentedDataSource.titleSelectedFont = kBoldFont20
+        segmentedDataSource.titleNormalColor = k666666Color
+        segmentedDataSource.titleSelectedColor = kThemeColor
+        segmentedDataSource.titleNormalFont = kRegularFont14!
+        segmentedDataSource.titleSelectedFont = kBoldFont18
         segmentedDataSource.isTitleStrokeWidthEnabled = true
         
         return segmentedDataSource
     }()
     //3.初始化指示器indicator
-    private lazy var indicator: JXSegmentedIndicatorLineView = {
-        let indicator = JXSegmentedIndicatorLineView()
-        indicator.indicatorColor = k333333Color
-        indicator.indicatorHeight = 4
-        indicator.indicatorWidth = 20
-        return indicator
-    }()
-    
+//    private lazy var indicator: JXSegmentedIndicatorLineView = {
+//        let indicator = JXSegmentedIndicatorLineView()
+//        indicator.indicatorColor = k333333Color
+//        indicator.indicatorHeight = 4
+//        indicator.indicatorWidth = 20
+//        return indicator
+//    }()
+//
     //4.初始化JXSegmentedListContainerView
     private lazy var listContainerView: JXSegmentedListContainerView = {
         let listContainerView = JXSegmentedListContainerView(dataSource: self)
@@ -130,6 +142,18 @@ class CommunityRecommnendSuperViewController: BaseViewController {
         listContainerView.scrollView.isScrollEnabled = false
         return listContainerView
     }()
+    
+    lazy var onelineView: UIView = {
+        let onelineView = UIView()
+        onelineView.backgroundColor = keeeeeeColor
+        return onelineView
+    }()
+    
+    lazy var twolineView: UIView = {
+        let twolineView = UIView()
+        twolineView.backgroundColor = keeeeeeColor
+        return twolineView
+    }()
 }
 
 extension CommunityRecommnendSuperViewController : JXSegmentedListContainerViewListDelegate {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -143,6 +143,7 @@ class CommunityRecommnendViewController: UIViewController {
         tableView.backgroundColor = kf7f8faColor
         tableView.dataSource = self
         tableView.delegate = self
+        tableView.contentInset = UIEdgeInsets(top: 10, left: 0, bottom: 0, right: 0)
         return tableView
     }()
     
@@ -417,7 +418,7 @@ extension CommunityRecommnendViewController : UITableViewDelegate,UITableViewDat
         case .banner?:
 
             if !(communityRecommendDataModel.data?.isEmpty ?? true) {
-                return 150 * kScaleWidth
+                return 160 * kScaleWidth
             }
             return 0
         //推荐用户