Skip to content

Commit 2086774

Browse files
xhpxhp
committed
Merge branch 'master' of github.com:reactnativecomponent/react-native-netease-im
2 parents d202861 + ffb7766 commit 2086774

File tree

6 files changed

+37
-35
lines changed

6 files changed

+37
-35
lines changed

‎ios/RNNeteaseIm/RNNeteaseIm/ContactViewController.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ typedef void(^Success)(id param);
2323
-(void)getFriendList:(Success )success error:(Error )error;
2424
- (void)disealloc;
2525
-(void)upDateUserInfo:(NSString *)contactId alias:(NSString *)alias Success:(Success )success error:(Error )err;
26-
-(void)updateMyUserInfo:(NSDictionary *)userInFo Success:(Success )success error:(Error )err;
26+
-(void)updateMyUserInfo:(NSString *)strName;
2727
@end

‎ios/RNNeteaseIm/RNNeteaseIm/ContactViewController.m‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -188,55 +188,58 @@ -(void)upDateUserInfo:(NSString *)contactId alias:(NSString *)alias Success:(Suc
188188

189189
}
190190
//修改个人资料
191-
-(void)updateMyUserInfo:(NSDictionary *)userInFo Success:(Success )success error:(Error )err{
191+
-(void)updateMyUserInfo:(NSString *)strName{
192+
[self fetchUserInfos:[NIMSDK sharedSDK].loginManager.currentAccount Success:^(id param) {
193+
NSLog(@"更新成功");
194+
} error:^(NSString *error) {
195+
NSLog(@"更新失败");
196+
}];
197+
/*
192198
NSArray *keys = [userInFo allKeys];
193-
NSMutableDictionary *userDic;
199+
NSMutableDictionary *userDic = [NSMutableDictionary dictionary];
194200
for (NSString *tem in keys) {
195201
//设置用户昵称
196-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagNick"]) {
197-
[userDic setObject:@(NIMUserInfoUpdateTagNick) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagNick"]];
202+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagNick"]) {
203+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagNick"] forKey:@(NIMUserInfoUpdateTagNick)];
198204
}
199205
//用户头像
200-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagAvatar"]) {
201-
[userDic setObject:@(NIMUserInfoUpdateTagAvatar) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagAvatar"]];
206+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagAvatar"]) {
207+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagAvatar"] forKey:@(NIMUserInfoUpdateTagAvatar)];
202208
}
203209
//用户签名
204-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagSign"]) {
205-
[userDic setObject:@(NIMUserInfoUpdateTagSign) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagSign"]];
210+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagSign"]) {
211+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagSign"] forKey:@(NIMUserInfoUpdateTagSign)];
206212
}
207213
//用户性别
208-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagGender"]) {
209-
[userDic setObject:@(NIMUserInfoUpdateTagGender) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagGender"]];
214+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagGender"]) {
215+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagGender"] forKey:@(NIMUserInfoUpdateTagGender)];
210216
}
211217
//用户邮箱
212-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagEmail"]) {
213-
[userDic setObject:@(NIMUserInfoUpdateTagEmail) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagEmail"]];
218+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagEmail"]) {
219+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagEmail"] forKey:@(NIMUserInfoUpdateTagEmail)];
214220
}
215221
//用户生日
216-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagBirth"]) {
217-
[userDic setObject:@(NIMUserInfoUpdateTagBirth) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagBirth"]];
222+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagBirth"]) {
223+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagBirth"] forKey:@(NIMUserInfoUpdateTagBirth)];
218224
}
219225
//用户手机
220-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagBirth"]) {
221-
[userDic setObject:@(NIMUserInfoUpdateTagBirth) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagBirth"]];
226+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagBirth"]) {
227+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagBirth"] forKey:@(NIMUserInfoUpdateTagBirth)];
222228
}
223229
//拓展字段
224-
if ([[userInFo objectForKey:tem] isEqualToString:@"NIMUserInfoUpdateTagExt"]) {
225-
[userDic setObject:@(NIMUserInfoUpdateTagExt) forKey:[userInFo objectForKey:@"NIMUserInfoUpdateTagExt"]];
230+
if ([tem isEqualToString:@"NIMUserInfoUpdateTagExt"]) {
231+
[userDic setObject:[userInFo objectForKey:@"NIMUserInfoUpdateTagExt"] forKey:@(NIMUserInfoUpdateTagExt)];
226232
}
227-
228233
}
229-
230-
231234
[[NIMSDK sharedSDK].userManager updateMyUserInfo:userDic completion:^(NSError *error) {
232235
if (!error) {
233236
success(@"设置成功");
234237
}else{
235238
err(@"昵称设置失败，请重试");
236239
}
237-
}];
238-
240+
}];*/
239241
}
242+
240243
//- (void)presentMemberSelector:(ContactSelectFinishBlock) block{
241244
// NSMutableArray *users = [[NSMutableArray alloc] init];
242245
// //使用内置的好友选择器

‎ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ - (void)playTipsMusicWithMessage:(NIMMessage *)message{
567567
}
568568
if (message.messageType == NIMMessageTypeNotification) return;
569569
if (message.session.sessionType == NIMSessionTypeP2P) {//个人
570-
NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:message.from];
570+
NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:message.session.sessionId];
571571
needToPlay = user.notifyForNewMsg;
572572

