juggleim-rnsdk 0.1.13 → 0.2.1

package/android/src/main/java/com/juggleim/JuggleIMManager.java

@@ -30,10 +30,15 @@ import com.juggle.im.model.UserInfo;
 import com.juggle.im.model.GroupMessageReadInfo;
 import com.juggle.im.model.MessageContent;
 import com.juggle.im.model.messages.*;
+import com.juggle.im.model.MergeMessagePreviewUnit;
+import com.juggle.im.model.PushData;
+import com.juggle.im.model.MessageOptions;
 import com.juggle.im.JIM;
 import com.juggle.im.internal.logger.JLogConfig;
 import com.juggle.im.internal.logger.JLogLevel;
 import com.juggle.im.model.MessageContent.*;
+import com.juggle.im.model.GroupInfo;
+import com.juggle.im.model.GroupMember;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -494,7 +499,14 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         byte[] bytes = content.encode();
         String str = new String(bytes, StandardCharsets.UTF_8);
         Log.d("JuggleIM", "convertMessageContentToMap: " + str);
-        return RNTypeConverter.stringToWritableMap(str);
+        WritableMap map = RNTypeConverter.stringToWritableMap(str);
+        if (content instanceof ImageMessage) {
+            ImageMessage img = (ImageMessage) content;
+            map.putString("localPath", img.getLocalPath());
+            map.putString("thumbnailLocalPath", img.getThumbnailLocalPath());
+            map.putString("thumbnailUrl", img.getThumbnailUrl());
+        }
+        return map;
     }
 
     private MessageContent convertMapToMessageContent(ReadableMap map) {
@@ -525,6 +537,32 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 voice.setLocalPath(map.getString("localPath"));
                 voice.setDuration(map.getInt("duration"));
                 return voice;
+            case "jg:merge":
+                String title = map.getString("title");
+                Conversation conversation = convertMapToConversation(map.getMap("conversation"));
+                ReadableArray messageIdArray = map.getArray("messageIdList");
+                List<String> messageIdList = new ArrayList<>();
+                if (messageIdArray != null) {
+                    for (int i = 0; i < messageIdArray.size(); i++) {
+                        messageIdList.add(messageIdArray.getString(i));
+                    }
+                }
+
+                ReadableArray previewArray = map.getArray("previewList");
+                List<MergeMessagePreviewUnit> previewList = new ArrayList<>();
+                if (previewArray != null) {
+                    for (int i = 0; i < previewArray.size(); i++) {
+                        previewList.add(convertMapToMergeMessagePreviewUnit(previewArray.getMap(i)));
+                    }
+                }
+                MergeMessage merge = new MergeMessage(title, conversation, messageIdList, previewList);
+                if (map.hasKey("containerMsgId")) {
+                    merge.setContainerMsgId(map.getString("containerMsgId"));
+                }
+                if (map.hasKey("extra")) {
+                    merge.setExtra(map.getString("extra"));
+                }
+                return merge;
             default:
                 // 检查是否是自定义消息
                 if (customMessageTypes.containsKey(contentType)) {
@@ -708,6 +746,53 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         map.putString("userId", userInfo.getUserId());
         map.putString("nickname", userInfo.getUserName());
         map.putString("avatar", userInfo.getPortrait());
+        if (userInfo.getExtra() != null) {
+            WritableMap extra = new WritableNativeMap();
+            for (Map.Entry<String, String> entry : userInfo.getExtra().entrySet()) {
+                extra.putString(entry.getKey(), entry.getValue());
+            }
+            map.putMap("extra", extra);
+        }
+        map.putDouble("updatedTime", userInfo.getUpdatedTime());
+
+        return map;
+    }
+
+    /**
+     * 将群组信息转换为Map
+     */
+    private WritableMap convertGroupInfoToMap(GroupInfo groupInfo) {
+        WritableMap map = new WritableNativeMap();
+        map.putString("groupId", groupInfo.getGroupId());
+        map.putString("groupName", groupInfo.getGroupName());
+        map.putString("portrait", groupInfo.getPortrait());
+        if (groupInfo.getExtra() != null) {
+            WritableMap extra = new WritableNativeMap();
+            for (Map.Entry<String, String> entry : groupInfo.getExtra().entrySet()) {
+                extra.putString(entry.getKey(), entry.getValue());
+            }
+            map.putMap("extra", extra);
+        }
+        map.putDouble("updatedTime", groupInfo.getUpdatedTime());
+        return map;
+    }
+
+    /**
+     * 将群成员信息转换为Map
+     */
+    private WritableMap convertGroupMemberToMap(GroupMember groupMember) {
+        WritableMap map = new WritableNativeMap();
+        map.putString("groupId", groupMember.getGroupId());
+        map.putString("userId", groupMember.getUserId());
+        map.putString("groupDisplayName", groupMember.getGroupDisplayName());
+        if (groupMember.getExtra() != null) {
+            WritableMap extra = new WritableNativeMap();
+            for (Map.Entry<String, String> entry : groupMember.getExtra().entrySet()) {
+                extra.putString(entry.getKey(), entry.getValue());
+            }
+            map.putMap("extra", extra);
+        }
+        map.putDouble("updatedTime", groupMember.getUpdatedTime());
         return map;
     }
 
@@ -786,6 +871,45 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         }
     }
 
