juggleim-rnsdk 0.0.22 → 0.1.3

package/android/build/reports/lint-results-debug.txt

@@ -0,0 +1,46 @@
+/Users/panyantong/juggle/rnsdk/juggleim-rnsdk/android/build.gradle:19: Warning: Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the android.os.Build.VERSION_CODES javadoc for details. [OldTargetApi]
+        targetSdkVersion 33
+        ~~~~~~~~~~~~~~~~~~~
+
+   Explanation for issues of type "OldTargetApi":
+   When your application or sdk runs on a version of Android that is more
+   recent than your targetSdkVersion specifies that it has been tested with,
+   various compatibility modes kick in. This ensures that your application
+   continues to work, but it may look out of place. For example, if the
+   targetSdkVersion is less than 14, your app may get an option button in the
+   UI.
+
+   To fix this issue, set the targetSdkVersion to the highest available value.
+   Then test your app to make sure everything works correctly. You may want to
+   consult the compatibility notes to see what changes apply to each version
+   you are adding support for:
+   https://developer.android.com/reference/android/os/Build.VERSION_CODES.html
+   as well as follow this guide:
+   https://developer.android.com/distribute/best-practices/develop/target-sdk.
+   html
+
+   https://developer.android.com/distribute/best-practices/develop/target-sdk.html
+
+/Users/panyantong/juggle/rnsdk/juggleim-rnsdk/android/build.gradle:8: Warning: A newer version of com.android.tools.build:gradle than 7.0.2 is available: 8.13.1. (There is also a newer version of 7.0.𝑥 available, if upgrading to 8.13.1 is difficult: 7.0.4) [AndroidGradlePluginVersion]
+        classpath 'com.android.tools.build:gradle:7.0.2'
+                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+   Explanation for issues of type "AndroidGradlePluginVersion":
+   This detector looks for usage of the Android Gradle Plugin where the
+   version you are using is not the current stable release. Using older
+   versions is fine, and there are cases where you deliberately want to stick
+   with an older version. However, you may simply not be aware that a more
+   recent version is available, and that is what this lint check helps find.
+
+/Users/panyantong/juggle/rnsdk/juggleim-rnsdk/android/build.gradle:15: Warning: A newer version of compileSdkVersion than 31 is available: 36 [GradleDependency]
+    compileSdkVersion 31
+    ~~~~~~~~~~~~~~~~~~~~
+
+   Explanation for issues of type "GradleDependency":
+   This detector looks for usages of libraries where the version you are using
+   is not the current stable release. Using older versions is fine, and there
+   are cases where you deliberately want to stick with an older version.
+   However, you may simply not be aware that a more recent version is
+   available, and that is what this lint check helps find.
+
+0 errors, 3 warnings

package/android/build/reports/lint-results-debug.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.12.0">
+
+    <issue
+        id="OldTargetApi"
+        severity="Warning"
+        message="Not targeting the latest versions of Android; compatibility modes apply. Consider testing and updating this version. Consult the `android.os.Build.VERSION_CODES` javadoc for details."
+        category="Correctness"
+        priority="6"
+        summary="Target SDK attribute is not targeting latest version"
+        explanation="When your application or sdk runs on a version of Android that is more recent than your `targetSdkVersion` specifies that it has been tested with, various compatibility modes kick in. This ensures that your application continues to work, but it may look out of place. For example, if the `targetSdkVersion` is less than 14, your app may get an option button in the UI.&#xA;&#xA;To fix this issue, set the `targetSdkVersion` to the highest available value. Then test your app to make sure everything works correctly. You may want to consult the compatibility notes to see what changes apply to each version you are adding support for: https://developer.android.com/reference/android/os/Build.VERSION_CODES.html as well as follow this guide:&#xA;https://developer.android.com/distribute/best-practices/develop/target-sdk.html"
+        url="https://developer.android.com/distribute/best-practices/develop/target-sdk.html"
+        urls="https://developer.android.com/distribute/best-practices/develop/target-sdk.html,https://developer.android.com/reference/android/os/Build.VERSION_CODES.html"
+        errorLine1="        targetSdkVersion 33"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="/Users/panyantong/juggle/rnsdk/juggleim-rnsdk/android/build.gradle"
+            line="19"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="AndroidGradlePluginVersion"
+        severity="Warning"
+        message="A newer version of com.android.tools.build:gradle than 7.0.2 is available: 8.13.1. (There is also a newer version of 7.0.𝑥 available, if upgrading to 8.13.1 is difficult: 7.0.4)"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Android Gradle Plugin Version"
+        explanation="This detector looks for usage of the Android Gradle Plugin where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="        classpath &apos;com.android.tools.build:gradle:7.0.2&apos;"
+        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="/Users/panyantong/juggle/rnsdk/juggleim-rnsdk/android/build.gradle"
+            line="8"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="GradleDependency"
+        severity="Warning"
+        message="A newer version of `compileSdkVersion` than 31 is available: 36"
+        category="Correctness"
+        priority="4"
+        summary="Obsolete Gradle Dependency"
+        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
+        errorLine1="    compileSdkVersion 31"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="/Users/panyantong/juggle/rnsdk/juggleim-rnsdk/android/build.gradle"
+            line="15"
+            column="5"/>
+    </issue>
+
+</issues>

