Merge branch 'develop' into feature/jeremy

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -365,6 +365,11 @@
 		BD1DC6C9228D005000B89C57 /* OrderCreateParameterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1DC6C8228D005000B89C57 /* OrderCreateParameterModel.swift */; };
 		BD1DC6CB228D157000B89C57 /* OrderCreateBackModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1DC6CA228D157000B89C57 /* OrderCreateBackModel.swift */; };
 		BD1DC6CD228D160D00B89C57 /* OrderPurchaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1DC6CC228D160D00B89C57 /* OrderPurchaseModel.swift */; };
+		BD1FC17F22B08D3C00D55081 /* CommunityMyFollowTopicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1FC17E22B08D3C00D55081 /* CommunityMyFollowTopicController.swift */; };
+		BD1FC18122B08D7A00D55081 /* CommunityMyFollowTopicCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1FC18022B08D7A00D55081 /* CommunityMyFollowTopicCell.swift */; };
+		BD1FC18622B09F9800D55081 /* CommunitySubCommentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1FC18522B09F9800D55081 /* CommunitySubCommentController.swift */; };
+		BD1FC18822B0A30300D55081 /* CommunityMajorCommentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1FC18722B0A30300D55081 /* CommunityMajorCommentCell.swift */; };
+		BD1FC18A22B0A32100D55081 /* CommunityReplyCommentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD1FC18922B0A32100D55081 /* CommunityReplyCommentCell.swift */; };
 		BD20F1CB2283C12000677D8E /* ShoppingCartListNoneItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1CA2283C12000677D8E /* ShoppingCartListNoneItemCell.swift */; };
 		BD20F1CD2283C51300677D8E /* OrderFinishPayController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1CC2283C51300677D8E /* OrderFinishPayController.swift */; };
 		BD20F1CF2283CE2300677D8E /* OrderFinishPayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD20F1CE2283CE2300677D8E /* OrderFinishPayView.swift */; };
@@ -808,6 +813,11 @@
 		BD1DC6C8228D005000B89C57 /* OrderCreateParameterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCreateParameterModel.swift; sourceTree = "<group>"; };
 		BD1DC6CA228D157000B89C57 /* OrderCreateBackModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCreateBackModel.swift; sourceTree = "<group>"; };
 		BD1DC6CC228D160D00B89C57 /* OrderPurchaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderPurchaseModel.swift; sourceTree = "<group>"; };
+		BD1FC17E22B08D3C00D55081 /* CommunityMyFollowTopicController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityMyFollowTopicController.swift; sourceTree = "<group>"; };
+		BD1FC18022B08D7A00D55081 /* CommunityMyFollowTopicCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityMyFollowTopicCell.swift; sourceTree = "<group>"; };
+		BD1FC18522B09F9800D55081 /* CommunitySubCommentController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunitySubCommentController.swift; sourceTree = "<group>"; };
+		BD1FC18722B0A30300D55081 /* CommunityMajorCommentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityMajorCommentCell.swift; sourceTree = "<group>"; };
+		BD1FC18922B0A32100D55081 /* CommunityReplyCommentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityReplyCommentCell.swift; sourceTree = "<group>"; };
 		BD20F1CA2283C12000677D8E /* ShoppingCartListNoneItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShoppingCartListNoneItemCell.swift; sourceTree = "<group>"; };
 		BD20F1CC2283C51300677D8E /* OrderFinishPayController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderFinishPayController.swift; sourceTree = "<group>"; };
 		BD20F1CE2283CE2300677D8E /* OrderFinishPayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderFinishPayView.swift; sourceTree = "<group>"; };
@@ -1254,6 +1264,8 @@
 			isa = PBXGroup;
 			children = (
 				A719EE6722AF438E001AAC98 /* Community */,
+				BD1FC18222B09F4700D55081 /* CommunitySubComment */,
+				BD1FC17D22B08CEB00D55081 /* CommunityMyFollowTopic */,
 			);
 			path = CommunityModule;
 			sourceTree = "<group>";
@@ -3150,6 +3162,25 @@
 			path = OrderModel;
 			sourceTree = "<group>";
 		};
