修改了部分bug

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityPostDetailModel.swift

@@ -27,6 +27,7 @@ class CommunityPostDetailModel : NSObject, Mappable{
 	var pv : Int?
 	var title : String?
 	var topic : [CommunityPostDetailTopicModel]?
+    var topicIds : String?
 	var type : String?
 	var uid : Int?
 	var username : String?
@@ -69,6 +70,7 @@ class CommunityPostDetailModel : NSObject, Mappable{
 		video <- map["video"]
 		willCollectBean <- map["will_collect_bean"]
         collectCount <- map["collect_count"]
+        topicIds <- map["topic_ids"]
 		
 	}
 

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityPostsModel.swift

@@ -35,6 +35,7 @@ class CommunityPostDataModel : NSObject, Mappable{
     var isLike : Int?
     var praiseCount : Int?
     var title : String?
+    var content : String?
     var type : String?
     var uid : Int?
     var username : String?
@@ -57,6 +58,7 @@ class CommunityPostDataModel : NSObject, Mappable{
         type <- map["type"]
         uid <- map["uid"]
         username <- map["username"]
+        content <- map["content"]
         
     }
     

RainbowPlanet/RainbowPlanet/Model/CommunityModel/CommunityTopicsModel.swift

@@ -28,7 +28,7 @@ class CommunityTopicsModel : NSObject, Mappable{
 
 class CommunityTopicDataModel : NSObject, Mappable{
     
-    var followCount : Int?
+    var followCount : String?
     var id : Int?
     var img : String?
     var name : String?

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/TitleContent/CardContentTitleTableViewCell.swift

@@ -106,8 +106,8 @@ class CardContentTitleTableViewCell: UITableViewCell {
                     subtitleLabel.isHidden = false
                     var str = communityRecommendDataModel?.content ?? ""
                     
-                    if str.count >= 46 {
-                        str = String(str.prefix(46) + "...更多")
+                    if str.count >= 45 {
+                        str = String(str.prefix(45) + "...更多")
                         let str1 = str.suffix(2)
                         subtitleLabel.attributedText = str.changeTextColorFont(rangStr: String(str1), rangColor: k313334Color, font: kMediumFont14!)
                         
@@ -146,8 +146,8 @@ class CardContentTitleTableViewCell: UITableViewCell {
                 if PostType(rawValue: communityRecommendDataModel?.type ?? "image") != .html {
                     subtitleLabel.isHidden = false
                     var str = communityRecommendDataModel?.content ?? ""
-                    if str.count >= 46 {
-                        str = String(str.prefix(46) + "...更多")
+                    if str.count >= 45 {
+                        str = String(str.prefix(45) + "...更多")
                         let str1 = str.suffix(2)
                         subtitleLabel.attributedText = str.changeTextColorFont(rangStr: String(str1), rangColor: k313334Color, font: kMediumFont14!)
                         

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/User/CardContentUserTableViewCell.swift

@@ -85,7 +85,7 @@ class CardContentUserTableViewCell: UITableViewCell {
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
         avatarButton.setImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
-        avatarButton.imageView?.contentMode = .scaleAspectFit
+        avatarButton.imageView?.contentMode = .scaleAspectFill
         avatarButton.cornerRadius = 20
         avatarButton.masksToBounds = true
         avatarButton.rx.tap.subscribe(onNext: {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FeaturedTopics/FeaturedTopicsTableViewCell.swift

@@ -7,6 +7,7 @@
 // 精选话题cell
 
 import UIKit
+import SwiftyMediator
 
 class FeaturedTopicsTableViewCell: UITableViewCell {
 
@@ -90,7 +91,9 @@ extension FeaturedTopicsTableViewCell: UICollectionViewDelegateFlowLayout,UIColl
     }
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "CommunityFeaturedTopics"), object: communityRecommendTypeDataModels?[indexPath.row])
+        let communityRecommendTypeDataModel = communityRecommendTypeDataModels?[indexPath.row]
+        Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityRecommendTypeDataModel?.id ?? 0))
+
 
     }
     

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/FollowStatus/CommunityFollowStatusTableViewCell.swift

@@ -147,7 +147,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
         avatarButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
-        avatarButton.imageView?.contentMode = .scaleAspectFit
+        avatarButton.imageView?.contentMode = .scaleAspectFill
         avatarButton.cornerRadius = 14
         avatarButton.masksToBounds = true
         avatarButton.rx.tap.subscribe(onNext: { [weak self] (data) in
@@ -187,7 +187,7 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     private lazy var avatarOtherButton: UIButton = {
         let avatarOtherButton = UIButton(type: UIButton.ButtonType.custom)
         avatarOtherButton.setImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
-        avatarOtherButton.imageView?.contentMode = .scaleAspectFit
+        avatarOtherButton.imageView?.contentMode = .scaleAspectFill
         avatarOtherButton.cornerRadius = 20
         avatarOtherButton.masksToBounds = true
         avatarOtherButton.rx.tap.subscribe(onNext: {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/RecommendFollow/CommunityRecommendFollowCollectionViewCell.swift

@@ -84,7 +84,7 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
         avatarButton.setImage(kImage(name: "pic_preload"), for: UIControl.State.normal)
-        avatarButton.imageView?.contentMode = .scaleAspectFit
+        avatarButton.imageView?.contentMode = .scaleAspectFill
         avatarButton.cornerRadius = 30
         avatarButton.masksToBounds = true
         avatarButton.isUserInteractionEnabled = false

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import JXSegmentedView
+import SwiftyMediator
 
 class CommunityViewController: BaseViewController {
     
@@ -64,7 +65,6 @@ class CommunityViewController: BaseViewController {
             [weak self] in
             let vc = SearchViewController()
             vc.searchType = .content
-            let nav = BaseNavigationViewController(rootViewController: vc)
             self?.navigationController?.pushViewController(vc, animated: true)
 
         }
@@ -206,23 +206,14 @@ class CommunityViewController: BaseViewController {
                 self?.navigationController?.pushViewController(vc, animated: true)
                 break
             case .topic?: //话题
-                let vc = CommunityFeaturedTopicsViewController()
-                vc.id = communityRecommendTypeDataModel?.linkContentId ?? 0
-                self?.navigationController?.pushViewController(vc, animated: true)
+                Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityRecommendTypeDataModel?.linkContentId ?? 0))
                 break
             default:
                 break
                 
             }
         }
-        
-        // 精选话题
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityFeaturedTopics"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
-            let communityRecommendTypeDataModel = notification.object as? CommunityRecommendTypeDataModel
-            let vc = CommunityFeaturedTopicsViewController()
-            vc.id = communityRecommendTypeDataModel?.id ?? 0
-            self?.navigationController?.pushViewController(vc, animated: true)
-        }
+
         
         // 星球H5
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityPlanetH5"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFindFriends/View/CommunityFindFriendsView.swift

@@ -49,8 +49,7 @@ class CommunityFindFriendsView: BaseView {
         picButton.cornerRadius = 5
         picButton.masksToBounds = true
         picButton.rx.tap.subscribe(onNext: { [weak self] _ in
-            let vc = CommunityShareActivityViewController()
-            self?.findViewController().navigationController?.pushViewController(vc, animated: true)
+            ShareCommunityView.inviteGoodFriends()
         }).disposed(by: disposeBag)
         return picButton
     }()

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFindFriends/ViewController/CommunityFindFriendsViewController.swift

@@ -46,7 +46,6 @@ class CommunityFindFriendsViewController: BaseViewController {
             [weak self] in
             let vc = SearchViewController()
             vc.searchType = .user
-            let nav = BaseNavigationViewController(rootViewController: vc)
             self?.navigationController?.pushViewController(vc, animated: true)
 
         }
@@ -92,7 +91,7 @@ class CommunityFindFriendsViewController: BaseViewController {
 extension CommunityFindFriendsViewController {
     /// 获取关注列表
     func cmsMemberListApi() {
-        SwiftMoyaNetWorkServiceCMS.shared().cmsMemberListApi {
+        SwiftMoyaNetWorkServiceCMS.shared().cmsMemberListApi(takeCount: 50) {
             [weak self] (cmsMemberListModel) -> (Void) in
             let cmsMemberListModel = cmsMemberListModel as? CMSMemberListModel
             self?.cmsMemberModels = (cmsMemberListModel?.list)!

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

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 class CommunityMyFollowTopicController: BaseViewController {
         
@@ -117,9 +118,9 @@ extension CommunityMyFollowTopicController: UITableViewDataSource, UITableViewDe
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
-        let vc = CommunityFeaturedTopicsViewController()
-        vc.id = communityMemberFollowTopicListDataModels[indexPath.row].topicId ?? 0
-        self.navigationController?.pushViewController(vc, animated: true)
+        
+        Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityMemberFollowTopicListDataModels[indexPath.row].topicId ?? 0))
+
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/Controller/CommunityRecommendController.swift

@@ -184,7 +184,6 @@ class CommunityRecommendController: BaseViewController {
             [weak self] (page) in
             self?.communityPostDetailApi()
             self?.communityPostCommentApi(page: page)
-            self?.communityPostsApi(page: page)
         }
         tableView.addFooterWithWithHeader(withAutomaticallyRefresh: true) {
             [weak self] (page) in
@@ -320,6 +319,7 @@ extension CommunityRecommendController {
     func communityPostDetailApi() {
         SwiftMoyaNetWorkServiceCommunity.shared().communityPostDetailApi(id: id) { [weak self] (communityPostDetailModel) -> (Void) in
             self?.communityPostDetailModel = communityPostDetailModel as? CommunityPostDetailModel
+            self?.communityPostsApi(page:1)
             self?.avatarButton.kf.setImage(with: kURLImage(name: self?.communityPostDetailModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             self?.nameButton.setTitle(self?.communityPostDetailModel?.username, for: UIControl.State.normal)
             if self?.communityPostDetailModel?.uid == UserModel.shared().getModel()?.uid {
@@ -363,6 +363,7 @@ extension CommunityRecommendController {
             
             self?.tableView.reloadData()
             VirusViewModel.shared.read(communityPostDetailModel: (self?.communityPostDetailModel)!)
+
         }
     }
     
@@ -388,7 +389,7 @@ extension CommunityRecommendController {
     ///
     /// - Parameter page: 分页
     func communityPostsApi(page:Int) {
-        SwiftMoyaNetWorkServiceCommunity.shared().communityPostsApi(page: page) {
+        SwiftMoyaNetWorkServiceCommunity.shared().communityPostsApi(topicIds:"[\(self.communityPostDetailModel?.topicIds ?? "")]", page: page) {
             [weak self] (communityPostsModel) -> (Void) in
             let communityPostsModel = communityPostsModel as? CommunityPostsModel
             if communityPostsModel?.pagination?.currentPage ?? 1  <= communityPostsModel?.pagination?.totalPages ?? 1 {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/HTMLCell/CommunityRecommendDetailHTMLTableViewCell.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import WebKit
+import SwiftyMediator
 
 class CommunityRecommendDetailHTMLTableViewCell: UITableViewCell {
     
@@ -342,9 +343,7 @@ extension CommunityRecommendDetailHTMLTableViewCell: UICollectionViewDelegateFlo
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let communityPostDetailTopicModel = communityPostDetailModel?.topic?[indexPath.row]
         if let id = communityPostDetailTopicModel?.id {
-            let vc = CommunityFeaturedTopicsViewController()
-            vc.id = id
-            findViewController().navigationController?.pushViewController(vc, animated: true)
+            Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: id ))
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityRecommendDetail/View/imageCell/RecommendDetailContentCell.swift

@@ -7,6 +7,8 @@
 //  推荐图文内容--图文Cell
 
 import UIKit
+import SwiftyMediator
+
 
 class RecommendDetailContentCell: UITableViewCell {
     
@@ -285,9 +287,7 @@ extension RecommendDetailContentCell: UICollectionViewDelegateFlowLayout,UIColle
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let communityPostDetailTopicModel = communityPostDetailModel?.topic?[indexPath.row]
         if let id = communityPostDetailTopicModel?.id {
-            let vc = CommunityFeaturedTopicsViewController()
-            vc.id = id
-            findViewController().navigationController?.pushViewController(vc, animated: true)
+            Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id:id))
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoCoverCollectionCell.swift

@@ -630,7 +630,7 @@ class CommunityVideoCoverCollectionCell: UICollectionViewCell {
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
         avatarButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
-        avatarButton.imageView?.contentMode = .scaleAspectFit
+        avatarButton.imageView?.contentMode = .scaleAspectFill
         avatarButton.cornerRadius = 15
         avatarButton.masksToBounds = true
         avatarButton.rx.tap.subscribe(onNext: {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/View/CommunityVideoTopicView.swift

@@ -7,6 +7,8 @@
 //  话题标签View
 
 import UIKit
+import SwiftyMediator
+
 
 class CommunityVideoTopicView: BaseView {
     
@@ -76,9 +78,7 @@ extension CommunityVideoTopicView: UICollectionViewDelegateFlowLayout,UICollecti
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let topicMdl = topicArray?[indexPath.row]
-        let vc = CommunityFeaturedTopicsViewController()
-        vc.id = topicMdl?.id ?? 0
-        findViewController().navigationController?.pushViewController(vc, animated: true)
+        Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: topicMdl?.id ?? 0))
     }
     
 }

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/OtherPersonalCenter/ViewController/OtherPersonalCenterViewController.swift

@@ -45,7 +45,6 @@ class OtherPersonalCenterViewController: BaseViewController {
         navigationBar.backgroundImageView.frame = CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenWidth)
         navigationBar.backgroundImageView.contentMode = .scaleAspectFill
         navigationBar.layer.masksToBounds = true
-        navigationBar.wr_setRightButton(image: kImage(name: "center_share")!)
         // 设置导航栏显示图片
         navigationBar.barBackgroundImage = UIImage(named: "pic_preload")
         // 设置初始导航栏透明度
@@ -71,9 +70,6 @@ class OtherPersonalCenterViewController: BaseViewController {
     
     
     override func setupData() {
-        navigationBar.onClickRightButton = {
-            ShareCommunityView.inviteGoodFriends()
-        }
         reloadData()
         pagingView.mainTableView.addHeaderWithHeader(withBeginRefresh: true, animation: false, refreshBlock: { [weak self] (page) in
             self?.userMemberDetailApi()

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishAddAddress/PublishAddAddressController.swift

@@ -29,13 +29,10 @@ class PublishAddAddressController: BaseViewController {
         BaiduMapManager.shared.startLocation()
         BaiduMapManager.shared.locationSuccessBlock =  {
             [weak self] in
-            print("----定位成功")
             self?.poiList = LocationModel.shared().object()?.poiList ?? []
             self?.addressPOIView.poiList = self?.poiList
         }
-        BaiduMapManager.shared.locationFalseBlock =  {
-            [weak self] in
-            SwiftProgressHUD.shared().showText("定位失败")
+        BaiduMapManager.shared.locationFalseBlock =  {            SwiftProgressHUD.shared().showText("定位失败")
         }
     }
     

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

@@ -13,7 +13,7 @@ class PublishTopicItemCell: UITableViewCell {
     var subTopicModel: CommunityTopicDataModel? {
         didSet {
             titleLabel.text = self.subTopicModel?.name
-            joinLabel.text = "\(self.subTopicModel?.followCount ?? 0)人参与"
+            joinLabel.text = "\(self.subTopicModel?.followCount ?? "0")人参与"
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishSuccess/PublishSuccessController.swift

@@ -41,7 +41,6 @@ class PublishSuccessController: BaseViewController {
         navigationBar.titleLabelColor = kffffffColor
         navigationBar.wr_setLeftButton(image: kImage(name: "navbar_back_white")!)
         navigationBar.onClickLeftButton = {
-            [weak self] in
            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "DismissFromPublishEditVc"), object: nil)
         }
         

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/View/PasswordLoginView.swift

@@ -184,7 +184,7 @@ class PasswordLoginView: BaseView {
         passwordTextField.tintColor = kThemeColor
 
         passwordTextField.rx.text.changed.subscribe(onNext: { [weak self] (text) in
-            self?.passwordTextField.text = String(text?.prefix(16) ?? "") as String
+            TextLimitTool.restrictionInputTextField((self?.passwordTextField)!, maxNumber: 16)
             self?.password = self?.passwordTextField.text ?? ""
             self?.observableString()
         }).disposed(by: disposeBag)

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/TopicSelection/View/TopicSelectionCollectionViewCell.swift

@@ -87,7 +87,7 @@ class TopicSelectionCollectionViewCell: UICollectionViewCell {
     var communityTopicModel: CommunityTopicModel? {
         didSet {
             iconImageView.kf.setImage(with: kURLImage(name: communityTopicModel?.img ?? ""), placeholder: kImage(name: "pic_preload"))
-            titleLabel.text = communityTopicModel?.desc
+            titleLabel.text = communityTopicModel?.name
             selectionButton.isSelected = communityTopicModel?.isSelected ?? false
         }
     }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/Search/View/SearchNavigationbarView.swift

@@ -27,13 +27,13 @@ class SearchNavigationbarView: BaseView {
     override func setupLayouts() {
         cancelButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(14)
-            make.size.equalTo(22)
+            make.left.equalToSuperview().offset(8)
+            make.size.equalTo(44)
         }
         searchbgView.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalTo(-14)
-            make.left.equalTo(cancelButton.snp.right).offset(10)
+            make.left.equalTo(cancelButton.snp.right).offset(2)
             make.height.equalTo(30)
         }
         searchIconImageView.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/View/SearchContentListCollectionCell.swift

@@ -110,7 +110,7 @@ class SearchContentListCollectionCell: UICollectionViewCell {
         titleLabel.textColor = k262626Color
         titleLabel.font = kMediumFont13
         titleLabel.textAlignment = .left
-        titleLabel.numberOfLines = 0
+        titleLabel.numberOfLines = 2
         return titleLabel
     }()
     
@@ -170,17 +170,9 @@ class SearchContentListCollectionCell: UICollectionViewCell {
             contentImageView.kf.setImage(with: kURLImage(name: communityPostDataModel?.img ?? ""), placeholder: kImage(name: "pic_preload"))
             titleLabel.text = communityPostDataModel?.title
             if communityPostDataModel?.title == "" || communityPostDataModel?.title == nil {
-                titleLabel.snp.remakeConstraints { (make) in
-                    make.top.equalTo(contentImageView.snp_bottom).offset(5)
-                    make.left.equalTo(contentImageView.snp_left).offset(10)
-                    make.right.equalTo(contentImageView.snp_right).offset(-10)
-                }
+                titleLabel.text = communityPostDataModel?.content
             }else {
-                titleLabel.snp.remakeConstraints { (make) in
-                    make.top.equalTo(contentImageView.snp_bottom).offset(15)
-                    make.left.equalTo(contentImageView.snp_left).offset(10)
-                    make.right.equalTo(contentImageView.snp_right).offset(-10)
-                }
+                titleLabel.text = communityPostDataModel?.title
             }
             avatarButton.kf.setImage(with: kURLImage(name: communityPostDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             likeBtn.setTitle("\(communityPostDataModel?.praiseCount ?? 0)", for: UIControl.State.normal)

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchContentList/ViewController/SearchContentListViewController.swift

@@ -125,14 +125,13 @@ extension SearchContentListViewController {
                 //label高度
                 var labelHeight : CGFloat = 0
                 //总间距
-                let spacingHeght : CGFloat!
+                let spacingHeght : CGFloat = 35
                 
                 if communityPostDataModel.title == "" || communityPostDataModel.title == nil  {
-                    labelHeight = 0
-                    spacingHeght = 25
+                    let content = "\(communityPostDataModel.content?.prefix(13) ?? "")"
+                    labelHeight = (content.heightForComment(font: kMediumFont13!, width: (((kScreenWidth - 15)/2) - 20)))
                 }else {
                     labelHeight = (communityPostDataModel.title?.heightForComment(font: kMediumFont13!, width: (((kScreenWidth - 15)/2) - 20)))!
-                    spacingHeght = 35
                 }
                 
                 //button高度

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchResult/ViewController/SearchResultViewController.swift

@@ -88,15 +88,6 @@ class SearchResultViewController: BaseViewController {
             }
         }
         
-        // 话题详情页面
-        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("CommunityFeaturedTopics"), object: nil, queue: OperationQueue.main) {
-            [weak self] (notification) in
-            let communityTopicDataModel = notification.object as! CommunityTopicDataModel
-            let vc = CommunityFeaturedTopicsViewController()
-            vc.id = communityTopicDataModel.id!
-            self?.navigationController?.pushViewController(vc, animated: true)
-        }
-        
         // 内容详情页面
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("SearchContentList"), object: nil, queue: OperationQueue.main) {
             [weak self] (notification) in

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/View/SearchTopicListTableViewCell.swift

@@ -117,7 +117,7 @@ class SearchTopicListTableViewCell: UITableViewCell {
         didSet {
             iconButton.kf.setImage(with: kURLImage(name: communityTopicDataModel?.img ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "pic_preload"))
             titleLabel.text = communityTopicDataModel?.name
-            subtitleLabel.text = "\(communityTopicDataModel?.followCount ?? 0)人参与"
+            subtitleLabel.text = "\(communityTopicDataModel?.followCount ?? "0")人参与"
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchTopicList/ViewController/SearchTopicListViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import JXSegmentedView
+import SwiftyMediator
 class SearchTopicListViewController: UIViewController {
 
     var keyWord : String = ""
@@ -107,7 +108,9 @@ extension SearchTopicListViewController :UITableViewDataSource,UITableViewDelega
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let communityTopicDataModel = communityTopicModels[indexPath.row]
-        NotificationCenter.default.post(name: NSNotification.Name("CommunityFeaturedTopics"), object: communityTopicDataModel)
+        if communityTopicDataModel.id != nil {
+            Mediator.push(CommunityRouterModuleType.pushFeaturedTopics(id: communityTopicDataModel.id ?? 0))
+        }
     }
     
 }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/View/SearchUserLitTableViewCell.swift

@@ -54,7 +54,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
         titleButton.snp_makeConstraints { (make) in
             make.top.equalTo(avatarButton).offset(-3)
             make.left.equalTo(avatarButton.snp_right).offset(10)
-            make.right.equalTo(-90)
+            make.right.equalTo(-14)
             make.height.equalTo(23)
         }
         topicLabel.snp_makeConstraints { (make) in
@@ -80,7 +80,7 @@ class SearchUserLitTableViewCell: UITableViewCell {
     private lazy var avatarButton: UIButton = {
         let avatarButton = UIButton(type: UIButton.ButtonType.custom)
         avatarButton.setImage(kImage(name: "default_avatar"), for: UIControl.State.normal)
-        avatarButton.imageView?.contentMode = .scaleAspectFit
+        avatarButton.imageView?.contentMode = .scaleAspectFill
         avatarButton.isUserInteractionEnabled = false
         avatarButton.cornerRadius = 22
         avatarButton.masksToBounds = true

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Category/ViewController/CategoryViewController.swift

@@ -51,7 +51,6 @@ class CategoryViewController: BaseViewController {
             [weak self] in
             let vc = SearchViewController()
             vc.searchType = .product
-            let nav = BaseNavigationViewController(rootViewController: vc)
             self?.navigationController?.pushViewController(vc, animated: true)
 
         }).disposed(by: disposeBag)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/ViewController/ShoppingMallViewController.swift

@@ -73,7 +73,6 @@ class ShoppingMallViewController: BaseViewController {
             [weak self] in
             let vc = SearchViewController()
             vc.searchType = .product
-            let nav = BaseNavigationViewController(rootViewController: vc)
             self?.navigationController?.pushViewController(vc, animated: true)
 
         }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Special/ViewController/SpecialViewController.swift

@@ -57,7 +57,6 @@ class SpecialViewController: BaseViewController {
             [weak self] in
             let vc = SearchViewController()
             vc.searchType = .product
-            let nav = BaseNavigationViewController(rootViewController: vc)
             self?.navigationController?.pushViewController(vc, animated: true)
 
         }).disposed(by: disposeBag)

RainbowPlanet/RainbowPlanet/Router/CommunityRouterModuleType.swift

@@ -13,9 +13,11 @@ import SwiftyMediator
 ///
 /// - pushPostDetailContent: 跳转帖子内容
 /// - pushPostDetailVoide: 跳转视频内容
+/// - pushFeaturedTopics: 话题内容
 public enum CommunityRouterModuleType: MediatorTargetType {
     case pushPostDetailContent(postId: String)
     case pushPostDetailVoide(postId: String)
+    case pushFeaturedTopics(id : Int)
 }
 
 extension CommunityRouterModuleType: MediatorSourceType {
@@ -29,6 +31,12 @@ extension CommunityRouterModuleType: MediatorSourceType {
             let vc = CommunityVideoListController()
             vc.contentId = Int(postId) ?? 0
             return vc
+        case .pushFeaturedTopics(let id):
+            let vc = CommunityFeaturedTopicsViewController()
+            vc.id = id
+            return vc
         }
     }
 }
+
+

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCMS/SwiftMoyaNetWorkServiceCMS.swift

@@ -80,11 +80,9 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
     ///   - completion: completion description
     func cmsMemberListApi(takeCount:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
-        if takeCount == 0 {
-            parameters.updateValue("", forKey: "take_count")
-        }else {
-            parameters.updateValue(takeCount, forKey: "take_count")
-        }
+
+        parameters.updateValue(takeCount, forKey: "take_count")
+
         SwiftMoyaNetWorkManager.shared.requestObject(CMSMemberListModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsMemberList(parameters: parameters))) {
             (cmsMemberListModel) in
             completion(cmsMemberListModel)

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaNetWorkServiceCommunity.swift

@@ -100,7 +100,6 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     ///
     /// - Parameters:
     ///   - keyword: 关键字搜索：标题，内容
-    ///   - topicIds: 话题ids，json字符串，[1,2],推荐内容用
     ///   - page: 分页
     ///   - completion: 回调
     func communityPostsApi(keyword:String = "",topicIds : String = "",page:Int = 1,completion: @escaping apiCallBack) {

RainbowPlanet/RainbowPlanet/ViewModel/UserMemberTotalBeanViewModel/UserMemberTotalBeanViewModel.swift

@@ -16,17 +16,23 @@ class UserMemberTotalBeanViewModel: NSObject {
     static let shared : UserMemberTotalBeanViewModel = UserMemberTotalBeanViewModel()
     
     func userMemberGetTotalBeanApi() {
-        SwiftMoyaNetWorkServiceUser.shared().userMemberGetTotalBeanApi(completion: { (totalBeanModel) -> (Void) in
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "userMemberGetTotalBean"), object: totalBeanModel)
-        })
+        if UserModel.shared().getModel()?.token != nil {
+            SwiftMoyaNetWorkServiceUser.shared().userMemberGetTotalBeanApi(completion: { (totalBeanModel) -> (Void) in
+                if UserModel.shared().getModel()?.token != nil {
+                    
+                }
+            })
+        }
     }
     
     func userMemberGetTotalBeanApiInterval() {
         Observable<Int>.interval(60, scheduler: MainScheduler.instance).subscribe(onNext: { _ in
-            SwiftMoyaNetWorkServiceUser.shared().userMemberGetTotalBeanApi(completion: { (totalBeanModel) -> (Void) in
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "userMemberGetTotalBean"), object: totalBeanModel)
-                
-            })
+            if UserModel.shared().getModel()?.token != nil {
+                SwiftMoyaNetWorkServiceUser.shared().userMemberGetTotalBeanApi(completion: { (totalBeanModel) -> (Void) in
+                    NotificationCenter.default.post(name: NSNotification.Name(rawValue: "userMemberGetTotalBean"), object: totalBeanModel)
+                    
+                })
+            }
         }).disposed(by: disposeBag)
     }