编辑发布 && 添加话题

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -444,6 +444,9 @@
 		BD28078F22B76A9F002AB976 /* PublishAddTopicController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28078E22B76A9F002AB976 /* PublishAddTopicController.swift */; };
 		BD28079122B770C9002AB976 /* PublishTopicTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079022B770C9002AB976 /* PublishTopicTypeCell.swift */; };
 		BD28079522B7713C002AB976 /* PublishTopicTypeItemCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079422B7713C002AB976 /* PublishTopicTypeItemCollectionCell.swift */; };
+		BD28079722B791AF002AB976 /* PublishTopicItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079622B791AF002AB976 /* PublishTopicItemCell.swift */; };
+		BD28079922B79A58002AB976 /* PublishTopicHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079822B79A58002AB976 /* PublishTopicHeaderView.swift */; };
+		BD28079B22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD28079A22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift */; };
 		BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */; };
 		BD2FCBE222B21CF70006D974 /* CommunityRecommendController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2FCBE122B21CF70006D974 /* CommunityRecommendController.swift */; };
 		BD2FCBE422B244250006D974 /* RecommendDetailContentCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD2FCBE322B244250006D974 /* RecommendDetailContentCell.swift */; };
@@ -983,6 +986,9 @@
 		BD28078E22B76A9F002AB976 /* PublishAddTopicController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishAddTopicController.swift; sourceTree = "<group>"; };
 		BD28079022B770C9002AB976 /* PublishTopicTypeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishTopicTypeCell.swift; sourceTree = "<group>"; };
 		BD28079422B7713C002AB976 /* PublishTopicTypeItemCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishTopicTypeItemCollectionCell.swift; sourceTree = "<group>"; };
+		BD28079622B791AF002AB976 /* PublishTopicItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishTopicItemCell.swift; sourceTree = "<group>"; };
+		BD28079822B79A58002AB976 /* PublishTopicHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishTopicHeaderView.swift; sourceTree = "<group>"; };
+		BD28079A22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PublishSelTopicCollectionCell.swift; sourceTree = "<group>"; };
 		BD29A92D228F99780018CFC3 /* OrderCommentParameterModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderCommentParameterModel.swift; sourceTree = "<group>"; };
 		BD2FCBE122B21CF70006D974 /* CommunityRecommendController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityRecommendController.swift; sourceTree = "<group>"; };
 		BD2FCBE322B244250006D974 /* RecommendDetailContentCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendDetailContentCell.swift; sourceTree = "<group>"; };
@@ -3698,6 +3704,9 @@
 			children = (
 				BD28079022B770C9002AB976 /* PublishTopicTypeCell.swift */,
 				BD28079422B7713C002AB976 /* PublishTopicTypeItemCollectionCell.swift */,
+				BD28079622B791AF002AB976 /* PublishTopicItemCell.swift */,
+				BD28079822B79A58002AB976 /* PublishTopicHeaderView.swift */,
+				BD28079A22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -4511,6 +4520,7 @@
 				BD1DC6CB228D157000B89C57 /* OrderCreateBackModel.swift in Sources */,
 				A72A72BD22321DE000B21995 /* Extension+UIColor.swift in Sources */,
 				A7FF1596228CFA8100A85748 /* OrderListViewController.swift in Sources */,
+				BD28079B22B79BAB002AB976 /* PublishSelTopicCollectionCell.swift in Sources */,
 				A7A98E05227EB891005306E9 /* CategoryViewController.swift in Sources */,
 				A7DF50E322A55AB600998908 /* BrowsePicturesPagerViewCell.swift in Sources */,
 				A77F2CC822320627001BD3F6 /* WRCustomNavigationBar.swift in Sources */,
@@ -4534,6 +4544,7 @@
 				A7CC751822716202003C4F38 /* SetView.swift in Sources */,
 				BD2FCBEA22B267280006D974 /* RecommendNoneCommentCell.swift in Sources */,
 				A7FF1594228C919A00A85748 /* OrderRefunddetailsTipsTableViewCell.swift in Sources */,
