Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 6a64b775 由 cgx
选项

完成通知已读功能（query_community_notify_flag、update_comment_reply_read_status）

1 个父辈 3626cf08
内嵌 并排
正在显示 11 个修改的文件 包含 155 行增加 和 2 行删除
DreamSleep/DreamSleep/Class/CommunityModule/DynamicList/Controller/CommunityController.m
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
@property (nonatomic, strong) CommunityView *communityView; @property (nonatomic, strong) CommunityView *communityView;
@property (nonatomic, strong) ComListViewModel *comListViewModel; @property (nonatomic, strong) ComListViewModel *comListViewModel;
@property (nonatomic, strong) NSURLSessionDataTask *likeDataTask; @property (nonatomic, strong) NSURLSessionDataTask *likeDataTask;
@property (nonatomic, strong) UIView *redDot;
@end @end
@implementation CommunityController @implementation CommunityController
...@@ -34,6 +35,12 @@ ...@@ -34,6 +35,12 @@
[self setupUI]; [self setupUI];
} }
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[self getCommunityNotifyFlag];
}
- (void)dealloc { - (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self name:NeedUpdateComList object:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self name:NeedUpdateComList object:nil];
} }
...@@ -51,6 +58,7 @@ ...@@ -51,6 +58,7 @@
[messageBtn addTarget:self action:@selector(messageAction) forControlEvents:UIControlEventTouchUpInside]; [messageBtn addTarget:self action:@selector(messageAction) forControlEvents:UIControlEventTouchUpInside];
[messageBtn dk_setImage:DKImagePickerWithNames(@"ic_message_shequ", @"dk_ic_message_shequ", @"ic_message_shequ") forState:UIControlStateNormal]; [messageBtn dk_setImage:DKImagePickerWithNames(@"ic_message_shequ", @"dk_ic_message_shequ", @"ic_message_shequ") forState:UIControlStateNormal];
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:messageBtn]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:messageBtn];
[messageBtn addSubview:self.redDot];
// 监听社区动态列表需要刷新数据通知 // 监听社区动态列表需要刷新数据通知
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(needUpdateNoti) name:NeedUpdateComList object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(needUpdateNoti) name:NeedUpdateComList object:nil];
...@@ -68,6 +76,15 @@ ...@@ -68,6 +76,15 @@
[self.navigationController pushViewController:[MessageController new] animated:YES]; [self.navigationController pushViewController:[MessageController new] animated:YES];
} }
#pragma mark - 获取社区列表通知按钮状态
- (void)getCommunityNotifyFlag {
[ComListViewModel queryCommunityNotifyFlagWithCompletion:^(ComListViewModel * _Nonnull requestModel) {
if (requestModel.resCode == DSResCodeSuccess) {
self.redDot.hidden = !requestModel.hasNoti;
}
}];
}
#pragma mark - CommunityViewDelegate #pragma mark - CommunityViewDelegate
- (void)tapCommunityHeaderModule:(NSInteger)index { - (void)tapCommunityHeaderModule:(NSInteger)index {
if (![LoginUtils getUserLoginData]) { if (![LoginUtils getUserLoginData]) {
...@@ -79,7 +96,12 @@ ...@@ -79,7 +96,12 @@
} }
- (void)getDynamicListRequest:(BOOL)loadMore { - (void)getDynamicListRequest:(BOOL)loadMore {
if (loadMore == NO) { self.offset = 1; } // 下拉刷新
if (loadMore == NO) {
[self getCommunityNotifyFlag];
self.offset = 1;
}
[self.comListViewModel querySleepDynamicListWithLoadMore:loadMore offset:self.offset completion:^(ComListViewModel * _Nonnull requestModel) { [self.comListViewModel querySleepDynamicListWithLoadMore:loadMore offset:self.offset completion:^(ComListViewModel * _Nonnull requestModel) {
if (requestModel.resCode == DSResCodeSuccess) { if (requestModel.resCode == DSResCodeSuccess) {
...@@ -181,6 +203,16 @@ ...@@ -181,6 +203,16 @@
return _communityView; return _communityView;
} }
- (UIView *)redDot {
if (!_redDot) {
_redDot = [[UIView alloc] initWithFrame:CGRectMake(17, 5, 5, 5)];
[_redDot cornerRadius:2.5];
_redDot.hidden = YES;
_redDot.backgroundColor = ColorFromHex(0xF04B77);
}
return _redDot;
}
#pragma mark - 导航栏日间、黑夜模式 #pragma mark - 导航栏日间、黑夜模式
- (NaviStyle)navigationBarStyle { - (NaviStyle)navigationBarStyle {
return [self.dk_manager.themeVersion isEqualToString:DKThemeVersionNormal] ? NaviStyleLight : NaviStyleDark; return [self.dk_manager.themeVersion isEqualToString:DKThemeVersionNormal] ? NaviStyleLight : NaviStyleDark;
......
DreamSleep/DreamSleep/Class/CommunityModule/DynamicList/ViewModel/ComListViewModel.h
...@@ -21,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -21,6 +21,9 @@ NS_ASSUME_NONNULL_BEGIN
/// 自定义字段，用于标识是否是官方发布的动态 /// 自定义字段，用于标识是否是官方发布的动态
@property (nonatomic, assign) BOOL isOfficial; @property (nonatomic, assign) BOOL isOfficial;
/// 社区列表通知图标是否有新的通知标识
@property (nonatomic, assign) BOOL hasNoti;
/// 社区动态查询列表接口 /// 社区动态查询列表接口
/// @param loadMore 上下拉标识 /// @param loadMore 上下拉标识
/// @param offset offset /// @param offset offset
...@@ -42,6 +45,10 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -42,6 +45,10 @@ NS_ASSUME_NONNULL_BEGIN
/// @param comDynModel comDynModel /// @param comDynModel comDynModel
/// @param completion completion /// @param completion completion
+ (NSURLSessionDataTask *)userDynamicPraiseWithComDynModel:(ComDynModel *)comDynModel completion:(void (^)(ComListViewModel *requestModel))completion; + (NSURLSessionDataTask *)userDynamicPraiseWithComDynModel:(ComDynModel *)comDynModel completion:(void (^)(ComListViewModel *requestModel))completion;
/// 社区广场右上角通知标识的接口
/// @param completion completion
+ (NSURLSessionDataTask *)queryCommunityNotifyFlagWithCompletion:(void (^)(ComListViewModel *requestModel))completion;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/DynamicList/ViewModel/ComListViewModel.m
...@@ -117,4 +117,20 @@ ...@@ -117,4 +117,20 @@
}]; }];
} }
+ (NSURLSessionDataTask *)queryCommunityNotifyFlagWithCompletion:(void (^)(ComListViewModel *requestModel))completion {
ComListViewModel * requestModel = [[ComListViewModel alloc] init];
NSString *api = @"query_community_notify_flag";
NSString *argStr = [NSString stringWithFormat:@"query{%@}", api];
return [self httpPostBodyRequestWithAPI:api params:@{@"query" : argStr} view:nil hasNetActivity:YES loadingInfo:nil hasFailInfo:NO success:^(NSDictionary * _Nonnull apiDic) {
DSLog(@"社区广场右上角通知标识的接口apiDic：%@", apiDic);
requestModel.resCode = DSResCodeSuccess;
requestModel.hasNoti = [apiDic[@"result"] boolValue];
completion(requestModel);
} failure:^(id _Nonnull failureInfo) {
requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel);
}];
}
@end @end
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/Controller/MessageController.m
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
#pragma mark - MessageNotiViewDelegate #pragma mark - MessageNotiViewDelegate
- (void)didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - (void)didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
if (indexPath.section == 0) { if (indexPath.section == 0) {
// 点击官方通知或者收到点赞里面标记已读
[self.messageCenterVM updateOfficialReadStatus:indexPath];
[self.messageNotiView refreshReadStatusView:indexPath];
if (indexPath.row == 0) { if (indexPath.row == 0) {
OfficialNoticeController *officialVC = [OfficialNoticeController new]; OfficialNoticeController *officialVC = [OfficialNoticeController new];
[self.navigationController pushViewController:officialVC animated:YES]; [self.navigationController pushViewController:officialVC animated:YES];
...@@ -44,6 +48,19 @@ ...@@ -44,6 +48,19 @@
[self.navigationController pushViewController:praiseVC animated:YES]; [self.navigationController pushViewController:praiseVC animated:YES];
} }
} else { } else {
// 1、先更新阅读状态
[self.messageCenterVM updateReadStatus:indexPath status:1];
[self.messageNotiView refreshReadStatusView:indexPath];
// 2、调用更新状态接口
int notiID = (int)[self.messageCenterVM getNotiIDWithIndexPath:indexPath];
[MessageCenterViewModel updateCommentReplyReadStatusWithID:notiID completion:^(MessageCenterViewModel * _Nonnull requestModel) {
if (requestModel.resCode != DSResCodeSuccess) {
// 3、阅读状态回滚
[self.messageCenterVM updateReadStatus:indexPath status:0];
[self.messageNotiView refreshReadStatusView:indexPath];
}
}];
ReplyListController *replyList = [ReplyListController new]; ReplyListController *replyList = [ReplyListController new];
replyList.commentID = (int)[self.messageCenterVM getUserCommentIDWithIndexPath:indexPath]; replyList.commentID = (int)[self.messageCenterVM getUserCommentIDWithIndexPath:indexPath];
[self.navigationController pushViewController:replyList animated:YES]; [self.navigationController pushViewController:replyList animated:YES];
......
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/Model/MessageComReplyModel.h
...@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
/// 消息中心评论和回复数据model /// 消息中心评论和回复数据model
@interface MessageComReplyModel : NSObject @interface MessageComReplyModel : NSObject
/// 评论回复id
@property (nonatomic, assign) NSInteger notiID;
/// 动态id /// 动态id
@property (nonatomic, assign) NSInteger talkID; @property (nonatomic, assign) NSInteger talkID;
/// 评论id /// 评论id
......
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/Model/MessageComReplyModel.m
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
#pragma mark - YYModel #pragma mark - YYModel
+ (nullable NSDictionary<NSString *, id> *)modelCustomPropertyMapper { + (nullable NSDictionary<NSString *, id> *)modelCustomPropertyMapper {
return @{@"talkID" : @"talk_id", return @{@"notiID" : @"id",
@"talkID" : @"talk_id",
@"commentID" : @"comment_id", @"commentID" : @"comment_id",
@"userID" : @"user_id", @"userID" : @"user_id",
@"preUserID" : @"pre_user_id", @"preUserID" : @"pre_user_id",
......
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/View/MessageComReplyCell.m
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
@property (nonatomic, strong) UIImageView *icon; @property (nonatomic, strong) UIImageView *icon;
@property (nonatomic, strong) UILabel *nameLab; @property (nonatomic, strong) UILabel *nameLab;
@property (nonatomic, strong) UILabel *timeLab; @property (nonatomic, strong) UILabel *timeLab;
@property (nonatomic, strong) UIView *readStatusView;
@property (nonatomic, strong) UILabel *detailLab; @property (nonatomic, strong) UILabel *detailLab;
@property (nonatomic, strong) UILabel *mesCountLab; @property (nonatomic, strong) UILabel *mesCountLab;
@property (nonatomic, strong) UILabel *contentLab; @property (nonatomic, strong) UILabel *contentLab;
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
[self.contentView addSubview:self.icon]; [self.contentView addSubview:self.icon];
[self.contentView addSubview:self.nameLab]; [self.contentView addSubview:self.nameLab];
[self.contentView addSubview:self.timeLab]; [self.contentView addSubview:self.timeLab];
[self.contentView addSubview:self.readStatusView];
[self.contentView addSubview:self.detailLab]; [self.contentView addSubview:self.detailLab];
[self.contentView addSubview:self.mesCountLab]; [self.contentView addSubview:self.mesCountLab];
[self.contentView addSubview:self.contentLab]; [self.contentView addSubview:self.contentLab];
...@@ -59,11 +61,17 @@ ...@@ -59,11 +61,17 @@
self.contentLab.text = comReplyModel.content; self.contentLab.text = comReplyModel.content;
self.preContentLab.text = comReplyModel.preContent; self.preContentLab.text = comReplyModel.preContent;
[self.timeLab sizeToFit]; [self.timeLab sizeToFit];
self.readStatusView.hidden = comReplyModel.status;
[self.timeLab mas_remakeConstraints:^(MASConstraintMaker *make) { [self.timeLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.contentView).offset(-15); make.right.equalTo(self.contentView).offset(-15);
make.top.equalTo(self.contentView).offset(3); make.top.equalTo(self.contentView).offset(3);
}]; }];
[self.readStatusView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.timeLab);
make.top.equalTo(self.contentView).offset(40);
make.size.mas_equalTo(CGSizeMake(6, 6));
}];
[self.nameLab mas_remakeConstraints:^(MASConstraintMaker *make) { [self.nameLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.detailLab); make.left.equalTo(self.detailLab);
make.top.equalTo(self.icon); make.top.equalTo(self.icon);
...@@ -116,6 +124,15 @@ ...@@ -116,6 +124,15 @@
return _nameLab; return _nameLab;
} }
- (UIView *)readStatusView {
if (!_readStatusView) {
_readStatusView = [UIView new];
_readStatusView.backgroundColor = ColorFromHex(0xF04B77);
[_readStatusView cornerRadius:3];
}
return _readStatusView;
}
- (UILabel *)timeLab { - (UILabel *)timeLab {
if (!_timeLab) { if (!_timeLab) {
_timeLab = [UILabel labWithFont:SysFont(12)]; _timeLab = [UILabel labWithFont:SysFont(12)];
......
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/View/MessageNotiView.h
...@@ -28,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -28,6 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)dismissKeyBoard; - (void)dismissKeyBoard;
/// 更新阅读状态
/// @param indexPath indexPath
- (void)refreshReadStatusView:(NSIndexPath *)indexPath;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/View/MessageNotiView.m
...@@ -44,6 +44,10 @@ static int secFooterHeight = 8; ...@@ -44,6 +44,10 @@ static int secFooterHeight = 8;
[self.textInputAlertView dismiss]; [self.textInputAlertView dismiss];
} }
- (void)refreshReadStatusView:(NSIndexPath *)indexPath {
[self reloadSections:[NSIndexSet indexSetWithIndex:indexPath.section] withRowAnimation:UITableViewRowAnimationNone];
}
#pragma mark - UITableViewDelegate, UITableViewDataSource #pragma mark - UITableViewDelegate, UITableViewDataSource
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
return self.messageCenterVM.messageListArr.count; return self.messageCenterVM.messageListArr.count;
......
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/ViewModel/MessageCenterViewModel.h
...@@ -28,6 +28,23 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -28,6 +28,23 @@ NS_ASSUME_NONNULL_BEGIN
/// 获取消息中心评论回复用户评论id /// 获取消息中心评论回复用户评论id
/// @param indexPath indexPath /// @param indexPath indexPath
- (NSInteger)getUserCommentIDWithIndexPath:(NSIndexPath *)indexPath; - (NSInteger)getUserCommentIDWithIndexPath:(NSIndexPath *)indexPath;
/// 获取消息中心评论回复通知id
/// @param indexPath indexPath
- (NSInteger)getNotiIDWithIndexPath:(NSIndexPath *)indexPath;
// 更新官方通知阅读状态（用户点击立马标记已读）
- (void)updateOfficialReadStatus:(NSIndexPath *)indexPath;
/// 更新评论回复cell阅读状态
/// @param indexPath indexPath
/// @param status status（阅读状态）
- (void)updateReadStatus:(NSIndexPath *)indexPath status:(int)status;
/// 消息中心-动态评论或回复 更新通知阅读状态
/// @param notiID 通知id
/// @param completion completion
+ (NSURLSessionDataTask *)updateCommentReplyReadStatusWithID:(NSInteger)notiID completion:(void (^)(MessageCenterViewModel *requestModel))completion;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/MessageCenter/ViewModel/MessageCenterViewModel.m
...@@ -99,6 +99,43 @@ ...@@ -99,6 +99,43 @@
return model.commentID; return model.commentID;
} }
- (NSInteger)getNotiIDWithIndexPath:(NSIndexPath *)indexPath {
NSArray *userNotiList = self.messageListArr[indexPath.section];
MessageComReplyModel *model = userNotiList[indexPath.row];
return model.notiID;
}
- (void)updateOfficialReadStatus:(NSIndexPath *)indexPath {
if (indexPath.section == 0) {
NSArray *offNotiArr = self.messageListArr[0];
MessageOfficialModel *model = offNotiArr[indexPath.row];
model.messageCount = 0;
}
}
- (void)updateReadStatus:(NSIndexPath *)indexPath status:(int)status {
if (indexPath.section == 1) {
NSArray *userNotiList = self.messageListArr[1];
MessageComReplyModel *model = userNotiList[indexPath.row];
model.status = status;
}
}
+ (NSURLSessionDataTask *)updateCommentReplyReadStatusWithID:(NSInteger)notiID completion:(void (^)(MessageCenterViewModel *requestModel))completion {
MessageCenterViewModel * requestModel = [[MessageCenterViewModel alloc] init];
NSString *api = @"update_comment_reply_read_status";
NSString *argStr = [NSString stringWithFormat:@"mutation{%@(id:%ld)}", api, notiID];
return [MessageCenterViewModel httpPostBodyRequestWithAPI:api params:@{@"query" : argStr} view:nil hasNetActivity:YES loadingInfo:nil hasFailInfo:NO success:^(NSDictionary * _Nonnull apiDic) {
DSLog(@"消息中心-动态评论或回复 更新通知阅读状态接口apiDic：%@", apiDic);
requestModel.resCode = DSResCodeSuccess;
completion(requestModel);
} failure:^(id _Nonnull failureInfo) {
requestModel.resCode = [failureInfo[@"errorCode"] integerValue];
requestModel.errMessage = failureInfo[@"errMessage"];
completion(requestModel);
}];
}
#pragma mark - private #pragma mark - private
- (NSURLSessionDataTask *)queryUserMessageCountWithCompletion:(void (^)(MessageCenterViewModel *requestModel))completion { - (NSURLSessionDataTask *)queryUserMessageCountWithCompletion:(void (^)(MessageCenterViewModel *requestModel))completion {
MessageCenterViewModel *requestModel = [MessageCenterViewModel new]; MessageCenterViewModel *requestModel = [MessageCenterViewModel new];
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!