diff --git a/ios/OpenImSdkRn.m b/ios/OpenImSdkRn.m index 395c5ed..16a715c 100644 --- a/ios/OpenImSdkRn.m +++ b/ios/OpenImSdkRn.m @@ -73,7 +73,7 @@ - (dispatch_queue_t)methodQueue { @"onRecvMessageExtensionsAdded", @"onRecvMessageExtensionsChanged", @"onRecvMessageExtensionsDeleted", - + @"onConversationChanged", @"onConversationUserInputStatusChanged", @"onNewConversation", @@ -82,7 +82,7 @@ - (dispatch_queue_t)methodQueue { @"onSyncServerStart", @"onSyncServerProgress", @"onTotalUnreadMessageCountChanged", - + @"onBlackAdded", @"onBlackDeleted", @"onFriendApplicationAccepted", @@ -150,10 +150,10 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { } RCT_EXPORT_METHOD(initSDK:(NSDictionary *)config operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) { - + NSMutableDictionary *newConfig = [config mutableCopy]; [newConfig setObject:@1 forKey:@"platformID"]; - + BOOL flag = Open_im_sdkInitSDK(self,operationID,[newConfig json]); Open_im_sdkSetUserListener(self); Open_im_sdkSetConversationListener(self); @@ -267,11 +267,11 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(setGlobalRecvMessageOpt:(NSInteger)opt operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSDictionary *param = @{ @"globalRecvMsgOpt":@(opt), }; - + Open_im_sdkSetSelfInfo(proxy, operationID, [param json]); } @@ -287,16 +287,16 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(setConversation:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSString *conversationID = [options valueForKey:@"conversationID"]; - + Open_im_sdkSetConversation(proxy,operationID, conversationID, [options json]); } RCT_EXPORT_METHOD(setConversationDraft:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - - + + NSString *conversationID = [options valueForKey:@"conversationID"]; NSString *draftText = [options valueForKey:@"draftText"]; @@ -305,7 +305,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(resetConversationGroupAtType:(NSString *)conversationID operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSDictionary *param = @{ @"groupAtType":@(0), }; @@ -314,17 +314,17 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(pinConversation:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSDictionary *param = @{ @"isPinned":options[@"isPinned"], }; - + Open_im_sdkSetConversation(proxy,operationID, [options valueForKey:@"conversationID"], [param json]); } RCT_EXPORT_METHOD(setConversationPrivateChat:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSDictionary *param = @{ @"isPrivateChat":options[@"isPrivate"], }; @@ -333,7 +333,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(setConversationBurnDuration:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSDictionary *param = @{ @"burnDuration":options[@"burnDuration"], }; @@ -342,7 +342,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(setConversationRecvMessageOpt:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSDictionary *param = @{ @"recvMsgOpt":options[@"opt"], }; @@ -362,7 +362,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(createAdvancedTextMessage:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { NSArray *messageEntityList = options[@"messageEntityList"]; NSString *text = options[@"text"]; - + NSString *result = Open_im_sdkCreateAdvancedTextMessage(operationID, text, [messageEntityList json]); NSDictionary *message = [self parseJsonStr2Dict:result]; if (message) { @@ -386,7 +386,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { if (!atUserIDList) { atUserIDList = [NSArray array]; } - + NSString *result = Open_im_sdkCreateTextAtMessage(operationID, text, [atUserIDList json], [atUsersInfo json], messageJson); NSDictionary *messageObj = [self parseJsonStr2Dict:result]; if (messageObj) { @@ -484,8 +484,8 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { NSDictionary *sourcePicture = options[@"sourcePicture"]; NSDictionary *bigPicture = options[@"bigPicture"]; NSDictionary *snapshotPicture = options[@"snapshotPicture"]; - NSString *sourcePath = options[@"sourcePath"]; - + NSString *sourcePath = options[@"sourcePath"]; + NSString *result = Open_im_sdkCreateImageMessageByURL(operationID, sourcePath, [sourcePicture json], [bigPicture json], [snapshotPicture json]); NSDictionary *message = [self parseJsonStr2Dict:result]; if (message) { @@ -508,7 +508,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(createSoundMessageFromFullPath:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { NSString *soundPath = options[@"soundPath"]; NSInteger duration = [options[@"duration"] integerValue]; - + NSString *result = Open_im_sdkCreateSoundMessageFromFullPath(operationID, soundPath, (long)duration); NSDictionary *message = [self parseJsonStr2Dict:result]; if (message) { @@ -532,8 +532,8 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { NSString *videoPath = options[@"videoPath"]; NSString *videoType = options[@"videoType"]; NSString *snapshotPath = options[@"snapshotPath"]; - NSInteger duration = [options[@"duration"] integerValue]; - + NSInteger duration = [options[@"duration"] integerValue]; + NSString *result = Open_im_sdkCreateVideoMessage(operationID, videoPath, videoType, (long)duration, snapshotPath); NSDictionary *message = [self parseJsonStr2Dict:result]; if (message) { @@ -571,7 +571,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(createFileMessage:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { NSString *filePath = options[@"filePath"]; NSString *fileName = options[@"fileName"]; - + NSString *result = Open_im_sdkCreateFileMessage(operationID, filePath, fileName); NSDictionary *message = [self parseJsonStr2Dict:result]; if (message) { @@ -584,7 +584,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(createFileMessageFromFullPath:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { NSString *filePath = options[@"filePath"]; NSString *fileName = options[@"fileName"]; - + NSString *result = Open_im_sdkCreateFileMessageFromFullPath(operationID, filePath, fileName); NSDictionary *message = [self parseJsonStr2Dict:result]; if (message) { @@ -621,7 +621,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(createFaceMessage:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { NSInteger index = [options[@"index"] integerValue]; NSString *dataStr = options[@"dataStr"]; - + NSString *result = Open_im_sdkCreateFaceMessage(operationID, (long)index, dataStr); NSDictionary *message = [self parseJsonStr2Dict:result]; if (message) { @@ -684,7 +684,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { NSString *recvID = options[@"recvID"]; NSString *groupID = options[@"groupID"]; NSDictionary *offlinePushInfo = options[@"offlinePushInfo"]; - + BOOL isOnlineOnly = [options[@"isOnlineOnly"] boolValue]; if(!isOnlineOnly) { isOnlineOnly = NO; @@ -707,7 +707,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(findMessageList:(NSDictionary *)findOptions operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSString *findOptionsJson = [findOptions json]; - + Open_im_sdkFindMessageList(proxy, operationID, findOptionsJson); } @@ -774,7 +774,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(deleteMessageFromLocalStorage:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - NSString *conversationID = options[@"conversationID"]; + NSString *conversationID = options[@"conversationID"]; NSString *clientMsgID = options[@"clientMsgID"]; Open_im_sdkDeleteMessageFromLocalStorage(proxy, operationID, conversationID, clientMsgID); @@ -842,7 +842,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(getSpecifiedFriendsInfo:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSArray *userIDList = [options valueForKey:@"userIDList"]; Open_im_sdkGetSpecifiedFriendsInfo(proxy, operationID, [userIDList json], [[options valueForKey:@"filterBlack"] boolValue]); } @@ -856,14 +856,14 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSInteger offset = [options[@"offset"] integerValue]; NSInteger count = [options[@"count"] integerValue]; - + Open_im_sdkGetFriendListPage(proxy, operationID, (int32_t)offset, (int32_t)count, [[options valueForKey:@"filterBlack"] boolValue]); } RCT_EXPORT_METHOD(searchFriends:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSString *optionsJson = [options json]; - + Open_im_sdkSearchFriends(proxy, operationID, optionsJson); } @@ -883,7 +883,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(setFriendRemark:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - + NSArray *friendUserIDs = @[options[@"toUserID"]]; NSDictionary *param = @{ @"friendUserIDs":friendUserIDs, @@ -910,7 +910,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(acceptFriendApplication:(NSDictionary *)userIDHandleMsg operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSString *userIDHandleMsgJson = [userIDHandleMsg json]; - + Open_im_sdkAcceptFriendApplication(proxy, operationID, userIDHandleMsgJson); } @@ -960,7 +960,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(joinGroup:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - NSInteger joinSource = [options[@"joinSource"] integerValue]; + NSInteger joinSource = [options[@"joinSource"] integerValue]; NSString *groupID = options[@"groupID"]; NSString *reqMsg = options[@"reqMsg"]; NSString *ex = options[@"ex"]; @@ -986,7 +986,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSString *groupID = options[@"groupID"]; BOOL isMute = [options[@"isMute"] boolValue]; - + Open_im_sdkChangeGroupMute(proxy, operationID, groupID, isMute); } @@ -1011,7 +1011,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSInteger offset = [options[@"offset"] integerValue]; NSInteger count = [options[@"count"] integerValue]; - + Open_im_sdkGetJoinedGroupListPage(proxy, operationID, (int32_t)offset, (int32_t)count); } @@ -1061,7 +1061,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { @"groupID":options[@"groupID"], @"applyMemberFriend":options[@"rule"], }; - + Open_im_sdkSetGroupInfo(proxy, operationID, [param json]); } @@ -1084,11 +1084,11 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSString *groupID = options[@"groupID"]; NSArray *filterUserIDList = options[@"filterUserIDList"]; - NSInteger offset = [options[@"offset"] integerValue]; - NSInteger count = [options[@"count"] integerValue]; - NSInteger joinTimeBegin = [options[@"joinTimeBegin"] integerValue]; - NSInteger joinTimeEnd = [options[@"joinTimeEnd"] integerValue]; - + NSInteger offset = [options[@"offset"] integerValue]; + NSInteger count = [options[@"count"] integerValue]; + NSInteger joinTimeBegin = [options[@"joinTimeBegin"] integerValue]; + NSInteger joinTimeEnd = [options[@"joinTimeEnd"] integerValue]; + Open_im_sdkGetGroupMemberListByJoinTimeFilter(proxy, operationID, groupID, (int32_t)offset, (int32_t)count, (long)joinTimeBegin, (long)joinTimeEnd, [filterUserIDList json]); } @@ -1096,7 +1096,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSString *groupID = options[@"groupID"]; NSArray *userIDList = options[@"userIDList"]; - + Open_im_sdkGetSpecifiedGroupMembersInfo(proxy, operationID, groupID, [userIDList json]); } @@ -1104,7 +1104,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; NSString *groupID = options[@"groupID"]; NSArray *userIDList = options[@"userIDList"]; - + Open_im_sdkGetUsersInGroup(proxy, operationID, groupID, [userIDList json]); } @@ -1149,7 +1149,7 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { NSString *groupID = options[@"groupID"]; NSString *fromUserID = options[@"fromUserID"]; NSString *handleMsg = options[@"handleMsg"]; - + Open_im_sdkAcceptGroupApplication(proxy, operationID, groupID, fromUserID, handleMsg); } @@ -1196,13 +1196,13 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(updateFcmToken:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; - NSArray *userIDList = options[@"userIDList"]; + NSString *fcmToken = options[@"fcmToken"]; NSInteger expiredTime = [options[@"expiredTime"] integerValue]; - Open_im_sdkUpdateFcmToken(proxy, operationID, [userIDList json], (long)expiredTime); + Open_im_sdkUpdateFcmToken(proxy, operationID, fcmToken, (long)expiredTime); } -RCT_EXPORT_METHOD(setAppBadge:(int32_t)appUnreadCount operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { +RCT_EXPORT_METHOD(setAppBadge:(NSInteger)appUnreadCount operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy *proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; Open_im_sdkSetAppBadge(proxy, operationID, appUnreadCount); } @@ -1210,13 +1210,13 @@ - (NSArray *)parseJsonStr2Array:(NSString *)jsonStr { RCT_EXPORT_METHOD(uploadLogs:(NSDictionary *)options operationID:(NSString *)operationID resolver:(RCTPromiseResolveBlock)resolver rejecter:(RCTPromiseRejectBlock)rejecter) { RNCallbackProxy * proxy = [[RNCallbackProxy alloc] initWithCallback:resolver rejecter:rejecter]; RNUploadLogCallbackProxy * uploadProxy = [[RNUploadLogCallbackProxy alloc] initWithOpid:operationID module:self resolver:resolver rejecter:rejecter]; - + NSString *ex = options[@"ex"]; if (!ex) { ex = @""; } - + Open_im_sdkUploadLogs(proxy,operationID,[[options valueForKey:@"line"] longValue],ex,uploadProxy); }