package/android/build.gradle

@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }

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

@@ -0,0 +1,45 @@
+package com.juggleim;
+
+import com.juggle.im.model.MessageContent;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 通用自定义消息类
+ * 用于承载 RN 层自定义消息的 JSON 数据
+ */
+public class GenericCustomMessage extends MessageContent {
+    private String mContentType = "jgrn:custom";
+    private byte[] mData;
+
+    public GenericCustomMessage() {
+    }
+
+    @Override
+    public String getContentType() {
+        return mContentType;
+    }
+    
+    @Override
+    public byte[] encode() {
+        return mData;
+    }
+    
+    @Override
+    public void decode(byte[] data) {
+        this.mData = data;
+    }
+    
+    public void setData(byte[] data) {
+        this.mData = data;
+    }
+    
+    public byte[] getData() {
+        return mData;
+    }
+    
+    @Override
+    public String conversationDigest() {
+        // 返回默认摘要
+        return "[自定义消息]";
+    }
+}

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

@@ -36,8 +36,14 @@ import com.juggle.im.internal.logger.JLogLevel;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.nio.charset.StandardCharsets;
+
+import org.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONException;
 
 import javax.annotation.Nonnull;
 
@@ -50,6 +56,9 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
     private Map<String, IMessageManager.IMessageListener> messageListeners = new HashMap<>();
     private Map<String, IMessageManager.IMessageReadReceiptListener> readReceiptListeners = new HashMap<>();
     private Map<String, IConversationManager.IConversationListener> conversationListeners = new HashMap<>();