573573
}else if(message.session.sessionType == NIMSessionTypeTeam){//群

‎ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ -(void)getResouces{
201201
//群组名称或者聊天对象名称
202202
[dic setObject:[NSString stringWithFormat:@"%@", [self nameForRecentSession:recent] ] forKey:@"name"];
203203
//账号
204-
[dic setObject:[NSString stringWithFormat:@"%@",recent.lastMessage.from] forKey:@"account"];
204+
[dic setObject:[NSString stringWithFormat:@"%@",recent.lastMessage.session.sessionId] forKey:@"account"];
205205
//消息类型
206206
[dic setObject:[NSString stringWithFormat:@"%ld", recent.lastMessage.messageType] forKey:@"msgType"];
207207
//消息状态
@@ -214,7 +214,7 @@ -(void)getResouces{
214214
[dic setObject:[NSString stringWithFormat:@"%@", [self timestampDescriptionForRecentSession:recent] ] forKey:@"time"];
215215

216216
[dic setObject:[NSString stringWithFormat:@"%@", [self imageUrlForRecentSession:recent] ? [self imageUrlForRecentSession:recent] : @""] forKey:@"imagePath"];
217-
NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:recent.lastMessage.from];
217+
NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:recent.lastMessage.session.sessionId];
218218
NSString *strMute = user.notifyForNewMsg?@"1":@"0";
219219
[dic setObject:strMute forKey:@"mute"];
220220
[sessionList addObject:dic];

‎ios/RNNeteaseIm/RNNeteaseIm/NoticeViewController.m‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,17 @@ - (void)onReceiveSystemNotification:(NIMSystemNotification *)notification{
113113
}
114114

115115
if (_notifications.count) {
116+
NSMutableArray *tmpArr = [NSMutableArray array];
116117
for (NIMSystemNotification *notices in _notifications) {
117118

118119
if ([notices.sourceID isEqualToString:notification.sourceID]) {
119-
120120
[[[NIMSDK sharedSDK] systemNotificationManager] deleteNotification:notices];
121-
[_notifications removeObject:notices];
121+
}else{
122+
[tmpArr addObject:notices];
122123
}
123124
}
125+
[_notifications removeAllObjects];
126+
[_notifications addObjectsFromArray:tmpArr];
124127
}
125128
[_notifications insertObject:notification atIndex:0];
126129

‎ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,8 @@ - (dispatch_queue_t)methodQueue
9595
}];
9696
}
9797
//保存用户信息
98-
RCT_EXPORT_METHOD(updateMyUserInfo:(nonnull NSDictionary *)userInFo resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){
99-
[[ContactViewController initWithContactViewController] updateMyUserInfo:userInFo Success:^(id param) {
100-
resolve(param);
101-
} error:^(NSString *error) {
102-
reject(@"-1",error,nil);
103-
}];
98+
RCT_EXPORT_METHOD(updateMyUserInfo:(nonnull NSString *)userInFo){
99+
[[ContactViewController initWithContactViewController] updateMyUserInfo:userInFo];
104100
}
105101
//添加好友
106102
RCT_EXPORT_METHOD(addFriend:(nonnull NSString * )contactId msg:(nonnull NSString * )msg resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject){

0 commit comments

Comments
 (0)