+		BD1FC17D22B08CEB00D55081 /* CommunityMyFollowTopic */ = {
+			isa = PBXGroup;
+			children = (
+				BD1FC17E22B08D3C00D55081 /* CommunityMyFollowTopicController.swift */,
+				BD1FC18022B08D7A00D55081 /* CommunityMyFollowTopicCell.swift */,
+			);
+			path = CommunityMyFollowTopic;
+			sourceTree = "<group>";
+		};
+		BD1FC18222B09F4700D55081 /* CommunitySubComment */ = {
+			isa = PBXGroup;
+			children = (
+				BD1FC18522B09F9800D55081 /* CommunitySubCommentController.swift */,
+				BD1FC18722B0A30300D55081 /* CommunityMajorCommentCell.swift */,
+				BD1FC18922B0A32100D55081 /* CommunityReplyCommentCell.swift */,
+			);
+			path = CommunitySubComment;
+			sourceTree = "<group>";
+		};
 		BD3474F722859788000908C5 /* OrderPayOrder */ = {
 			isa = PBXGroup;
 			children = (
@@ -3811,6 +3842,7 @@
 				A70B2C402288312900B2449F /* ProductDetailSectionHeader.swift in Sources */,
 				A7A98E3122801B10005306E9 /* ShoppingMallListView.swift in Sources */,
 				BD1DC6C6228CFD0B00B89C57 /* SwiftMoyaServiceOrderApi.swift in Sources */,
+				BD1FC18A22B0A32100D55081 /* CommunityReplyCommentCell.swift in Sources */,
 				A7CC751A22716254003C4F38 /* SetTableViewCell.swift in Sources */,
 				BD20F1D32283D0ED00677D8E /* OrderFinishPaySuccessCell.swift in Sources */,
 				A71AA52822732173008FF1A5 /* SwiftMoyaNetWorkServiceConfig.swift in Sources */,
@@ -3839,6 +3871,7 @@
 				A7A98E17227EED76005306E9 /* SpecialViewController.swift in Sources */,
 				A7778CB32244D73400C7C47A /* RegisterLoginViewController.swift in Sources */,
 				BD7AB8432284390B0030646A /* OrderPaySelfPickInfoCell.swift in Sources */,
+				BD1FC18622B09F9800D55081 /* CommunitySubCommentController.swift in Sources */,
 				A7274C5F228EE636000E3A07 /* LBXScanWrapper.swift in Sources */,
 				A7CC752F2271A1F2003C4F38 /* SetPasswordView.swift in Sources */,
 				A7A98E09227EB8DD005306E9 /* CategoryView.swift in Sources */,
@@ -3952,6 +3985,7 @@
 				BD7AB8452284398A0030646A /* OrderPaySelfPickAddInfoCell.swift in Sources */,
 				A72A72D222321E2700B21995 /* Common.swift in Sources */,
 				A70B2C64228875DE00B2449F /* ShopViewShopInfoTableViewCell.swift in Sources */,
+				BD1FC17F22B08D3C00D55081 /* CommunityMyFollowTopicController.swift in Sources */,
 				BDEF7791228571DC00ED0AC0 /* CommonPayView.swift in Sources */,
 				A71AF0A6226EDDC8001730FE /* SearchViewController.swift in Sources */,
 				BD20F1CF2283CE2300677D8E /* OrderFinishPayView.swift in Sources */,
@@ -3968,6 +4002,7 @@
 				BDF47D822282B3D100941AB9 /* ShoppingCartHotSaleTableViewCell.swift in Sources */,
 				BD20F1CB2283C12000677D8E /* ShoppingCartListNoneItemCell.swift in Sources */,
 				A7B4E756228281620012914A /* ShoppingMallSlidingLeftRightBgCollectionViewCell.swift in Sources */,
+				BD1FC18122B08D7A00D55081 /* CommunityMyFollowTopicCell.swift in Sources */,
 				A757C92E22744ACE00226355 /* AddressManagerListModel.swift in Sources */,
 				BDAA40F9228E9ADA00CF841D /* OrderApplyRefundReasonCell.swift in Sources */,
 				A7274C59228EE636000E3A07 /* LBXScanNetAnimation.swift in Sources */,
@@ -3977,6 +4012,7 @@
 				A77F2C9C2231FDCF001BD3F6 /* BaseView.swift in Sources */,
 				A7A98E2F228017E2005306E9 /* SwiftMoyaNetWorkServiceCMS.swift in Sources */,
 				A7284A522252EE9A000BAEC4 /* RootModel.swift in Sources */,
+				BD1FC18822B0A30300D55081 /* CommunityMajorCommentCell.swift in Sources */,
 				BD6EDF48229007EA009A20FE /* OrderApplyRefundModel.swift in Sources */,
 				A72A7388223396CB00B21995 /* ApiMacro.swift in Sources */,
 				A72A72B922321DE000B21995 /* Extension+Array.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityMyFollowTopic/CommunityMyFollowTopicCell.swift

@@ -0,0 +1,105 @@
+//
+//  CommunityMyFollowTopicCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/12.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import RxSwift
+import RxCocoa
+
+class CommunityMyFollowTopicCell: UITableViewCell {
+    
+    let disposeBag = DisposeBag()
+    
+    typealias FocusClickClosure = (_ isFocusSelected: Int) -> Void
+    var focusClickClosure : FocusClickClosure?
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> CommunityMyFollowTopicCell {
+        let ID = "CommunityMyFollowTopicCell"
+        tableView.register(CommunityMyFollowTopicCell.self, forCellReuseIdentifier: ID)
+        let cell : CommunityMyFollowTopicCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! CommunityMyFollowTopicCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        backgroundColor = kffffffColor
+        
+        addSubview(titleLabel)
+        addSubview(focusButton)
+        addSubview(sepView)
+    }
+    
+    private func setupLayouts() {
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(20)
+            make.left.equalTo(14)
+            make.right.equalToSuperview().offset(-92)
+            make.height.equalTo(21)
+        }
+        focusButton.snp.makeConstraints { (make) in
+            make.top.equalTo(18)
+            make.right.equalToSuperview().offset(-14)
+            make.width.equalTo(64)
+            make.height.equalTo(26)
+        }
+        sepView.snp.makeConstraints { (make) in
+            make.left.equalTo(titleLabel.snp_left)
+            make.right.equalTo(focusButton.snp_right)
+            make.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }        
+    }
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "空瓶好物合集"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kRegularFont15
+        titleLabel.textAlignment = .left
+        return titleLabel
+    }()
+    
+    private lazy var focusButton: UIButton = {
+        let focusButton = UIButton(type: UIButton.ButtonType.custom)
+        focusButton.setImage(kImage(name: "common_uncheck_icon"), for: UIControl.State.normal)
+        focusButton.setImage(kImage(name: "common_check_icon"), for: UIControl.State.selected)
+        focusButton.rx.tap.subscribe(onNext: { [weak self] (data) in
+            focusButton.isSelected = !focusButton.isSelected
+            if let focusClickClosure = self?.focusClickClosure {
+                let isSel: Int = focusButton.isSelected == true ? 1 : 0
+                focusClickClosure(isSel)
+            }
+        }).disposed(by: disposeBag)
+        
+        return focusButton
+    }()
+    
+    private lazy var sepView: UIView = {
+        let sepView = UIView()
+        sepView.backgroundColor = kf5f5f5Color
+        return sepView
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityMyFollowTopic/CommunityMyFollowTopicController.swift

@@ -0,0 +1,75 @@
+//
+//  CommunityMyFollowTopicController.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/12.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class CommunityMyFollowTopicController: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupLayouts()
+        
+    }
+    
+    override func setupViews() {
+        navigationBar.title = "我的关注话题"
+        view.backgroundColor = kf7f8faColor
+        
+        view.addSubview(tableView)
+    }
+    
+    override func setupLayouts() {
+        tableView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(kNavBarTotalHeight)
+            make.left.right.bottom.equalTo(0)
+        }
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
+        tableView.separatorStyle = .none
+        tableView.backgroundColor = kf7f8faColor
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.estimatedRowHeight = 60
+        tableView.estimatedSectionFooterHeight = 0.000001
+        tableView.estimatedSectionHeaderHeight = 0.000001
+        return tableView
+    }()
+}
+
+// MARK: - tableView dataSource && delegate
+extension CommunityMyFollowTopicController: UITableViewDataSource, UITableViewDelegate {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = CommunityMyFollowTopicCell.cellWith(tableView: tableView, indexPath: indexPath)
+        cell.focusClickClosure = {
+            [weak self] (isSelected) in
+            print("当前item选中状态为\(isSelected)")
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 60
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 10
+    }
+    
+}

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/CommunityMajorCommentCell.swift

@@ -0,0 +1,108 @@
+//
+//  CommunityMajorCommentCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/12.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  主评论のCell
+
+import UIKit
+
+class CommunityMajorCommentCell: UITableViewCell {
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> CommunityMajorCommentCell {
+        let ID = "CommunityMajorCommentCell"
+        tableView.register(CommunityMajorCommentCell.self, forCellReuseIdentifier: ID)
+        let cell : CommunityMajorCommentCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! CommunityMajorCommentCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        backgroundColor = kffffffColor
+        
+        addSubview(iconImageView)
+        addSubview(titleLabel)
+        addSubview(contentLabel)
+        addSubview(timeLabel)
+    }
+    
+    private func setupLayouts() {
+        iconImageView.snp.makeConstraints { (make) in
+            make.top.equalTo(20)
+            make.left.equalTo(14)
+            make.size.equalTo(24)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(iconImageView.snp_right).offset(10)
+            make.right.equalToSuperview().offset(-26)
+            make.centerY.equalTo(iconImageView)
+            make.height.equalTo(17)
+        }
+        contentLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(titleLabel.snp_bottom).offset(12)
+            make.left.equalTo(titleLabel.snp_left)
+            make.right.equalToSuperview().offset(-26)
+        }
+        timeLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(contentLabel.snp_bottom).offset(8)
+            make.left.equalTo(titleLabel.snp_left)
+            make.right.equalTo(contentLabel.snp_right)
+            make.height.equalTo(15)
+            make.bottom.equalToSuperview().offset(-20)
+        }
+    }
+    
+    lazy var iconImageView : UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "page05")
+        return iconImageView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "张吃饭"
+        titleLabel.textColor = k999999Color
+        titleLabel.font = kRegularFont14
+        titleLabel.textAlignment = .left
+        return titleLabel
+    }()
+    
+    private lazy var contentLabel: UILabel = {
+        let contentLabel = UILabel()
+        contentLabel.text = "点击单条评时弹出选择操作框（目前仅支持回复），点击操作框后进行相应的操作"
+        contentLabel.textColor = k333333Color
+        contentLabel.font = kRegularFont14
+        contentLabel.textAlignment = .left
+        contentLabel.numberOfLines = 0
+        return contentLabel
+    }()
+    
+    private lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel()
+        timeLabel.text = "6个小时前"
+        timeLabel.textColor = kbbbbbbColor
+        timeLabel.font = kRegularFont12
+        timeLabel.textAlignment = .left
+        return timeLabel
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/CommunityReplyCommentCell.swift

@@ -0,0 +1,108 @@
+//
+//  CommunityReplyCommentCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/12.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  二级评论--评论回复のCell
+
+import UIKit
+
+class CommunityReplyCommentCell: UITableViewCell {
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> CommunityReplyCommentCell {
+        let ID = "CommunityReplyCommentCell"
+        tableView.register(CommunityReplyCommentCell.self, forCellReuseIdentifier: ID)
+        let cell : CommunityReplyCommentCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! CommunityReplyCommentCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    var indexPath: IndexPath? {
+        didSet {
+            
+        }
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        self.selectionStyle = .none
+        backgroundColor = kf7f8faColor
+        
+        addSubview(iconImageView)
+        addSubview(titleLabel)
+        addSubview(contentLabel)
+        addSubview(timeLabel)
+    }
+    
+    private func setupLayouts() {
+        iconImageView.snp.makeConstraints { (make) in
+            make.top.equalTo(10)
+            make.left.equalTo(24)
+            make.size.equalTo(24)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.left.equalTo(iconImageView.snp_right).offset(10)
+            make.right.equalToSuperview().offset(-26)
+            make.centerY.equalTo(iconImageView)
+            make.height.equalTo(17)
+        }
+        contentLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(titleLabel.snp_bottom).offset(12)
+            make.left.equalTo(titleLabel.snp_left)
+            make.right.equalToSuperview().offset(-26)
+        }
+        timeLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(contentLabel.snp_bottom).offset(8)
+            make.left.equalTo(titleLabel.snp_left)
+            make.right.equalTo(contentLabel.snp_right)
+            make.height.equalTo(15)
+            make.bottom.equalToSuperview()
+        }
+    }
+    
+    lazy var iconImageView : UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "page05")
+        return iconImageView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "Monster"
+        titleLabel.textColor = k999999Color
+        titleLabel.font = kRegularFont14
+        titleLabel.textAlignment = .left
+        return titleLabel
+    }()
+    
+    private lazy var contentLabel: UILabel = {
+        let contentLabel = UILabel()
+        contentLabel.text = "我也觉得好看"
+        contentLabel.textColor = k333333Color
+        contentLabel.font = kRegularFont14
+        contentLabel.textAlignment = .left
+        contentLabel.numberOfLines = 0
+        return contentLabel
+    }()
+    
+    private lazy var timeLabel: UILabel = {
+        let timeLabel = UILabel()
+        timeLabel.text = "6个小时前"
+        timeLabel.textColor = kbbbbbbColor
+        timeLabel.font = kRegularFont12
+        timeLabel.textAlignment = .left
+        return timeLabel
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunitySubComment/CommunitySubCommentController.swift

@@ -0,0 +1,80 @@
+//
+//  CommunitySubCommentController.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/12.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class CommunitySubCommentController: BaseViewController {
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupViews()
+        setupLayouts()
+        
+    }
+    
+    override func setupViews() {
+        navigationBar.title = "3条评论"
+        view.backgroundColor = kf7f8faColor
+        
+        view.addSubview(tableView)
+    }
+    
+    override func setupLayouts() {
+        tableView.snp.makeConstraints { (make) in
+            make.top.equalToSuperview().offset(kNavBarTotalHeight)
+            make.left.right.bottom.equalTo(0)
+        }
+    }
+    
+    override func setupData() {
+        
+    }
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style: UITableView.Style.grouped)
+        tableView.separatorStyle = .none
+        tableView.backgroundColor = kf7f8faColor
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.estimatedRowHeight = 60
+        tableView.estimatedSectionFooterHeight = 0.000001
+        tableView.estimatedSectionHeaderHeight = 0.000001
+        return tableView
+    }()
+}
+
+// MARK: - tableView dataSource && delegate
+extension CommunitySubCommentController: UITableViewDataSource, UITableViewDelegate {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.row == 0 {
+            let cell = CommunityMajorCommentCell.cellWith(tableView: tableView, indexPath: indexPath)
+            return cell
+        } else {
+            let cell = CommunityReplyCommentCell.cellWith(tableView: tableView, indexPath: indexPath)
+            return cell
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        print("点击了----\(indexPath.row)")
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 10
+    }
+    
+}

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageComment/MessageCommentTableCell.swift

@@ -93,7 +93,7 @@ class MessageCommentTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "xxx恢复了xxx"
         titleLabel.textColor = k333333Color
-        titleLabel.font = kScaleBoldFont14
+        titleLabel.font = kBoldFont14
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -102,7 +102,7 @@ class MessageCommentTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "”大师果然厉害，不愧是牛逼之人“"
         subLabel.textColor = k999999Color
-        subLabel.font = kScaleRegularFont13
+        subLabel.font = kRegularFont13
         subLabel.textAlignment = .left
         subLabel.numberOfLines = 0
         return subLabel
@@ -112,7 +112,7 @@ class MessageCommentTableCell: UITableViewCell {
         let timeLabel = UILabel()
         timeLabel.text = "10分钟前"
         timeLabel.textColor = kbbbbbbColor
-        timeLabel.font = kScaleRegularFont12
+        timeLabel.font = kRegularFont12
         timeLabel.textAlignment = .left
         return timeLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageFollowNoti/MessageFollowNotiTableCell.swift

@@ -93,7 +93,7 @@ class MessageFollowNotiTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "xxx关注了你"
         titleLabel.textColor = k333333Color
-        titleLabel.font = kScaleBoldFont14
+        titleLabel.font = kBoldFont14
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -102,7 +102,7 @@ class MessageFollowNotiTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "你们的爱好相似度高于90%，快去回个粉吧!"
         subLabel.textColor = k999999Color
-        subLabel.font = kScaleRegularFont13
+        subLabel.font = kRegularFont13
         subLabel.textAlignment = .left
         subLabel.numberOfLines = 0
         return subLabel
@@ -112,7 +112,7 @@ class MessageFollowNotiTableCell: UITableViewCell {
         let timeLabel = UILabel()
         timeLabel.text = "5月20日"
         timeLabel.textColor = kbbbbbbColor
-        timeLabel.font = kScaleRegularFont12
+        timeLabel.font = kRegularFont12
         timeLabel.textAlignment = .left
         return timeLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/View/MessagePlanetTableCell.swift

@@ -97,7 +97,7 @@ class MessagePlanetTableCell: UITableViewCell {
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = k333333Color
-        titleLabel.font = kScaleRegularFont16
+        titleLabel.font = kRegularFont16
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -106,7 +106,7 @@ class MessagePlanetTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "我就是一个消息用来测一测"
         subLabel.textColor = k999999Color
-        subLabel.font = kScaleRegularFont12
+        subLabel.font = kRegularFont12
         subLabel.textAlignment = .left
         return subLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/View/MessageActivityTableCell.swift

@@ -92,7 +92,7 @@ class MessageActivityTableCell: UITableViewCell {
         timeLabel.backgroundColor = kRGBAColor(r: 0/255.0, g: 0/255.0, b: 0/255.0, a: 0.1)
         timeLabel.text = "05-16 20:03"
         timeLabel.textColor = kffffffColor
-        timeLabel.font = kScaleRegularFont12
+        timeLabel.font = kRegularFont12
         timeLabel.textAlignment = .center
         timeLabel.cornerRadius = 2
         timeLabel.masksToBounds = true
@@ -116,7 +116,7 @@ class MessageActivityTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "我就是一个用来测一测的Title"
         titleLabel.textColor = kffffffColor
-        titleLabel.font = kScaleRegularFont15
+        titleLabel.font = kRegularFont15
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -125,7 +125,7 @@ class MessageActivityTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "活动时间：2019/5/19~2019/5/20"
         subLabel.textColor = kffffffColor
-        subLabel.font = kScaleRegularFont12
+        subLabel.font = kRegularFont12
         subLabel.textAlignment = .left
         return subLabel
     }()

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetThumb/MessageThumbTableCell.swift

@@ -93,7 +93,7 @@ class MessageThumbTableCell: UITableViewCell {
         let titleLabel = UILabel()
         titleLabel.text = "xxx赞了你的内容"
         titleLabel.textColor = k333333Color
-        titleLabel.font = kScaleBoldFont14
+        titleLabel.font = kBoldFont14
         titleLabel.textAlignment = .left
         return titleLabel
     }()
@@ -102,7 +102,7 @@ class MessageThumbTableCell: UITableViewCell {
         let subLabel = UILabel()
         subLabel.text = "那是春的感觉，并非只在复苏的田野"
         subLabel.textColor = k999999Color
-        subLabel.font = kScaleRegularFont13
+        subLabel.font = kRegularFont13
         subLabel.textAlignment = .left
         subLabel.numberOfLines = 0
         return subLabel
@@ -112,7 +112,7 @@ class MessageThumbTableCell: UITableViewCell {
         let timeLabel = UILabel()
         timeLabel.text = "5月20日"
         timeLabel.textColor = kbbbbbbColor
-        timeLabel.font = kScaleRegularFont12
+        timeLabel.font = kRegularFont12
         timeLabel.textAlignment = .left
         return timeLabel
     }()