From 4d9733da93bce64d208063e17ad19c14f731ec76 Mon Sep 17 00:00:00 2001 From: fengshuo <963787902@qq.com> Date: Fri, 13 May 2022 21:55:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=BB=91=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xplan-ios.xcodeproj/project.pbxproj | 8 ++++ xplan-ios/Main/Mine/Api/Api+Mine.h | 5 +++ xplan-ios/Main/Mine/Api/Api+Mine.m | 7 ++++ .../Mine/Presenter/XPMineBlackListPresenter.h | 16 ++++++++ .../Mine/Presenter/XPMineBlackListPresenter.m | 25 ++++++++++++ .../Mine/Protocol/XPMineBlackListProtocol.h | 18 +++++++++ .../View/Cell/XPMineBlackListTableViewCell.h | 4 +- .../View/Cell/XPMineBlackListTableViewCell.m | 10 ++--- .../MineInfo/XPMineUserInfoViewController.m | 10 ++--- .../Setting/XPMineBlackListViewController.h | 4 +- .../Setting/XPMineBlackListViewController.m | 40 ++++++++++++++++--- 11 files changed, 125 insertions(+), 22 deletions(-) create mode 100644 xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.h create mode 100644 xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.m create mode 100644 xplan-ios/Main/Mine/Protocol/XPMineBlackListProtocol.h diff --git a/xplan-ios.xcodeproj/project.pbxproj b/xplan-ios.xcodeproj/project.pbxproj index 1df6c6b6..1bd00d22 100644 --- a/xplan-ios.xcodeproj/project.pbxproj +++ b/xplan-ios.xcodeproj/project.pbxproj @@ -287,6 +287,7 @@ E800808527FD8FC20055A8AB /* ClanMemberDetailInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E800808427FD8FC20055A8AB /* ClanMemberDetailInfoModel.m */; }; E800808827FDA5100055A8AB /* XPClanSectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E800808727FDA5100055A8AB /* XPClanSectionView.m */; }; E80487652717DDD9008595F2 /* XPRoomMenuItem.m in Sources */ = {isa = PBXBuildFile; fileRef = E80487642717DDD9008595F2 /* XPRoomMenuItem.m */; }; + E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */; }; E80B0712280D0A6700A79F63 /* FansInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0711280D0A6700A79F63 /* FansInfoModel.m */; }; E80B0734280D740600A79F63 /* MessageContentGuildView.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0733280D740600A79F63 /* MessageContentGuildView.m */; }; E80B0737280D790400A79F63 /* GuildMessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E80B0736280D790400A79F63 /* GuildMessageModel.m */; }; @@ -1364,6 +1365,9 @@ E800808727FDA5100055A8AB /* XPClanSectionView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPClanSectionView.m; sourceTree = ""; }; E80487632717DDD9008595F2 /* XPRoomMenuItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPRoomMenuItem.h; sourceTree = ""; }; E80487642717DDD9008595F2 /* XPRoomMenuItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomMenuItem.m; sourceTree = ""; }; + E8098CB2282E97550090B9F0 /* XPMineBlackListPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListPresenter.h; sourceTree = ""; }; + E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineBlackListPresenter.m; sourceTree = ""; }; + E8098CB6282E97AC0090B9F0 /* XPMineBlackListProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineBlackListProtocol.h; sourceTree = ""; }; E80B0710280D0A6700A79F63 /* FansInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FansInfoModel.h; sourceTree = ""; }; E80B0711280D0A6700A79F63 /* FansInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FansInfoModel.m; sourceTree = ""; }; E80B0732280D740600A79F63 /* MessageContentGuildView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageContentGuildView.h; sourceTree = ""; }; @@ -6135,6 +6139,8 @@ E8E70D7926F2F16600F03460 /* XPMinePresent.m */, E8AC721A26F4720B007D6E91 /* XPMineSettingPresent.h */, E8AC721B26F4720B007D6E91 /* XPMineSettingPresent.m */, + E8098CB2282E97550090B9F0 /* XPMineBlackListPresenter.h */, + E8098CB3282E97550090B9F0 /* XPMineBlackListPresenter.m */, E8AC722526F482A4007D6E91 /* XPMineFeedbackPresenter.h */, E8AC722626F482A4007D6E91 /* XPMineFeedbackPresenter.m */, E8AC723326F49939007D6E91 /* XPMineNotificaPresenter.h */, @@ -6184,6 +6190,7 @@ children = ( E8E70D7B26F2F18900F03460 /* XPMineProtocol.h */, E8AC721D26F4723D007D6E91 /* XPMineSettingProtocol.h */, + E8098CB6282E97AC0090B9F0 /* XPMineBlackListProtocol.h */, E8AC722826F48889007D6E91 /* XPMineFeedbackProtocol.h */, E8AC723626F49957007D6E91 /* XPMineNotificaProtocol.h */, E824544726F5940600BE8163 /* XPMinePayPwdProtocol.h */, @@ -6954,6 +6961,7 @@ E8F1558D28124D5200EE8C06 /* MessageConentAudioView.m in Sources */, E8E20BDB281645300033B688 /* SessionInfoViewController.m in Sources */, E8E859CA28264C2300EE4857 /* WebSocket.m in Sources */, + E8098CB4282E97550090B9F0 /* XPMineBlackListPresenter.m in Sources */, E8E859CC28264C2300EE4857 /* MultipartFormDataParser.m in Sources */, E800807C27FD84980055A8AB /* GuildInfoModel.m in Sources */, E8A03DF0276303D40098D9EA /* XPCandyTreeRankTableViewCell.m in Sources */, diff --git a/xplan-ios/Main/Mine/Api/Api+Mine.h b/xplan-ios/Main/Mine/Api/Api+Mine.h index e44eaa96..5fee26fe 100644 --- a/xplan-ios/Main/Mine/Api/Api+Mine.h +++ b/xplan-ios/Main/Mine/Api/Api+Mine.h @@ -219,6 +219,11 @@ NS_ASSUME_NONNULL_BEGIN /// @param uid 用户的uid /// @param orderType 类型2 + (void)getUserGiftWall:(HttpRequestHelperCompletion)comletion uid:(NSString *)uid orderType:(NSString *)orderType; + +/// 批量获取用户信息 +/// @param completion 完成 +/// @param uids 用户的uid ++ (void)getUsersListInfo:(HttpRequestHelperCompletion)completion uids:(NSString *)uids; @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/Api/Api+Mine.m b/xplan-ios/Main/Mine/Api/Api+Mine.m index 469c08dd..73ae4fbe 100644 --- a/xplan-ios/Main/Mine/Api/Api+Mine.m +++ b/xplan-ios/Main/Mine/Api/Api+Mine.m @@ -239,4 +239,11 @@ [self makeRequest:@"giftwall/get" method:HttpRequestHelperMethodGET completion:comletion, __FUNCTION__, uid, orderType, nil]; } +/// 批量获取用户信息 +/// @param completion 完成 +/// @param uids 用户的uid ++ (void)getUsersListInfo:(HttpRequestHelperCompletion)completion uids:(NSString *)uids { + [self makeRequest:@"user/list" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__, uids, nil]; +} + @end diff --git a/xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.h b/xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.h new file mode 100644 index 00000000..344daa05 --- /dev/null +++ b/xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.h @@ -0,0 +1,16 @@ +// +// XPMineBlackListPresenter.h +// xplan-ios +// +// Created by 冯硕 on 2022/5/13. +// + +#import "BaseMvpPresenter.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface XPMineBlackListPresenter : BaseMvpPresenter +- (void)getUserListInfo:(NSArray *)array; +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.m b/xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.m new file mode 100644 index 00000000..a49ec15a --- /dev/null +++ b/xplan-ios/Main/Mine/Presenter/XPMineBlackListPresenter.m @@ -0,0 +1,25 @@ +// +// XPMineBlackListPresenter.m +// xplan-ios +// +// Created by 冯硕 on 2022/5/13. +// + +#import "XPMineBlackListPresenter.h" +#import "Api+Mine.h" +#import "UserInfoModel.h" +#import "XPMineBlackListProtocol.h" +@implementation XPMineBlackListPresenter + +- (void)getUserListInfo:(NSArray *)array { + NSString * uids = @""; + if (array.count > 0) { + uids = [array componentsJoinedByString:@","]; + } + [Api getUsersListInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + NSArray *users= [UserInfoModel modelsWithArray:data.data]; + [[self getView] getUserListInfoSuccess:users]; + }] uids:uids]; +} + +@end diff --git a/xplan-ios/Main/Mine/Protocol/XPMineBlackListProtocol.h b/xplan-ios/Main/Mine/Protocol/XPMineBlackListProtocol.h new file mode 100644 index 00000000..31099e93 --- /dev/null +++ b/xplan-ios/Main/Mine/Protocol/XPMineBlackListProtocol.h @@ -0,0 +1,18 @@ +// +// XPMineBlackListProtocol.h +// xplan-ios +// +// Created by 冯硕 on 2022/5/13. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@protocol XPMineBlackListProtocol + +- (void)getUserListInfoSuccess:(NSArray *)array; + +@end + +NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.h b/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.h index 7b742c2d..1d88e23a 100644 --- a/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.h +++ b/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.h @@ -8,9 +8,9 @@ #import NS_ASSUME_NONNULL_BEGIN -@class NIMUser; +@class UserInfoModel; @interface XPMineBlackListTableViewCell : UITableViewCell -@property (nonatomic,strong) NIMUser *userInfo; +@property (nonatomic,strong) UserInfoModel *userInfo; @end NS_ASSUME_NONNULL_END diff --git a/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.m b/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.m index 3b69e562..000c6f8b 100644 --- a/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.m +++ b/xplan-ios/Main/Mine/View/Cell/XPMineBlackListTableViewCell.m @@ -8,11 +8,11 @@ #import "XPMineBlackListTableViewCell.h" ///Third #import -#import ///Tool #import "ThemeColor.h" -///Tool #import "NetImageView.h" +///Model +#import "UserInfoModel.h" @interface XPMineBlackListTableViewCell () ///头像 @@ -52,11 +52,11 @@ }]; } #pragma mark - Getters And Setters -- (void)setUserInfo:(NIMUser *)userInfo { +- (void)setUserInfo:(UserInfoModel *)userInfo { _userInfo = userInfo; if (_userInfo) { - self.avatarImageView.imageUrl = _userInfo.userInfo.avatarUrl; - self.nickLabel.text = _userInfo.userInfo.nickName; + self.avatarImageView.imageUrl = _userInfo.avatar; + self.nickLabel.text = _userInfo.nick; } } diff --git a/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m b/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m index 3c411574..0dba8cf5 100644 --- a/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m +++ b/xplan-ios/Main/Mine/View/MineInfo/XPMineUserInfoViewController.m @@ -154,20 +154,16 @@ vc.url = urlstr; [self.navigationController pushViewController:vc animated:YES]; }]; - TTActionSheetConfig *removeBlack = [TTActionSheetConfig normalTitle:@"移除黑名单" clickAction:^{ - [self addOrRemoveBlack:YES uid:uid]; - }]; + TTActionSheetConfig *black = [TTActionSheetConfig normalTitle:@"拉黑" clickAction:^{ [self addOrRemoveBlack:NO uid:uid]; }]; - [array addObjectsFromArray:@[report]]; + [array addObjectsFromArray:@[report, black]]; BOOL isInBlackList = [[NIMSDK sharedSDK].userManager isUserInBlackList:uid]; if (isInBlackList) { - [array addObject:removeBlack]; - } else { - [array addObject:black]; + [array removeObject:black]; } [TTPopup actionSheetWithItems:array]; } diff --git a/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.h b/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.h index 12aef276..f85c4ac8 100644 --- a/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.h +++ b/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.h @@ -5,11 +5,11 @@ // Created by 冯硕 on 2022/4/25. // -#import "BaseViewController.h" +#import "MvpViewController.h" NS_ASSUME_NONNULL_BEGIN -@interface XPMineBlackListViewController : BaseViewController +@interface XPMineBlackListViewController : MvpViewController @end diff --git a/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.m b/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.m index fae2f9b5..1fc9d357 100644 --- a/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.m +++ b/xplan-ios/Main/Mine/View/Setting/XPMineBlackListViewController.m @@ -11,19 +11,34 @@ #import #import "XPMineBlackListTableViewCell.h" #import "XPMineFriendEmptyTableViewCell.h" +///Model +#import "UserInfoModel.h" +///P +#import "XPMineBlackListPresenter.h" +#import "XPMineBlackListProtocol.h" -@interface XPMineBlackListViewController () +@interface XPMineBlackListViewController () ///列表 @property (nonatomic,strong) UITableView *tableView; /// -@property (nonatomic,strong) NSArray *datasource; +@property (nonatomic,strong) NSMutableArray *datasource; @end @implementation XPMineBlackListViewController +- (__kindof id)createPresenter { + return [[XPMineBlackListPresenter alloc] init]; +} + - (void)viewDidLoad { [super viewDidLoad]; - self.datasource = [[NIMSDK sharedSDK].userManager myBlackList]; + NSArray *array = [[NIMSDK sharedSDK].userManager myBlackList]; + NSMutableArray * uids = [NSMutableArray array]; + for (int i = 0; i< array.count; i++) { + NIMUser * user = [array objectAtIndex:i]; + [uids addObject:user.userId]; + } + [self.presenter getUserListInfo:uids]; [self initSubViews]; [self initSubViewConstraints]; } @@ -72,10 +87,10 @@ -(void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath{ if (editingStyle ==UITableViewCellEditingStyleDelete){ if (self.datasource.count > 0) { - NIMUser *userInfo = [self.datasource objectAtIndex:indexPath.row]; - [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:userInfo.userId completion:^(NSError * _Nullable error) { + UserInfoModel *userInfo = [self.datasource objectAtIndex:indexPath.row]; + [[NIMSDK sharedSDK].userManager removeFromBlackBlackList:[NSString stringWithFormat:@"%ld", userInfo.uid] completion:^(NSError * _Nullable error) { if (error == nil) { - self.datasource = [[NIMSDK sharedSDK].userManager myBlackList]; + [self.datasource removeObject:userInfo]; [self.tableView reloadData]; } }]; @@ -84,6 +99,12 @@ } } +#pragma mark - XPMineBlackListPrototcol +- (void)getUserListInfoSuccess:(NSArray *)array { + [self.datasource addObjectsFromArray:array]; + [self.tableView reloadData]; +} + #pragma mark - Getters And Setters - (UITableView *)tableView { if (!_tableView) { @@ -102,6 +123,13 @@ return _tableView; } +- (NSMutableArray *)datasource { + if (!_datasource) { + _datasource = [NSMutableArray array]; + } + return _datasource; +} + @end