+    /**
+     * 获取用户信息
+     */
+    @ReactMethod
+    public void getUserInfo(String userId, Promise promise) {
+        UserInfo userInfo = JIM.getInstance().getUserInfoManager().getUserInfo(userId);
+        if (userInfo != null) {
+            promise.resolve(convertUserInfoToMap(userInfo));
+        } else {
+            promise.resolve(null);
+        }
+    }
+
+    /**
+     * 获取群组信息
+     */
+    @ReactMethod
+    public void getGroupInfo(String groupId, Promise promise) {
+        GroupInfo groupInfo = JIM.getInstance().getUserInfoManager().getGroupInfo(groupId);
+        if (groupInfo != null) {
+            promise.resolve(convertGroupInfoToMap(groupInfo));
+        } else {
+            promise.resolve(null);
+        }
+    }
+
+    /**
+     * 获取群成员信息
+     */
+    @ReactMethod
+    public void getGroupMember(String groupId, String userId, Promise promise) {
+        GroupMember groupMember = JIM.getInstance().getUserInfoManager().getGroupMember(groupId, userId);
+        if (groupMember != null) {
+            promise.resolve(convertGroupMemberToMap(groupMember));
+        } else {
+            promise.resolve(null);
+        }
+    }
+
     /**
      * 获取单个会话信息
      */
@@ -1025,9 +1149,19 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
     public void sendMessage(ReadableMap messageMap, String messageId, Promise promise) {
         Message message = convertMapToMessage(messageMap);
         Log.d("JuggleIM", "sendMessage: " + messageId);
+        PushData pushData = convertMapToPushData(messageMap);
+
+        MessageOptions options = new MessageOptions();
+        options.setPushData(pushData);
+        options.setMentionInfo(message.getMentionInfo());
+        if (messageMap.hasKey("referredMessageId")) {
+            options.setReferredMessageId(messageMap.getString("referredMessageId"));
+        }
+
         Message sendMsg = JIM.getInstance().getMessageManager().sendMessage(
                 message.getContent(),
                 message.getConversation(),
+                options,
                 new IMessageManager.ISendMessageCallback() {
                     @Override
                     public void onSuccess(Message sentMessage) {
@@ -1245,9 +1379,24 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 imageMessage.setHeight(contentMap.getInt("height"));
             }
 
+            MessageOptions options = new MessageOptions();
+            PushData pushData = convertMapToPushData(messageMap);
+            if (pushData != null) {
+                options.setPushData(pushData);
+            }
+            ReadableMap mentionInfoMap = messageMap.getMap("mentionInfo");
+            if (mentionInfoMap != null) {
+                MessageMentionInfo mentionInfo = convertMapToMentionInfo(mentionInfoMap);
+                options.setMentionInfo(mentionInfo);
+            }
+            if (messageMap.hasKey("referredMessageId")) {
+                options.setReferredMessageId(messageMap.getString("referredMessageId"));
+            }
+
             Message message = JIM.getInstance().getMessageManager().sendMediaMessage(
                     imageMessage,
                     conversation,
+                    options,
                     new IMessageManager.ISendMediaMessageCallback() {
                         @Override
                         public void onProgress(int progress, Message message) {
@@ -1320,10 +1469,24 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             if (contentMap.hasKey("type")) {
                 fileMessage.setType(contentMap.getString("type"));
             }
+            MessageOptions options = new MessageOptions();
+            PushData pushData = convertMapToPushData(messageMap);
+            if (pushData != null) {
+                options.setPushData(pushData);
+            }
+            ReadableMap mentionInfoMap = messageMap.getMap("mentionInfo");
+            if (mentionInfoMap != null) {
+                MessageMentionInfo mentionInfo = convertMapToMentionInfo(mentionInfoMap);
+                options.setMentionInfo(mentionInfo);
+            }
+            if (messageMap.hasKey("referredMessageId")) {
+                options.setReferredMessageId(messageMap.getString("referredMessageId"));
+            }
 
             Message message = JIM.getInstance().getMessageManager().sendMediaMessage(
                     fileMessage,
                     conversation,
+                    options,
                     new IMessageManager.ISendMediaMessageCallback() {
                         @Override
                         public void onProgress(int progress, Message message) {
@@ -1389,10 +1552,23 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             if (contentMap.hasKey("duration")) {
                 voiceMessage.setDuration(contentMap.getInt("duration"));
             }
-
+            MessageOptions options = new MessageOptions();
+            PushData pushData = convertMapToPushData(messageMap);
+            if (pushData != null) {
+                options.setPushData(pushData);
+            }
+            ReadableMap mentionInfoMap = messageMap.getMap("mentionInfo");
+            if (mentionInfoMap != null) {
+                MessageMentionInfo mentionInfo = convertMapToMentionInfo(mentionInfoMap);
+                options.setMentionInfo(mentionInfo);
+            }
+            if (messageMap.hasKey("referredMessageId")) {
+                options.setReferredMessageId(messageMap.getString("referredMessageId"));
+            }
             Message message = JIM.getInstance().getMessageManager().sendMediaMessage(
                     voiceMessage,
                     conversation,
+                    options,
                     new IMessageManager.ISendMediaMessageCallback() {
                         @Override
                         public void onProgress(int progress, Message message) {
@@ -1500,9 +1676,25 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             MessageMentionInfo mentionInfo = convertMapToMentionInfo(mentionInfoMap);
             message.setMentionInfo(mentionInfo);
         }
+
         return message;
     }
 
+    private PushData convertMapToPushData(ReadableMap map) {
+        if (!map.hasKey("pushData")) {
+            return null;
+        }
+        ReadableMap pushDataMap = map.getMap("pushData");
+        PushData pushData = new PushData();
+        if (pushDataMap.hasKey("content")) {
+            pushData.setContent(pushDataMap.getString("content"));
+        }
+        if (pushDataMap.hasKey("extra")) {
+            pushData.setExtra(pushDataMap.getString("extra"));
+        }
+        return pushData;
+    }
+
     private MessageMentionInfo convertMapToMentionInfo(ReadableMap mentionInfoMap) {
         MessageMentionInfo mentionInfo = new MessageMentionInfo();
         if (mentionInfoMap.hasKey("type")) {
@@ -1534,9 +1726,34 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         if (userMap.hasKey("avatar")) {
             userInfo.setPortrait(userMap.getString("avatar"));
         }
+        if (userMap.hasKey("extra")) {
+            Map<String, String> extra = new HashMap<>();
+            ReadableMap extraMap = userMap.getMap("extra");
+            ReadableMapKeySetIterator iterator = extraMap.keySetIterator();
+            while (iterator.hasNextKey()) {
+                String key = iterator.nextKey();
+                extra.put(key, extraMap.getString(key));
+            }
+            userInfo.setExtra(extra);
+        }
         return userInfo;
     }
 
+    private MergeMessagePreviewUnit convertMapToMergeMessagePreviewUnit(ReadableMap map) {
+        String previewContent = "";
+        if (map.hasKey("previewContent")) {
+            previewContent = map.getString("previewContent");
+        }
+        UserInfo sender = new UserInfo();
+        if (map.hasKey("sender")) {
+            sender = convertMapToUserInfo(map.getMap("sender"));
+        }
+        MergeMessagePreviewUnit unit = new MergeMessagePreviewUnit();
+        unit.setPreviewContent(previewContent);
+        unit.setSender(sender);
+        return unit;
+    }
+
     /**
      * 发送消息已读回执
      * 
@@ -1633,4 +1850,116 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             promise.reject(e);
         }
     }
+
+    /**
+     * 获取合并消息列表
+     * 
+     * @param messageId 合并消息ID
+     * @param promise   Promise对象
+     */
+    @ReactMethod
+    public void getMergedMessageList(String messageId, Promise promise) {
+        JIM.getInstance().getMessageManager().getMergedMessageList(messageId,
+                new IMessageManager.IGetMessagesCallback() {
+                    @Override
+                    public void onSuccess(List<Message> list) {
+                        WritableArray array = new WritableNativeArray();
+                        for (Message msg : list) {
+                            array.pushMap(convertMessageToMap(msg));
+                        }
+                        promise.resolve(array);
+                    }
+
+                    @Override
+                    public void onError(int i) {
+                        promise.reject(String.valueOf(i), "getMergedMessageList failed");
+                    }
+                });
+    }
+
+    /**
+     * 从服务端获取用户信息
+     * 
+     * @param userId 用户ID
+     */
+    @ReactMethod
+    public void fetchUserInfo(String userId, Promise promise) {
+        JIM.getInstance().getUserInfoManager().fetchUserInfo(userId, new JIMConst.IResultCallback<UserInfo>() {
+            @Override
+            public void onSuccess(UserInfo userInfo) {
+                if (userInfo != null) {
+                    promise.resolve(convertUserInfoToMap(userInfo));
+                } else {
+                    promise.resolve(null);
+                }
+            }
+
+            @Override
+            public void onError(int i) {
+                promise.reject(String.valueOf(i), "fetchUserInfo failed");
+            }
+        });
+    }
+
+    /**
+     * 从服务端获取群组信息
+     * 
+     * @param groupId 群组ID
+     */
+    @ReactMethod
+    public void fetchGroupInfo(String groupId, Promise promise) {
+        JIM.getInstance().getUserInfoManager().fetchGroupInfo(groupId, new JIMConst.IResultCallback<GroupInfo>() {
+            @Override
+            public void onSuccess(GroupInfo groupInfo) {
+                if (groupInfo != null) {
+                    promise.resolve(convertGroupInfoToMap(groupInfo));
+                } else {
+                    promise.resolve(null);
+                }
+            }
+
+            @Override
+            public void onError(int i) {
+                promise.reject(String.valueOf(i), "fetchGroupInfo failed");
+            }
+        });
+    }
+
+    /**
+     * 批量获取用户信息
+     * 
+     * @param userIdList 用户ID列表
+     */
+    @ReactMethod
+    public void getUserInfoList(ReadableArray userIdList, Promise promise) {
+        List<String> ids = new ArrayList<>();
+        for (int i = 0; i < userIdList.size(); i++) {
+            ids.add(userIdList.getString(i));
+        }
+        List<UserInfo> users = JIM.getInstance().getUserInfoManager().getUserInfoList(ids);
+        WritableArray array = new WritableNativeArray();
+        for (UserInfo user : users) {
+            array.pushMap(convertUserInfoToMap(user));
+        }
+        promise.resolve(array);
+    }
+
+    /**
+     * 批量获取群组信息
+     * 
+     * @param groupIdList 群组ID列表
+     */
+    @ReactMethod
+    public void getGroupInfoList(ReadableArray groupIdList, Promise promise) {
+        List<String> ids = new ArrayList<>();
+        for (int i = 0; i < groupIdList.size(); i++) {
+            ids.add(groupIdList.getString(i));
+        }
+        List<GroupInfo> groups = JIM.getInstance().getUserInfoManager().getGroupInfoList(ids);
+        WritableArray array = new WritableNativeArray();
+        for (GroupInfo group : groups) {
+            array.pushMap(convertGroupInfoToMap(group));
+        }
+        promise.resolve(array);
+    }
 }