juggleim-rnsdk 0.0.17 → 0.0.23

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"
     }
@@ -43,6 +43,6 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.facebook.react:react-native:+'
-    api 'com.juggle.im:juggle:1.8.13.2'
+    implementation 'com.facebook.react:react-native:0.71.1'
+    implementation 'com.juggle.im:juggle:1.8.27.1'
 }

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

@@ -257,6 +257,15 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 sendEvent("MessageReactionRemoved", params);
             }
 
+            @Override
+            public void onMessageSetTop(Message message, UserInfo userInfo, boolean b) {
+                WritableMap params = new WritableNativeMap();
+                params.putString("key", key);
+                params.putMap("message", convertMessageToMap(message));
+                params.putMap("operator", convertUserInfoToMap(userInfo));
+                params.putBoolean("isTop", b);
+                sendEvent("MessageSetTop", params);
+            }
         };
 
         messageListeners.put(key, listener);
@@ -473,7 +482,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             map.putString("localPath", voice.getLocalPath());
             map.putInt("duration", voice.getDuration());
         } else {
-            Log.e("convertMessageContentToMap", "Unknown contentType: " + content.getContentType());
+            Log.e("JuggleIM", "Unknown contentType: " + content.getContentType());
             return RNTypeConverter.toWritableMap(content);
         }
 
@@ -509,7 +518,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 voice.setDuration(map.getInt("duration"));
                 return voice;
             default:
-                Log.e("convertMapToMessageContent", "contentType: " + contentType);
+                Log.e("JuggleIM", "contentType: " + contentType);
                 return RNTypeConverter.fromReadableMap(map, MessageContent.class);
         }
     }
@@ -585,7 +594,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                     JIMConst.PullDirection.NEWER : JIMConst.PullDirection.OLDER;
 
             List<ConversationInfo> conversationInfos = com.juggle.im.JIM.getInstance().getConversationManager().getConversationInfoList(count, (long) ts, direction);