+    
+    // 自定义消息类型注册表
+    private Map<String, String> customMessageTypes = new HashMap<>();
 
     public JuggleIMManager(@Nonnull ReactApplicationContext reactContext) {
         super(reactContext);
@@ -98,6 +107,22 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         logBuilder.setLogConsoleLevel(JLogLevel.JLogLevelVerbose);
         builder.setJLogConfig(new JLogConfig(logBuilder));
         JIM.getInstance().init(getCurrentActivity(), appKey, builder.build());
+        JIM.getInstance().getMessageManager().registerContentType(GenericCustomMessage.class);
+    }
+
+    /**
+     * 注册自定义消息类型
+     *
+     * @param contentType 消息类型标识符
+     */
+    @ReactMethod
+    public void registerCustomMessageType(String contentType) {
+        if (contentType == null || contentType.isEmpty() || contentType.startsWith("jg:")) {
+            Log.e("JuggleIM", "contentType 不能以 'jg:' 开头");
+            return;
+        }
+        customMessageTypes.put(contentType, contentType);
+        Log.d("JuggleIM", "注册自定义消息类型: " + contentType);
     }
 
     /**
@@ -459,10 +484,13 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
      */
     private WritableMap convertMessageContentToMap(MessageContent content) {
         WritableMap map = new WritableNativeMap();
-        map.putString("contentType", content.getContentType());
-        if (content.getContentType().equals("jg:text")) {
+        String contentType = content.getContentType();
+        Log.d("JuggleIM", "contentType: " + contentType);
+        map.putString("contentType", contentType);
+        
+        if (contentType.equals("jg:text")) {
             map.putString("content", ((TextMessage) content).getContent());
-        } else if (content.getContentType().equals("jg:img")) {
+        } else if (contentType.equals("jg:img")) {
             ImageMessage img = (ImageMessage) content;
             map.putString("url", img.getUrl());
             map.putString("localPath", img.getLocalPath());
@@ -470,21 +498,36 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             map.putString("thumbnailUrl", img.getThumbnailUrl());
             map.putInt("width", img.getWidth());
             map.putInt("height", img.getHeight());
-        } else if (content.getContentType().equals("jg:file")) {
+        } else if (contentType.equals("jg:file")) {
             FileMessage file = (FileMessage) content;
             map.putString("url", file.getUrl());
             map.putString("type", file.getType());
             map.putString("name", file.getName());
             map.putDouble("size", file.getSize());
-        } else if (content.getContentType().equals("jg:voice")) {
+        } else if (contentType.equals("jg:voice")) {
             VoiceMessage voice = (VoiceMessage) content;
             map.putString("url", voice.getUrl());
             map.putString("localPath", voice.getLocalPath());
             map.putInt("duration", voice.getDuration());
+        } else if (contentType.equals("jgrn:custom")) {
+            GenericCustomMessage genericCustomMessage = (GenericCustomMessage) content;
+            byte[] data = genericCustomMessage.encode();
+            if (data != null) {
+                try {
+                    String jsonStr = new String(data, StandardCharsets.UTF_8);
+                    JSONObject jsonObject = new JSONObject(jsonStr);
+                    map = convertJSONToWritableMap(jsonObject);
+                } catch (JSONException e) {
+                    Log.e("JuggleIM", "解析自定义消息失败: " + e.getMessage());
+                }
+            } else {
+                Log.e("JuggleIM", "No data for contentType: " + contentType);
+            }
         } else {
-            Log.e("JuggleIM", "Unknown contentType: " + content.getContentType());
+            Log.e("JuggleIM", "Unknown contentType: " + contentType);
             return RNTypeConverter.toWritableMap(content);
         }
+        Log.d("JuggleIM", "convertMessageContentToMap: " + map.getString("contentType"));
 
         return map;
     }
@@ -518,11 +561,160 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 voice.setDuration(map.getInt("duration"));
                 return voice;
             default:
+                // 检查是否是自定义消息
+                if (customMessageTypes.containsKey(contentType)) {
+                    return createCustomMessage(map);
+                }
                 Log.e("JuggleIM", "contentType: " + contentType);
                 return RNTypeConverter.fromReadableMap(map, MessageContent.class);
         }
     }
 
