juggleim-rnsdk 0.1.13 → 0.2.1

package/ios/JuggleIMManager.m

@@ -476,6 +476,14 @@ RCT_EXPORT_METHOD(addConversationDelegate) {
     dict[@"localPath"] = voiceMsg.localPath ?: @"";
     dict[@"duration"] = @(voiceMsg.duration);
     dict[@"extra"] = voiceMsg.extra ?: @"";
+  } else if ([content isKindOfClass:[JMergeMessage class]]) {
+    JMergeMessage *mergeMsg = (JMergeMessage *)content;
+    dict[@"title"] = mergeMsg.title ?: @"";
+    dict[@"conversation"] = mergeMsg.conversation;
+    dict[@"messageIdList"] = mergeMsg.messageIdList;
+    dict[@"previewList"] = mergeMsg.previewList;
+    dict[@"containerMsgId"] = mergeMsg.containerMsgId;
+    dict[@"extra"] = mergeMsg.extra ?: @"";
   } else if (self.customMessageTypes[contentType]) {
     // 处理自定义消息:解析 JSON 数据
     JUnknownMessage *customMsg = (JUnknownMessage *)content;
@@ -532,8 +540,37 @@ RCT_EXPORT_METHOD(addConversationDelegate) {
 - (NSDictionary *)convertUserInfoToDictionary:(JUserInfo *)userInfo {
   return @{
     @"userId" : userInfo.userId ?: @"",
-    @"userName" : userInfo.userName ?: @"",
-    @"avatar" : userInfo.portrait ?: @""
+    @"nickname" : userInfo.userName ?: @"",
+    @"avatar" : userInfo.portrait ?: @"",
+    @"extra" : userInfo.extraDic ?: @{},
+    @"type" : @(userInfo.type),
+    @"updatedTime" : @(userInfo.updatedTime)
+  };
+}
+
+/**
+ * 将群组信息转换为字典
+ */
+- (NSDictionary *)convertGroupInfoToDictionary:(JGroupInfo *)groupInfo {
+  return @{
+    @"groupId" : groupInfo.groupId ?: @"",
+    @"groupName" : groupInfo.groupName ?: @"",
+    @"portrait" : groupInfo.portrait ?: @"",
+    @"extra" : groupInfo.extraDic ?: @{},
+    @"updatedTime" : @(groupInfo.updatedTime)
+  };
+}
+
+/**
+ * 将群成员信息转换为字典
+ */
+- (NSDictionary *)convertGroupMemberToDictionary:(JGroupMember *)groupMember {
+  return @{
+    @"groupId" : groupMember.groupId ?: @"",
+    @"userId" : groupMember.userId ?: @"",
+    @"groupDisplayName" : groupMember.groupDisplayName ?: @"",
+    @"extra" : groupMember.extraDic ?: @{},
+    @"updatedTime" : @(groupMember.updatedTime)
   };
 }
 
@@ -652,6 +689,38 @@ RCT_EXPORT_METHOD(getConversationInfo : (NSDictionary *)
   }
 }
 
+RCT_EXPORT_METHOD(getUserInfo : (NSString *)userId resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  JUserInfo *userInfo = [JIM.shared.userInfoManager getUserInfo:userId];
+  if (userInfo) {
+    resolve([self convertUserInfoToDictionary:userInfo]);
+  } else {
+    resolve([NSNull null]);
+  }
+}
+
+RCT_EXPORT_METHOD(getGroupInfo : (NSString *)groupId resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  JGroupInfo *groupInfo = [JIM.shared.userInfoManager getGroupInfo:groupId];
+  if (groupInfo) {
+    resolve([self convertGroupInfoToDictionary:groupInfo]);
+  } else {
+    resolve([NSNull null]);
+  }
+}
+
+RCT_EXPORT_METHOD(getGroupMember : (NSString *)groupId userId : (NSString *)
+                      userId resolver : (RCTPromiseResolveBlock)
+                          resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  JGroupMember *groupMember =
+      [JIM.shared.userInfoManager getGroupMember:groupId userId:userId];
+  if (groupMember) {
+    resolve([self convertGroupMemberToDictionary:groupMember]);
+  } else {
+    resolve([NSNull null]);
+  }
+}
+
 /**
  * 上传图片
  */
@@ -845,12 +914,12 @@ RCT_EXPORT_METHOD(setUnread : (NSDictionary *)conversationMap resolver : (
 /**
  * 获取置顶会话列表
  */
-RCT_EXPORT_METHOD(getTopConversationInfoList:(int)count
-          timestamp:(double)timestamp
-        pullDirection:(int)pullDirection
-          resolver:(RCTPromiseResolveBlock)resolve
-          rejecter:(RCTPromiseRejectBlock)reject) {
-  JPullDirection direction = pullDirection == 0 ? JPullDirectionNewer : JPullDirectionOlder;
+RCT_EXPORT_METHOD(getTopConversationInfoList : (int)count timestamp : (double)
+                      timestamp pullDirection : (int)pullDirection resolver : (
+                          RCTPromiseResolveBlock)
+                          resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  JPullDirection direction =
+      pullDirection == 0 ? JPullDirectionNewer : JPullDirectionOlder;
 
   NSArray<JConversationInfo *> *conversationInfos =
       [JIM.shared.conversationManager
@@ -952,8 +1021,10 @@ RCT_EXPORT_METHOD(sendMessage : (NSDictionary *)messageDict messageId : (
       return;
     }
 
+    JMessageOptions *options = [self getOptionsFromDictionary:messageDict];
     // 发送消息
     JMessage *message = [JIM.shared.messageManager sendMessage:msg.content
+        messageOption:options
         inConversation:msg.conversation
         success:^(JMessage *message) {
           [self sendEventWithName:@"onMessageSent"
@@ -1011,7 +1082,9 @@ RCT_EXPORT_METHOD(sendImageMessage : (NSDictionary *)messageDict messageId : (
       imageMessage.height = [contentDict[@"height"] integerValue];
     }
 
+    JMessageOptions *options = [self getOptionsFromDictionary:messageDict];
     JMessage *message = [JIM.shared.messageManager sendMediaMessage:imageMessage
+        messageOption:options
         inConversation:conversation
         progress:^(int progress, JMessage *_Nonnull message) {
           NSMutableDictionary *params = [NSMutableDictionary dictionary];
@@ -1076,7 +1149,9 @@ RCT_EXPORT_METHOD(sendFileMessage : (NSDictionary *)messageDict messageId : (
       fileMessage.type = contentDict[@"type"];
     }
 
+    JMessageOptions *options = [self getOptionsFromDictionary:messageDict];
     JMessage *message = [JIM.shared.messageManager sendMediaMessage:fileMessage
+        messageOption:options
         inConversation:conversation
         progress:^(int progress, JMessage *_Nonnull message) {
           NSMutableDictionary *params = [NSMutableDictionary dictionary];
@@ -1135,7 +1210,9 @@ RCT_EXPORT_METHOD(sendVoiceMessage : (NSDictionary *)messageDict messageId : (
       voiceMessage.duration = [contentDict[@"duration"] integerValue];
     }
 
+    JMessageOptions *options = [self getOptionsFromDictionary:messageDict];
     JMessage *message = [JIM.shared.messageManager sendMediaMessage:voiceMessage
+        messageOption:options
         inConversation:conversation
         progress:^(int progress, JMessage *_Nonnull message) {
           NSMutableDictionary *params = [NSMutableDictionary dictionary];
@@ -1362,6 +1439,28 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
     voice.localPath = messageDict[@"localPath"];
     voice.duration = [messageDict[@"duration"] integerValue];
     return voice;
+  } else if ([contentType isEqualToString:@"jg:merge"]) {
+    NSString *title = messageDict[@"title"];
+    JConversation *conversation =
+        [self convertDictionaryToConversation:messageDict[@"conversation"]];
+    NSArray *messageIdList = messageDict[@"messageIdList"];
+    NSArray *previewListDict = messageDict[@"previewList"];
+    NSMutableArray *previewList = [NSMutableArray array];
+    for (NSDictionary *previewDict in previewListDict) {
+      [previewList addObject:[self convertDictionaryToPreviewUnit:previewDict]];
+    }
+
+    JMergeMessage *merge = [[JMergeMessage alloc] initWithTitle:title
+                                                   conversation:conversation
+                                                  MessageIdList:messageIdList
+                                                    previewList:previewList];
+    if (messageDict[@"containerMsgId"]) {
+      merge.containerMsgId = messageDict[@"containerMsgId"];
+    }
+    if (messageDict[@"extra"]) {
+      merge.extra = messageDict[@"extra"];
+    }
+    return merge;
   } else if (self.customMessageTypes[contentType]) {
     NSString *contenType = messageDict[@"contentType"];
     NSError *error = nil;
@@ -1475,7 +1574,7 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
     for (NSDictionary *userDict in mentionedUsers) {
       if ([userDict isKindOfClass:[NSDictionary class]] &&
           userDict[@"userId"]) {
-        JUserInfo *userInfo = [self convertDictToUserInfo:userDict[@"userId"]];
+        JUserInfo *userInfo = [self convertDictionaryToJUserInfo:userDict];
         [userArray addObject:userInfo];
       }
     }
@@ -1483,13 +1582,36 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
 
   return mentionInfo;
 }
-// convert dict userinfo
-- (JUserInfo *)convertDictToUserInfo:(NSString *)userId {
+
+- (JUserInfo *)convertDictionaryToJUserInfo:(NSDictionary *)dict {
   JUserInfo *userInfo = [[JUserInfo alloc] init];
-  userInfo.userId = userId;
+  if (dict[@"userId"]) {
+    userInfo.userId = dict[@"userId"];
+  }
+  if (dict[@"nickname"]) {
+    userInfo.userName = dict[@"nickname"];
+  }
+  if (dict[@"avatar"]) {
+    userInfo.portrait = dict[@"avatar"];
+  }
+  if (dict[@"extra"]) {
+    userInfo.extraDic = dict[@"extra"];
+  }
   return userInfo;
 }
 
+- (JMergeMessagePreviewUnit *)convertDictionaryToPreviewUnit:
+    (NSDictionary *)dict {
+  JMergeMessagePreviewUnit *unit = [[JMergeMessagePreviewUnit alloc] init];
+  if (dict[@"previewContent"]) {
+    unit.previewContent = dict[@"previewContent"];
+  }
+  if (dict[@"sender"]) {
+    unit.sender = [self convertDictionaryToJUserInfo:dict[@"sender"]];
+  }
+  return unit;
+}
+
 /**
  * 发送消息已读回执
  */
@@ -1561,4 +1683,121 @@ RCT_EXPORT_METHOD(
       }];
 }
 
+- (JMessageOptions *)getOptionsFromDictionary:(NSDictionary *)dict {
+  JMessageOptions *options = [[JMessageOptions alloc] init];
+  if (dict[@"mentionInfo"]) {
+    options.mentionInfo =
+        [self convertDictToMessageMentionInfo:dict[@"mentionInfo"]];
+  }
+  if (dict[@"referredMessageId"]) {
+    options.referredMsgId = dict[@"referredMessageId"];
+  }
+  if (dict[@"pushData"]) {
+    options.pushData = [self convertDictToPushData:dict[@"pushData"]];
+  }
+  if (dict[@"lifeTime"]) {
+    options.lifeTime = [dict[@"lifeTime"] longLongValue];
+  }
+  if (dict[@"lifeTimeAfterRead"]) {
+    options.lifeTimeAfterRead = [dict[@"lifeTimeAfterRead"] longLongValue];
+  }
+  return options;
+}
+
+- (JPushData *)convertDictToPushData:(NSDictionary *)dict {
+  JPushData *pushData = [[JPushData alloc] init];
+  if (dict[@"content"]) {
+    pushData.content = dict[@"content"];
+  }
+  if (dict[@"extra"]) {
+    pushData.extra = dict[@"extra"];
+  }
+  return pushData;
+}
+
+/**
+ * 获取合并消息列表
+ */
+RCT_EXPORT_METHOD(getMergedMessageList : (NSString *)messageId resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  [[JIM shared].messageManager getMergedMessageList:messageId
+      success:^(NSArray<JMessage *> *mergedMessages) {
+        NSMutableArray *array = [NSMutableArray new];
+        for (JMessage *msg in mergedMessages) {
+          [array addObject:[self convertMessageToDictionary:msg]];
+        }
+        resolve(array);
+      }
+      error:^(JErrorCode code) {
+        reject([NSString stringWithFormat:@"%ld", (long)code],
+               @"getMergedMessageList failed", nil);
+      }];
+}
+
+/**
+ * 从服务端获取用户信息
+ */
+RCT_EXPORT_METHOD(fetchUserInfo : (NSString *)userId resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  [[JIM shared].userInfoManager fetchUserInfo:userId
+      success:^(JUserInfo *userInfo) {
+        if (userInfo) {
+          resolve([self convertUserInfoToDictionary:userInfo]);
+        } else {
+          resolve([NSNull null]);
+        }
+      }
+      error:^(JErrorCode code) {
+        reject([NSString stringWithFormat:@"%ld", (long)code],
+               @"fetchUserInfo failed", nil);
+      }];
+}
+
+/**
+ * 从服务端获取群组信息
+ */
+RCT_EXPORT_METHOD(fetchGroupInfo : (NSString *)groupId resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  [[JIM shared].userInfoManager fetchGroupInfo:groupId
+      success:^(JGroupInfo *groupInfo) {
+        if (groupInfo) {
+          resolve([self convertGroupInfoToDictionary:groupInfo]);
+        } else {
+          resolve([NSNull null]);
+        }
+      }
+      error:^(JErrorCode code) {
+        reject([NSString stringWithFormat:@"%ld", (long)code],
+               @"fetchGroupInfo failed", nil);
+      }];
+}
+
+/**
+ * 批量获取用户信息
+ */
+RCT_EXPORT_METHOD(getUserInfoList : (NSArray *)userIdList resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  NSArray<JUserInfo *> *users =
+      [[JIM shared].userInfoManager getUserInfoList:userIdList];
+  NSMutableArray *array = [NSMutableArray new];
+  for (JUserInfo *user in users) {
+    [array addObject:[self convertUserInfoToDictionary:user]];
+  }
+  resolve(array);
+}
+
+/**
+ * 批量获取群组信息
+ */
+RCT_EXPORT_METHOD(getGroupInfoList : (NSArray *)groupIdList resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  NSArray<JGroupInfo *> *groups =
+      [[JIM shared].userInfoManager getGroupInfoList:groupIdList];
+  NSMutableArray *array = [NSMutableArray new];
+  for (JGroupInfo *group in groups) {
+    [array addObject:[self convertGroupInfoToDictionary:group]];
+  }
+  resolve(array);
+}
+
 @end

package/juggleim-rnsdk.podspec

@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency "JuggleIM", "~> 1.8.31"
+  s.dependency "JuggleIM", "~> 1.8.34.1"
   s.dependency 'JZegoCall', '1.8.25'
 
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "juggleim-rnsdk",
-  "version": "0.1.13",
+  "version": "0.2.1",
   "description": "React Native wrapper for Juggle IM SDK",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/index.d.ts

@@ -26,7 +26,10 @@ import {
   CustomMessageConstructor,
   UpdateMessageCallback,
   GetMessageOptions,
-  MessageResponse
+  MessageResponse,
+  GroupInfo,
+  GroupMember,
+  UserInfo
 } from './types';
 
 /**
@@ -430,6 +433,28 @@ export default class JuggleIM {
     messageIds: string[],
   ): Promise<Boolean>;
 
+  /**
+   * 获取用户信息
+   * @param userId 用户ID
+   * @returns {Promise<UserInfo | null>} 用户信息
+   */
+  static getUserInfo(userId: string): Promise<UserInfo | null>;
+
+  /**
+   * 获取群组信息
+   * @param groupId 群组ID
+   * @returns {Promise<GroupInfo | null>} 群组信息
+   */
+  static getGroupInfo(groupId: string): Promise<GroupInfo | null>;
+
+  /**
+   * 获取群成员信息
+   * @param groupId 群组ID
+   * @param userId 用户ID
+   * @returns {Promise<GroupMember | null>} 群成员信息
+   */
+  static getGroupMember(groupId: string, userId: string): Promise<GroupMember | null>;
+
   /**
    * 更新消息
    * @param messageId 消息ID
@@ -458,6 +483,42 @@ export default class JuggleIM {
     conversation: Conversation,
     isTop: boolean,
   ): Promise<Boolean>;
+  /**
+   * 获取合并消息列表
+   * @param messageId 合并消息ID
+   * @returns {Promise<Message[]>} 消息列表
+   */
+  static getMergedMessageList(messageId: string): Promise<Message[]>;
+
+  /**
+   * 从服务端获取用户信息同时更新本地缓存为最新数据
+   * 注意：可以在进入会话页面/个人详情页面时使用此接口
+   * @param userId 用户ID
+   * @returns {Promise<UserInfo | null>} 用户信息
+   */
+  static fetchUserInfo(userId: string): Promise<UserInfo | null>;
+
+  /**
+   * 从服务端获取群组信息同时更新本地缓存为最新数据
+   * 注意：可以在进入群组页面时使用此接口
+   * @param groupId 群组ID
+   * @returns {Promise<GroupInfo | null>} 群组信息
+   */
+  static fetchGroupInfo(groupId: string): Promise<GroupInfo | null>;
+
+  /**
+   * 批量获取用户信息
+   * @param userIdList 用户ID列表
+   * @returns {Promise<UserInfo[]>} 用户信息列表
+   */
+  static getUserInfoList(userIdList: string[]): Promise<UserInfo[]>;
+
+  /**
+   * 批量获取群组信息
+   * @param groupIdList 群组ID列表
+   * @returns {Promise<GroupInfo[]>} 群组信息列表
+   */
+  static getGroupInfoList(groupIdList: string[]): Promise<GroupInfo[]>;
 }