juggleim-rnsdk 0.2.0 → 0.2.1

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.34"
+  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.2.0",
+  "version": "0.2.1",
   "description": "React Native wrapper for Juggle IM SDK",
   "main": "src/index.js",
   "types": "src/index.d.ts",

package/src/index.js

@@ -152,9 +152,10 @@ class JuggleIM {
     if (listener.onMessageReceive) {
       const subscription = juggleIMEmitter.addListener(
         "MessageReceived",
-        (event) => {
+        async (event) => {
+          const message = await this.buildMessageInfo(event.message);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onMessageReceive(event.message);
+          listener.onMessageReceive(message);
         }
       );
       subscriptions.push(subscription);
@@ -356,8 +357,10 @@ class JuggleIM {
       const subscription = juggleIMEmitter.addListener(
         "ConversationInfoAdded",
         (event) => {
+          const convsList = this.buildConversationInfoList(event.conversations);
+          console.log("ConversationInfoAdded", convsList);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onConversationInfoAdd(event.conversations);
+          listener.onConversationInfoAdd(convsList);
         }
       );
       subscriptions.push(subscription);
@@ -368,8 +371,10 @@ class JuggleIM {
       const subscription = juggleIMEmitter.addListener(
         "ConversationInfoUpdated",
         (event) => {
+          const convsList = this.buildConversationInfoList(event.conversations);
+          console.log("ConversationInfoUpdated", convsList);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onConversationInfoUpdate(event.conversations);
+          listener.onConversationInfoUpdate(convsList);
         }
       );
       subscriptions.push(subscription);
@@ -380,8 +385,10 @@ class JuggleIM {
       const subscription = juggleIMEmitter.addListener(
         "ConversationInfoDeleted",
         (event) => {
+          const convsList = this.buildConversationInfoList(event.conversations);
+          console.log("ConversationInfoDeleted", convsList);
           if (Platform.OS === "android" && event.key !== key) return;
-          listener.onConversationInfoDelete(event.conversations);
+          listener.onConversationInfoDelete(convsList);
         }
       );
       subscriptions.push(subscription);
@@ -444,6 +451,37 @@ class JuggleIM {
     });
   }
 
+  static buildConversationInfoList(convs) {
+    convs?.forEach(async (conv) => {
+      if (conv.conversation?.conversationType === 1) {
+        const userInfo = await JMI.getUserInfo(conv.conversation?.conversationId);
+        conv.name = userInfo?.nickname;
+        conv.avatar = userInfo?.avatar;
+        conv.extra = userInfo?.extra;
+      } else if (conv.conversation?.conversationType === 2) {
+        const groupInfo = await JMI.getGroupInfo(conv.conversation?.conversationId);
+        conv.name = groupInfo?.groupName;
+        conv.avatar = groupInfo?.portrait;
+        conv.extra = groupInfo?.extra;
+      }
+      if (conv.lastMessage) {
+        const userInfo = await JMI.getUserInfo(conv.lastMessage.senderUserId);
+        conv.lastMessage.senderUserName = userInfo?.nickname;
+        conv.lastMessage.senderUserAvatar = userInfo?.avatar;
+        conv.lastMessage.senderUserExtra = userInfo?.extra;
+      }
+    });
+    return convs;
+  }
+
+  static async buildMessageInfo(message) {
+    const userInfo = await JMI.getUserInfo(message.senderUserId);
+    message.senderUserName = userInfo?.nickname;
+    message.senderUserAvatar = userInfo?.avatar;
+    message.senderUserExtra = userInfo?.extra;
+    return message;
+  }
+
   /**
    * 获取单个会话信息
    * @param {object} conversation - 会话对象
@@ -571,11 +609,18 @@ class JuggleIM {
    * @returns {Promise<boolean>} 清除结果
    */
   static clearUnreadCount(conversation) {
-    if (Platform.OS === "android") {
-      return JMI.clearUnreadCount(conversation);
-    } else if (Platform.OS === "ios") {
-      return JMI.clearUnreadCount(conversation);
-    }
+    // 参数检查
+    return new Promise((resolve, reject) => {
+      if (!conversation || !conversation.conversationId || !conversation.conversationType) {
+        reject('error', '会话参数错误');
+        return;
+      }
+      if (Platform.OS === "android") {
+        JMI.clearUnreadCount(conversation).then(resolve).catch(reject);
+      } else if (Platform.OS === "ios") {
+        JMI.clearUnreadCount(conversation).then(resolve).catch(reject);
+      }
+    });
   }
 
   /**

package/src/types.d.ts

@@ -448,6 +448,22 @@ export interface SendMessageObject {
 }
 /**
  * 连接状态监听器回调函数
+ * @param {ConnectionStatus} status - 连接状态
+ * @param {number} code - 状态码
+ *        0: CONNECT_SUCCESS 链接成功
+ *        11000: CONNECT_ERROR 默认错误
+ *        11001: CONNECT_APPKEY_IS_REQUIRE 未传 Appkey
+ *        11002: CONNECT_TOKEN_NOT_EXISTS 未传 Token
+ *        11003: CONNECT_APPKEY_NOT_EXISTS Appkey 不存在
+ *        11004: CONNECT_TOKEN_ILLEGAL Token 不合法
+ *        11005: CONNECT_TOKEN_UNAUTHORIZED Token 未授权
+ *        11006: CONNECT_TOKEN_EXPIRE Token 已过期
+ *        11008: CONNECT_UNSUPPORT_PLATFORM 不支持的平台类型
+ *        11009: CONNECT_APP_BLOCKED App已封禁
+ *        11010: CONNECT_USER_BLOCKED 用户已封禁
+ *        11011: CONNECT_USER_KICKED 被踢下线
+ *        11012: CONNECT_USER_LOGOUT 注销下线
+ * @param {string} extra - 扩展信息
  */
 export type ConnectionStatusListener = (
     status: ConnectionStatus,