缺省页面基本调完

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -1536,6 +1536,16 @@
 			path = PayManagerPay;
 			sourceTree = "<group>";
 		};
+		A701454022F9813A0090E1BD /* RedemptionArea */ = {
+			isa = PBXGroup;
+			children = (
+				A7D77DEC22DDDDA40048D5F6 /* ViewModel */,
+				A714348A22DD9E4C00132DA9 /* View */,
+				A714348822DD9E2800132DA9 /* ViewController */,
+			);
+			path = RedemptionArea;
+			sourceTree = "<group>";
+		};
 		A70B2C0522841F1B00B2449F /* FloorCell */ = {
 			isa = PBXGroup;
 			children = (
@@ -1792,9 +1802,7 @@
 		A714348522DD9CD000132DA9 /* RedemptionAreaModule */ = {
 			isa = PBXGroup;
 			children = (
-				A7D77DEC22DDDDA40048D5F6 /* ViewModel */,
-				A714348A22DD9E4C00132DA9 /* View */,
-				A714348822DD9E2800132DA9 /* ViewController */,
+				A701454022F9813A0090E1BD /* RedemptionArea */,
 			);
 			path = RedemptionAreaModule;
 			sourceTree = "<group>";

RainbowPlanet/RainbowPlanet/Manager/MJRefreshManager/MJRefreshManager.swift

@@ -17,6 +17,16 @@ class MJRefreshManager: NSObject {
         tableView?.ly_endLoading()
     }
     
+    class func hiddenHeaderWithFooterNONetWork(tableView : UITableView?) {
+        DIYEmptyView.emptyNoDataActionTableView(tableView: tableView, btnClickBlock: {
+            [weak tableView] in
+            tableView?.mj_header.beginRefreshing()
+        })
+        tableView?.endHeaderRefresh()
+        tableView?.endFooterRefresh()
+        tableView?.ly_endLoading()
+    }
+    
     class func hiddenFooterNoMoreData(tableView : UITableView?) {
         tableView?.endFooterNoMoreData()
         tableView?.ly_endLoading()
@@ -43,6 +53,22 @@ class MJRefreshManager: NSObject {
     class func hiddenHeaderWithFooter(collectionView : UICollectionView?) {
         collectionView?.endHeaderRefresh()
         collectionView?.endFooterRefresh()
+        collectionView?.ly_endLoading()
+    }
+    
+    class func hiddenFooterNoMoreData(collectionView : UICollectionView?) {
+        collectionView?.endFooterNoMoreData()
+        collectionView?.ly_endLoading()
+    }
+    
+    class func hiddenHeaderWithFooterNONetWork(collectionView : UICollectionView?) {
+        DIYEmptyView.emptyNoDataActionCollectionView(collectionView: collectionView, btnClickBlock: {
+            [weak collectionView] in
+            collectionView?.mj_header.beginRefreshing()
+        })
+        collectionView?.endHeaderRefresh()
+        collectionView?.endFooterRefresh()
+        collectionView?.ly_endLoading()
     }
     
     class func hiddenHeaderWithFooter(collectionView : UICollectionView?,currentPage:Int?,totalPages:Int?) {
@@ -51,8 +77,6 @@ class MJRefreshManager: NSObject {
         if  currentPage ?? 1  >= totalPages ?? 1 {
             collectionView?.endFooterNoMoreData()
         }
+        collectionView?.ly_endLoading()
     }
-    
-    
-    
 }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Header/CommunityFollowTableHeaderView.swift

@@ -46,17 +46,17 @@ class CommunityFollowTableHeaderView: BaseView {
     
     private lazy var iconImageView: UIImageView = {
         let iconImageView = UIImageView()
-        iconImageView.image = kImage(name: "followed")
+        iconImageView.image = kImage(name: "def_page_pic_focusfeed")
         return iconImageView
     }()
     
     private lazy var infoLabel: UILabel = {
         let infoLabel = UILabel()
         infoLabel.text = ""
-        infoLabel.textColor = k666666Color
+        infoLabel.textColor = k999999Color
         infoLabel.font = kRegularFont14
         infoLabel.numberOfLines = 0
-        let str = "关注其他彩虹居民后\n可以在这里浏览他们的美好瞬间！"
+        let str = "去寻找感兴趣的好友吧~\n关注后，可以在这里看到对方的动态"
         let attributeString = NSMutableAttributedString(string:str)
         attributeString.changeAllLineSpacing(5)
         infoLabel.attributedText = attributeString

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

@@ -34,9 +34,6 @@ class CommunityRecommnendViewController: UIViewController {
     func setupViews() {
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
-        let emptyView = DIYEmptyView.empty(with: kImage(name: "default_page_data"), titleStr: nil, detailStr: "当前暂无数据")
-        emptyView!.contentViewY = kScaleValue(value: 182)
-        tableView.ly_emptyView = emptyView
     }
     
     func setupLayouts() {
@@ -179,6 +176,7 @@ extension CommunityRecommnendViewController {
         
         SwiftMoyaNetWorkServiceCommunity.shared().communityPostSuggestApi(page:page,completion: {
             [weak self] (communityRecommendFeedModel) -> (Void) in
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView)
             let communityRecommendFeedModel = communityRecommendFeedModel as? CommunityRecommendFeedModel
             if communityRecommendFeedModel?.pagination?.currentPage ?? 1  <= communityRecommendFeedModel?.pagination?.totalPages ?? 1 {
                 if communityRecommendFeedModel?.pagination?.currentPage == 1{
@@ -190,11 +188,11 @@ extension CommunityRecommnendViewController {
                 MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: communityRecommendFeedModel?.pagination?.currentPage, totalPages: communityRecommendFeedModel?.pagination?.totalPages)
 
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
         }) {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
         
     }

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

@@ -32,6 +32,7 @@ class CommunityFindFriendsViewController: BaseViewController {
         navigationBar.wr_setRightButton(image: kImage(name: "nav_search_black44px")!)
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
+        view.insertSubview(navigationBar, aboveSubview: tableView)
     }
     
     override func setupLayouts() {
@@ -49,7 +50,6 @@ class CommunityFindFriendsViewController: BaseViewController {
             self?.navigationController?.pushViewController(vc, animated: true)
 
         }
-        tableView.tableHeaderView = communityFindFriendsView
         tableView.addHeader(withBeginRefresh: true, animation: true) { [weak self] (page) in
             self?.cmsMemberListApi()
         }
@@ -93,13 +93,15 @@ extension CommunityFindFriendsViewController {
     func cmsMemberListApi() {
         SwiftMoyaNetWorkServiceCMS.shared().cmsMemberListApi(takeCount: 50,completion: {
             [weak self] (cmsMemberListModel) -> (Void) in
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView)
             let cmsMemberListModel = cmsMemberListModel as? CMSMemberListModel
             self?.cmsMemberModels = (cmsMemberListModel?.list)!
+            self?.tableView.tableHeaderView = self?.communityFindFriendsView
             self?.tableView.reloadData()
             MJRefreshManager.hiddenHeaderWithFooter(tableView:  self?.tableView)
         }) {
             [weak self] loadingStatus in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView:  self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView:  self?.tableView)
         }
     }
     
@@ -124,6 +126,10 @@ extension CommunityFindFriendsViewController {
 // MARK: - tableView dataSource && delegate
 extension CommunityFindFriendsViewController: UITableViewDataSource, UITableViewDelegate {
     
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return self.cmsMemberModels.isEmpty ? 0 : self.cmsMemberModels.count
     }

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

@@ -25,6 +25,7 @@ class CommunityMyFollowTopicController: BaseViewController {
         navigationBar.title = "我的关注话题"
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
+        view.insertSubview(navigationBar, aboveSubview: tableView)
     }
     
     override func setupLayouts() {
@@ -40,23 +41,6 @@ class CommunityMyFollowTopicController: BaseViewController {
     
     override func setupData() {
         
-        let emptyView = DIYEmptyView.emptyActionView(withImageStr: "default_page_topic", titleStr: nil, detailStr: "暂无关注，去发现好玩的话题吧", btnTitleStr: "去首页") {
-            [weak self] in
-            self?.tabBarController?.selectedIndex = 0
-            self?.navigationController?.popToClass(type: CommunityViewController.self)
-        }
-        emptyView?.actionBtnHorizontalMargin = 58
-        emptyView?.contentViewY = kScaleValue(value: 164)
-        emptyView?.subViewMargin = 20
-        emptyView?.actionBtnFont = kBoldFont16
-        emptyView?.actionBtnHeight = 32
-        emptyView?.actionBtnCornerRadius = 32/2
-        emptyView?.actionBtnTitleColor = kffffffColor
-        emptyView?.actionBtnBackGroundColor = kThemeColor
-        emptyView?.detailLabFont = kRegularFont14
-        tableView.ly_emptyView = emptyView
-        tableView.ly_startLoading()
-        
         tableView.addHeader(withBeginRefresh: true, animation: false) {
             [weak self] (page) in
             self?.communityMemberFollowTopicListApi(page: page)
@@ -81,8 +65,9 @@ class CommunityMyFollowTopicController: BaseViewController {
 extension CommunityMyFollowTopicController {
     //我的关注话题
     func communityMemberFollowTopicListApi(page:Int) {
-        SwiftMoyaNetWorkServiceCommunity.shared().communityMemberFollowTopicListApi(page: page) {
+        SwiftMoyaNetWorkServiceCommunity.shared().communityMemberFollowTopicListApi(page: page, completion: {
             [weak self] (communityMemberFollowTopicListModel) -> (Void) in
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView, imageStr: .twelve, detailStr: .twelve)
             let communityMemberFollowTopicListModel = communityMemberFollowTopicListModel as? CommunityMemberFollowTopicListModel
             if communityMemberFollowTopicListModel?.pagination?.currentPage ?? 1  <= communityMemberFollowTopicListModel?.pagination?.totalPages ?? 1 {
                 if communityMemberFollowTopicListModel?.pagination?.currentPage == 1{
@@ -91,21 +76,18 @@ extension CommunityMyFollowTopicController {
                 }
                 self?.communityMemberFollowTopicListDataModels = (self?.communityMemberFollowTopicListDataModels)! + (communityMemberFollowTopicListModel?.data!)!
                 self?.tableView.reloadData()
-                if  self?.communityMemberFollowTopicListDataModels.count ?? 0 >= communityMemberFollowTopicListModel?.pagination?.total ?? 0 {
-                    self?.tableView.endFooterNoMoreData()
-                }
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: communityMemberFollowTopicListModel?.pagination?.currentPage, totalPages: communityMemberFollowTopicListModel?.pagination?.totalPages)
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
+        }) {[weak self] _ in
+            MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
         }
     }
 }
 
 // MARK: - tableView dataSource && delegate
 extension CommunityMyFollowTopicController: UITableViewDataSource, UITableViewDelegate {
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return 1
-    }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return communityMemberFollowTopicListDataModels.isEmpty ? 0 : communityMemberFollowTopicListDataModels.count

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

@@ -65,23 +65,6 @@ class CommunityRecommendController: BaseViewController {
             make.left.right.equalToSuperview()
             make.bottom.equalTo(commentView.snp_top).offset(0)
         }
-        emptyView = DIYEmptyView.emptyActionView(withImageStr: "default_page_content", titleStr: nil, detailStr: "内容飞走了, 去看看别的吧", btnTitleStr: "去首页") {
-            [weak self] in
-            self?.tabBarController?.selectedIndex = 0
-            self?.navigationController?.popToRootViewController(animated: true)
-        }
-        emptyView?.actionBtnHorizontalMargin = 58
-        emptyView?.contentViewY = kScaleValue(value: 164 + kNavBarTotalHeight)
-        emptyView?.subViewMargin = 20
-        emptyView?.actionBtnFont = kBoldFont16
-        emptyView?.actionBtnHeight = 32
-        emptyView?.actionBtnCornerRadius = 32/2
-        emptyView?.actionBtnTitleColor = kffffffColor
-        emptyView?.actionBtnBackGroundColor = kThemeColor
-        self.view.ly_emptyView = emptyView
-        self.view.ly_showEmpty()
-        
-
     }
     
     override func setupLayouts() {
@@ -362,8 +345,11 @@ extension CommunityRecommendController {
     
     /// 帖子内容
     func communityPostDetailApi() {
-        SwiftMoyaNetWorkServiceCommunity.shared().communityPostDetailApi(id: id) { [weak self] (communityPostDetailModel) -> (Void) in
-            self?.view.ly_hideEmpty()
+        SwiftMoyaNetWorkServiceCommunity.shared().communityPostDetailApi(id: id, completion: { [weak self] (communityPostDetailModel) -> (Void) in
+            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, imageStr: .three, detailStr: .three, btnTitleStr: .two, btnClickBlock: {
+                self?.tabBarController?.selectedIndex = 0
+                self?.navigationController?.popToRootViewController(animated: true)
+            })
             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"))
@@ -376,7 +362,7 @@ extension CommunityRecommendController {
             CommunityFollowUserViewModel.shared.setFollowType(followButton: (self?.followButton)!, followType: FollowType(rawValue: self?.communityPostDetailModel?.isFollow ?? 0) ?? .futureFollow)
             self?.commentView.communityPostDetailModel = self?.communityPostDetailModel
             self?.count = self?.communityPostDetailModel?.commentCount ?? 0
-
+            
             if PostType(rawValue: self?.communityPostDetailModel?.type ?? "html") == .html {
                 self?.avatarButton.isHidden = true
                 self?.nameButton.isHidden = true
@@ -398,7 +384,7 @@ extension CommunityRecommendController {
                     }
                     self?.communityPostDetailTableViewHeaderView.tableView = self?.tableView
                     self?.tableView.tableHeaderView = self?.communityPostDetailTableViewHeaderView
-
+                    
                 }else {
                     if self?.communityPostDetailModel?.img != nil ||  self?.communityPostDetailModel?.img != "" {
                         let height = getImageHeight(imgStr: (self?.communityPostDetailModel?.img)!)
@@ -409,12 +395,13 @@ extension CommunityRecommendController {
                     }
                 }
                 self?.communityPostDetailTableViewHeaderView.communityPostDetailModel = self?.communityPostDetailModel
-
+                
             }
             self?.setupLayouts()
-            
             self?.tableView.reloadData()
             self?.readVirueRecordAddApi()
+        }) { [weak self] loadingStatus in
+            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
         }
     }
     
@@ -467,11 +454,11 @@ extension CommunityRecommendController {
                 self?.tableView.reloadData()
                 MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: communityPostsModel?.pagination?.currentPage, totalPages: communityPostsModel?.pagination?.totalPages)
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
         }) {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
     }
     
@@ -576,17 +563,17 @@ extension CommunityRecommendController {
 extension CommunityRecommendController: UITableViewDataSource, UITableViewDelegate {
     
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 3
+        if communityPostDetailModel != nil {
+            return 3
+        }else {
+            return 0
+        }
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         switch section {
         case 0:
-            if communityPostDetailModel != nil {
-                return 1
-            }else {
-                return 0
-            }
+            return 1
         case 1:
             return communityPostCommentModels.isEmpty ? 1 : communityPostCommentModels.count
         case 2:

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessageList/ViewController/MessageListController.swift

@@ -117,11 +117,7 @@ extension MessageListController {
             }
         }) {
             [weak self] (loadingStatus) in
-            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, btnClickBlock: {
-                [weak self] in
-                self?.tableView.mj_header.beginRefreshing()
-            })
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetActivity/Controller/MessagePlanetActivityController.swift

@@ -88,7 +88,7 @@ extension MessagePlanetActivityController {
             }
         }) {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/MessageModule/MessagePlanetNotification/Controller/MessagePlanetNotiController.swift

@@ -82,11 +82,7 @@ extension MessagePlanetNotiController {
             }
         }) {
             [weak self] (loadingStatus) in
-            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, btnClickBlock: {
-                [weak self] in
-                self?.tableView.mj_header.beginRefreshing()
-            })
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/MineModule/MyFollowAndFan/ViewController/MyFollowAndFanViewController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftyMediator
 
 enum MyFollowAndFanType {
     case follow
@@ -46,45 +47,8 @@ class MyFollowAndFanViewController: BaseViewController {
     }
     
     override func setupData() {
-        
-        if myfollowAndFanType == .follow {
-            tableView.tableHeaderView = followHeaderView
-            emptyView = DIYEmptyView.emptyActionView(withImageStr: "default_page_kept", titleStr: nil, detailStr: "关注其他彩虹居民后\n可以在这里浏览他们的美好瞬间！", btnTitleStr: "找朋友") {
-                [weak self] in
-                
-                let vc = CommunityFindFriendsViewController()
-                self?.navigationController?.pushViewController(vc, animated: true)
-                
-            }
-            emptyView?.actionBtnHorizontalMargin = 58
-            emptyView?.contentViewY = kScaleValue(value: 164)
-            
-        }else if myfollowAndFanType == .fan {
-            tableView.tableHeaderView = fanHeaderView
-            emptyView = DIYEmptyView.emptyActionView(withImageStr: "default_page_fans", titleStr: nil, detailStr: "发布动态，让更多人去认识你", btnTitleStr: "发布动态") {
-                [weak self] in
-                
-                let pickVc = PublishViewController()
-                let nav = BaseNavigationViewController.init(rootViewController: pickVc)
-                self?.tabBarController?.present(nav, animated: true, completion: nil)
-                self?.navigationController?.popToRootViewController(animated: false)
-                
-            }
-            emptyView?.actionBtnHorizontalMargin = 66
-            emptyView?.contentViewY = kScaleValue(value: 151)
-        }
-        
-        emptyView?.subViewMargin = 20
-        emptyView?.actionBtnFont = kBoldFont16
-        emptyView?.actionBtnHeight = 32
-        emptyView?.actionBtnCornerRadius = 32/2
-        emptyView?.actionBtnTitleColor = kffffffColor
-        emptyView?.actionBtnBackGroundColor = kThemeColor
-        tableView.ly_emptyView = emptyView
-        tableView.ly_startLoading()
-        
         /// 上拉刷新
-        tableView.addHeader(withBeginRefresh: true, animation: false) {
+        tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self]  (page) in
             self?.userFollowsFans(page:page)
         }
@@ -138,6 +102,11 @@ extension MyFollowAndFanViewController {
     /// 获取关注列表
     func userFollows(page:Int = 1) {
         SwiftMoyaNetWorkServiceUser.shared().userFollowsApi(uid: self.userDetailModel?.uid ?? 0, page: page, completion: { [weak self] (userFollowsModel) -> (Void) in
+            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, imageStr: .eight, detailStr: .eight, btnTitleStr: .five, btnClickBlock: {
+                Mediator.push(CommunityRouterModuleType.pushFindFriends)
+
+            })
+            
             let userFollowsModel = userFollowsModel as? UserFollowsModel
             if userFollowsModel?.pagination?.currentPage ?? 1  <= userFollowsModel?.pagination?.totalPages ?? 1 {
                 if userFollowsModel?.pagination?.currentPage == 1{
@@ -149,17 +118,25 @@ extension MyFollowAndFanViewController {
                 MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: userFollowsModel?.pagination?.currentPage, totalPages: userFollowsModel?.pagination?.totalPages)
 
             }else {
-                 self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
         }, fail: {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         })
     }
     
     /// 获取粉丝列表
     func userFans(page:Int = 1) {
         SwiftMoyaNetWorkServiceUser.shared().userFansApi(uid: self.userDetailModel?.uid ?? 0, page: page,completion: {[weak self] (userFansModel) -> (Void) in
+            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, imageStr: .seven, detailStr: .seven, btnTitleStr: .four, btnClickBlock: {
+                [weak self] in
+                let pickVc = PublishViewController()
+                let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+                self?.tabBarController?.present(nav, animated: true, completion: {
+                    self?.navigationController?.popToRootViewController(animated: false)
+                })
+            })
             let userFansModel = userFansModel as? UserFansModel
             if userFansModel?.pagination?.currentPage ?? 1  <= userFansModel?.pagination?.totalPages ?? 1 {
                 if userFansModel?.pagination?.currentPage == 1{
@@ -171,11 +148,11 @@ extension MyFollowAndFanViewController {
                 self?.tableView.reloadData()
                 MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: userFansModel?.pagination?.currentPage, totalPages: userFansModel?.pagination?.totalPages)
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
         }, fail: {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         })
     }
     

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

@@ -50,11 +50,6 @@ class PersonViewUserAndOtherListView: BaseView {
             [weak self] (page) in
             self?.communityPostMyApi(page: page)
         }
-        let emptyView = DIYEmptyView.empty(withImageStr: nil, titleStr: nil, detailStr: "暂无内容")
-        emptyView?.contentViewY = kScaleValue(value: 35)
-        emptyView?.subViewMargin = 20
-        collectionView.ly_emptyView = emptyView
-        collectionView.ly_startLoading()
         
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("communityDeletePostApi"), object: nil, queue: OperationQueue.main) { [weak self] (notification) in
             let postId = notification.object as? Int
@@ -99,23 +94,24 @@ extension PersonViewUserAndOtherListView {
         if personalCenterVCType == 2 {
             type = .share
         }
-        SwiftMoyaNetWorkServiceCommunity.shared().communityPostMyApi(type: type,uid:uid ?? 0,page:page) {
+        SwiftMoyaNetWorkServiceCommunity.shared().communityPostMyApi(type: type,uid:uid ?? 0,page:page, completion: {
             [weak self] (communityPostMyModel) -> (Void) in
+            DIYEmptyView.emptyNoDataCollectionView(collectionView: self?.collectionView)
             let communityPostMyModel = communityPostMyModel as? CommunityPostMyModel
             if communityPostMyModel?.pagination?.currentPage ?? 1  <= communityPostMyModel?.pagination?.totalPages ?? 1 {
                 if communityPostMyModel?.pagination?.currentPage == 1{
                     self?.postMyModels.removeAll()
                     self?.collectionView.resetNoMoreData()
-
                 }
                 self?.postMyModels = (self?.postMyModels)! + (communityPostMyModel?.data!)!
                 self?.collectionView.reloadData()
-                if  self?.postMyModels.count ?? 0 >= communityPostMyModel?.pagination?.total ?? 0 {
-                    self?.collectionView.endFooterNoMoreData()
-                }
+                MJRefreshManager.hiddenHeaderWithFooter(collectionView: self?.collectionView, currentPage: communityPostMyModel?.pagination?.currentPage, totalPages: communityPostMyModel?.pagination?.totalPages)
             }else {
-                self?.collectionView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(collectionView: self?.collectionView)
             }
+        }) {
+            [weak self] _ in
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(collectionView: self?.collectionView)
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/RedemptionAreaModule/ViewController/RedemptionAreaViewController.swift

@@ -80,13 +80,15 @@ extension RedemptionAreaViewController {
     func cmsTemplateExchangeApi() {
         SwiftMoyaNetWorkServiceCMS.shared().cmsTemplateExchangeApi(completion: {
             [weak self] (cmsRedemptionAreaModel) -> (Void) in
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView)
+
             self?.cmsRedemptionAreaModel = cmsRedemptionAreaModel as? CMSRedemptionAreaModel
             self?.navigationBar.title = self?.cmsRedemptionAreaModel?.title
             self?.tableView.reloadData()
             MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
         }) {
             [weak self] loadingStaus in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
     }
     

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

@@ -15,10 +15,7 @@ class SearchView: BaseView {
     var searchHistoryArray = Array<String>()
     override func setupViews() {
         addSubview(collectionView)
-        let emptyView = DIYEmptyView.empty(withImageStr: nil, titleStr: nil, detailStr: "没有历史搜索记录")
-        emptyView!.contentViewY = kScaleValue(value: 60)
-        collectionView.ly_emptyView = emptyView
-        collectionView.ly_startLoading()
+
         setupData()
     }
     
@@ -30,9 +27,15 @@ class SearchView: BaseView {
     
     override func setupData() {
         
+        let emptyView = DIYEmptyView.empty(withImageStr: nil, titleStr: nil, detailStr: "没有历史搜索记录")
+        emptyView!.contentViewY = kScaleValue(value: 60)
+        collectionView.ly_emptyView = emptyView
+        collectionView.ly_startLoading()
+        
         guard UserDefaults.standard.array(forKey: "SearchHistoryArray")?.isEmpty ?? true else {
             searchHistoryArray = UserDefaults.standard.array(forKey: "SearchHistoryArray") as! [String]
             collectionView.reloadData()
+            collectionView.ly_endLoading()
             return
         }
     }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/Search/ViewController/SearchViewController.swift

@@ -23,6 +23,7 @@ class SearchViewController: BaseViewController {
         navigationBar.onClickLeftButton = nil
         navigationBar.addSubview(navigationBarView)
         view.addSubview(searchView)
+        view.insertSubview(navigationBar, aboveSubview: searchView)
     }
     
     override func setupLayouts() {

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

@@ -26,16 +26,11 @@ class SearchContentListViewController: UIViewController {
         setupViews()
         setupLayouts()
         setupData()
-        // Do any additional setup after loading the view.
     }
     
     private func setupViews() {
         view.backgroundColor = kf7f8faColor
         view.addSubview(collectionView)
-        let emptyView = DIYEmptyView.empty(with: kImage(name: "default_page_content"), titleStr: "没有找到相关，去看看别人都在看什么吧~", detailStr: nil)
-        emptyView!.contentViewY = kScaleValue(value: 141)
-        collectionView.ly_emptyView = emptyView
-        collectionView.ly_startLoading()
     }
     
     private func setupLayouts() {
@@ -91,6 +86,13 @@ extension SearchContentListViewController {
     func communityPostsApi(page:Int) {
         SwiftMoyaNetWorkServiceCommunity.shared().communityPostsApi(keyword: keyWord, page: page, completion: {
             [weak self] (communityPostsModel) -> (Void) in
+            
+            DIYEmptyView.emptyNoDataActionCollectionView(collectionView: self?.collectionView, imageStr: .six, detailStr: .six, btnTitleStr: .three, btnClickBlock: {
+                let pickVc = PublishViewController()
+                let nav = BaseNavigationViewController.init(rootViewController: pickVc)
+                BaseTabbarViewController.shared.esTabBarController.present(nav, animated: true, completion: nil)
+            })
+            
             let communityPostsModel = communityPostsModel as? CommunityPostsModel
             if communityPostsModel?.pagination?.currentPage ?? 1  <= communityPostsModel?.pagination?.totalPages ?? 1 {
                 if communityPostsModel?.pagination?.currentPage == 1{
@@ -98,19 +100,16 @@ extension SearchContentListViewController {
                     self?.collectionView.resetNoMoreData()
                 }
                 self?.communityPostDataModels = (self?.communityPostDataModels)! + (communityPostsModel?.data!)!
-                if (self?.communityPostDataModels.isEmpty)! {
-                    self?.collectionView.isHiddenFooter(true)
-                }
                 self?.heightList()
-                MJRefreshManager.hiddenHeaderWithFooter(collectionView: self?.collectionView, currentPage: communityPostsModel?.pagination?.currentPage, totalPages: communityPostsModel?.pagination?.totalPages)
                 self?.collectionView.reloadData()
+                MJRefreshManager.hiddenHeaderWithFooter(collectionView: self?.collectionView, currentPage: communityPostsModel?.pagination?.currentPage, totalPages: communityPostsModel?.pagination?.totalPages)
 
             }else {
-                self?.collectionView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(collectionView: self?.collectionView)
             }
         }) {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(collectionView: self?.collectionView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(collectionView: self?.collectionView)
         }
     }
     
@@ -155,6 +154,7 @@ extension SearchContentListViewController {
 
 
 extension SearchContentListViewController : WaterFallLayoutDelegate {
+    
     func collectionView(_ collectionView: UICollectionView!, heightOfItemAt indexPath: IndexPath!) -> CGFloat {
         return heights.isEmpty ? 0 : heights[indexPath.row]
     }
@@ -174,14 +174,8 @@ extension SearchContentListViewController : WaterFallLayoutDelegate {
 
 extension SearchContentListViewController: UICollectionViewDelegateFlowLayout,UICollectionViewDataSource {
     
-    func numberOfSections(in collectionView: UICollectionView) -> Int {
-        return 1
-
-    }
-    
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return communityPostDataModels.isEmpty ? 0 : communityPostDataModels.count
-
     }
     
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {

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

@@ -26,10 +26,6 @@ class SearchTopicListViewController: BaseViewController {
         navigationBar.isHidden = true
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
-        let emptyView = DIYEmptyView.empty(with: kImage(name: "default_page_content"), titleStr: "没有找到相关，去看看别人都在看什么吧~", detailStr: nil)
-        emptyView!.contentViewY = kScaleValue(value: 141)
-        tableView.ly_emptyView = emptyView
-        tableView.ly_startLoading()
     }
     
     override func setupLayouts() {
@@ -77,6 +73,7 @@ extension SearchTopicListViewController {
         
         SwiftMoyaNetWorkServiceCommunity.shared().communityTopicsApi(name: keyWord, page: page, completion: {
             [weak self] (communityTopicsModel) -> (Void) in
+            DIYEmptyView.emptyNoDataTableView(tableView: self?.tableView, imageStr: .twelve, detailStr: .twelve)
             self?.communityTopicsModel = communityTopicsModel as? CommunityTopicsModel
             if self?.communityTopicsModel?.pagination?.currentPage ?? 1  <= self?.communityTopicsModel?.pagination?.totalPages ?? 1 {
                 if self?.communityTopicsModel?.pagination?.currentPage == 1{
@@ -84,15 +81,15 @@ extension SearchTopicListViewController {
                     self?.tableView.resetNoMoreData()
                 }
                 self?.communityTopicModels = (self?.communityTopicModels)! + (self?.communityTopicsModel?.data!)!
-                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: self?.communityTopicsModel?.pagination?.currentPage, totalPages: self?.communityTopicsModel?.pagination?.totalPages)
                 self?.tableView.reloadData()
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: self?.communityTopicsModel?.pagination?.currentPage, totalPages: self?.communityTopicsModel?.pagination?.totalPages)
 
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView:self?.tableView)
             }
         }) {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
 
     }
@@ -100,11 +97,6 @@ extension SearchTopicListViewController {
 
 extension SearchTopicListViewController :UITableViewDataSource,UITableViewDelegate  {
     
-    
-    func numberOfSections(in tableView: UITableView) -> Int {
-        return communityTopicModels.isEmpty ? 0 : 1
-    }
-    
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return communityTopicModels.isEmpty ? 0 : communityTopicModels.count
     }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchUser/ViewController/SearchUserListViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import JXSegmentedView
+import SwiftyMediator
 class SearchUserListViewController: BaseViewController {
     
     deinit {
@@ -31,10 +32,6 @@ class SearchUserListViewController: BaseViewController {
         navigationBar.isHidden = true
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
-        let emptyView = DIYEmptyView.empty(with: kImage(name: "default_page_content"), titleStr: "没有找到相关，去看看别人都在看什么吧~", detailStr: nil)
-        emptyView!.contentViewY = kScaleValue(value: 141)
-        tableView.ly_emptyView = emptyView
-        tableView.ly_startLoading()
     }
     
     override func setupLayouts() {
@@ -90,6 +87,10 @@ extension SearchUserListViewController {
     /// - Parameter page: 分页
     func userMemberSearchMemberApi(page:Int) {
         SwiftMoyaNetWorkServiceUser.shared().userMemberSearchMemberApi(userName: keyWord,page:page, completion: { [weak self] (searchMemberListModel) -> (Void) in
+            
+            DIYEmptyView.emptyNoDataActionTableView(tableView: self?.tableView, imageStr: .eight, detailStr: .eight, btnTitleStr: .five, btnClickBlock: {
+                Mediator.push(CommunityRouterModuleType.pushFindFriends)
+            })
             let searchMemberListModel = searchMemberListModel as? SearchMemberListModel
             
             if searchMemberListModel?.pagination?.currentPage ?? 1  <= searchMemberListModel?.pagination?.totalPages ?? 1 {
@@ -98,19 +99,15 @@ extension SearchUserListViewController {
                     self?.tableView.resetNoMoreData()
                 }
                 self?.searchMemberModels = (self?.searchMemberModels)!  + (searchMemberListModel?.data)!
-                if (self?.searchMemberModels.isEmpty)! {
-                    self?.tableView.isHiddenFooter(true)
-                }
-                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: searchMemberListModel?.pagination?.currentPage, totalPages: searchMemberListModel?.pagination?.totalPages)
                 self?.tableView.reloadData()
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: searchMemberListModel?.pagination?.currentPage, totalPages: searchMemberListModel?.pagination?.totalPages)
 
             }else {
-                self?.tableView.endFooterNoMoreData()
+                MJRefreshManager.hiddenFooterNoMoreData(tableView: self?.tableView)
             }
-            
         }) {
             [weak self] (loadingStatus) in
-            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
+            MJRefreshManager.hiddenHeaderWithFooterNONetWork(tableView: self?.tableView)
         }
     }
     

RainbowPlanet/RainbowPlanet/Router/CommunityRouterModuleType.swift

@@ -14,10 +14,12 @@ import SwiftyMediator
 /// - pushPostDetailContent: 跳转帖子内容
 /// - pushPostDetailVoide: 跳转视频内容
 /// - pushFeaturedTopics: 话题内容
+/// - pushFindFriends: 找朋友
 public enum CommunityRouterModuleType: MediatorTargetType {
     case pushPostDetailContent(postId: String)
     case pushPostDetailVoide(postId: String, departType: DepartureVCType)
     case pushFeaturedTopics(id : Int)
+    case pushFindFriends
 }
 
 extension CommunityRouterModuleType: MediatorSourceType {
@@ -36,7 +38,12 @@ extension CommunityRouterModuleType: MediatorSourceType {
             let vc = CommunityFeaturedTopicsViewController()
             vc.id = id
             return vc
+        case .pushFindFriends:
+            let vc = CommunityFindFriendsViewController()
+            return vc
         }
+        
+        
     }
 }
 

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

@@ -61,7 +61,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     /// - Parameters:
     ///   - type: 个人中心内容类别
     ///   - completion: 回调
-    func communityPostMyApi(type:CommunityPostMyType,uid:Int,page:Int = 1,completion: @escaping successCallBack) {
+    func communityPostMyApi(type:CommunityPostMyType,uid:Int,page:Int = 1,completion: @escaping successCallBack,fail: @escaping failCallback) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(type.rawValue, forKey: "type")
         parameters.updateValue(uid, forKey: "uid")
@@ -73,6 +73,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         }
         SwiftMoyaNetWorkManager.shared.failCallback = {
             (loadingStatus) in
+            fail(loadingStatus)
         }
     }
     
@@ -419,7 +420,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     ///   - name: 话题名字
     ///   - page: 分页
     ///   - completion: 回调
-    func communityMemberFollowTopicListApi(name:String = "",page:Int = 1,completion: @escaping successCallBack) {
+    func communityMemberFollowTopicListApi(name:String = "",page:Int = 1,completion: @escaping successCallBack,fail: @escaping failCallback) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         parameters.updateValue(name, forKey: "name")
@@ -430,6 +431,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         }
         SwiftMoyaNetWorkManager.shared.failCallback = {
             (loadingStatus) in
+            fail(loadingStatus)
         }
     }
     
@@ -478,7 +480,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     /// - Parameters:
     ///   - id: 内容id
     ///   - completion: 回调
-    func communityPostDetailApi(id:Int,completion: @escaping successCallBack) {
+    func communityPostDetailApi(id:Int,completion: @escaping successCallBack,fail: @escaping failCallback) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         
@@ -488,6 +490,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         }
         SwiftMoyaNetWorkManager.shared.failCallback = {
             (loadingStatus) in
+            fail(loadingStatus)
         }
     }
     

RainbowPlanet/RainbowPlanet/Tools/EmptyView/DIYEmptyView.swift

@@ -142,7 +142,7 @@ class DIYEmptyView: LYEmptyView {
     ///   - collectionView: collectionView
     ///   - imageStr: 图片默认图
     ///   - detailStr: 标题
-    class func emptyNoDataTableView(collectionView:UICollectionView?,imageStr:DIYEmptyViewImageStr = .one,detailStr:DIYEmptyViewDetailString = .one) {
+    class func emptyNoDataCollectionView(collectionView:UICollectionView?,imageStr:DIYEmptyViewImageStr = .one,detailStr:DIYEmptyViewDetailString = .one) {
         let emptyView = DIYEmptyView.empty(withImageStr: imageStr.rawValue, titleStr: nil, detailStr: detailStr.rawValue)
         collectionView?.ly_emptyView = emptyView
         collectionView?.ly_startLoading()
@@ -156,41 +156,10 @@ class DIYEmptyView: LYEmptyView {
     ///   - detailStr: 标题
     ///   - btnTitleStr: 按钮表示
     ///   - btnClickBlock:
-    class func emptyNoDataActionTableView(collectionView:UICollectionView?,imageStr:DIYEmptyViewImageStr = .one,detailStr:DIYEmptyViewDetailString = .one,btnTitleStr:DIYEmptyViewActionBtnString = .one,btnClickBlock: @escaping LYActionTapBlock) {
+    class func emptyNoDataActionCollectionView(collectionView:UICollectionView?,imageStr:DIYEmptyViewImageStr = .one,detailStr:DIYEmptyViewDetailString = .one,btnTitleStr:DIYEmptyViewActionBtnString = .one,btnClickBlock: @escaping LYActionTapBlock) {
         let emptyView = DIYEmptyView.emptyActionView(withImageStr: imageStr.rawValue, titleStr: nil, detailStr: detailStr.rawValue, btnTitleStr: btnTitleStr.rawValue,btnClick: btnClickBlock)
         collectionView?.ly_emptyView = emptyView
         collectionView?.ly_startLoading()
     }
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-
-    /// tableView上的默认图
-    ///
-    /// - Parameter tableView: UITableView
-    class func emptyTableView(tableView:UITableView,contentViewY : CGFloat = kScaleValue(value: 164)) {
-        let emptyView = DIYEmptyView.empty(withImageStr: "default_page_content", titleStr: nil, detailStr: "暂时没有内容哦")
-        emptyView?.contentViewY = contentViewY
-        tableView.ly_emptyView = emptyView
-        tableView.ly_startLoading()
-    }
-    
-    /// collectionView上的默认图
-    ///
-    /// - Parameter collectionView: UICollectionView
-    class func emptyCollectionView(collectionView:UICollectionView,contentViewY : CGFloat = kScaleValue(value: 164)) {
-        let emptyView = DIYEmptyView.empty(withImageStr: "default_page_content", titleStr: nil, detailStr: "暂时没有内容哦")
-        emptyView?.contentViewY = contentViewY
-        collectionView.ly_emptyView = emptyView
-        collectionView.ly_startLoading()
-    }
 
 }