-            Log.d("getConversationInfoList", "conversationInfos: " + conversationInfos.size());
+            Log.d("JuggleIM", "conversationInfos: " + conversationInfos.size());
             WritableArray result = new WritableNativeArray();
             for (ConversationInfo info : conversationInfos) {
                 result.pushMap(convertConversationInfoToMap(info));
@@ -800,7 +809,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
     @ReactMethod
     public void sendMessage(ReadableMap messageMap, String messageId, Promise promise) {
         Message message = convertMapToMessage(messageMap);
-        Log.d("sendMessage", message.toString());
+        Log.d("JuggleIM", "sendMessage: " + messageId);
         Message sendMsg = JIM.getInstance().getMessageManager().sendMessage(
                 message.getContent(),
                 message.getConversation(),
@@ -903,9 +912,8 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
      * 撤回消息
      */
     @ReactMethod
-    public void recallMessage(ReadableMap messageMap, ReadableMap extras, Promise promise) {
+    public void recallMessage(String messageId, ReadableMap extras, Promise promise) {
         try {
-            String messageId = messageMap.getString("messageId");
             Map<String, String> extrasMap = new HashMap<>();
             if (extras != null) {
                 ReadableMapKeySetIterator it = extras.keySetIterator();
@@ -1270,6 +1278,106 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         if (messageMap.hasKey("isEdit")) {
             message.setEdit(messageMap.getBoolean("isEdit"));
         }
+
+        if (messageMap.hasKey("mentionInfo")) {
+            ReadableMap mentionInfoMap = messageMap.getMap("mentionInfo");
+            MessageMentionInfo mentionInfo = convertMapToMentionInfo(mentionInfoMap);
+            message.setMentionInfo(mentionInfo);
+        }
         return message;
     }
+
+    private MessageMentionInfo convertMapToMentionInfo(ReadableMap mentionInfoMap) {
+        MessageMentionInfo mentionInfo = new MessageMentionInfo();
+        if (mentionInfoMap.hasKey("type")) {
+            MessageMentionInfo.MentionType type = MessageMentionInfo.MentionType.setValue(mentionInfoMap.getInt("type"));
+            mentionInfo.setType(type);
+        }
+        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);
+                targetUsersList.add(userInfo);
+            }
+            mentionInfo.setTargetUsers(targetUsersList);
+        }
+        return mentionInfo;
+    }
+
+    private UserInfo convertMapToUserInfo(ReadableMap userMap) {
+        UserInfo userInfo = new UserInfo();
+        if (userMap.hasKey("userId")) {
+            userInfo.setUserId(userMap.getString("userId"));
+        }
+        if (userMap.hasKey("nickname")) {
+            userInfo.setUserName(userMap.getString("nickname"));
+        }
+        if (userMap.hasKey("avatar")) {
+            userInfo.setPortrait(userMap.getString("avatar"));
+        }
+        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/JuggleIMManager.m

@@ -875,20 +875,15 @@ RCT_EXPORT_METHOD(sendMessage : (NSDictionary *)messageDict messageId : (
     NSString *)messageId resolver : (RCTPromiseResolveBlock)
                       resolve rejecter : (RCTPromiseRejectBlock)reject) {
   @try {
-    // 构建消息内容和会话对象
-    JMessageContent *content = [self
-        convertDictToMessageContent:[messageDict objectForKey:@"content"]];
-    JConversation *conversation =
-        [self convertDictionaryToConversation:messageDict];
-
-    if (!content) {
+    JMessage *msg = [self convertDictToMessage:messageDict];
+    if (!msg.content) {
       reject(@"SEND_MESSAGE_ERROR", @"无效的消息内容", nil);
       return;
     }
 
     // 发送消息
-    JMessage *message = [JIM.shared.messageManager sendMessage:content
-        inConversation:conversation
+    JMessage *message = [JIM.shared.messageManager sendMessage:msg.content
+        inConversation:msg.conversation
         success:^(JMessage *message) {
           [self sendEventWithName:@"onMessageSent"
                              body:@{
@@ -1300,4 +1295,158 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
 
   return nil;
 }
+
+- (JMessage *)convertDictToMessage:(NSDictionary *)messageDict {
+  if (![messageDict isKindOfClass:[NSDictionary class]]) {
+    return nil;
+  }
+
+  JMessage *message = [[JMessage alloc] init];
+
+  // 1. Conversation
+  JConversation *conversation =
+      [self convertDictionaryToConversation:messageDict];
+  message.conversation = conversation;
+
+  // 2. messageId
+  if (messageDict[@"messageId"]) {
+    message.messageId = messageDict[@"messageId"];
+  }
+
+  // 3. clientMsgNo
+  if (messageDict[@"clientMsgNo"]) {
+    message.clientMsgNo = [messageDict[@"clientMsgNo"] longLongValue];
+  }
+
+  // 4. timestamp
+  if (messageDict[@"timestamp"]) {
+    message.timestamp = [messageDict[@"timestamp"] longLongValue];
+  }
+
+  // 5. senderUserId
+  if (messageDict[@"senderUserId"]) {
+    message.senderUserId = messageDict[@"senderUserId"];
+  }
+
+  // 6. content
+  NSDictionary *contentDict = messageDict[@"content"];
+  if ([contentDict isKindOfClass:[NSDictionary class]]) {
+    JMessageContent *content = [self convertDictToMessageContent:contentDict];
+    message.content = content;
+  }
+
+  // 7. direction
+  if (messageDict[@"direction"]) {
+    NSInteger directionValue = [messageDict[@"direction"] integerValue];
+    message.direction = directionValue;
+  }
+
+  // 8. state
+  if (messageDict[@"state"]) {
+    NSInteger stateValue = [messageDict[@"state"] integerValue];
+    message.messageState = stateValue;
+  }
+
+  // 9. hasRead
+  if (messageDict[@"hasRead"]) {
+    message.hasRead = [messageDict[@"hasRead"] boolValue];
+  }
+
+  // 10. localAttribute
+  if (messageDict[@"localAttribute"]) {
+    message.localAttribute = messageDict[@"localAttribute"];
+  }
+
+  // 11. isDelete
+  if (messageDict[@"isDelete"]) {
+    message.isDeleted = [messageDict[@"isDelete"] boolValue];
+  }
+
+  // 12. isEdit
+  if (messageDict[@"isEdit"]) {
+    message.isEdit = [messageDict[@"isEdit"] boolValue];
+  }
+
+  if (messageDict[@"mentionInfo"]) {
+    NSDictionary *mentionInfoDict = messageDict[@"mentionInfo"];
+    if ([mentionInfoDict isKindOfClass:[NSDictionary class]]) {
+      JMessageMentionInfo *mentionInfo =
+          [self convertDictToMessageMentionInfo:mentionInfoDict];
+      message.mentionInfo = mentionInfo;
+    }
+  }
+
+  return message;
+}
+
+- (JMessageMentionInfo *)convertDictToMessageMentionInfo:(NSDictionary *)dict {
+  JMessageMentionInfo *mentionInfo = [[JMessageMentionInfo alloc] init];
+  if (dict[@"type"]) {
+    mentionInfo.type = [dict[@"type"] intValue];
+  }
+  if (dict[@"targetUsers"]) {
+    NSDictionary *mentionedUsers = dict[@"targetUsers"];
+    // convert dict userinfo
+    NSMutableArray *userArray = [NSMutableArray array];
+    for (NSDictionary *userDict in mentionedUsers) {
+      if ([userDict isKindOfClass:[NSDictionary class]] &&
+          userDict[@"userId"]) {
+        JUserInfo *userInfo = [self convertDictToUserInfo:userDict[@"userId"]];
+        [userArray addObject:userInfo];
+      }
+    }
+  }
+
+  return mentionInfo;
+}
+// convert dict userinfo
+- (JUserInfo *)convertDictToUserInfo:(NSString *)userId {
+  JUserInfo *userInfo = [[JUserInfo alloc] init];
+  userInfo.userId = userId;
+  return userInfo;
+}
+
+/**
+ * 发送消息已读回执
+ */
+RCT_EXPORT_METHOD(
+    sendReadReceipt : (NSDictionary *)conversationMap messageIds : (NSArray *)
+        messageIds resolver : (RCTPromiseResolveBlock)
+            resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  JConversation *conversation =
+      [self convertDictionaryToConversation:conversationMap];
+
+  [JIM.shared.messageManager sendReadReceipt:messageIds
+      inConversation:conversation
+      success:^{
+        resolve(@YES);
+      }
+      error:^(JErrorCode code) {
+        reject(@"error",
+               [NSString stringWithFormat:@"Error code: %ld", (long)code], nil);
+      }];
+}
+
+/**
+ * 设置消息置顶
+ */
+RCT_EXPORT_METHOD(
+    setMessageTop : (NSString *)messageId conversation : (NSDictionary *)
+        conversationMap isTop : (BOOL)isTop resolver : (RCTPromiseResolveBlock)
+            resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  JConversation *conversation =
+      [self convertDictionaryToConversation:conversationMap];
+
+  [JIM.shared.messageManager setTop:isTop
+      messageId:messageId
+      conversation:conversation
+      success:^{
+        resolve(@YES);
+      }
+      error:^(JErrorCode code) {
+        reject(@"error",
+               [NSString stringWithFormat:@"Error code: %ld", (long)code], nil);
+      }];
+}
+
 @end

package/package.json

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

package/src/index.d.ts

@@ -791,5 +791,33 @@ declare module "juggleim-rnsdk" {
       messageId: string,
       reactionId: string
     ): Promise<Boolean>;
+
+    /**
+     * 发送消息已读回执
+     * @param conversation 会话对象
+     * @param messageIds 消息ID列表
+     * @param callback 回调函数
+     * @returns {Promise<Boolean>} 是否发送成功
+     */
+    static sendReadReceipt(
+      conversation: Conversation,
+      messageIds: string[],
+      callback?: SimpleCallback
+    ): Promise<Boolean>;
+
+    /**
+     * 设置消息置顶
+     * @param messageId 消息ID
+     * @param conversation 会话对象
+     * @param isTop 是否置顶
+     * @param callback 回调函数
+     * @returns {Promise<Boolean>} 是否设置成功
+     */
+    static setMessageTop(
+      messageId: string,
+      conversation: Conversation,
+      isTop: boolean,
+      callback?: SimpleCallback
+    ): Promise<Boolean>;
   }
 }