南鑫林 5 anos atrás
pai
commit
cdcbd3b625

+ 6 - 2
RainbowPlanet/RainbowPlanet/Modules/CircleModule/Circle/View/CircleEssenceView/CircleEssenceView.swift

@@ -40,7 +40,7 @@ class CircleEssenceView: BaseView {
         
         tableView.addHeader(withBeginRefresh: true,  animation: false) {
             [weak self] (page) in
-            self?.communityCircleArticlesApi(page: page)
+            self?.communityCircleArticlesApi(page: 1)
         }
         tableView.addAutoNormalFooter(withAutomaticallyRefresh: true, loadMoreBlock: {
             [weak self] (page) in
@@ -454,6 +454,10 @@ extension CircleEssenceView : UITableViewDelegate,UITableViewDataSource {
         view.backgroundColor = kf7f8faColor
         return view
     }
+    
+    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        self.listViewDidScrollCallback?(scrollView)
+    }
 }
 
 extension CircleEssenceView : JXPagingViewListViewDelegate {
@@ -466,6 +470,6 @@ extension CircleEssenceView : JXPagingViewListViewDelegate {
     }
     
     public func listScrollView() -> UIScrollView {
-        return UIScrollView()
+        return tableView
     }
 }

+ 5 - 2
RainbowPlanet/RainbowPlanet/Modules/CircleModule/Circle/View/CircleLeavingMessageView/CircleLeavingMessageView.swift

@@ -141,7 +141,6 @@ extension CircleLeavingMessageView : UITableViewDelegate,UITableViewDataSource {
                 var indexPath = indexPath
                 indexPath.row = 2
                 tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
-//                tableView.reloadSections([indexPath.section], with: UITableView.RowAnimation.none)
             }
             return cell
         default:
@@ -213,6 +212,10 @@ extension CircleLeavingMessageView : UITableViewDelegate,UITableViewDataSource {
         view.backgroundColor = kf7f8faColor
         return view
     }
+    
+    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        self.listViewDidScrollCallback?(scrollView)
+    }
 }
 
 extension CircleLeavingMessageView : JXPagingViewListViewDelegate {
@@ -225,6 +228,6 @@ extension CircleLeavingMessageView : JXPagingViewListViewDelegate {
     }
     
     public func listScrollView() -> UIScrollView {
-        return UIScrollView()
+        return  tableView
     }
 }

+ 5 - 3
RainbowPlanet/RainbowPlanet/Modules/CircleModule/Circle/ViewController/CircleViewController.swift

@@ -103,6 +103,7 @@ class CircleViewController: BaseViewController {
             }
             
         }).disposed(by: disposeBag)
+        
         loadCircleData()
     }
     
@@ -236,8 +237,9 @@ class CircleViewController: BaseViewController {
     }()
     
     //4.pagingView
-    lazy var pagingView: JXPagingView = {
-        let pagingView = JXPagingView(delegate: self)
+    lazy var pagingView: JXPagingListRefreshView = {
+        let pagingView = JXPagingListRefreshView(delegate: self)
+        pagingView.pinSectionHeaderVerticalOffset = Int(kNavBarTotalHeight)
         pagingView.frame = self.view.frame
         return pagingView
     }()
@@ -298,7 +300,7 @@ extension CircleViewController : JXPagingViewDelegate {
     }
     
     func viewForPinSectionHeader(in pagingView: JXPagingView) -> UIView {
-        pagingView.pinSectionHeaderVerticalOffset = Int(kNavBarTotalHeight)
+       
         return segmentedView
     }