除了发布内容,优化基本完成,接下来优化发布内容

RainbowPlanet/RainbowPlanet/Macro/ColorMacro.swift

@@ -149,3 +149,5 @@ let k7AD489Color = UIColor(hexString: "7AD489")
 let kFF5E5EColor = UIColor(hexString: "FF5E5E")
 
 let kE5E5E5Color = UIColor(hexString: "E5E5E5")
+
+let kA8ACBCColor = UIColor(hexString: "A8ACBC")

RainbowPlanet/RainbowPlanet/Manager/MJRefreshManager/MJRefreshManager.swift

@@ -17,7 +17,7 @@ class MJRefreshManager: NSObject {
         tableView?.ly_endLoading()
     }
     
-    private class func hiddenHeaderWithFooterNONetWork(tableView : UITableView?) {
+    class func hiddenHeaderWithFooterNONetWork(tableView : UITableView?) {
         DIYEmptyView.emptyNoDataActionTableView(tableView: tableView, btnClickBlock: {
             [weak tableView] in
             tableView?.mj_header.beginRefreshing()
@@ -27,14 +27,15 @@ class MJRefreshManager: NSObject {
         tableView?.ly_endLoading()
     }
     
-    private class func hiddenHeaderWithFooterNOData(tableView : UITableView?) {
-        DIYEmptyView.emptyNoDataTableView(tableView: tableView)
+    class func hiddenHeaderWithFooterNOData(tableView : UITableView?) {
+        DIYEmptyView.emptyNoDataTableView(tableView: tableView,imageStr: .one,detailStr: .one)
         tableView?.endHeaderRefresh()
         tableView?.endFooterRefresh()
         tableView?.ly_endLoading()
     }
     
     class func hiddenHeaderWithFooter(tableView:UITableView?,loadingStatus:SwiftMoyaNetWorkManagerLoadingStatus) {
+        tableView?.isHiddenFooter(true)
         if loadingStatus == .noData {
             MJRefreshManager.hiddenHeaderWithFooterNOData(tableView: tableView)
         }else if loadingStatus == .noNetwork {
@@ -68,7 +69,7 @@ class MJRefreshManager: NSObject {
         collectionView?.ly_endLoading()
     }
     
-    private class func hiddenHeaderWithFooterNONetWork(collectionView : UICollectionView?) {
+    class func hiddenHeaderWithFooterNONetWork(collectionView : UICollectionView?) {
         DIYEmptyView.emptyNoDataActionCollectionView(collectionView: collectionView, btnClickBlock: {
             [weak collectionView] in
             collectionView?.mj_header.beginRefreshing()
@@ -78,7 +79,7 @@ class MJRefreshManager: NSObject {
         collectionView?.ly_endLoading()
     }
     
-    private class func hiddenHeaderWithFooterNOData(collectionView : UICollectionView?) {
+    class func hiddenHeaderWithFooterNOData(collectionView : UICollectionView?) {
         DIYEmptyView.emptyNoDataCollectionView(collectionView: collectionView)
         collectionView?.endHeaderRefresh()
         collectionView?.endFooterRefresh()
@@ -86,6 +87,7 @@ class MJRefreshManager: NSObject {
     }
     
     class func hiddenHeaderWithFooter(collectionView:UICollectionView?,loadingStatus:SwiftMoyaNetWorkManagerLoadingStatus) {
+        collectionView?.isHiddenFooter(true)
         if loadingStatus == .noData {
             MJRefreshManager.hiddenHeaderWithFooterNOData(collectionView: collectionView)
         }else if loadingStatus == .noNetwork {

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

@@ -77,8 +77,8 @@ class CardContentUserTableViewCell: UITableViewCell {
         }
         followButton.snp_makeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.height.equalTo(26)
-            make.width.equalTo(64)
+            make.height.equalTo(28)
+            make.width.equalTo(60)
             make.right.equalTo(setButton.snp_left).offset(-11)
         }
     }
@@ -121,11 +121,13 @@ class CardContentUserTableViewCell: UITableViewCell {
     
     private lazy var followButton: UIButton = {
         let followButton = UIButton(type: UIButton.ButtonType.custom)
-        followButton.titleLabel?.font = kMediumFont13
-        followButton.layer.cornerRadius = 13
+        followButton.titleLabel?.font = kRegularFont13
+        followButton.layer.cornerRadius = 14
         followButton.layer.masksToBounds = true
-        followButton.layer.borderWidth = 1
+        followButton.layer.borderWidth = 0.5
+        followButton.layer.borderColor = kThemeColor.cgColor
         followButton.rx.tap.subscribe(onNext: {[weak self] (data) in
+            followButton.isEnabled = false
             if let followClosure = self?.followClosure {
                 followClosure()
             }
@@ -158,7 +160,8 @@ class CardContentUserTableViewCell: UITableViewCell {
             avatarButton.kf.setImage(with: kURLImage(name: communityRecommendDataModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(communityRecommendDataModel?.username, for: UIControl.State.normal)
             timeLabel.text = communityRecommendDataModel?.createdAt
-            followType = FollowType(rawValue: communityRecommendDataModel?.isFollow ?? 0)
+            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: communityRecommendDataModel?.isFollow ?? 0))
+
             if communityRecommendDataModel?.uid == UserModel.shared().getModel()?.uid {
                 followButton.isHidden = true
             }else {
@@ -173,11 +176,11 @@ class CardContentUserTableViewCell: UITableViewCell {
             avatarButton.kf.setImage(with: kURLImage(name: communityFollowDataModel?.relateData?.avatar ?? ""), for: UIControl.State.normal , placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(communityFollowDataModel?.relateData?.username, for: UIControl.State.normal)
             timeLabel.text = communityFollowDataModel?.relateData?.createdAt
-            followType = FollowType(rawValue: communityFollowDataModel?.relateData?.isFollow ?? 0)
+            
+            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: communityFollowDataModel?.relateData?.isFollow ?? 0))
 
             if communityFollowDataModel?.relateData?.uid == UserModel.shared().getModel()?.uid {
                 followButton.isHidden = true
-
             }else {
                 followButton.isHidden = false
 
@@ -185,41 +188,6 @@ class CardContentUserTableViewCell: UITableViewCell {
         }
     }
     
-    var followType: FollowType! {
-        didSet {
-            switch followType {
-            case .futureFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(kThemeColor, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_attention"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kThemeColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                
-                break
-            case .alreadyFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_followed"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kf7f8faColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kf7f8faColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                break
-            case .mutualFollow?:
-                followButton.setTitle("互相关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                followButton.setImage(nil, for: UIControl.State.normal)
-                followButton.layer.borderColor = kCCCCCCColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 0)
-                
-                break
-            default:
-                break
-            }
-        }
-    }
-    
     func pushCommunityUser() {
         if UserModel.isTokenNil()  {
             kAppDelegate.setLogin()

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

@@ -98,8 +98,8 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
         followButton.snp_makeConstraints { (make) in
             make.centerY.equalTo(avatarOtherButton)
             make.right.equalToSuperview().offset(-15)
-            make.height.equalTo(26)
-            make.width.equalTo(64)
+            make.height.equalTo(28)
+            make.width.equalTo(60)
         }
         
         twoCardView.snp_makeConstraints { (make) in
@@ -214,10 +214,10 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
     private lazy var followButton: UIButton = {
         let followButton = UIButton(type: UIButton.ButtonType.custom)
         followButton.titleLabel?.font = kRegularFont13
-        followButton.layer.cornerRadius = 13
+        followButton.layer.cornerRadius = 14
         followButton.layer.masksToBounds = true
-        followButton.layer.borderWidth = 0.5
         followButton.rx.tap.subscribe(onNext: {[weak self] (data) in
+            followButton.isEnabled = false
             if let followClosure = self?.followClosure {
                 followClosure()
             }
@@ -317,7 +317,8 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
                 }else {
                     followButton.isHidden = false
                 }
-                followType = FollowType(rawValue: communityFollowDataModel?.relateData?.isFollow ?? 0)
+                CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: communityFollowDataModel?.relateData?.isFollow ?? 0))
+
                 oneCardView.isHidden = false
                 twoCardView.isHidden = true
                 threeCardView.isHidden = true
@@ -432,41 +433,6 @@ class CommunityFollowStatusTableViewCell: UITableViewCell {
         }
     }
     
-    var followType: FollowType! {
-        didSet {
-            switch followType {
-            case .futureFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(kThemeColor, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_attention"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kThemeColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                
-                break
-            case .alreadyFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k666666Color, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_followed"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kf7f8faColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kf7f8faColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                break
-            case .mutualFollow?:
-                followButton.setTitle("互相关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k666666Color, for: UIControl.State.normal)
-                followButton.setImage(nil, for: UIControl.State.normal)
-                followButton.layer.borderColor = kCCCCCCColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 0)
-                
-                break
-            default:
-                break
-            }
-        }
-    }
-    
     
     /// 内容详情页面
     @objc func contentDetail() {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoCollectionViewCell.swift

@@ -75,9 +75,9 @@ class PopularVideoCollectionViewCell: UICollectionViewCell {
     
     private lazy var nameLabel: UILabel = {
         let nameLabel = UILabel()
-        nameLabel.text = "彩虹星球小太阳"
         nameLabel.textColor = kffffffColor
         nameLabel.font = kMediumFont12
+        nameLabel.textAlignment = .center
         return nameLabel
     }()
     

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

@@ -75,8 +75,8 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
         followButton.snp_makeConstraints { (make) in
             make.top.equalTo(topicLabel.snp_bottom).offset(16)
             make.centerX.equalToSuperview()
-            make.height.equalTo(26)
-            make.width.equalTo(90)
+            make.height.equalTo(28)
+            make.width.equalTo(60)
         }
         
     }
@@ -110,12 +110,13 @@ class CommunityRecommendFollowCollectionViewCell: UICollectionViewCell {
     
     private lazy var followButton: UIButton = {
         let followButton = UIButton(type: UIButton.ButtonType.custom)
-        followButton.titleLabel?.font = kBoldFont16
-        followButton.layer.cornerRadius = 13
+        followButton.titleLabel?.font = kRegularFont13
+        followButton.layer.cornerRadius = 14
         followButton.layer.masksToBounds = true
-        followButton.layer.borderWidth = 1
+        followButton.layer.borderWidth = 0.5
         followButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
+            followButton.isEnabled = false
             if let followClosure = self?.followClosure {
                 followClosure()
             }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -237,8 +237,8 @@ extension CommunityFollowViewController {
                     self?.communityFollowDataModels?.removeAll()
                     self?.tableView.resetNoMoreData()
                 }
-                self?.communityFollowDataModels = (self?.communityFollowDataModels)! + (communityFollowFeedModel?.data!)!
-                if (self?.communityFollowDataModels?.isEmpty)! {
+                self?.communityFollowDataModels = (self?.communityFollowDataModels ?? Array<CommunityFollowDataModel>()) + (communityFollowFeedModel?.data ?? Array<CommunityFollowDataModel>())
+                if self?.communityFollowDataModels?.isEmpty ?? true {
                     self?.tableView.tableHeaderView = self?.followTableHeaderView
                 }
                 self?.tableView.reloadData()
@@ -253,7 +253,7 @@ extension CommunityFollowViewController {
             MJRefreshManager.hiddenHeaderWithFooter(tableView: self.tableView)
         }
         
-        
+
     }
     
     /// 评论

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -133,18 +133,17 @@ class CommunityFeaturedTopicsViewController: BaseViewController {
     
     private lazy var focusButton: UIButton = {
         let focusButton = UIButton(type: UIButton.ButtonType.custom)
-        focusButton.setImage(kImage(name: "star_attention"), for: UIControl.State.normal)
-        focusButton.setImage(kImage(name: "star_followed"), for: UIControl.State.selected)
-        focusButton.setTitleColor(k666666Color, for: UIControl.State.selected)
-        focusButton.setTitleColor(kThemeColor, for: UIControl.State.normal)
+        focusButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        focusButton.setTitleColor(kThemeColor, for: UIControl.State.selected)
         focusButton.setTitle("关注", for: UIControl.State.normal)
-        focusButton.setTitle("关注", for: UIControl.State.selected)
-        focusButton.titleLabel?.font = kMediumFont13
-        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kf7f8faColor), for: UIControl.State.selected)
+        focusButton.setTitle("已关注", for: UIControl.State.selected)
+        focusButton.titleLabel?.font = kRegularFont13
+        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
+        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.selected)
         focusButton.alpha = 0
-        focusButton.layer.borderWidth = 1
-        focusButton.cornerRadius = 12
+        focusButton.layer.borderWidth = 0.5
+        focusButton.layer.borderColor = kThemeColor.cgColor
+        focusButton.cornerRadius = 14
         focusButton.masksToBounds = true
         focusButton.rx.tap.subscribe(onNext: { [weak self] (data) in
             if self?.communityTopicDetailModel?.isFollow == 1 {

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

@@ -58,10 +58,9 @@ class CommunityMyFollowTopicCell: UITableViewCell {
         focusButton.snp.makeConstraints { (make) in
             make.top.equalTo(18)
             make.right.equalToSuperview().offset(-14)
-            make.width.equalTo(64)
-            make.height.equalTo(26)
+            make.width.equalTo(60)
+            make.height.equalTo(28)
         }
-        focusButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
         sepView.snp.makeConstraints { (make) in
             make.left.equalTo(titleLabel.snp_left)
             make.right.equalTo(focusButton.snp_right)
@@ -81,21 +80,22 @@ class CommunityMyFollowTopicCell: UITableViewCell {
     
     private lazy var focusButton: UIButton = {
         let focusButton = UIButton(type: UIButton.ButtonType.custom)
-        focusButton.setImage(kImage(name: "star_attention"), for: UIControl.State.normal)
-        focusButton.setImage(kImage(name: "star_followed"), for: UIControl.State.selected)
-        focusButton.setTitleColor(k666666Color, for: UIControl.State.selected)
-        focusButton.setTitleColor(kThemeColor, for: UIControl.State.normal)
+        focusButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+        focusButton.setTitleColor(kThemeColor, for: UIControl.State.selected)
         focusButton.setTitle("关注", for: UIControl.State.normal)
-        focusButton.setTitle("关注", for: UIControl.State.selected)
-        focusButton.titleLabel?.font = kMediumFont13
-        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kf7f8faColor), for: UIControl.State.selected)
-        focusButton.layer.borderWidth = 1
-        focusButton.cornerRadius = 13
+        focusButton.setTitle("已关注", for: UIControl.State.selected)
+        focusButton.titleLabel?.font = kRegularFont13
+        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
+        focusButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.selected)
+        focusButton.alpha = 0
+        focusButton.layer.borderWidth = 0.5
+        focusButton.layer.borderColor = kThemeColor.cgColor
+        focusButton.cornerRadius = 14
         focusButton.masksToBounds = true
         focusButton.rx.tap.subscribe(onNext: { [weak self] (data) in
+            focusButton.isEnabled = false
             if self?.communityMemberFollowTopicListDataModel?.isFollow == 1 {
-               self?.communityMemberFollowTopicCancelFollowApi()
+                self?.communityMemberFollowTopicCancelFollowApi()
             }else {
                 self?.communityMemberFollowTopicFollowApi()
             }
@@ -117,8 +117,6 @@ class CommunityMyFollowTopicCell: UITableViewCell {
         }
     }
     
-    
-    
 }
 
 
@@ -126,10 +124,13 @@ extension CommunityMyFollowTopicCell {
     func isFollow() {
         if communityMemberFollowTopicListDataModel?.isFollow == 1 {
             focusButton.isSelected = true
-            focusButton.layer.borderColor = kf7f8faColor.cgColor
+            UIView.animate(withDuration: 1) {
+                [weak self] in
+                self?.focusButton.alpha = 0
+            }
         }else {
             focusButton.isSelected = false
-            focusButton.layer.borderColor = kThemeColor.cgColor
+            focusButton.alpha = 1
         }
     }
 }
@@ -143,6 +144,7 @@ extension CommunityMyFollowTopicCell {
     func communityMemberFollowTopicFollowApi() {
         SwiftMoyaNetWorkServiceCommunity.shared().communityMemberFollowTopicFollowApi(topicId: communityMemberFollowTopicListDataModel?.topicId ?? 0) {
             [weak self] (data) -> (Void) in
+            self?.focusButton.isEnabled = true
             self?.communityMemberFollowTopicListDataModel?.isFollow = 1
             self?.isFollow()
         }
@@ -156,6 +158,7 @@ extension CommunityMyFollowTopicCell {
     func communityMemberFollowTopicCancelFollowApi() {
         SwiftMoyaNetWorkServiceCommunity.shared().communityMemberFollowTopicCancelFollowApi(topicId: communityMemberFollowTopicListDataModel?.topicId ?? 0) {
             [weak self] (data) -> (Void) in
+            self?.focusButton.isEnabled = true
             self?.communityMemberFollowTopicListDataModel?.isFollow = 0
             self?.isFollow()
         }

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

@@ -463,6 +463,7 @@ extension CommunityRecommendController {
 
         }) {
             [weak self] (loadingStatus) in
+            
             MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView,loadingStatus: loadingStatus)
 
         }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageMain/ViewController/MessageMainViewController.swift

@@ -89,7 +89,7 @@ extension MessageMainViewController {
             MJRefreshManager.hiddenHeaderWithFooter(collectionView: self?.collectionView)
         }) {
             [weak self] loadingStauts in
-            MJRefreshManager.hiddenHeaderWithFooter(collectionView: self?.collectionView)
+            MJRefreshManager.hiddenHeaderWithFooter(collectionView: self?.collectionView, loadingStatus: loadingStauts)
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherHeaderView.swift

@@ -78,8 +78,8 @@ class PersonViewUserAndOtherHeaderView: BaseView {
         followButton.snp_makeConstraints { (make) in
             make.centerX.equalTo(avatarButton)
             make.bottom.equalTo(-23)
-            make.width.equalTo(64)
-            make.height.equalTo(24)
+            make.width.equalTo(60)
+            make.height.equalTo(28)
         }
         
     }
@@ -175,20 +175,21 @@ class PersonViewUserAndOtherHeaderView: BaseView {
         followButton.setTitle("关注", for: UIControl.State.normal)
         followButton.titleLabel?.font = kMediumFont13
         followButton.alpha = 1
-        followButton.cornerRadius = 12
+        followButton.cornerRadius = 14
         followButton.masksToBounds = true
         followButton.isHidden = true
         followButton.rx.tap.subscribe(onNext: {
             [weak self] (data) in
+            followButton.isEnabled = false
             if self?.userDetailModel?.isFollowStatus == 0 {
                 self?.userFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { (isFollowStatus) in
                     self?.userDetailModel?.isFollowStatus = isFollowStatus
-                    self?.followType = FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0)
+                    CommunityFollowUserViewModel.shared.setFollowType(followButton: followButton, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0))
                 })
             }else {
                 self?.userCancelFollow(followUid: self?.userDetailModel?.uid ?? 0, completion: { (isFollowStatus) in
                     self?.userDetailModel?.isFollowStatus = isFollowStatus
-                    self?.followType = FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0)
+                    CommunityFollowUserViewModel.shared.setFollowType(followButton: followButton, followType: FollowType(rawValue: self?.userDetailModel?.isFollowStatus ?? 0))
                 })
             }
         }).disposed(by: disposeBag)
@@ -228,7 +229,7 @@ class PersonViewUserAndOtherHeaderView: BaseView {
     
     var userDetailModel: UserDetailModel? {
         didSet {
-            followType = FollowType(rawValue: userDetailModel?.isFollowStatus ?? 0)
+            CommunityFollowUserViewModel.shared.setFollowType(followButton: followButton, followType: FollowType(rawValue: userDetailModel?.isFollowStatus ?? 0))
             bgImageView.kf.setImage(with: kURLImage(name: userDetailModel?.backgroundImg ?? "default_pic"), placeholder: kImage(name: "default_pic"))
             titleLabel.text = userDetailModel?.username
             if userDetailModel?.signature == "" || userDetailModel?.signature == nil  {
@@ -236,7 +237,6 @@ class PersonViewUserAndOtherHeaderView: BaseView {
                     subtitleLabel.text = "添加个人简介，让更多的彩虹居民认识你~"
                 }else {
                     subtitleLabel.text = "暂无个人介绍"
-
                 }
             }else {
                 subtitleLabel.text = userDetailModel?.signature
@@ -247,42 +247,6 @@ class PersonViewUserAndOtherHeaderView: BaseView {
 
         }
     }
-    
-    var followType: FollowType! {
-        didSet {
-            switch followType {
-            case .futureFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(kThemeColor, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_attention"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kThemeColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                
-                break
-            case .alreadyFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_followed"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kf7f8faColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kf7f8faColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                break
-            case .mutualFollow?:
-                followButton.setTitle("互相关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                followButton.setImage(nil, for: UIControl.State.normal)
-                followButton.layer.borderColor = kCCCCCCColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 0)
-                
-                break
-            default:
-                break
-            }
-        }
-    }
-    
 }
 extension PersonViewUserAndOtherHeaderView {
     

RainbowPlanet/RainbowPlanet/Modules/MineModule/PersonalCenter/PersonalCenterView/PersonViewUserAndOtherListView.swift

@@ -96,8 +96,13 @@ extension PersonViewUserAndOtherListView {
         }
         SwiftMoyaNetWorkServiceCommunity.shared().communityPostMyApi(type: type,uid:uid ?? 0,page:page, completion: {
             [weak self] (communityPostMyModel) -> (Void) in
-            DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView, detailStr: .one)
-            
+            if self?.uid != UserModel.shared().uid {
+                DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView,imageStr: .one, detailStr: .one)
+            }else {
+                if self?.personalCenterVCType != 0 {
+                    DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView,imageStr: .one, detailStr: .one)
+                }
+            }
             let communityPostMyModel = communityPostMyModel as? CommunityPostMyModel
             if communityPostMyModel?.pagination?.currentPage == 1{
                 self?.postMyModels.removeAll()

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

@@ -68,8 +68,8 @@ class SearchUserLitTableViewCell: UITableViewCell {
         followButton.snp_makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalTo(-14)
-            make.height.equalTo(26)
-            make.width.equalTo(64)
+            make.height.equalTo(28)
+            make.width.equalTo(60)
         }
         lineLabel.snp_makeConstraints { (make) in
             make.bottom.equalToSuperview()
@@ -115,11 +115,11 @@ class SearchUserLitTableViewCell: UITableViewCell {
     var followButtonClosure : FollowButtonClosure?
     private lazy var followButton: UIButton = {
         let followButton = UIButton(type: UIButton.ButtonType.custom)
-        followButton.titleLabel?.font = kBoldFont13
-        followButton.layer.cornerRadius = 13
+        followButton.titleLabel?.font = kRegularFont13
+        followButton.layer.cornerRadius = 14
         followButton.layer.masksToBounds = true
-        followButton.layer.borderWidth = 1
         followButton.rx.tap.subscribe(onNext: {[weak self] (data) in
+            followButton.isEnabled = false
             if let followButtonClosure = self?.followButtonClosure {
                 followButtonClosure()
             }
@@ -135,7 +135,9 @@ class SearchUserLitTableViewCell: UITableViewCell {
     
     var userFollowModel: UserFollowModel? {
         didSet {
-            followType = FollowType(rawValue: userFollowModel?.isFollowStatus ?? 0)
+            
+            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: userFollowModel?.isFollowStatus ?? 0))
+
             avatarButton.kf.setImage(with: kURLImage(name: userFollowModel?.followAvatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(userFollowModel?.followUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -156,7 +158,8 @@ class SearchUserLitTableViewCell: UITableViewCell {
     
     var userFanModel: UserFanModel? {
         didSet {
-            followType = FollowType(rawValue: userFanModel?.isFollowStatus ?? 0)
+            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: userFanModel?.isFollowStatus ?? 0))
+
             avatarButton.kf.setImage(with: kURLImage(name: userFanModel?.fanAvatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(userFanModel?.fanUsername, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -177,7 +180,8 @@ class SearchUserLitTableViewCell: UITableViewCell {
     
     var cmsMemberModel: CMSMemberModel? {
         didSet {
-            followType = FollowType(rawValue: cmsMemberModel?.followStatus ?? 0)
+            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: cmsMemberModel?.followStatus ?? 0))
+
             avatarButton.kf.setImage(with: kURLImage(name: cmsMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(cmsMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -199,7 +203,8 @@ class SearchUserLitTableViewCell: UITableViewCell {
     
     var searchMemberModel: SearchMemberModel? {
         didSet {
-            followType = FollowType(rawValue: searchMemberModel?.followStatus ?? 0)
+            CommunityFollowUserViewModel.setFollowFeedType(followButton: followButton, followType: FollowType(rawValue: searchMemberModel?.followStatus ?? 0))
+
             avatarButton.kf.setImage(with: kURLImage(name: searchMemberModel?.avatar ?? ""), for: UIControl.State.normal, placeholder: kImage(name: "default_avatar"))
             titleButton.setTitle(searchMemberModel?.username, for: UIControl.State.normal)
             var followTopic = Array<String>()
@@ -218,40 +223,5 @@ class SearchUserLitTableViewCell: UITableViewCell {
             }
         }
     }
-    
-    var followType: FollowType! {
-        didSet {
-            switch followType {
-            case .futureFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(kThemeColor, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_attention"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kThemeColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                
-                break
-            case .alreadyFollow?:
-                followButton.setTitle("关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                followButton.setImage(kImage(name: "star_followed"), for: UIControl.State.normal)
-                followButton.layer.borderColor = kf7f8faColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kf7f8faColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
-                break
-            case .mutualFollow?:
-                followButton.setTitle("互相关注", for: UIControl.State.normal)
-                followButton.setTitleColor(k333333Color, for: UIControl.State.normal)
-                followButton.setImage(nil, for: UIControl.State.normal)
-                followButton.layer.borderColor = kCCCCCCColor.cgColor
-                followButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-                followButton.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 0)
-                
-                break
-            default:
-                break
-            }
-        }
-    }
 
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -730,7 +730,6 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 let followStatusModel = followStatusModel as? FollowStatusModel
                 followStatusModel?.uid = followUid
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel)
-                SwiftProgressHUD.shared().showText("已关注")
                 completion(followStatusModel as Any)
             }) {
                 (loadingStatus) in
@@ -756,7 +755,6 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 let followStatusModel = followStatusModel as? FollowStatusModel
                 followStatusModel?.uid = followUid
                 NotificationCenter.default.post(name: NSNotification.Name(rawValue: "followApi"), object: followStatusModel)
-                SwiftProgressHUD.shared().showText("已取消关注")
                 completion(followStatusModel as Any)
             }) {
                 (loadingStatus) in

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

@@ -82,11 +82,8 @@ extension SwiftMoyaNetWorkManager {
     
     // MARK: 失败回调有提示没有
     /// 失败回调有提示
-    func failCall(fail:@escaping failCallback) {
-        self.failCallback = fail
-        if let failCallback = self.failCallback  {
-            failCallback(.noNetwork)
-        }
+    func failNoNetwork(fail:@escaping failCallback) {
+        fail(.noNetwork)
     }
     // MARK: 失败回调有提示没有
     /// 失败回调有提示
@@ -96,9 +93,11 @@ extension SwiftMoyaNetWorkManager {
     
     // MARK: 失败回调有提示
     /// 失败回调有提示
-    func failCallShowText() {
+    func failCallShowText(fail:@escaping failCallback) {
         DispatchQueue.main.async {
+            [weak self] in
             SwiftProgressHUD.shared().showText("网络链接失败,请检查网络")
+            self?.failNoNetwork(fail:fail)
         }
     }
     // MARK: 网络连接状态
@@ -106,7 +105,7 @@ extension SwiftMoyaNetWorkManager {
     func networkConnect(fail:@escaping failCallback) {
         //判断是否链接网络
         if !isNetworkConnect{
-            failNoData(fail:fail)
+            failNoNetwork(fail:fail)
             return
         }
     }
@@ -138,7 +137,7 @@ extension SwiftMoyaNetWorkManager {
                 completion(element)
             }) {
                 [weak self] (error) in
-                self?.failCallShowText()
+                self?.failCallShowText(fail: fail)
             }
             .disposed(by: disposeBag)
     }
@@ -167,7 +166,7 @@ extension SwiftMoyaNetWorkManager {
                 completion(element)
             }) {
                 [weak self] (error) in
-                self?.failCallShowText()
+                self?.failCallShowText(fail: fail)
             }
             .disposed(by: disposeBag)
     }
@@ -194,7 +193,7 @@ extension SwiftMoyaNetWorkManager {
                 completion(element)
             }) {
                 [weak self] (error) in
-                self?.failCallShowText()
+                self?.failCallShowText(fail: fail)
             }
             .disposed(by: disposeBag)
     }
@@ -223,7 +222,7 @@ extension SwiftMoyaNetWorkManager {
                 completion(element)
             }) {
                 [weak self] (error) in
-                self?.failCallShowText()
+                self?.failCallShowText(fail: fail)
             }
             .disposed(by: disposeBag)
     }
@@ -249,7 +248,7 @@ extension SwiftMoyaNetWorkManager {
                 completion(element)
             }) {
                 [weak self] (error) in
-                self?.failCallShowText()
+                self?.failCallShowText(fail: fail)
             }
             .disposed(by: disposeBag)
     }

RainbowPlanet/RainbowPlanet/Tools/EmptyView/DIYEmptyView.swift

@@ -136,7 +136,7 @@ class DIYEmptyView: LYEmptyView {
     ///   - detailStr: 标题
     ///   - btnTitleStr: 按钮表示
     ///   - btnClickBlock:
-    class func emptyNoDataActionTableView(tableView:UITableView?,imageStr:DIYEmptyViewImageStr = .one,detailStr:DIYEmptyViewDetailString = .one,btnTitleStr:DIYEmptyViewActionBtnString = .one,btnClickBlock: @escaping LYActionTapBlock) {
+    class func emptyNoDataActionTableView(tableView:UITableView?,imageStr:DIYEmptyViewImageStr = .five,detailStr:DIYEmptyViewDetailString = .five,btnTitleStr:DIYEmptyViewActionBtnString = .one,btnClickBlock: @escaping LYActionTapBlock) {
         let emptyView = DIYEmptyView.emptyActionView(withImageStr: imageStr.rawValue, titleStr: nil, detailStr: detailStr.rawValue, btnTitleStr: btnTitleStr.rawValue,btnClick: btnClickBlock)
         tableView?.ly_emptyView = emptyView
         tableView?.ly_startLoading()

RainbowPlanet/RainbowPlanet/ViewModel/Community/CommunityFollowTopicViewModel.swift

@@ -43,10 +43,8 @@ extension CommunityFollowTopicViewModel {
             communityFeaturedTopicsHeaderView.communityTopicDetailModel = communityTopicDetailModel
             if communityTopicDetailModel.isFollow == 1 {
                 button.isSelected = true
-                button.layer.borderColor = kf7f8faColor.cgColor
             }else {
                 button.isSelected = false
-                button.layer.borderColor = kThemeColor.cgColor
             }
         }
     }

RainbowPlanet/RainbowPlanet/ViewModel/Community/CommunityFollowUserViewModel.swift

@@ -28,38 +28,71 @@ class CommunityFollowUserViewModel: NSObject {
         }
     }
     
+    /// 设置feed关注
+    ///
+    /// - Parameters:
+    ///   - followButton: 关注button
+    ///   - followType: 关注类型
+    class func setFollowFeedType(followButton:UIButton? = nil,followType: FollowType? = nil) {
+        followButton?.isEnabled = true
+        switch followType {
+        case .futureFollow?:
+            followButton?.setTitle("关注", for: UIControl.State.normal)
+            followButton?.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
+            followButton?.alpha = 1
+            break
+        case .alreadyFollow?:
+            followButton?.setTitle("已关注", for: UIControl.State.normal)
+            followButton?.setTitleColor(kThemeColor, for: UIControl.State.normal)
+            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
+            UIView.animate(withDuration: 1) {
+                [weak followButton] in
+                followButton?.alpha = 0
+            }
+            break
+        case .mutualFollow?:
+            followButton?.setTitle("已互关", for: UIControl.State.normal)
+            followButton?.setTitleColor(kThemeColor, for: UIControl.State.normal)
+            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
+            UIView.animate(withDuration: 1) {
+                [weak followButton] in
+                followButton?.alpha = 0
+            }
+            break
+        default:
+            break
+        }
+    }
     
-    /// 设置关注
+    
+    
+    /// 设置推荐关注
     ///
     /// - Parameters:
     ///   - followButton: 关注button
     ///   - followType: 关注类型
     func setFollowType(followButton:UIButton? = nil,followType: FollowType? = nil) {
+        followButton?.isEnabled = true
         switch followType {
         case .futureFollow?:
             followButton?.setTitle("关注", for: UIControl.State.normal)
-            followButton?.setTitleColor(kThemeColor, for: UIControl.State.normal)
-            followButton?.setImage(kImage(name: "star_attention"), for: UIControl.State.normal)
+            followButton?.setTitleColor(kffffffColor, for: UIControl.State.normal)
             followButton?.layer.borderColor = kThemeColor.cgColor
-            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-            followButton?.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
+            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kThemeColor), for: UIControl.State.normal)
             
             break
         case .alreadyFollow?:
-            followButton?.setTitle("关注", for: UIControl.State.normal)
-            followButton?.setTitleColor(k333333Color, for: UIControl.State.normal)
-            followButton?.setImage(kImage(name: "star_followed"), for: UIControl.State.normal)
+            followButton?.setTitle("已关注", for: UIControl.State.normal)
+            followButton?.setTitleColor(kffffffColor, for: UIControl.State.normal)
             followButton?.layer.borderColor = kf7f8faColor.cgColor
-            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kf7f8faColor), for: UIControl.State.normal)
-            followButton?.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 2)
+            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kA8ACBCColor), for: UIControl.State.normal)
             break
         case .mutualFollow?:
-            followButton?.setTitle("互相关注", for: UIControl.State.normal)
-            followButton?.setTitleColor(k333333Color, for: UIControl.State.normal)
-            followButton?.setImage(nil, for: UIControl.State.normal)
-            followButton?.layer.borderColor = kCCCCCCColor.cgColor
-            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
-            followButton?.layoutButton(edgeInsetsStyle: ButtonEdgeInsetsStyle.left, imageTitleSpace: 0)
+            followButton?.setTitle("已互关", for: UIControl.State.normal)
+            followButton?.setTitleColor(kffffffColor, for: UIControl.State.normal)
+            followButton?.layer.borderColor = kA8ACBCColor.cgColor
+            followButton?.setBackgroundImage(UIImage.imageWithColor(color: kA8ACBCColor), for: UIControl.State.normal)
             
             break
         case .none: