juggleim-rnsdk 0.1.8 → 0.1.9

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

@@ -45,6 +45,8 @@ import java.nio.charset.StandardCharsets;
 import org.json.JSONObject;
 import org.json.JSONArray;
 import org.json.JSONException;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 
 import javax.annotation.Nonnull;
 
@@ -795,6 +797,33 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         promise.resolve(convertConversationInfoToMap(conversationInfo));
     }
 
+    /**
+     * 上传图片
+     */
+    @ReactMethod
+    public void uploadImage(String localPath, Promise promise) {
+        try {
+            String path = localPath;
+            if (path.startsWith("file://")) {
+                path = path.substring(7);
+            }
+            JIM.getInstance().getMessageManager().uploadImage(localPath, new JIMConst.IResultCallback<String>() {
+                @Override
+                public void onSuccess(String s) {
+                    promise.resolve(s);
+                }
+
+                @Override
+                public void onError(int i) {
+                    promise.reject(String.valueOf(i), "Upload failed with code: " + i);
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            promise.reject("-1", e.getMessage());
+        }
+    }
+
     /**
      * 创建会话信息
      */
@@ -1066,7 +1095,8 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 getOptions.setStartTime((long) options.getDouble("startTime"));
             }
 
-            JIMConst.PullDirection pullDirection = direction == 0 ? JIMConst.PullDirection.NEWER : JIMConst.PullDirection.OLDER;
+            JIMConst.PullDirection pullDirection = direction == 0 ? JIMConst.PullDirection.NEWER
+                    : JIMConst.PullDirection.OLDER;
             JIM.getInstance().getMessageManager().getMessages(
                     conversation,
                     pullDirection,

package/ios/JuggleIMManager.m

@@ -652,6 +652,32 @@ RCT_EXPORT_METHOD(getConversationInfo : (NSDictionary *)
   }
 }
 
+/**
+ * 上传图片
+ */
+RCT_EXPORT_METHOD(uploadImage : (NSString *)localPath resolver : (
+    RCTPromiseResolveBlock)resolve rejecter : (RCTPromiseRejectBlock)reject) {
+  NSString *path = localPath;
+  if ([path hasPrefix:@"file://"]) {
+    path = [path substringFromIndex:7];
+  }
+
+  UIImage *image = [UIImage imageWithContentsOfFile:path];
+  if (!image) {
+    reject(@"-1", @"Image decode failed", nil);
+    return;
+  }
+
+  [JIM.shared.messageManager uploadImage:image
+      success:^(NSString *url) {
+        resolve(url);
+      }
+      error:^(JErrorCode code) {
+        reject([NSString stringWithFormat:@"%ld", (long)code], @"Upload failed",
+               nil);
+      }];
+}
+
 /**
  * 创建会话信息
  */
@@ -1167,7 +1193,7 @@ RCT_EXPORT_METHOD(getMessages : (NSDictionary *)conversationDict direction : (
 
     JPullDirection pullDirection =
         direction == 0 ? JPullDirectionNewer : JPullDirectionOlder;
-      NSLog(@"getMessages start");
+    NSLog(@"getMessages start");
     [JIM.shared.messageManager
         getMessages:conversation
           direction:pullDirection

package/package.json

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

package/src/call/JuggleIMCall.ts

@@ -9,46 +9,98 @@ const { JuggleIMCallModule } = NativeModules;
 const eventEmitter = new NativeEventEmitter(JuggleIMCallModule);
 
 export interface CallReceiveListener {
+    /**
+     * 收到通话请求的回调
+     * @param callSession 通话会话对象
+     */
     onCallReceive(callSession: CallSession): void;
 }
 
 export interface ConversationCallListener {
+    /**
+     * 会话中通话信息更新的回调
+     * @param callInfo 通话信息
+     * @param conversation 所属会话
+     * @param isFinished 通话是否已结束
+     */
     onCallInfoUpdate(callInfo: CallInfo, conversation: Conversation, isFinished: boolean): void;
 }
 
 export default class JuggleIMCall {
+    /**
+     * 初始化 Zego 引擎
+     * @param appId Zego App ID
+     */
     static initZegoEngine(appId: number): void {
         JuggleIMCallModule.initZegoEngine(appId);
     }
 
+    /**
+     * 初始化 LiveKit 引擎
+     */
     static initLiveKitEngine(): void {
         JuggleIMCallModule.initLiveKitEngine();
     }
 
+    /**
+     * 初始化 Agora 引擎
+     * @param appId Agora App ID
+     */
     static initAgoraEngine(appId: string): void {
         JuggleIMCallModule.initAgoraEngine(appId);
     }
 
+    /**
+     * 发起单人通话
+     * @param userId 对方用户 ID
+     * @param mediaType 通话媒体类型 (音频/视频)
+     * @param extra 扩展信息
+     * @returns Promise<CallSession> 通话会话对象
+     */
     static startSingleCall(userId: string, mediaType: CallMediaType, extra?: string): Promise<CallSession> {
         return JuggleIMCallModule.startSingleCall(userId, mediaType, extra || "")
             .then((session: any) => new CallSession(session));
     }
 
+    /**
+     * 发起群组/多人通话
+     * @param userIdList 参与者用户 ID 列表
+     * @param mediaType 通话媒体类型 (音频/视频)
+     * @param extra 扩展信息
+     * @param conversation 关联的会话信息 (可选)
+     * @returns Promise<CallSession> 通话会话对象
+     */
     static startMultiCall(userIdList: string[], mediaType: CallMediaType, extra?: string, conversation?: Conversation): Promise<CallSession> {
         return JuggleIMCallModule.startMultiCall(userIdList, mediaType, extra || "", conversation)
             .then((session: any) => new CallSession(session));
     }
 
+    /**
+     * 加入通话
+     * @param callId 通话 ID
+     * @returns Promise<CallSession> 通话会话对象
+     */
     static joinCall(callId: string): Promise<CallSession> {
         return JuggleIMCallModule.joinCall(callId)
             .then((session: any) => new CallSession(session));
     }
 
+    /**
+     * 获取通话会话实例
+     * @param callId 通话 ID
+     * @returns Promise<CallSession | null> 通话会话对象，如果不存在则返回 null
+     */
     static getCallSession(callId: string): Promise<CallSession | null> {
         return JuggleIMCallModule.getCallSession(callId)
             .then((session: any) => session ? new CallSession(session) : null);
     }
 
+    /**
+     * 添加收到通话请求的监听器
+     * 在全局或者应用首页添加，用于处理收到的通话请求
+     * @param listener 监听器回调
+     * @returns 取消监听的函数
+     */
     static addReceiveListener(listener: CallReceiveListener): () => void {
         const key = `CallManager_Receive_${Date.now()}`;
         JuggleIMCallModule.addReceiveListener(key);
@@ -63,6 +115,11 @@ export default class JuggleIMCall {
         };
     }
 
+    /**
+     * 添加会话通话信息监听器
+     * @param listener 监听器回调
+     * @returns 取消监听的函数
+     */
     static addConversationCallListener(listener: ConversationCallListener): () => void {
         const key = `CallManager_Conversation_${Date.now()}`;
         JuggleIMCallModule.addConversationCallListener(key);

package/src/index.d.ts

@@ -270,6 +270,13 @@ export default class JuggleIM {
     options: ConversationTagOptions
   ): Promise<Boolean>;
 
+  /**
+   * 上传图片
+   * @param localPath 图片本地路径
+   * @returns {Promise<string>} 图片URL
+   */
+  static uploadImage(localPath: string): Promise<string>;
+
   /**
    * 发送消息
    * @param {SendMessageObject} message  发送消息对象

package/src/index.js

@@ -583,6 +583,15 @@ class JuggleIM {
     return JMI.removeConversationsFromTag(conversations, tagId);
   }
 
+  /**
+   * 上传图片
+   * @param {string} localPath - 图片本地路径
+   * @returns {Promise<string>} 图片URL
+   */
+  static uploadImage(localPath) {
+    return JMI.uploadImage(localPath);
+  }
+
   //message
 
   /**

package/README.md

@@ -1,552 +0,0 @@
-,
-# Juggle IM React Native SDK
-
-React Native wrapper for Juggle IM SDK，提供即时通讯功能的React Native封装。
-
-## 安装
-
-```bash
-npm install juggleim-rnsdk --legacy-peer-deps
-```
-
-## 初始化
-
-在使用Juggle IM SDK之前，需要先进行初始化设置：
-
-```javascript
-import JuggleIM from 'juggleim-rnsdk';
-
-// 设置服务器地址
-JuggleIM.setServerUrls(['your_server_url']);
-
-// 初始化SDK
-JuggleIM.init('your_app_key');
-
-// 连接服务器
-JuggleIM.connect('your_token');
-```
-
-## 监听器
-
-### 连接状态监听
-
-```javascript
-const unsubscribe = JuggleIM.addConnectionStatusListener('listener_key', (status, code, extra) => {
-  console.log('Connection status:', status);
-});
-
-// 取消监听
-// unsubscribe();
-```
-
-### 消息监听
-
-```javascript
-const unsubscribe = JuggleIM.addMessageListener('listener_key', {
-  onMessageReceive: (message) => {
-    console.log('Received message:', message);
-  },
-  onMessageRecall: (message) => {
-    console.log('Message recalled:', message);
-  },
-  onMessageUpdate: (message) => {
-    console.log('Message updated:', message);
-  },
-  onMessageDelete: (conversation, clientMsgNos) => {
-    console.log('Messages deleted:', conversation, clientMsgNos);
-  },
-  onMessageClear: (conversation, timestamp, senderId) => {
-    console.log('Messages cleared:', conversation, timestamp, senderId);
-  },
-  onMessageReactionAdd: (conversation, reaction) => {
-    console.log('Message reaction added:', conversation, reaction);
-  },
-  onMessageReactionRemove: (conversation, reaction) => {
-    console.log('Message reaction removed:', conversation, reaction);
-  },
-  onMessageSetTop: (message, operator, isTop) => {
-    console.log('Message set top:', message, operator, isTop);
-  }
-});
-
-// 取消监听
-// unsubscribe();
-```
-
-### 消息阅读状态监听
-
-```javascript
-const unsubscribe = JuggleIM.addMessageReadReceiptListener('read_listener_key', {
-  onMessagesRead: (conversation, messageIds) => {
-    console.log('Messages read:', conversation, messageIds);
-  },
-  onGroupMessagesRead: (conversation, messages) => {
-    console.log('Group messages read info updated:', conversation, messages);
-  }
-});
-
-// 取消监听
-// unsubscribe();
-```
-
-### 消息销毁监听
-
-```javascript
-const unsubscribe = JuggleIM.addMessageDestroyListener('destroy_listener_key', {
-  onMessageDestroyTimeUpdate: (messageId, conversation, destroyTime) => {
-    console.log('Message destroy time updated:', messageId, conversation, destroyTime);
-  }
-});
-
-// 取消监听
-// unsubscribe();
-```
-
-### 会话监听
-
-```javascript
-const unsubscribe = JuggleIM.addConversationListener('listener_key', {
-  onConversationInfoAdd: (conversations) => {
-    console.log('New conversations:', conversations);
-  },
-  onConversationInfoUpdate: (conversations) => {
-    console.log('Updated conversations:', conversations);
-  },
-  onConversationInfoDelete: (conversations) => {
-    console.log('Deleted conversations:', conversations);
-  },
-  onTotalUnreadMessageCountUpdate: (count) => {
-    console.log('Total unread count updated:', count);
-  }
-});
-
-// 取消监听
-// unsubscribe();
-```
-
-## 会话操作
-
-### 获取会话列表
-
-```javascript
-// 获取会话信息列表
-const conversations = await JuggleIM.getConversationInfoList({
-  count: 20,
-  timestamp: Date.now(),
-  direction: 1 // 0-更新的消息, 1-更早的消息
-});
-```
-
-### 获取单个会话
-
-```javascript
-const conversationInfo = await JuggleIM.getConversationInfo({
-  conversationType: 1, // ConversationType.PRIVATE
-  conversationId: 'user123'
-});
-```
-
-### 创建会话
-
-```javascript
-const conversationInfo = await JuggleIM.createConversationInfo({
-  conversationType: 1,
-  conversationId: 'user123'
-});
-```
-
-### 删除会话
-
-```javascript
-const result = await JuggleIM.deleteConversationInfo({
-  conversationType: 1,
-  conversationId: 'user123'
-}, {
-  onSuccess: () => {
-    console.log('Conversation deleted successfully');
-  },
-  onError: (errorCode) => {
-    console.log('Failed to delete conversation, error code:', errorCode);
-  }
-});
-```
-
-### 会话免打扰设置
-
-```javascript
-const result = await JuggleIM.setMute({
-  conversationType: 1,
-  conversationId: 'user123'
-}, true); // true为开启免打扰
-```
-
-### 会话置顶设置
-
-```javascript
-const result = await JuggleIM.setTop({
-  conversationType: 1,
-  conversationId: 'user123'
-}, true); // true为置顶会话
-```
-
-### 设置会话未读状态
-
-```javascript
-const result = await JuggleIM.setUnread({
-  conversationType: 1,
-  conversationId: 'user123'
-}, true); // true为标记为未读
-```
-
-### 未读数操作
-
-```javascript
-// 清除会话未读数
-const result = await JuggleIM.clearUnreadCount({
-  conversationType: 1,
-  conversationId: 'user123'
-});
-
-// 清除总未读数
-const totalResult = await JuggleIM.clearTotalUnreadCount();
-
-// 获取总未读数
-const totalCount = await JuggleIM.getTotalUnreadCount();
-
-// 获取指定类型的未读数
-const typeUnreadCount = await JuggleIM.getUnreadCountWithTypes([1, 2]); // PRIVATE 和 GROUP 会话的未读数
-```
-
-### 草稿操作
-
-```javascript
-// 设置会话草稿
-const setResult = await JuggleIM.setDraft({
-  conversationType: 1,
-  conversationId: 'user123'
-}, 'Hello, this is a draft');
-
-// 清除会话草稿
-const clearResult = await JuggleIM.clearDraft({
-  conversationType: 1,
-  conversationId: 'user123'
-});
-```
-
-### 会话标签操作
-
-```javascript
-// 将会话添加到标签
-const addResult = await JuggleIM.addConversationsToTag({
-  tagId: 'tag123',
-  conversations: [
-    {
-      conversationType: 1,
-      conversationId: 'user123'
-    },
-    {
-      conversationType: 2,
-      conversationId: 'group456'
-    }
-  ]
-});
-
-// 从标签中移除会话
-const removeResult = await JuggleIM.removeConversationsFromTag({
-  tagId: 'tag123',
-  conversations: [
-    {
-      conversationType: 1,
-      conversationId: 'user123'
-    }
-  ]
-});
-```
-
-### 获取置顶会话列表
-
-```javascript
-const topConversations = await JuggleIM.getTopConversationInfoList(
-  20,         // 获取数量
-  Date.now(), // 时间戳
-  1           // 拉取方向: 0-更新的消息, 1-更早的消息
-);
-```
-
-## 消息操作
-
-### 发送消息
-
-```javascript
-const message = await JuggleIM.sendMessage({
-  conversationType: 1,
-  conversationId: 'user123',
-  content: {
-    contentType: 'text',
-    content: 'Hello World!'
-  } as TextMessageContent
-}, {
-  onSuccess: (message) => {
-    console.log('Message sent successfully:', message);
-  },
-  onError: (message, errorCode) => {
-    console.log('Send failed with error:', errorCode);
-  }
-});
-```
-
-### 发送图片消息
-
-```javascript
-const imageMessage = await JuggleIM.sendImageMessage({
-  conversationType: 1,
-  conversationId: 'user123',
-  content: {
-    contentType: 'jg:img',
-    localPath: '/path/to/image.jpg',
-    width: 800,
-    height: 600
-  } as ImageMessageContent
-}, {
-  onProgress: (progress, message) => {
-    console.log('Upload progress:', progress);
-  },
-  onSuccess: (message) => {
-    console.log('Image sent successfully:', message);
-  },
-  onError: (message, errorCode) => {
-    console.log('Send image failed with error:', errorCode);
-  }
-});
-```
-
-### 发送文件消息
-
-```javascript
-const fileMessage = await JuggleIM.sendFileMessage({
-  conversationType: 1,
-  conversationId: 'user123',
-  content: {
-    contentType: 'jg:file',
-    localPath: '/path/to/document.pdf',
-    name: 'document.pdf',
-    size: 102400
-  } as FileMessageContent
-}, {
-  onProgress: (progress, message) => {
-    console.log('Upload progress:', progress);
-  },
-  onSuccess: (message) => {
-    console.log('File sent successfully:', message);
-  },
-  onError: (message, errorCode) => {
-    console.log('Send file failed with error:', errorCode);
-  }
-});
-```
-
-### 发送语音消息
-
-```javascript
-const voiceMessage = await JuggleIM.sendVoiceMessage(1, 'user123', {
-  contentType: 'jg:voice',
-  localPath: '/path/to/audio.mp3',
-  duration: 10
-} as VoiceMessageContent, {
-  onProgress: (progress, message) => {
-    console.log('Upload progress:', progress);
-  },
-  onSuccess: (message) => {
-    console.log('Voice sent successfully:', message);
-  },
-  onError: (message, errorCode) => {
-    console.log('Send voice failed with error:', errorCode);
-  }
-});
-```
-
-### 获取历史消息
-
-```javascript
-const messageResponse = await JuggleIM.getMessageList({
-  conversationType: 1,
-  conversationId: 'user123'
-}, 1, { // 方向: 1表示获取更早的消息(向前翻页), 0表示获取更新的消息(向后翻页)
-  count: 20,
-  startTime: Date.now()
-});
-```
-
-### 撤回消息
-
-```javascript
-const result = await JuggleIM.recallMessage(['message_id_1', 'message_id_2'], {
-  reason: 'sent by mistake'
-});
-```
-
-### 消息反应
-
-```javascript
-// 添加消息反应
-const addResult = await JuggleIM.addMessageReaction('message_id', 'thumbs_up');
-
-// 移除消息反应
-const removeResult = await JuggleIM.removeMessageReaction('message_id', 'thumbs_up');
-```
-
-### 发送消息已读回执
-
-发送消息已读回执，通知对方消息已被阅读。
-
-```javascript
-const conversation = {
-  conversationType: 1, // ConversationType.PRIVATE
-  conversationId: 'user123'
-};
-
-const messageIds = ['messageId1', 'messageId2'];
-
-JuggleIM.sendReadReceipt(conversation, messageIds);
-```
-
-### 设置消息置顶
-
-设置或取消消息置顶状态。
-
-```javascript
-const conversation = {
-  conversationType: 2, // ConversationType.GROUP
-  conversationId: 'group123'
-};
-
-const messageId = 'messageId1';
-const isTop = true; // true 表示置顶，false 表示取消置顶
-
-JuggleIM.setMessageTop(messageId, conversation, isTop);
-```
-
-## 类型定义
-
-### 会话类型
-
-```typescript
-export enum ConversationType {
-  PRIVATE = 1,
-  GROUP = 2,
-  CHATROOM = 3,
-  SYSTEM = 4,
-}
-```
-
-### 连接状态
-
-```typescript
-export type ConnectionStatus =
-  | "connected"
-  | "connecting"
-  | "disconnected"
-  | "failure"
-  | "dbOpen"
-  | "dbClose";
-```
-
-### 消息内容类型
-
-支持多种消息内容类型：
-
-#### 文本消息 (TextMessageContent)
-``typescript
-export interface TextMessageContent extends MessageContent {
-  content: string;
-}
-```
-
-#### 图片消息 (ImageMessageContent)
-``typescript
-export interface ImageMessageContent extends MessageContent {
-  localPath: string;
-  thumbnailLocalPath?: string;
-  url?: string;
-  thumbnailUrl?: string;
-  width: number;
-  height: number;
-}
-```
-
-#### 文件消息 (FileMessageContent)
-``typescript
-export interface FileMessageContent extends MessageContent {
-  localPath: string;
-  url?: string;
-  name: string;
-  size: number;
-  type?: string;
-}
-```
-
-#### 语音消息 (VoiceMessageContent)
-``typescript
-export interface VoiceMessageContent extends MessageContent {
-  localPath: string;
-  url?: string;
-  duration: number;
-}
-```
-
-#### 消息对象 (Message)
-```typescript
-export interface Message {
-  clientMsgNo: number;
-  localAttribute: string;
-  messageState: number;
-  isEdite: boolean;
-  direction: number;
-  isDelete: boolean;
-  senderUserId: string;
-  messageId: string;
-  hasRead: boolean;
-  timestamp: number;
-  conversation: Conversation;
-  content: MessageContent;
-  groupMessageReadInfo?: GroupMessageReadInfo;
-  mentionInfo: MessageMentionInfo;
-}
-```
-
-#### 会话对象 (Conversation)
-```typescript
-export interface Conversation {
-  conversationType: number;
-  conversationId: string;
-}
-```
-
-#### 用户信息 (UserInfo)
-```typescript
-export interface UserInfo {
-  userId: string;
-  nickname: string;
-  avatar: string;
-}
-```
-
-#### 消息内容 (MessageContent)
-```
-
-```
-
-#### 提及信息 (MessageMentionInfo)
-```typescript
-export interface MessageMentionInfo {
-  /**
-   *   DEFAULT(0),
-   *   ALL(1),
-   *   SOMEONE(2),
-   *   ALL_AND_SOMEONE(3);
-   */
-  type: number;
-  targetUsers: UserInfo[];
-}
-```
-