+    /**
+     * 创建自定义消息对象
+     */
+    private MessageContent createCustomMessage(ReadableMap map) {
+        try {
+            // 将 ReadableMap 转换为 JSON
+            JSONObject jsonObject = convertReadableMapToJSON(map);
+            String jsonStr = jsonObject.toString();
+            
+            // 创建通用自定义消息对象
+            GenericCustomMessage customMsg = new GenericCustomMessage();
+            customMsg.setData(jsonStr.getBytes(StandardCharsets.UTF_8));
+            
+            return customMsg;
+        } catch (JSONException e) {
+            Log.e("JuggleIM", "创建自定义消息失败: " + e.getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * 将 ReadableMap 转换为 JSONObject
+     */
+    private JSONObject convertReadableMapToJSON(ReadableMap map) throws JSONException {
+        JSONObject jsonObject = new JSONObject();
+        ReadableMapKeySetIterator iterator = map.keySetIterator();
+        
+        while (iterator.hasNextKey()) {
+            String key = iterator.nextKey();
+            switch (map.getType(key)) {
+                case Null:
+                    jsonObject.put(key, JSONObject.NULL);
+                    break;
+                case Boolean:
+                    jsonObject.put(key, map.getBoolean(key));
+                    break;
+                case Number:
+                    jsonObject.put(key, map.getDouble(key));
+                    break;
+                case String:
+                    jsonObject.put(key, map.getString(key));
+                    break;
+                case Map:
+                    jsonObject.put(key, convertReadableMapToJSON(map.getMap(key)));
+                    break;
+                case Array:
+                    jsonObject.put(key, convertReadableArrayToJSONArray(map.getArray(key)));
+                    break;
+            }
+        }
+        
+        return jsonObject;
+    }
+
+    /**
+     * 将 ReadableArray 转换为 JSONArray
+     */
+    private JSONArray convertReadableArrayToJSONArray(ReadableArray array) throws JSONException {
+        JSONArray jsonArray = new JSONArray();
+        
+        for (int i = 0; i < array.size(); i++) {
+            switch (array.getType(i)) {
+                case Null:
+                    jsonArray.put(JSONObject.NULL);
+                    break;
+                case Boolean:
+                    jsonArray.put(array.getBoolean(i));
+                    break;
+                case Number:
+                    jsonArray.put(array.getDouble(i));
+                    break;
+                case String:
+                    jsonArray.put(array.getString(i));
+                    break;
+                case Map:
+                    jsonArray.put(convertReadableMapToJSON(array.getMap(i)));
+                    break;
+                case Array:
+                    jsonArray.put(convertReadableArrayToJSONArray(array.getArray(i)));
+                    break;
+            }
+        }
+        
+        return jsonArray;
+    }
+
+    /**
+     * 将 JSONObject 转换为 WritableMap
+     */
+    private WritableMap convertJSONToWritableMap(JSONObject jsonObject) throws JSONException {
+        WritableMap map = new WritableNativeMap();
+        
+        Iterator<String> iterator = jsonObject.keys();
+        while (iterator.hasNext()) {
+            String key = iterator.next();
+            Object value = jsonObject.get(key);
+            if (value instanceof JSONObject) {
+                map.putMap(key, convertJSONToWritableMap((JSONObject) value));
+            } else if (value instanceof JSONArray) {
+                map.putArray(key, convertJSONArrayToWritableArray((JSONArray) value));
+            } else if (value instanceof Boolean) {
+                map.putBoolean(key, (Boolean) value);
+            } else if (value instanceof Integer) {
+                map.putInt(key, (Integer) value);
+            } else if (value instanceof Double) {
+                map.putDouble(key, (Double) value);
+            } else if (value instanceof String) {
+                map.putString(key, (String) value);
+            } else if (value == JSONObject.NULL) {
+                map.putNull(key);
+            }
+        }
+        
+        return map;
+    }
+
+    /**
+     * 将 JSONArray 转换为 WritableArray
+     */
+    private WritableArray convertJSONArrayToWritableArray(JSONArray jsonArray) throws JSONException {
+        WritableArray array = new WritableNativeArray();
+        
+        for (int i = 0; i < jsonArray.length(); i++) {
+            Object value = jsonArray.get(i);
+            
+            if (value instanceof JSONObject) {
+                array.pushMap(convertJSONToWritableMap((JSONObject) value));
+            } else if (value instanceof JSONArray) {
+                array.pushArray(convertJSONArrayToWritableArray((JSONArray) value));
+            } else if (value instanceof Boolean) {
+                array.pushBoolean((Boolean) value);
+            } else if (value instanceof Integer) {
+                array.pushInt((Integer) value);
+            } else if (value instanceof Double) {
+                array.pushDouble((Double) value);
+            } else if (value instanceof String) {
+                array.pushString((String) value);
+            } else if (value == JSONObject.NULL) {
+                array.pushNull();
+            }
+        }
+        
+        return array;
+    }
+
     /**
      * 将消息回应转换为Map
      */
@@ -768,6 +960,9 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
      * 将 ConversationInfo 转换为 WritableMap
      */
     private WritableMap convertConversationInfoToMap(ConversationInfo info) {
+        if (info == null) {
+            return null;
+        }
         WritableMap map = new WritableNativeMap();
         map.putMap("conversation", convertConversationToMap(info.getConversation()));
         map.putInt("unreadCount", info.getUnreadCount());
@@ -793,13 +988,18 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
      * 将 MentionInfo 转换为 WritableMap
      */
     private WritableMap convertMentionInfoToMap(MessageMentionInfo mentionInfo) {
+        if (mentionInfo == null) {
+            return null;
+        }
         WritableMap map = new WritableNativeMap();
         WritableArray userMap = new WritableNativeArray();
         map.putInt("type", mentionInfo.getType().getValue());
-        for (UserInfo userInfo : mentionInfo.getTargetUsers()) {
-            userMap.pushMap(convertUserInfoToMap(userInfo));
+        if (mentionInfo.getTargetUsers() != null) { 
+            for (UserInfo userInfo : mentionInfo.getTargetUsers()) {
+                userMap.pushMap(convertUserInfoToMap(userInfo));
+            }
+            map.putArray("targetUsers", userMap);
         }
-        map.putArray("targetUsers", userMap);
         return map;
     }
 
@@ -1295,11 +1495,13 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         }
         if (mentionInfoMap.hasKey("targetUsers")) {
             ReadableArray targetUsers = mentionInfoMap.getArray("targetUsers");
+            List<UserInfo> targetUsersList = new ArrayList<>();
             for (int i = 0; i < targetUsers.size(); i++) {
                 ReadableMap userMap = targetUsers.getMap(i);
                 UserInfo userInfo = convertMapToUserInfo(userMap);
-                mentionInfo.getTargetUsers().add(userInfo);
+                targetUsersList.add(userInfo);
             }
+            mentionInfo.setTargetUsers(targetUsersList);
         }
         return mentionInfo;
     }
@@ -1317,4 +1519,65 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         }
         return userInfo;
     }
+
+    /**
+     * 发送消息已读回执
+     * @param conversationMap 会话对象
+     * @param messageIds 消息ID列表
+     * @param promise Promise对象
+     */
+    @ReactMethod
+    public void sendReadReceipt(ReadableMap conversationMap, ReadableArray messageIds, Promise promise) {
+        try {
+            Conversation conversation = convertMapToConversation(conversationMap);
+            List<String> msgIdList = new ArrayList<>();
+            for (int i = 0; i < messageIds.size(); i++) {
+                msgIdList.add(messageIds.getString(i));
+            }
+
+            JIM.getInstance().getMessageManager().sendReadReceipt(conversation, msgIdList, new IMessageManager.ISendReadReceiptCallback() {
+                @Override
+                public void onSuccess() {
+                    promise.resolve(true);
+                }
+
+                @Override
+                public void onError(int errorCode) {
+                    promise.reject("error", "Error code: " + errorCode);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            promise.reject(e);
+        }
+    }
+
+    /**
+     * 设置消息置顶
+     * @param messageId 消息ID
+     * @param conversationMap 会话对象
+     * @param isTop 是否置顶
+     * @param promise Promise对象
+     */
+    @ReactMethod
+    public void setMessageTop(String messageId, ReadableMap conversationMap, boolean isTop, Promise promise) {
+        try {
+            Conversation conversation = convertMapToConversation(conversationMap);
+
+            JIM.getInstance().getMessageManager().setTop(messageId, conversation, isTop, new IMessageManager.ISimpleCallback() {
+                @Override
+                public void onSuccess() {
+                    promise.resolve(true);
+                }
+
+                @Override
+                public void onError(int errorCode) {
+                    promise.reject("error", "Error code: " + errorCode);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            promise.reject(e);
+        }
+    }
 }

package/ios/GenericCustomMessage.h

@@ -0,0 +1,24 @@
+#import <JuggleIM/JuggleIM.h>
+
+/**
+ * 通用自定义消息类
+ * 用于承载 RN 层自定义消息的 JSON 数据
+ */
+@interface GenericCustomMessage : JMessageContent
+
+/**
+ * 消息数据
+ */
+@property(nonatomic, strong) NSData *data;
+
+/**
+ * 设置消息数据
+ */
+- (void)setData:(NSData *)data;
+
+/**
+ * 获取消息数据
+ */
+- (NSData *)getData;
+
+@end

package/ios/GenericCustomMessage.m

@@ -0,0 +1,29 @@
+#import "GenericCustomMessage.h"
+
+@implementation GenericCustomMessage
+
++ (NSString *)contentType {
+  return @"jgrn:custom";
+}
+
+- (NSData *)encode {
+  return self.data;
+}
+
+- (void)decode:(NSData *)data {
+  self.data = data;
+}
+
+- (void)setData:(NSData *)data {
+  _data = data;
+}
+
+- (NSData *)getData {
+  return _data;
+}
+
+- (NSString *)conversationDigest {
+  return @"[自定义消息]";
+}
+
+@end