Skip to content

Commit 771c1ac

Browse files
author
Brett
committed
1 parent bafa194 commit 771c1ac

23 files changed

+226
-174
lines changed

Example/OpenIMSDKiOS/OPENIMSDKViewController.m

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ - (void)getDesignatedFriendsInfo {
508508
todo:^(void (^callback)(NSNumber *code, NSString *msg)) {
509509

510510
[OIMManager.manager getSpecifiedFriendsInfo:@[OTHER_USER_ID]
511+
filterBlack:NO
511512
onSuccess:^(NSArray<OIMFriendInfo *> * _Nullable friendInfo) {
512513
callback(nil, nil);
513514
} onFailure:^(NSInteger code, NSString * _Nullable msg) {
@@ -521,7 +522,7 @@ - (void)getFriendList {
521522
[self operate:_cmd
522523
todo:^(void (^callback)(NSNumber *code, NSString *msg)) {
523524

524-
[OIMManager.manager getFriendListWithOnSuccess:^(NSArray<OIMFullUserInfo *> * _Nullable userInfos) {
525+
[OIMManager.manager getFriendListWithFilterBlack:NO onSuccess:^(NSArray<OIMPublicUserInfo *> * _Nullable userInfos) {
525526
callback(nil, nil);
526527
} onFailure:^(NSInteger code, NSString * _Nullable msg) {
527528
callback(@(code), msg);
@@ -1465,20 +1466,6 @@ - (void)markGroupMessageHasRead {
14651466
}];
14661467
}
14671468

1468-
- (void)getConversationRecvMessageOpt {
1469-
[self operate:_cmd
1470-
todo:^(void (^callback)(NSNumber *code, NSString *msg)) {
1471-
1472-
[OIMManager.manager getConversationRecvMessageOpt:@[CONVERSASTION_ID]
1473-
onSuccess:^(NSArray<OIMConversationNotDisturbInfo *> * _Nullable conversations) {
1474-
1475-
callback(nil, nil);
1476-
} onFailure:^(NSInteger code, NSString * _Nullable msg) {
1477-
callback(@(code), msg);
1478-
}];
1479-
}];
1480-
}
1481-
14821469
- (void)setConversationRecvMessageOpt {
14831470
[self operate:_cmd
14841471
todo:^(void (^callback)(NSNumber *code, NSString *msg)) {

OpenIMSDK.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
Pod::Spec.new do |s|
1010
s.name = 'OpenIMSDK'
11-
s.version = '3.8.1-rc.0'
11+
s.version = '3.8.1'
1212
s.summary = 'Open-IM-SDK'
1313

1414
# This description is used to generate tags and improve search results.
@@ -77,6 +77,6 @@ Pod::Spec.new do |s|
7777

7878
s.static_framework = true
7979

80-
s.dependency 'OpenIMSDKCore', '3.8.1-rc.0'
80+
s.dependency 'OpenIMSDKCore', '3.8.1'
8181
s.dependency 'MJExtension'
8282
end

OpenIMSDK/Callbacker/OIMCallbacker.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ typedef void (^OIMSimpleResultsCallback)(NSArray <OIMSimpleResultInfo *> * _Null
3232

3333
typedef void (^OIMUserInfoCallback)(OIMUserInfo * _Nullable userInfo);
3434
typedef void (^OIMUsersInfoCallback)(NSArray <OIMUserInfo *> * _Nullable usersInfo);
35-
typedef void (^OIMUsersCallback)(NSArray <OIMFullUserInfo *> * _Nullable userInfos);
36-
typedef void (^OIMFullUserInfoCallback)(OIMFullUserInfo * _Nullable userInfo);
37-
typedef void (^OIMFullUsersInfoCallback)(NSArray <OIMFullUserInfo *> * _Nullable userInfos);
35+
typedef void (^OIMUsersCallback)(NSArray <OIMPublicUserInfo *> * _Nullable userInfos);
36+
typedef void (^OIMPublicUserInfoCallback)(OIMPublicUserInfo * _Nullable userInfo);
37+
typedef void (^OIMPublicUsersInfoCallback)(NSArray <OIMPublicUserInfo *> * _Nullable userInfos);
3838
typedef void (^OIMBlacksInfoCallback)(NSArray <OIMBlackInfo *> * _Nullable blackInfos);
3939
typedef void (^OIMUserStatusInfoCallback)(OIMUserStatusInfo * _Nullable statusInfo);
4040
typedef void (^OIMUserStatusInfosCallback)(NSArray <OIMUserStatusInfo *> * _Nullable statusInfos);

OpenIMSDK/Callbacker/OIMCallbacker.m

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,21 @@ - (void)onUserStatusChanged:(NSString *)statusMap {
246246
}];
247247
}
248248

249+
- (void)onUserCommandAdd:(NSString * _Nullable)userCommand {
250+
251+
}
252+
253+
254+
- (void)onUserCommandDelete:(NSString * _Nullable)userCommand {
255+
256+
}
257+
258+
259+
- (void)onUserCommandUpdate:(NSString * _Nullable)userCommand {
260+
261+
}
262+
263+
249264
#pragma mark -
250265
#pragma mark - Friend
251266

OpenIMSDK/Interface/OIMManager+Connection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ - (instancetype)init {
1818
self.dataDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject stringByAppendingString:@"/"];
1919
self.logFilePath = self.dataDir;
2020
self.isLogStandardOutput = YES;
21-
self.logLevel = 6;
21+
self.logLevel = 5;
2222
self.compression = NO;
2323
self.systemType = @"native_iOS";
2424
}

OpenIMSDK/Interface/OIMManager+Conversation.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,6 @@ NS_ASSUME_NONNULL_BEGIN
9797
- (void)getTotalUnreadMsgCountWithOnSuccess:(nullable OIMNumberCallback)onSuccess
9898
onFailure:(nullable OIMFailureCallback)onFailure;
9999

100-
/**
101-
* Get the "do not disturb" status for a conversation
102-
*/
103-
- (void)getConversationRecvMessageOpt:(NSArray <NSString *> *)conversationIDs
104-
onSuccess:(nullable OIMConversationNotDisturbInfoCallback)onSuccess
105-
onFailure:(nullable OIMFailureCallback)onFailure;
106-
107100
/**
108101
* Set the "do not disturb" status for a conversation
109102
*/
@@ -186,6 +179,11 @@ NS_ASSUME_NONNULL_BEGIN
186179
userID:(NSString *)userID
187180
onSuccess:(nullable OIMInputStatusChangedCallback)onSuccess
188181
onFailure:(nullable OIMFailureCallback)onFailure;
182+
183+
- (void)setConversation:(NSString *)conversationID
184+
userID:(OIMConversationReq *)req
185+
onSuccess:(nullable OIMSuccessCallback)onSuccess
186+
onFailure:(nullable OIMFailureCallback)onFailure;
189187
@end
190188

191189
NS_ASSUME_NONNULL_END

OpenIMSDK/Interface/OIMManager+Conversation.m

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#import "OIMManager+Conversation.h"
99
#import "CallbackProxy.h"
10+
#import "OIMConversationInfo.h"
1011

1112
@implementation OIMManager (Conversation)
1213

@@ -98,9 +99,10 @@ - (void)pinConversation:(NSString *)conversationID
9899
isPinned:(BOOL)isPinned
99100
onSuccess:(OIMSuccessCallback)onSuccess
100101
onFailure:(OIMFailureCallback)onFailure {
101-
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
102+
OIMConversationReq *req = [OIMConversationReq new];
103+
req.isPinned = isPinned;
102104

103-
Open_im_sdkPinConversation(callback, [self operationId], conversationID, isPinned);
105+
[self setConversation:conversationID req:req onSuccess:onSuccess onFailure:onFailure];
104106
}
105107

106108
- (void)getTotalUnreadMsgCountWithOnSuccess:(OIMNumberCallback)onSuccess
@@ -114,51 +116,43 @@ - (void)getTotalUnreadMsgCountWithOnSuccess:(OIMNumberCallback)onSuccess
114116
Open_im_sdkGetTotalUnreadMsgCount(callback, [self operationId]);
115117
}
116118

117-
- (void)getConversationRecvMessageOpt:(NSArray<NSString *> *)conversationIDs
118-
onSuccess:(OIMConversationNotDisturbInfoCallback)onSuccess
119-
onFailure:(OIMFailureCallback)onFailure {
120-
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:^(NSString * _Nullable data) {
121-
if (onSuccess) {
122-
onSuccess([OIMConversationNotDisturbInfo mj_objectArrayWithKeyValuesArray:data]);
123-
}
124-
} onFailure:onFailure];
125-
126-
Open_im_sdkGetConversationRecvMessageOpt(callback, [self operationId], conversationIDs.mj_JSONString);
127-
}
128-
129119
- (void)setConversationRecvMessageOpt:(NSString *)conversationID
130120
status:(OIMReceiveMessageOpt)status
131121
onSuccess:(OIMSuccessCallback)onSuccess
132122
onFailure:(OIMFailureCallback)onFailure {
133-
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
123+
OIMConversationReq *req = [OIMConversationReq new];
124+
req.recvMsgOpt = status;
134125

135-
Open_im_sdkSetConversationRecvMessageOpt(callback, [self operationId], conversationID, status);
126+
[self setConversation:conversationID req:req onSuccess:onSuccess onFailure:onFailure];
136127
}
137128

138129
- (void)setConversationPrivateChat:(NSString *)conversationID
139130
isPrivate:(BOOL)isPrivate
140131
onSuccess:(OIMSuccessCallback)onSuccess
141132
onFailure:(OIMFailureCallback)onFailure {
142-
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
133+
OIMConversationReq *req = [OIMConversationReq new];
134+
req.isPrivateChat = isPrivate;
143135

144-
Open_im_sdkSetConversationPrivateChat(callback, [self operationId], conversationID, isPrivate);
136+
[self setConversation:conversationID req:req onSuccess:onSuccess onFailure:onFailure];
145137
}
146138

147139
- (void)setConversationBurnDuration:(NSString *)conversationID
148140
duration:(NSInteger)burnDuration
149141
onSuccess:(OIMSuccessCallback)onSuccess
150142
onFailure:(OIMFailureCallback)onFailure {
151-
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
143+
OIMConversationReq *req = [OIMConversationReq new];
144+
req.burnDuration = burnDuration;
152145

153-
Open_im_sdkSetConversationBurnDuration(callback, [self operationId], conversationID, (int32_t)burnDuration);
146+
[self setConversation:conversationID req:req onSuccess:onSuccess onFailure:onFailure];
154147
}
155148

156149
- (void)resetConversationGroupAtType:(NSString *)conversationID
157150
onSuccess:(OIMSuccessCallback)onSuccess
158151
onFailure:(OIMFailureCallback)onFailure {
159-
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
152+
OIMConversationReq *req = [OIMConversationReq new];
153+
req.groupAtType = 0;
160154

161-
Open_im_sdkResetConversationGroupAtType(callback, [self operationId], conversationID);
155+
[self setConversation:conversationID req:req onSuccess:onSuccess onFailure:onFailure];
162156
}
163157

164158
- (void)hideConversation:(NSString *)conversationID
@@ -188,9 +182,10 @@ - (void)setConversationEx:(NSString *)conversationID
188182
ex:(NSString *)ex
189183
onSuccess:(nullable OIMSuccessCallback)onSuccess
190184
onFailure:(nullable OIMFailureCallback)onFailure {
191-
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
192-
193-
Open_im_sdkSetConversationEx(callback, [self operationId], conversationID, ex);
185+
OIMConversationReq *req = [OIMConversationReq new];
186+
req.ex = ex;
187+
188+
[self setConversation:conversationID req:req onSuccess:onSuccess onFailure:onFailure];
194189
}
195190

196191
- (void)searchConversation:(NSString *)name
@@ -226,4 +221,13 @@ - (void)getInputstates:(NSString *)conversationID
226221

227222
Open_im_sdkGetInputStates(callback, [self operationId], conversationID, userID);
228223
}
224+
225+
- (void)setConversation:(NSString *)conversationID
226+
req:(OIMConversationReq *)req
227+
onSuccess:(nullable OIMSuccessCallback)onSuccess
228+
onFailure:(nullable OIMFailureCallback)onFailure {
229+
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
230+
231+
Open_im_sdkSetConversation(callback, [self operationId], conversationID, req.mj_JSONString);
232+
}
229233
@end

OpenIMSDK/Interface/OIMManager+Friend.h

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77

88
#import "OIMManager.h"
9+
#import "OIMUpdateFriendsReq.h"
910

1011
NS_ASSUME_NONNULL_BEGIN
1112

@@ -87,18 +88,21 @@ NS_ASSUME_NONNULL_BEGIN
8788
* @param usersID List of user IDs
8889
*/
8990
- (void)getSpecifiedFriendsInfo:(NSArray <NSString *> *)usersID
90-
onSuccess:(nullable OIMFullUsersInfoCallback)onSuccess
91+
filterBlack:(BOOL)filterBlack
92+
onSuccess:(nullable OIMPublicUsersInfoCallback)onSuccess
9193
onFailure:(nullable OIMFailureCallback)onFailure;
9294

9395
/**
9496
* Get information for all friends
9597
*/
96-
- (void)getFriendListWithOnSuccess:(nullable OIMFullUsersInfoCallback)onSuccess
98+
- (void)getFriendListWithFilterBlack:(BOOL)filterBlack
99+
onSuccess:(nullable OIMPublicUsersInfoCallback)onSuccess
97100
onFailure:(nullable OIMFailureCallback)onFailure;
98101

99102
- (void)getFriendListPageWithOffset:(NSInteger)offset
100103
count:(NSInteger)count
101-
onSuccess:(nullable OIMFullUsersInfoCallback)onSuccess
104+
filterBlack:(BOOL)filterBlack
105+
onSuccess:(nullable OIMPublicUsersInfoCallback)onSuccess
102106
onFailure:(nullable OIMFailureCallback)onFailure;
103107

104108
/**
@@ -142,6 +146,11 @@ NS_ASSUME_NONNULL_BEGIN
142146
ex:(NSString *)ex
143147
onSuccess:(nullable OIMSuccessCallback)onSuccess
144148
onFailure:(nullable OIMFailureCallback)onFailure;
149+
150+
151+
- (void)updateFriends:(OIMUpdateFriendsReq *)req
152+
onSuccess:(nullable OIMSuccessCallback)onSuccess
153+
onFailure:(nullable OIMFailureCallback)onFailure;
145154
@end
146155

147156
NS_ASSUME_NONNULL_END

OpenIMSDK/Interface/OIMManager+Friend.m

Lines changed: 33 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,41 +98,44 @@ - (void)removeFromBlackList:(NSString *)userID
9898
Open_im_sdkRemoveBlack(callback, [self operationId], userID);
9999
}
100100

101-
- (void)getSpecifiedFriendsInfo:(NSArray<NSString *> *)usersID
102-
onSuccess:(OIMFullUsersInfoCallback)onSuccess
103-
onFailure:(OIMFailureCallback)onFailure {
101+
- (void)getSpecifiedFriendsInfo:(NSArray <NSString *> *)usersID
102+
filterBlack:(BOOL)filterBlack
103+
onSuccess:(nullable OIMPublicUsersInfoCallback)onSuccess
104+
onFailure:(nullable OIMFailureCallback)onFailure {
104105
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:^(NSString * _Nullable data) {
105106
if (onSuccess) {
106-
onSuccess([OIMFullUserInfo mj_objectArrayWithKeyValuesArray:data]);
107+
onSuccess([OIMPublicUserInfo mj_objectArrayWithKeyValuesArray:data]);
107108
}
108109
} onFailure:onFailure];
109110

110-
Open_im_sdkGetSpecifiedFriendsInfo(callback, [self operationId], usersID.mj_JSONString);
111+
Open_im_sdkGetSpecifiedFriendsInfo(callback, [self operationId], usersID.mj_JSONString, filterBlack);
111112
}
112113

113-
- (void)getFriendListWithOnSuccess:(OIMFullUsersInfoCallback)onSuccess
114-
onFailure:(OIMFailureCallback)onFailure {
114+
- (void)getFriendListWithFilterBlack:(BOOL)filterBlack
115+
onSuccess:(nullable OIMPublicUsersInfoCallback)onSuccess
116+
onFailure:(nullable OIMFailureCallback)onFailure {
115117

116118
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:^(NSString * _Nullable data) {
117119
if (onSuccess) {
118-
onSuccess([OIMFullUserInfo mj_objectArrayWithKeyValuesArray:data]);
120+
onSuccess([OIMPublicUserInfo mj_objectArrayWithKeyValuesArray:data]);
119121
}
120122
} onFailure:onFailure];
121123

122-
Open_im_sdkGetFriendList(callback, [self operationId]);
124+
Open_im_sdkGetFriendList(callback, [self operationId], filterBlack);
123125
}
124126

125127
- (void)getFriendListPageWithOffset:(NSInteger)offset
126128
count:(NSInteger)count
127-
onSuccess:(OIMFullUsersInfoCallback)onSuccess
129+
filterBlack:(BOOL)filterBlack
130+
onSuccess:(OIMPublicUsersInfoCallback)onSuccess
128131
onFailure:(OIMFailureCallback)onFailure {
129132
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:^(NSString * _Nullable data) {
130133
if (onSuccess) {
131-
onSuccess([OIMFullUserInfo mj_objectArrayWithKeyValuesArray:data]);
134+
onSuccess([OIMPublicUserInfo mj_objectArrayWithKeyValuesArray:data]);
132135
}
133136
} onFailure:onFailure];
134137

135-
Open_im_sdkGetFriendListPage(callback, [self operationId], (int32_t)offset, (int32_t)count);
138+
Open_im_sdkGetFriendListPage(callback, [self operationId], (int32_t)offset, (int32_t)count, filterBlack);
136139
}
137140

138141
- (void)checkFriend:(NSArray<NSString *> *)usersID
@@ -152,9 +155,12 @@ - (void)setFriendRemark:(NSString *)userID
152155
onSuccess:(OIMSuccessCallback)onSuccess
153156
onFailure:(OIMFailureCallback)onFailure {
154157
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
158+
159+
OIMUpdateFriendsReq *req = [OIMUpdateFriendsReq new];
160+
req.friendUserIDs = @[userID];
161+
req.remark = remark;
155162

156-
NSDictionary *param = @{@"toUserID": userID, @"remark": remark ?: @""};
157-
Open_im_sdkSetFriendRemark(callback, [self operationId], param.mj_JSONString);
163+
[self updateFriends:req onSuccess:onSuccess onFailure:onFailure];
158164
}
159165

160166
- (void)deleteFriend:(NSString *)friendUserID
@@ -185,6 +191,18 @@ - (void)setFriendsEx:(NSArray<NSString *> *)friendIDs
185191
onFailure:(OIMFailureCallback)onFailure {
186192
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
187193

188-
Open_im_sdkSetFriendsEx(callback, [self operationId], friendIDs.mj_JSONString, ex);
194+
OIMUpdateFriendsReq *req = [OIMUpdateFriendsReq new];
195+
req.friendUserIDs = friendIDs;
196+
req.ex = ex;
197+
198+
[self updateFriends:req onSuccess:onSuccess onFailure:onFailure];
199+
}
200+
201+
- (void)updateFriends:(OIMUpdateFriendsReq *)req
202+
onSuccess:(nullable OIMSuccessCallback)onSuccess
203+
onFailure:(nullable OIMFailureCallback)onFailure {
204+
CallbackProxy *callback = [[CallbackProxy alloc]initWithOnSuccess:onSuccess onFailure:onFailure];
205+
206+
Open_im_sdkUpdateFriends(callback, [self operationId], req.mj_JSONString);
189207
}
190208
@end

OpenIMSDK/Interface/OIMManager+Group.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ NS_ASSUME_NONNULL_BEGIN
228228
/**
229229
* Set group member's info
230230
*/
231-
- (void)setGroupMemberInfo:(OIMGroupMemberInfo *)groupMemberInfo
231+
- (void)setGroupMemberInfo:(OIMSetGroupMemberInfo *)groupMemberInfo
232232
onSuccess:(nullable OIMSuccessCallback)onSuccess
233233
onFailure:(nullable OIMFailureCallback)onFailure;
234234

0 commit comments

Comments
 (0)