Skip to content

Commit 7d250b0

Browse files
guangyaoguangyao
authored andcommitted
适配最新sdk 4.4
1 parent 7d49e85 commit 7d250b0

File tree

4 files changed

+24
-18
lines changed

4 files changed

+24
-18
lines changed

ios/RNNeteaseIm/RNNeteaseIm.xcodeproj/xcuserdata/Dowin.xcuserdatad/xcschemes/xcschememanagement.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>RNNeteaseIm.xcscheme</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>55</integer>
11+
</dict>
12+
</dict>
513
<key>SuppressBuildableAutocreation</key>
614
<dict>
715
<key>4E5B47401EC1788F00D74E72</key>

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ - (void)playTipsMusicWithMessage:(NIMMessage *)message{
633633
}else if(message.session.sessionType == NIMSessionTypeTeam){//
634634

635635
NIMTeam *team = [[[NIMSDK sharedSDK] teamManager]teamById:message.session.sessionId];
636-
needToPlay = team.notifyForNewMsg;
636+
needToPlay = team.notifyStateForNewMsg == NIMTeamNotifyStateAll ? YES : NO;
637637
}
638638
if (needToPlay) {
639639
[self.player stop];

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ -(void)getResouces{
269269
[dic setObject:[NSString stringWithFormat:@"%@", [self imageUrlForRecentSession:recent] ? [self imageUrlForRecentSession:recent] : @""] forKey:@"imagePath"];
270270
NIMTeam *team = [[[NIMSDK sharedSDK] teamManager]teamById:recent.lastMessage.session.sessionId];
271271
[dic setObject:[NSString stringWithFormat:@"%zd",team.memberNumber] forKey:@"memberCount"];
272-
NSString *strMute = team.notifyForNewMsg?@"1":@"0";
272+
NSString *strMute = team.notifyStateForNewMsg == NIMTeamNotifyStateAll ? @"1" : @"0";
273273
[dic setObject:strMute forKey:@"mute"];
274274
[sessionList addObject:dic];
275275

ios/RNNeteaseIm/RNNeteaseIm/TeamViewController.m

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ -(void)createTeam:(NSDictionary *)fields type:(NSString *)type accounts:(NSArray
9090
if ([type isEqualToString:@"1"]){
9191
option.type = NIMTeamTypeAdvanced;
9292
}
93-
[[NIMSDK sharedSDK].teamManager createTeam:option users:accounts completion:^(NSError *error, NSString *teamId) {
93+
[[NIMSDK sharedSDK].teamManager createTeam:option users:accounts completion:^(NSError * _Nullable error, NSString * _Nullable teamId, NSArray<NSString *> * _Nullable failedUserIds) {
9494
if (!error) {
9595
NSDictionary *dic = @{@"teamId":teamId};
9696
succ(dic);
@@ -213,7 +213,8 @@ -(void)getTeamInfo:(NSString *)teamId Succ:(Success)succ Err:(Errors)err{
213213
[teamDic setObject:[NSString stringWithFormat:@"%ld", team.memberNumber ] forKey:@"memberCount"];
214214
[teamDic setObject:[NSString stringWithFormat:@"%ld",team.level] forKey:@"memberLimit"];
215215
[teamDic setObject:[NSString stringWithFormat:@"%f", team.createTime ] forKey:@"createTime"];
216-
[teamDic setObject:[NSString stringWithFormat:@"%d", team.notifyForNewMsg ] forKey:@"mute"];
216+
NSString *strMute = team.notifyStateForNewMsg == NIMTeamNotifyStateAll ? @"1" : @"0";
217+
[teamDic setObject:[NSString stringWithFormat:@"%@", strMute ] forKey:@"mute"];
217218
[teamDic setObject:[NSString stringWithFormat:@"%ld",team.joinMode] forKey:@"verifyType"];
218219
[teamDic setObject:[NSString stringWithFormat:@"%ld",team.beInviteMode] forKey:@"teamBeInviteMode"];
219220
NSArray *keys = [teamDic allKeys];
@@ -271,7 +272,8 @@ -(void)fetchTeamInfo:(NSString *)teamId Succ:(Success)succ Err:(Errors)err{
271272
[teamDic setObject:[NSString stringWithFormat:@"%ld", team.memberNumber ] forKey:@"memberCount"];
272273
[teamDic setObject:[NSString stringWithFormat:@"%ld",team.level] forKey:@"memberLimit"];
273274
[teamDic setObject:[NSString stringWithFormat:@"%f", team.createTime ] forKey:@"createTime"];
274-
[teamDic setObject:[NSString stringWithFormat:@"%d", team.notifyForNewMsg ] forKey:@"mute"];
275+
NSString *strMute = team.notifyStateForNewMsg == NIMTeamNotifyStateAll ? @"1" : @"0";
276+
[teamDic setObject:[NSString stringWithFormat:@"%d", strMute ] forKey:@"mute"];
275277
[teamDic setObject:[NSString stringWithFormat:@"%ld",team.joinMode] forKey:@"verifyType"];
276278
[teamDic setObject:[NSString stringWithFormat:@"%ld",team.beInviteMode] forKey:@"teamBeInviteMode"];
277279
[teamDic setObject:[NSString stringWithFormat:@"%ld",team.inviteMode] forKey:@"teamInviteMode"];
@@ -380,21 +382,17 @@ - (void)fetchTeamMemberInfo:(NSString *)teamId contactId:(NSString *)contactId S
380382

381383
//开启/关闭消息提醒
382384
-(void)muteTeam:(NSString *)teamId mute:(NSString *)mute Succ:(Success)succ Err:(Errors)err{
383-
BOOL on;
385+
NSInteger notifyState = NIMTeamNotifyStateNone;//不接受任何群消息通知
384386
if ([mute isEqualToString:@"1"]) {
385-
on = true;
386-
}else{
387-
on = false;
387+
notifyState = NIMTeamNotifyStateAll;
388388
}
389-
[[[NIMSDK sharedSDK] teamManager] updateNotifyState:on
390-
inTeam:teamId
391-
completion:^(NSError *error) {
392-
if (!error) {
393-
succ(@"200");
394-
}else{
395-
err(error);
396-
}
397-
}];
389+
[[NIMSDK sharedSDK].teamManager updateNotifyState:notifyState inTeam:teamId completion:^(NSError * _Nullable error) {
390+
if (!error) {
391+
succ(@"200");
392+
}else{
393+
err(error);
394+
}
395+
}];
398396

399397
}
400398
//解散群组

0 commit comments

Comments
 (0)