消息中心列表和评论详情页添加下拉刷新

DreamSleep/DreamSleep/Class/CommunityModule/ComReplyList/ReplyListController.h

@@ -5,12 +5,16 @@
 //  Created by peter on 2022/10/9.
 //
 
-#import <UIKit/UIKit.h>
+#import "BaseViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-/// 评论回复列表页面
-@interface ReplyListController : UIViewController
+/*
+ 评论回复列表页面：
+ 1、社区动态详情页全部评论点击回复区域；
+ 2、消息中心点击评论回复cell；
+ */
+@interface ReplyListController : BaseViewController
 
 @property (nonatomic, assign) int commentID;
 

DreamSleep/DreamSleep/Class/CommunityModule/ComReplyList/ReplyListController.m

@@ -17,30 +17,27 @@
 @implementation ReplyListController
 
 - (void)loadView {
+    self.comDetailViewModel = [ComDetailViewModel new];
     self.view = self.replyDetailView;
 }
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-        
-    self.navigationItem.title = @"评论详情页";
     
-    self.comDetailViewModel = [ComDetailViewModel new];
+    self.navigationItem.title = @"评论详情页";
     
-    [self.comDetailViewModel queryCommentRelpyListWithCommentID:self.commentID completion:^(ComDetailViewModel * _Nonnull requestModel) {
-        if (requestModel.resCode == DSResCodeSuccess) {
-            [self.replyDetailView updateReplyDetailView:requestModel.replyGroupDatas];
-        } else {
-            [DSProgressHUD showToast:requestModel.errMessage];
-        }
+    WS(weakSelf);
+    self.replyDetailView.mj_header = [DSGifHeader headerWithRefreshingBlock:^{
+        [weakSelf.comDetailViewModel queryCommentRelpyListWithCommentID:weakSelf.commentID completion:^(ComDetailViewModel * _Nonnull requestModel) {
+            [weakSelf.replyDetailView.mj_header endRefreshing];
+            if (requestModel.resCode == DSResCodeSuccess) {
+                [weakSelf.replyDetailView updateReplyDetailView:requestModel.replyGroupDatas];
+            } else {
+                [DSProgressHUD showToast:requestModel.errMessage];
+            }
+        }];
     }];
-}
-
-#pragma mark - ReplyDetailViewDelegate
-
-#pragma mark - 品牌模式
-- (NaviStyle)navigationBarStyle {
-    return NaviStyleDefault;
+    [self.replyDetailView.mj_header beginRefreshing];
 }
 
 #pragma mark - lazy

DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/Controller/MessageController.m

@@ -28,9 +28,18 @@
     
     self.navigationItem.title = @"消息中心";
     
-    [self.messageCenterVM muiltiRequestWithCompletion:^(BOOL isSuccess) {
-        if (isSuccess) { [self.messageNotiView reloadData]; }
+    WS(weakSelf);
+    self.messageNotiView.mj_header = [DSGifHeader headerWithRefreshingBlock:^{
+        [weakSelf.messageCenterVM muiltiRequestWithCompletion:^(BOOL isSuccess, NSString * _Nonnull errorMessage) {
+            [weakSelf.messageNotiView.mj_header endRefreshing];
+            if (isSuccess) {
+                [weakSelf.messageNotiView reloadData];
+            } else {
+                [DSProgressHUD showToast:errorMessage];
+            }
+        }];
     }];
+    [self.messageNotiView.mj_header beginRefreshing];
 }
 
 #pragma mark - MessageNotiViewDelegate

DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/ViewModel/MessageCenterViewModel.h

@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// 官方通知和用户通知合并请求
 /// @param completion completion
-- (void)muiltiRequestWithCompletion:(void (^)(BOOL isSuccess))completion;
+- (void)muiltiRequestWithCompletion:(void (^)(BOOL isSuccess, NSString *errorMessage))completion;
 
 /// 消息中心用户回复评论接口
 /// @param content 回复内容

DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/ViewModel/MessageCenterViewModel.m

@@ -38,7 +38,7 @@
 }
 
 #pragma mark - public
-- (void)muiltiRequestWithCompletion:(void (^)(BOOL isSuccess))completion {
+- (void)muiltiRequestWithCompletion:(void (^)(BOOL isSuccess, NSString *errorMessage))completion {
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
     dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
     dispatch_group_t group = dispatch_group_create();
@@ -49,7 +49,7 @@
                 DSLog(@"获取社区动态消息中心官方和点赞统计未读通知数据成功...");
                 dispatch_semaphore_signal(semaphore);
             } else {
-                completion(NO);
+                completion(NO, requestModel.errMessage);
             }
         }];
     });
@@ -59,7 +59,7 @@
                 DSLog(@"社区动态消息中心接口数据成功...");
                 dispatch_semaphore_signal(semaphore);
             } else {
-                completion(NO);
+                completion(NO, requestModel.errMessage);
             }
         }];
     });
@@ -72,7 +72,7 @@
         // 在这里进行请求后的方法，回到主线程
         dispatch_async(dispatch_get_main_queue(), ^{
             self.messageListArr = @[self.offNotiArr, self.userNotiArr];
-            completion(YES);
+            completion(YES, nil);
         });
     });
 }