南鑫林 %!s(int64=5) %!d(string=hai) anos
pai
achega
41ce7d5361

+ 7 - 4
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -203,7 +203,8 @@ extension CommunityFollowViewController {
     ///
     /// - Parameter page: 分页
     func communityFollowFeedApi(page:Int) {
-        SwiftMoyaNetWorkServiceCommunity.shared().communityFollowFeedApi(page:page) {
+        
+        SwiftMoyaNetWorkServiceCommunity.shared().communityFollowFeedApi(page:page,completion:{
             [weak self] (communityFollowFeedModel) -> (Void) in
             let communityFollowFeedModel = communityFollowFeedModel as? CommunityFollowFeedModel
             if communityFollowFeedModel?.pagination?.currentPage ?? 1  <= communityFollowFeedModel?.pagination?.totalPages ?? 1 {
@@ -216,12 +217,14 @@ extension CommunityFollowViewController {
                     self?.tableView.tableHeaderView = self?.followTableHeaderView
                 }
                 self?.tableView.reloadData()
-                if  self?.communityFollowDataModels.count ?? 0 >= communityFollowFeedModel?.pagination?.total ?? 0 {
-                    self?.tableView.endFooterNoMoreData()
-                }
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: communityFollowFeedModel?.pagination?.currentPage, totalPages: communityFollowFeedModel?.pagination?.totalPages)
+
             }else {
                 self?.tableView.endFooterNoMoreData()
             }
+        }) {
+            [weak self] (loadingStatus) in
+            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
         }
     }
     

+ 8 - 4
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Recommend/CommunityRecommnendViewController.swift

@@ -168,7 +168,8 @@ extension CommunityRecommnendViewController {
     ///
     /// - Parameter page: 分页
     func communityPostSuggestApi(page:Int) {
-        SwiftMoyaNetWorkServiceCommunity.shared().communityPostSuggestApi(page:page) {
+        
+        SwiftMoyaNetWorkServiceCommunity.shared().communityPostSuggestApi(page:page,completion: {
             [weak self] (communityRecommendFeedModel) -> (Void) in
             let communityRecommendFeedModel = communityRecommendFeedModel as? CommunityRecommendFeedModel
             if communityRecommendFeedModel?.pagination?.currentPage ?? 1  <= communityRecommendFeedModel?.pagination?.totalPages ?? 1 {
@@ -178,13 +179,16 @@ extension CommunityRecommnendViewController {
                 }
                 self?.communityRecommendDataModels = (self?.communityRecommendDataModels)! + (communityRecommendFeedModel?.data!)!
                 self?.tableView.reloadData()
-                if  self?.communityRecommendDataModels.count ?? 0 >= communityRecommendFeedModel?.pagination?.total ?? 0 {
-                    self?.tableView.endFooterNoMoreData()
-                }
+                MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView, currentPage: communityRecommendFeedModel?.pagination?.currentPage, totalPages: communityRecommendFeedModel?.pagination?.totalPages)
+
             }else {
                 self?.tableView.endFooterNoMoreData()
             }
+        }) {
+            [weak self] (loadingStatus) in
+            MJRefreshManager.hiddenHeaderWithFooter(tableView: self?.tableView)
         }
+        
     }
     
     /// 评论

+ 4 - 2
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaNetWorkServiceCommunity.swift

@@ -328,7 +328,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     /// - Parameters:
     ///   - page: 多关注页面feed流
     ///   - completion: 回调
-    func communityFollowFeedApi(page:Int = 1,completion: @escaping successCallBack) {
+    func communityFollowFeedApi(page:Int = 1,completion: @escaping successCallBack,fail: @escaping failCallback) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityFollowFeedModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityFollowFeed(parameters: parameters))) {  (communityFollowFeedModel) in
@@ -337,6 +337,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         }
         SwiftMoyaNetWorkManager.shared.failCallback = {
             (loadingStatus) in
+            fail(loadingStatus)
         }
     }
     
@@ -347,7 +348,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     /// - Parameters:
     ///   - page: 多关注页面feed流
     ///   - completion: completion description
-    func communityPostSuggestApi(page:Int = 1,completion: @escaping successCallBack) {
+    func communityPostSuggestApi(page:Int = 1,completion: @escaping successCallBack,fail:@escaping failCallback) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         
@@ -357,6 +358,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         }
         SwiftMoyaNetWorkManager.shared.failCallback = {
             (loadingStatus) in
+            fail(loadingStatus)
         }
     }