no message

RainbowPlanet/RainbowPlanet/Base/BaseViewController/BaseViewController.swift

@@ -18,13 +18,12 @@ class BaseViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationController?.navigationBar.isHidden = true
-        automaticallyAdjustsScrollViewInsets = false
         view.backgroundColor = UIColor.white
         if #available(iOS 11.0, *) {
             UIScrollView.appearance().contentInsetAdjustmentBehavior =  .automatic
         } else {
             if self.responds(to: #selector(setter: self.automaticallyAdjustsScrollViewInsets)) {
-                self.automaticallyAdjustsScrollViewInsets = true
+                self.automaticallyAdjustsScrollViewInsets = false
             }
         }
         setupNavigationBar()

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

@@ -8,7 +8,7 @@
 
 import UIKit
 import JXSegmentedView
-class SearchUserListViewController: UIViewController {
+class SearchUserListViewController: BaseViewController {
     
     deinit {
         if observe != nil {
@@ -27,7 +27,8 @@ class SearchUserListViewController: UIViewController {
         setupData()
     }
     
-    func setupViews() {
+    override func setupViews() {
+        navigationBar.isHidden = true
         view.backgroundColor = kf7f8faColor
         view.addSubview(tableView)
         let emptyView = DIYEmptyView.empty(with: kImage(name: "default_page_content"), titleStr: "没有找到相关，去看看别人都在看什么吧~", detailStr: nil)
@@ -36,16 +37,14 @@ class SearchUserListViewController: UIViewController {
         tableView.ly_startLoading()
     }
     
-    func setupLayouts() {
+    override func setupLayouts() {
         tableView.snp.makeConstraints { (make) in
             make.top.equalTo(5)
-            make.left.equalTo(0)
-            make.right.equalTo(0)
-            make.bottom.equalTo(0)
+            make.left.right.bottom.equalToSuperview()
         }
     }
-    func setupData() {
-        tableView.addHeader(withBeginRefresh: true, animation: false) {
+    override func setupData() {
+        tableView.addHeader(withBeginRefresh: true, animation: true) {
             [weak self] (page) in
             self?.userMemberSearchMemberApi(page: page)
         }
@@ -76,6 +75,9 @@ class SearchUserListViewController: UIViewController {
         tableView.rowHeight = 81
         tableView.dataSource = self
         tableView.delegate = self
+        tableView.estimatedRowHeight = 0
+        tableView.estimatedSectionFooterHeight = 0
+        tableView.estimatedSectionHeaderHeight = 0
         return tableView
     }()
     
@@ -87,23 +89,24 @@ extension SearchUserListViewController {
     ///
     /// - Parameter page: 分页
     func userMemberSearchMemberApi(page:Int) {
-        SwiftMoyaNetWorkServiceUser.shared().userMemberSearchMemberApi(userName: keyWord) {
-            [weak self] (searchMemberListModel) -> (Void) in
+        SwiftMoyaNetWorkServiceUser.shared().userMemberSearchMemberApi(userName: keyWord,page:page, completion: { [weak self] (searchMemberListModel) -> (Void) in
             let searchMemberListModel = searchMemberListModel as? SearchMemberListModel
-            if searchMemberListModel?.pagination?.currentPage ?? 1  <= searchMemberListModel?.pagination?.totalPages ?? 1 {
-                if searchMemberListModel?.pagination?.currentPage == 1{
-                    self?.searchMemberModels.removeAll()
-                    self?.tableView.resetNoMoreData()
-
-                }
-                self?.searchMemberModels = (self?.searchMemberModels)! + (searchMemberListModel?.data!)!
-                self?.tableView.reloadData()
-                if  self?.searchMemberModels.count ?? 0 >= searchMemberListModel?.pagination?.total ?? 0 {
-                    self?.tableView.endFooterNoMoreData()
-                }
-            }else {
+            if searchMemberListModel?.pagination?.currentPage == 1{
+                self?.searchMemberModels.removeAll()
+                self?.tableView.resetNoMoreData()
+            }
+            self?.searchMemberModels = (self?.searchMemberModels)! + (searchMemberListModel?.data!)!
+            self?.tableView.endHeaderRefresh()
+            self?.tableView.endFooterRefresh()
+            if  searchMemberListModel?.pagination?.currentPage ?? 1  >= searchMemberListModel?.pagination?.totalPages ?? 1 {
                 self?.tableView.endFooterNoMoreData()
             }
+            self?.tableView.reloadData()
+
+        }) {
+            [weak self] (loadingStatus) in
+            self?.tableView.endHeaderRefresh()
+            self?.tableView.endFooterRefresh()
         }
     }
     
@@ -163,6 +166,22 @@ extension SearchUserListViewController :UITableViewDataSource,UITableViewDelegat
 
     }
     
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.000001
+    }
+
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return nil
+    }
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return nil
+    }
+    
 }
 
 extension SearchUserListViewController : JXSegmentedListContainerViewListDelegate {

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

@@ -36,6 +36,9 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
             (cmsTemplateModels) in
             completion(cmsTemplateModels)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     /// 获取首页
@@ -51,6 +54,9 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
             (cmsModel) in
             completion(cmsModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     /// 获取商品列表
@@ -63,6 +69,9 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
             (productSearchModels) in
             completion(productSearchModels)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     /// 默认推荐用户组
@@ -79,6 +88,9 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
             (cmsMemberListModel) in
             completion(cmsMemberListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     /// cms兑换模板展示
@@ -91,5 +103,8 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
             (cmsRedemptionAreaModel) in
             completion(cmsRedemptionAreaModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 }

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

@@ -34,6 +34,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityTopicCategoryModel.self,target: MultiTarget(SwiftMoyaServiceCommunityApi.communityTopicCategory(parameters: parameters))) { (communityTopicCategoryModel) in
             completion(communityTopicCategoryModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 关注推荐话题
@@ -48,6 +51,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceCommunityApi.communityMemberFollowTopic(parameters: parameters))) { (data) in
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     
@@ -66,6 +72,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityPostMyModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 话题列表
@@ -86,6 +95,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityTopicsModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 话题列表
@@ -105,6 +117,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityPostsModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 发布内容
@@ -136,6 +151,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(CommunityPublishModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 删除内容
@@ -152,6 +170,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             NotificationCenter.default.post(name: NSNotification.Name("communityDeletePostApi"), object: postId)
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 获取上传地址和凭证
@@ -172,6 +193,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityVideoAuthModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     /// 获取上传地址和凭证（图片）
@@ -186,6 +210,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(CommunityImageAuthModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 视频列表
@@ -202,6 +229,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityVideoListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 音乐相关
@@ -227,6 +257,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 热门推荐音乐列表
@@ -243,6 +276,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityRecommendMusicListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 获取音乐分类
@@ -258,6 +294,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityMusicCategoryListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 获取分类下所有音乐
@@ -276,6 +315,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityMusicListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 多关注页面feed流
@@ -291,6 +333,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityFollowFeedModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     
@@ -308,6 +353,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityRecommendFeedModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 话题详情
@@ -324,6 +372,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityTopicDetailModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 话题内容列表
@@ -342,6 +393,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityRecommendFeedModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 我关注的话题列表
@@ -360,6 +414,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityMemberFollowTopicListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 关注话题（单个)
@@ -376,6 +433,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(data)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 取消关注话题
@@ -392,6 +452,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(data)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     
@@ -409,6 +472,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityPostDetailModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     
@@ -429,6 +495,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityPostCommentsModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 回复列表
@@ -447,6 +516,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityPostReplysModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 评论&回复
@@ -464,6 +536,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
             
             completion(communityPostCommentIdModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
         
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaNetWorkServiceConfig.swift

@@ -25,12 +25,13 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
     /// - Parameter completion: 回调
     func configApi(completion: @escaping successCallBack) {
         let parameters = Dictionary<String,Any>()
-//
         SwiftMoyaNetWorkManager.shared.requestObject(ConfigModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configConfig(parameters: parameters))) {(configModel) in
-//
             ConfigModel.shared.saveObject(configModel: configModel as! ConfigModel)
             completion(configModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     /// 自提点列表
@@ -54,6 +55,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             
             completion(selfMentionAddressListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     /// 已开通城市列表
@@ -75,6 +79,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             
             completion(selfMentionAddressListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: 单图上传
@@ -100,6 +107,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             
             completion(imageUrlModel.url as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: 单图上传(无提示框)
@@ -123,6 +133,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             let imageUrlModel = imageUrlModel as! ImageUrlModel
             completion(imageUrlModel.url as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: 多图上传
@@ -147,6 +160,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             
             completion(imgUrlArr)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: 邀请海报
@@ -171,6 +187,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             UpdateVersionModel.shared.saveObject(model: updateVersionModel as? UpdateVersionModel ?? UpdateVersionModel())
             completion(updateVersionModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
             
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaNetWorkServiceOrder.swift

@@ -69,6 +69,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             
             completion(orderCreateBackModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 前台订单列表
@@ -105,6 +108,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             
             completion(orderListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
 
     }
     
@@ -122,6 +128,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             
             completion(orderModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 
     
@@ -138,6 +147,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             
             completion(orderModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 申请退款
@@ -164,6 +176,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             
             completion(orderApplyRefundModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 确认收货
@@ -180,6 +195,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 关闭订单
@@ -196,6 +214,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
             SwiftProgressHUD.shared().showText("取消成功")
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServicePay/SwiftMoyaNetWorkServicePay.swift

@@ -32,6 +32,9 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServicePayApi.alipay(parameters: parameters))) { (orderString) in
             completion(orderString as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 
     /// 微信
@@ -47,6 +50,9 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
             let weChatpayOrderModel = weChatpayOrderModel as! WeChatpayOrderModel
             completion(weChatpayOrderModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceProduct/SwiftMoyaNetWorkServiceProduct.swift

@@ -70,6 +70,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             .requestObject(ProductSearchListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productSearch(parameters: parameters))) {(productSearchListModel) in
             completion(productSearchListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 商品分类
@@ -89,6 +92,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
                 
                 completion(categoryListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 首页商品
@@ -122,6 +128,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(productDetailModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 热销商品
@@ -146,6 +155,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(productSearchListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 商品评价列表
@@ -161,6 +173,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         SwiftMoyaNetWorkManager.shared.requestObject(ProductCommentListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCommentList(parameters: parameters))) { (productCommentListModel) in
             completion(productCommentListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 购物车列表
@@ -184,6 +199,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(productCartListData)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 购物车-添加
@@ -221,6 +239,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(cartAmountModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 购物车-添加
@@ -259,6 +280,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(cartAmountModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 商品详情-添加购物车
@@ -296,6 +320,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(cartAmountModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     
@@ -316,6 +343,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 购物车-数量
@@ -335,6 +365,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(cartAmountModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 购物车-选中
@@ -362,6 +395,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 购物车-全选
@@ -388,6 +424,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 退款原因
@@ -402,6 +441,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(refundReasonModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 新增商品评价
@@ -444,6 +486,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             
             completion(dataArr)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 获取购物车商品个数
@@ -464,6 +509,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         SwiftMoyaNetWorkManager.shared.requestObject(ProductCartCountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productGetCartCount(parameters: parameters))) { (productCartCountModel) in
             completion(productCartCountModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceSMS/SwiftMoyaNetWorkServiceSMS.swift

@@ -38,6 +38,9 @@ class SwiftMoyaNetWorkServiceSMS: NSObject {
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceSMSApi.smsSend(parameters: parameters))) { (data) in
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceShop/SwiftMoyaNetWorkServiceShop.swift

@@ -32,6 +32,9 @@ class SwiftMoyaNetWorkServiceShop: NSObject {
             (shopModel) in
             completion(shopModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
 }

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

@@ -44,6 +44,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(userModel as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 
     // MARK: - 手机注册/登录
@@ -66,6 +69,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 
                 completion("")
             }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
         
     }
@@ -89,6 +95,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 
                 completion("")
             }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
     }
     
@@ -105,6 +114,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 登出
@@ -118,6 +130,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             // 设置友盟别名
             kAppDelegate.setLoginController()
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 
     // MARK: - 绑定手机号
@@ -185,6 +200,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 SwiftProgressHUD.shared().showText(rootModel.msg ?? "信息有误")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 绑定手号
@@ -211,6 +229,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 
                 completion("")
             }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
        
     }
@@ -236,6 +257,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 
                 completion("")
             }
+            
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
     }
 
@@ -266,6 +291,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                     completion("")
                 }
             }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
     }
     
@@ -287,6 +315,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(addressManagerListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - (新增、编辑）快递地址
@@ -327,6 +358,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                     completion("")
                 }
             }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
         
         
@@ -347,6 +381,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             if rootModel.code == 0 {
                 completion("")
             }
+            SwiftMoyaNetWorkManager.shared.failCallback = {
+                (loadingStatus) in
+            }
         }
     }
     
@@ -366,6 +403,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 自提点收货人列表
@@ -379,6 +419,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(contactListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 获取默认快递信息
@@ -392,6 +435,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(expressAddrModel as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 获取默认快递信息
@@ -405,6 +451,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(contactMdl as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 新增、编辑 自提地址收货人信息
@@ -456,6 +505,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 自提点收货人信息，设置默认
@@ -475,6 +527,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 新增自提地址
@@ -498,6 +553,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 设置用户配送方式
@@ -521,6 +579,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 completion("")
             }
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 修改用户性别
@@ -532,15 +593,16 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userGenderApi(gender:Int = 0,completion: @escaping successCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(gender, forKey: "gender")
-//
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceUserApi.userMemberUpdateGender(parameters: parameters))) { (data) in
             // 设置成功更新本地存储数据
             let model = UserModel.shared().getModel()
             model?.gender = gender
             UserModel.shared().setModel(model: model!)
-//
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 用户信息详情
@@ -555,6 +617,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(userDetailModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 更新用户信息详情
@@ -582,6 +647,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             UserModel.shared().setModel(model: userModel!)
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 用户关注列表
@@ -597,6 +665,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(userFollowsModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 粉丝列表
@@ -612,6 +683,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(userFansModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 关注
@@ -632,6 +706,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             SwiftProgressHUD.shared().showText("已关注")
             completion(followStatusModel as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 取消关注
@@ -652,6 +729,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             SwiftProgressHUD.shared().showText("已取消关注")
             completion(followStatusModel as Any)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 用户消息消息首页
@@ -666,6 +746,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(messageIndexModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 用户消息列表
@@ -684,6 +767,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(messageListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     // MARK: - 用户消息阅读
     /// 用户消息阅读
@@ -699,13 +785,16 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion("")
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
     
     // MARK: - 粉丝列表
     /// 粉丝列表
     ///
     /// - Parameter completion: 回调UserDetailModel
-    func userMemberSearchMemberApi(userName:String,page:Int = 1,completion: @escaping successCallBack) {
+    func userMemberSearchMemberApi(userName:String,page:Int = 1,completion: @escaping successCallBack,fail: @escaping failCallback) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         parameters.updateValue(userName, forKey: "username")
@@ -714,6 +803,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             
             completion(searchMemberListModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+            fail(loadingStatus)
+        }
     }
     
     
@@ -725,6 +818,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         SwiftMoyaNetWorkManager.shared.requestObject(TotalBeanModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMemberGetTotalBean(parameters: parameters))) { (totalBeanModel) in
             completion(totalBeanModel)
         }
+        SwiftMoyaNetWorkManager.shared.failCallback = {
+            (loadingStatus) in
+        }
     }
 
 }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceVirus/SwiftMoyaNetWorkServiceVirus.swift

@@ -29,7 +29,6 @@ class SwiftMoyaNetWorkServiceVirus: NSObject {
     func virueRecordAddApi(virueRecordAddParameterModel:VirueRecordAddParameterModel,completion: @escaping successCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters = virueRecordAddParameterModel.toJSON()
-        NXLLog(parameters.description)
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceVirusApi.virueRecordAdd(parameters: parameters))) {(data) in
             completion("")
         }

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

@@ -33,7 +33,6 @@ typealias successCallBack = (Any) -> (Void)
 typealias failCallback = (_ loadingStatus:SwiftMoyaNetWorkManagerLoadingStatus) -> Void
 
 
-
 public class SwiftMoyaNetWorkManager: NSObject {
     
     /// 释放内存
@@ -82,13 +81,15 @@ extension SwiftMoyaNetWorkManager {
         }
     }
     
-    /// 失败回调没有有提示
+    // MARK: 失败回调有提示没有
+    /// 失败回调有提示
     func failCall() {
         if let failCallback = self.failCallback  {
             failCallback(.noNetwork)
         }
     }
     
+    // MARK: 失败回调有提示
     /// 失败回调有提示
     func failCallShowText() {
         failCall()
@@ -96,7 +97,7 @@ extension SwiftMoyaNetWorkManager {
             SwiftProgressHUD.shared().showText("网络链接失败,请检查网络")
         }
     }
-    
+    // MARK: 网络连接状态
     /// 网络连接状态
     func networkConnect() {
         //判断是否链接网络
@@ -250,23 +251,6 @@ extension SwiftMoyaNetWorkManager {
     }
 }
 
-extension PrimitiveSequence {
-    
-    func showFailInfo(rootModel:RootModel) {
-        SwiftProgressHUD.shared().showText(rootModel.msg ?? "信息有误!!!")
-    }
-    
-    func log(response:Response,json:JSON) {
-        NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\njson=\n\(json.description)");
-    }
-    
-    func logError(response:Response) {
-        NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
-        SwiftProgressHUD.shared().showText(response.description)
-    }
-}
-
-
 // MARK: - 泛型
 extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Response {
     
@@ -448,3 +432,20 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
         }
     }
 }
+
+// MARK: - 提示
+extension PrimitiveSequence {
+    
+    func showFailInfo(rootModel:RootModel) {
+        SwiftProgressHUD.shared().showText(rootModel.msg ?? "信息有误!!!")
+    }
+    
+    func log(response:Response,json:JSON) {
+        NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\njson=\n\(json.description)");
+    }
+    
+    func logError(response:Response) {
+        NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
+        SwiftProgressHUD.shared().showText(response.description)
+    }
+}

RainbowPlanet/RainbowPlanet/Tools/MJRefreshEX/MJDIYAutoFooter.swift

@@ -9,8 +9,7 @@
 import Foundation
 import MJRefresh
 
-class MJDIYAutoFooter: MJRefreshAutoFooter
-{
+class MJDIYAutoFooter: MJRefreshAutoFooter {
     var label:UILabel!
     var loading:UIActivityIndicatorView!
     
@@ -20,17 +19,20 @@ class MJDIYAutoFooter: MJRefreshAutoFooter
         super.prepare()
         
         // 设置控件的高度
-        self.mj_h = 50
+        self.mj_h = 44
         
         // 添加label
         self.label =  UILabel()
-        self.label.textColor = UIColor(red:1.0, green:0.5, blue:0.0, alpha:1.0)
-        self.label.font = UIFont.boldSystemFont(ofSize: 16)
+        self.label.textColor = k999999Color
+        self.label.font = kRegularFont12
         self.label.textAlignment = .center
+        self.label.isHidden = true
+        self.label.text = "这是我的底线啦~"
         self.addSubview(self.label)
         
         // loading
         self.loading =  UIActivityIndicatorView(style: .gray)
+        self.loading.stopAnimating()
         self.addSubview(self.loading)
     }
     
@@ -39,7 +41,7 @@ class MJDIYAutoFooter: MJRefreshAutoFooter
     {
         super.placeSubviews()
         self.label.frame = self.bounds
-        self.loading.center = CGPoint(x:30, y:self.mj_h * 0.5)
+        self.loading.center = CGPoint(x:self.mj_w/2, y:self.mj_h/2)
     }
     
     //监听控件的刷新状态
@@ -48,15 +50,19 @@ class MJDIYAutoFooter: MJRefreshAutoFooter
         {
             switch (state) {
             case .idle:
-                self.label.text = ""
-                self.loading.stopAnimating()
+                self.label.isHidden = true
+                self.loading.isHidden = false
+                self.loading.startAnimating()
                 break
             case .refreshing:
-                self.label.text = "加载中..."
+                self.label.isHidden = true
+                self.loading.isHidden = false
+
                 self.loading.startAnimating()
                 break
             case .noMoreData:
-                self.label.text = "这是我的底线啦~"
+                self.label.isHidden = false
+                self.loading.isHidden = true
                 self.loading.stopAnimating()
                 break
             default:

RainbowPlanet/RainbowPlanet/Tools/MJRefreshEX/MJDIYBackFooter.swift

@@ -19,14 +19,17 @@ class MJDIYBackFooter: MJRefreshBackFooter {
         super.prepare()
         
         // 设置控件的高度
-        self.mj_h = 50
+        self.mj_h = 44
         
         // 添加label
         self.label =  UILabel()
-        self.label.textColor = UIColor(red:1.0, green:0.5, blue:0.0, alpha:1.0)
-        self.label.font = UIFont.boldSystemFont(ofSize: 16)
+        self.label.textColor = k999999Color
+        self.label.font = kRegularFont12
         self.label.textAlignment = .center
+        self.label.isHidden = true
+        self.label.text = "这是我的底线啦~"
         self.addSubview(self.label)
+        
         // loading
         self.loading =  UIActivityIndicatorView(style: .gray)
         self.addSubview(self.loading)
@@ -36,9 +39,8 @@ class MJDIYBackFooter: MJRefreshBackFooter {
     override func placeSubviews()
     {
         super.placeSubviews()
-        
         self.label.frame = self.bounds
-        self.loading.center = CGPoint(x:self.mj_w - 30, y:self.mj_h * 0.5)
+        self.loading.center = CGPoint(x:self.mj_w/2, y:self.mj_h/2)
     }
     
     //监听控件的刷新状态
@@ -47,39 +49,24 @@ class MJDIYBackFooter: MJRefreshBackFooter {
         {
             switch (state) {
             case .idle:
-                self.loading.stopAnimating()
-                self.label.text = ""
-                break
-            case .pulling:
-                self.loading.stopAnimating()
-                self.label.text = "加载中..."
+                self.label.isHidden = true
+                self.loading.startAnimating()
                 break
             case .refreshing:
+                self.label.isHidden = true
+                
                 self.loading.startAnimating()
-                self.label.text = "加载中..."
                 break
             case .noMoreData:
+                self.label.isHidden = false
                 self.loading.stopAnimating()
-                self.label.text = "这是我的底线啦~"
+                break
             default:
                 break
             }
         }
     }
     
-    //监听拖拽比例（控件被拖出来的比例）
-    override var pullingPercent: CGFloat {
-        didSet
-        {
-            // 1.0 0.5 0.0
-            // 0.5 0.0 0.5
-            let  red =  1.0 - pullingPercent * 0.5
-            let green =  0.5 - 0.5 * pullingPercent
-            let blue =  0.5 * pullingPercent
-            self.label.textColor = UIColor(red:red, green:green, blue:blue, alpha:1.0)
-        }
-    }
-    
     //监听scrollView的contentOffset改变
     override func scrollViewContentOffsetDidChange(_ change: [AnyHashable : Any]!) {
         super.scrollViewContentOffsetDidChange(change)

RainbowPlanet/RainbowPlanet/Tools/MJRefreshEX/UIScrollView+MJRefreshEX.h

@@ -39,7 +39,12 @@
 - (void)addFooterWithAutomaticallyRefresh:(BOOL)automaticallyRefresh loadMoreBlock:(void(^)(NSInteger pageIndex))loadMoreBlock;
 
 /**
- 普通请求结束刷新
+ 普通请求结束刷新头部
+ */
+- (void)endHeaderRefresh;
+
+/**
+ 普通请求结束刷新尾部
  */
 - (void)endFooterRefresh;
 

RainbowPlanet/RainbowPlanet/Tools/MJRefreshEX/UIScrollView+MJRefreshEX.m

@@ -39,9 +39,9 @@ typedef void(^LoadMoreBlock)(NSInteger pageIndex);
             weakSelf.refreshBlock(weakSelf.pageIndex);
         }
         
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [weakSelf endHeaderRefresh];
-        });
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [weakSelf endHeaderRefresh];
+//        });
 
     }];
 
@@ -84,68 +84,64 @@ typedef void(^LoadMoreBlock)(NSInteger pageIndex);
     __weak typeof(self) weakSelf = self;
     self.loadMoreBlock = loadMoreBlock;
     
-    if (automaticallyRefresh) {
-        MJRefreshAutoNormalFooter * footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-            weakSelf.pageIndex += 1;
-            if (weakSelf.loadMoreBlock) {
-                weakSelf.loadMoreBlock(weakSelf.pageIndex);
-            }
-            [weakSelf endFooterRefresh];
-        }];
-
-        footer.automaticallyRefresh = automaticallyRefresh;
-        footer.triggerAutomaticallyRefreshPercent = 1;
-        footer.onlyRefreshPerDrag = YES;
-
-        footer.stateLabel.font = [UIFont systemFontOfSize:13.0];
-        footer.stateLabel.textColor = [UIColor colorWithWhite:0.400 alpha:1.000];
-        [footer setTitle:@"加载中…" forState:MJRefreshStateRefreshing];
-        [footer setTitle:@"这是我的底线啦~" forState:MJRefreshStateNoMoreData];
-
-        self.mj_footer = footer;
-    } else{
-        MJRefreshBackNormalFooter * footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
-            weakSelf.pageIndex += 1;
-            if (weakSelf.loadMoreBlock) {
-                weakSelf.loadMoreBlock(weakSelf.pageIndex);
-            }
-            [weakSelf endFooterRefresh];
-        }];
-
-        footer.stateLabel.font = [UIFont systemFontOfSize:13.0];
-        footer.stateLabel.textColor = [UIColor colorWithWhite:0.400 alpha:1.000];
-        [footer setTitle:@"加载中…" forState:MJRefreshStateRefreshing];
-        [footer setTitle:@"这是我的底线啦~" forState:MJRefreshStateNoMoreData];
-
-        footer.mj_h = 50.0;
-        self.mj_footer = footer;
-    }
-    
-//        if (automaticallyRefresh) {
-//            MJDIYAutoFooter * footer = [MJDIYAutoFooter footerWithRefreshingBlock:^{
-//                self.pageIndex += 1;
-//                if (self.loadMoreBlock) {
-//                    self.loadMoreBlock(self.pageIndex);
-//                }
-//                [self endFooterRefresh];
-//            }];
+//    if (automaticallyRefresh) {
+//        MJRefreshAutoNormalFooter * footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+//            weakSelf.pageIndex += 1;
+//            if (weakSelf.loadMoreBlock) {
+//                weakSelf.loadMoreBlock(weakSelf.pageIndex);
+//            }
+//            [weakSelf endFooterRefresh];
+//        }];
 //
-//            footer.automaticallyRefresh = automaticallyRefresh;
-//            footer.triggerAutomaticallyRefreshPercent = 1;
-//            footer.onlyRefreshPerDrag = YES;
-//            self.mj_footer = footer;
-//        }
-//        else{
-//            MJDIYBackFooter * footer = [MJDIYBackFooter footerWithRefreshingBlock:^{
-//                self.pageIndex += 1;
-//                if (self.loadMoreBlock) {
-//                    self.loadMoreBlock(self.pageIndex);
-//                }
-//                [self endFooterRefresh];
-//            }];
-//            self.mj_footer = footer;
-//        }
+//        footer.automaticallyRefresh = automaticallyRefresh;
+//        footer.triggerAutomaticallyRefreshPercent = 1;
+//        footer.onlyRefreshPerDrag = YES;
+//
+//        footer.stateLabel.font = [UIFont systemFontOfSize:13.0];
+//        footer.stateLabel.textColor = [UIColor colorWithWhite:0.400 alpha:1.000];
+//        [footer setTitle:@"加载中…" forState:MJRefreshStateRefreshing];
+//        [footer setTitle:@"这是我的底线啦~" forState:MJRefreshStateNoMoreData];
+//
+//        self.mj_footer = footer;
+//    } else{
+//        MJRefreshBackNormalFooter * footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+//            weakSelf.pageIndex += 1;
+//            if (weakSelf.loadMoreBlock) {
+//                weakSelf.loadMoreBlock(weakSelf.pageIndex);
+//            }
+//            [weakSelf endFooterRefresh];
+//        }];
+//
+//        footer.stateLabel.font = [UIFont systemFontOfSize:13.0];
+//        footer.stateLabel.textColor = [UIColor colorWithWhite:0.400 alpha:1.000];
+//        [footer setTitle:@"加载中…" forState:MJRefreshStateRefreshing];
+//        [footer setTitle:@"这是我的底线啦~" forState:MJRefreshStateNoMoreData];
+//
+//        footer.mj_h = 50.0;
+//        self.mj_footer = footer;
+//    }
     
+        if (automaticallyRefresh) {
+            MJDIYAutoFooter * footer = [MJDIYAutoFooter footerWithRefreshingBlock:^{
+                weakSelf.pageIndex += 1;
+                if (weakSelf.loadMoreBlock) {
+                    weakSelf.loadMoreBlock(weakSelf.pageIndex);
+                }
+            }];
+            footer.automaticallyRefresh = automaticallyRefresh;
+//            footer.triggerAutomaticallyRefreshPercent = 1;
+            footer.onlyRefreshPerDrag = YES;
+            weakSelf.mj_footer = footer;
+
+        } else{
+            MJDIYBackFooter * footer = [MJDIYBackFooter footerWithRefreshingBlock:^{
+                weakSelf.pageIndex += 1;
+                if (weakSelf.loadMoreBlock) {
+                    weakSelf.loadMoreBlock(weakSelf.pageIndex);
+                }
+            }];
+            weakSelf.mj_footer = footer;
+        }
 }
 
 -(void)beginHeaderRefresh {