+				BD28079922B79A58002AB976 /* PublishTopicHeaderView.swift in Sources */,
 				A7B4E73A228192D20012914A /* CMSTemplateModel.swift in Sources */,
 				A72A72C622321DE000B21995 /* WebView.swift in Sources */,
 				A72A72D122321E2700B21995 /* HTMLURLMacro.swift in Sources */,
@@ -4633,6 +4644,7 @@
 				A79057062276EA3D0037F823 /* OpenCityListModel.swift in Sources */,
 				BD7AB838228420310030646A /* ShoppingCartPayOrderHeader.swift in Sources */,
 				A7824B002271F0DD00ABA381 /* EditSelfMentionContactsViewController.swift in Sources */,
+				BD28079722B791AF002AB976 /* PublishTopicItemCell.swift in Sources */,
 				A7CC751F227190C5003C4F38 /* AccountSecurityViewController.swift in Sources */,
 				A739121C229F75F50033177E /* JXPagingListRefreshView.swift in Sources */,
 				BD29A92E228F99780018CFC3 /* OrderCommentParameterModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/Macro/ColorMacro.swift

@@ -137,3 +137,5 @@ let k62cc74Color = UIColor(hexString: "62cc74")
 let kFFF8ECColor = UIColor(hexString: "FFF8EC")
 
 let kDDDDDDColor = UIColor(hexString: "DDDDDD")
+
+let k7AD489Color = UIColor(hexString: "7AD489")

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/CommunityTagCollectionCell.swift

@@ -69,7 +69,7 @@ class CommunityTagCollectionCell: UICollectionViewCell {
     
     private lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "pic_preload")
+        iconImageView.image = kImage(name: "edit_ico_topic_pre")
         return iconImageView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/Controller/PublishAddTopicController.swift

@@ -23,7 +23,7 @@ class PublishAddTopicController: BaseViewController {
         self.view.backgroundColor = kffffffColor
         
         navigationBar.title = "添加话题"
-        navigationBar.wr_setRightButton(title: "完成(x/5)", titleColor: k333333Color)
+        navigationBar.wr_setRightButton(title: "完成(x/5)", titleColor: k7AD489Color)
         navigationBar.onClickRightButton = {
             [weak self] in
             print("----点击了完成")
@@ -78,7 +78,7 @@ extension PublishAddTopicController : UITableViewDelegate, UITableViewDataSource
             let picCell = PublishTopicTypeCell.cellWith(tableView: tableView, indexPath: indexPath)
             return picCell
         case 1:
-            let titleCell = PublishEditTitleCell.cellWith(tableView: tableView, indexPath: indexPath)
+            let titleCell = PublishTopicItemCell.cellWith(tableView: tableView, indexPath: indexPath)
             return titleCell
         default:
             return UITableViewCell()
@@ -97,11 +97,23 @@ extension PublishAddTopicController : UITableViewDelegate, UITableViewDataSource
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return 0
+        if section == 0 {
+            return 44
+        } else {
+            return 0
+        }
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        return nil
+        if section == 0 {
+            let headerView = PublishTopicHeaderView(frame: CGRect.zero)
+            headerView.layoutIfNeeded()
+            headerView.reloadData()
+            return headerView
+        } else {
+            return nil
+        }
+        
     }
     
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishSelTopicCollectionCell.swift

@@ -0,0 +1,93 @@
+//
+//  PublishSelTopicCollectionCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  话题类别のCell
+
+import UIKit
+import RxSwift
+
+class PublishSelTopicCollectionCell: UICollectionViewCell {
+    
+    let disposeBag = DisposeBag()
+    
+    class func cellWith(collectionView:UICollectionView,indexPath:IndexPath) -> PublishSelTopicCollectionCell {
+        let ID = "PublishSelTopicCollectionCell"
+        collectionView.register(PublishSelTopicCollectionCell.self, forCellWithReuseIdentifier: ID)
+        let cell : PublishSelTopicCollectionCell = collectionView.dequeueReusableCell(withReuseIdentifier: ID, for: indexPath) as! PublishSelTopicCollectionCell
+        cell.indexPath = indexPath
+        return cell
+    }
+    //MARK: - indexPath
+    var indexPath: IndexPath?{
+        didSet {
+            
+        }
+    }
+    //MARK: - 初始化
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = kffffffColor
+        cornerRadius = 12
+        masksToBounds = true
+        setupViews()
+        setupLayouts()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //MRAK: - 设置View
+    private func setupViews() {
+        addSubview(iconImageView)
+        addSubview(titleLabel)
+        addSubview(deleteButton)
+    }
+    
+    private func setupLayouts() {
+        iconImageView.snp.makeConstraints { (make) in
+            make.top.equalTo(5)
+            make.left.equalTo(6)
+            make.size.equalTo(16)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(3)
+            make.left.equalTo(iconImageView.snp_right).offset(5)
+            make.right.equalTo(-26)
+            make.height.equalTo(19)
+        }
+        deleteButton.snp.makeConstraints { (make) in
+            make.left.equalTo(titleLabel.snp_right).offset(2)
+            make.right.equalTo(-2)
+            make.size.equalTo(22)
+        }
+    }
+    
+    private lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "edit_ico_topic_pre")
+        return iconImageView
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "运动健身"
+        titleLabel.textColor = k666666Color
+        titleLabel.font = kRegularFont13
+        titleLabel.textAlignment = .left
+        return titleLabel
+    }()
+    
+    private lazy var deleteButton: UIButton = {
+        let deleteButton = UIButton(type: UIButton.ButtonType.custom)
+        deleteButton.setImage(kImage(name: "edit_topic_delete"), for: UIControl.State.normal)
+        deleteButton.rx.tap.subscribe(onNext: { (data) in
+            print("----点击删除")
+        }).disposed(by: disposeBag)
+        return deleteButton
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicHeaderView.swift

@@ -0,0 +1,85 @@
+//
+//  PublishTopicHeaderView.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//  已选类别
+
+import UIKit
+
+class PublishTopicHeaderView: BaseView {
+    
+    override func setupViews() {
+        self.backgroundColor = kf7f8faColor
+        
+        addSubview(collectionView)
+    }
+    
+    override func setupLayouts() {
+        collectionView.snp.remakeConstraints { (make) in
+            make.top.equalTo(10)
+            make.bottom.equalTo(-10)
+            make.left.right.equalToSuperview()
+        }
+    }
+    
+    private lazy var collectionView: UICollectionView = {
+        let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
+        collectionView.backgroundColor = kf7f8faColor
+        collectionView.delegate = self;
+        collectionView.dataSource = self;
+        collectionView.showsVerticalScrollIndicator = false
+        collectionView.showsHorizontalScrollIndicator = false
+        collectionView.bounces = false        
+        return collectionView
+    }()
+    
+    private lazy var collectionViewLayout: UICollectionViewFlowLayout = {
+        let collectionViewLayout = UICollectionViewLeftAlignedLayout.init()
+        collectionViewLayout.minimumLineSpacing = 10
+        collectionViewLayout.minimumInteritemSpacing =  10
+        collectionViewLayout.scrollDirection = UICollectionView.ScrollDirection.horizontal
+        collectionViewLayout.estimatedItemSize = CGSize(width: ((kScreenWidth - 28) - 3*10)/4, height: 24)
+        return collectionViewLayout
+    }()
+    
+    //加载数据
+    func reloadData() {
+        //collectionView重新加载数据
+        self.collectionView.reloadData()
+        //更新collectionView的高度约束
+        let contentSize = self.collectionView.collectionViewLayout.collectionViewContentSize
+        collectionView.snp.makeConstraints { (make) in
+            make.top.equalTo(10)
+            make.bottom.equalTo(-10)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(contentSize.height)
+        }
+        self.collectionView.collectionViewLayout.invalidateLayout()
+    }
+}
+
+extension PublishTopicHeaderView: UICollectionViewDelegateFlowLayout,UICollectionViewDataSource {
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return 5
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell = PublishSelTopicCollectionCell.cellWith(collectionView: collectionView, indexPath: indexPath)
+        return cell
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
+        return UIEdgeInsets(top: 0, left: 14, bottom: 0, right: 14)
+    }
+    
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        print("点击了collection----\(indexPath.row)")
+    }
+    
+}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddTopic/View/PublishTopicItemCell.swift

@@ -0,0 +1,92 @@
+//
+//  PublishTopicItemCell.swift
+//  RainbowPlanet
+//
+//  Created by Christopher on 2019/6/17.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+
+class PublishTopicItemCell: UITableViewCell {
+    
+    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> PublishTopicItemCell {
+        let ID = "PublishTopicItemCell"
+        tableView.register(PublishTopicItemCell.self, forCellReuseIdentifier: ID)
+        let cell : PublishTopicItemCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! PublishTopicItemCell
+        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(selImageView)
+        addSubview(titleLabel)
+        addSubview(joinLabel)
+    }
+    
+    private func setupLayouts() {
+        selImageView.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-14)
+            make.width.equalTo(16)
+            make.height.equalTo(11)
+        }
+        titleLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(14)
+            make.width.lessThanOrEqualTo(225 * kScaleWidth)
+            make.height.equalTo(21)
+        }
+        joinLabel.snp.makeConstraints { (make) in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(titleLabel.snp_right).offset(15)
+            make.right.lessThanOrEqualTo(selImageView.snp_left).offset(-15)
+            make.height.equalTo(17)
+        }
+    }
+    
+    private lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel()
+        titleLabel.text = "电影里教会我的事"
+        titleLabel.textColor = k333333Color
+        titleLabel.font = kRegularFont15
+        titleLabel.textAlignment = .left
+        return titleLabel
+    }()
+    
+    private lazy var joinLabel: UILabel = {
+        let joinLabel = UILabel()
+        joinLabel.text = "3000人参与"
+        joinLabel.textColor = kDDDDDDColor
+        joinLabel.font = kRegularFont12
+        joinLabel.textAlignment = .left
+        return joinLabel
+    }()
+    
+    lazy var selImageView : UIImageView = {
+        let selImageView = UIImageView()
+        selImageView.image = kImage(name: "edit_topic_pitchon")
+        return selImageView
+    }()
+    
+}

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/View/PublishEditAddAddressCell.swift

@@ -47,9 +47,9 @@ class PublishEditAddAddressCell: UITableViewCell {
     
     private func setupLayouts() {
         iconImageView.snp.makeConstraints { (make) in
-            make.top.equalTo(20)
+            make.centerY.equalToSuperview()
             make.left.equalTo(14)
-            make.size.equalTo(24)
+            make.size.equalTo(16)
         }
         arrowImageView.snp.makeConstraints { (make) in
             make.right.equalToSuperview().offset(-19)
@@ -73,7 +73,7 @@ class PublishEditAddAddressCell: UITableViewCell {
     
     lazy var iconImageView : UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "page05")
+        iconImageView.image = kImage(name: "edit_ico_address")
         return iconImageView
     }()
     

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishEditController/View/PublishEditAddTopicCell.swift

@@ -47,9 +47,9 @@ class PublishEditAddTopicCell: UITableViewCell {
     
     private func setupLayouts() {
         iconImageView.snp.makeConstraints { (make) in
-            make.top.equalTo(20)
+            make.centerY.equalToSuperview()
             make.left.equalTo(14)
-            make.size.equalTo(24)
+            make.size.equalTo(16)
         }
         arrowImageView.snp.makeConstraints { (make) in
             make.right.equalToSuperview().offset(-19)
@@ -73,7 +73,7 @@ class PublishEditAddTopicCell: UITableViewCell {
     
     lazy var iconImageView : UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "page05")
+        iconImageView.image = kImage(name: "edit_ico_topic")
         return iconImageView
     }()
     

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_ico_address.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_ico_address@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_ico_address@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_ico_topic.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_ico_topic@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_ico_topic@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_topic_delete.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_topic_delete@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_topic_delete@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

RainbowPlanet/RainbowPlanet/Supporting Files/PublishModule.xcassets/edit_topic_pitchon.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_topic_pitchon@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "edit_topic_pitchon@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}