juggleim-rnsdk 0.0.9 → 0.0.11

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

@@ -60,13 +60,13 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
     public String getName() {
         return MODULE_NAME;
     }
-    
+
     // 添加这两个方法以解决React Native的警告
     @ReactMethod
     public void addListener(String eventName) {
         // Keep: Required for RN built in Event Emitter Calls.
     }
-    
+
     @ReactMethod
     public void removeListeners(Integer count) {
         // Keep: Required for RN built in Event Emitter Calls.
@@ -96,7 +96,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         JIM.InitConfig.Builder builder = new JIM.InitConfig.Builder();
         JLogConfig.Builder logBuilder = new JLogConfig.Builder(getReactApplicationContext());
         logBuilder.setLogConsoleLevel(JLogLevel.JLogLevelVerbose);
-        builder.setJLogConfig(new JLogConfig(logBuilder));      
+        builder.setJLogConfig(new JLogConfig(logBuilder));
         JIM.getInstance().init(getCurrentActivity(), appKey, builder.build());
     }
 
@@ -550,7 +550,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             JIMConst.PullDirection direction = pullDirection == 0 ?
                     JIMConst.PullDirection.NEWER : JIMConst.PullDirection.OLDER;
 
-            List<ConversationInfo> conversationInfos = com.juggle.im.JIM.getInstance().getConversationManager().getConversationInfoList(count, (long)ts, direction);
+            List<ConversationInfo> conversationInfos = com.juggle.im.JIM.getInstance().getConversationManager().getConversationInfoList(count, (long) ts, direction);
             Log.d("getConversationInfoList", "conversationInfos: " + conversationInfos.size());
             WritableArray result = new WritableNativeArray();
             for (ConversationInfo info : conversationInfos) {
@@ -765,39 +765,60 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
      */
     @ReactMethod
     public void sendMessage(ReadableMap messageMap, String messageId, Promise promise) {
-        try {
-            Message message = convertMapToMessage(messageMap);
-            Log.d("sendMessage", message.toString());
-            Message sendMsg = JIM.getInstance().getMessageManager().sendMessage(
-                    message.getContent(),
-                    message.getConversation(),
-                    new IMessageManager.ISendMessageCallback() {
-                        @Override
-                        public void onSuccess(Message sentMessage) {
-                            WritableMap result = convertMessageToMap(sentMessage);
-                            WritableMap event = new WritableNativeMap();
-                            event.putString("messageId", messageId);
-                            event.putMap("message", result);
-                            sendEvent("onMessageSent", event);
-                        }
+        Message message = convertMapToMessage(messageMap);
+        Log.d("sendMessage", message.toString());
+        Message sendMsg = JIM.getInstance().getMessageManager().sendMessage(
+                message.getContent(),
+                message.getConversation(),
+                new IMessageManager.ISendMessageCallback() {
+                    @Override
+                    public void onSuccess(Message sentMessage) {
+                        WritableMap result = convertMessageToMap(sentMessage);
+                        WritableMap event = new WritableNativeMap();
+                        event.putString("messageId", messageId);
+                        event.putMap("message", result);
+                        sendEvent("onMessageSent", event);
+                    }
 
-                        @Override
-                        public void onError(Message message, int errorCode) {
-                            WritableMap errorResult = convertMessageToMap(message);
-                            WritableMap event = new WritableNativeMap();
-                            event.putString("messageId", messageId);
-                            event.putMap("message", errorResult);
-                            event.putInt("errorCode", errorCode);
-                            sendEvent("onMessageSentError", event);
-                        }
+                    @Override
+                    public void onError(Message message, int errorCode) {
+                        WritableMap errorResult = convertMessageToMap(message);
+                        WritableMap event = new WritableNativeMap();
+                        event.putString("messageId", messageId);
+                        event.putMap("message", errorResult);
+                        event.putInt("errorCode", errorCode);
+                        sendEvent("onMessageSentError", event);
                     }
-            );
-            WritableMap result = convertMessageToMap(sendMsg);
-            result.putString("messageId", messageId);
-            promise.resolve(result);
-        } catch (Exception e) {
-            promise.reject("SEND_MESSAGE_ERROR", e.getMessage());
+                }
+        );
+        WritableMap result = convertMessageToMap(sendMsg);
+        result.putString("messageId", messageId);
+        promise.resolve(result);
+    }
+
+    /**
+     * 根据clientMsgNo列表删除消息
+     */
+    @ReactMethod
+    public void deleteMessagesByClientMsgNoList(ReadableMap conversationMap, ReadableArray clientMsgNos, Promise promise) {
+        Conversation conversation = convertMapToConversation(conversationMap);
+        List<Long> msgNoList = new ArrayList<>();
+        for (int i = 0; i < clientMsgNos.size(); i++) {
+            msgNoList.add((long) clientMsgNos.getDouble(i));
         }
+
+        JIM.getInstance().getMessageManager()
+                .deleteMessagesByClientMsgNoList(conversation, msgNoList, new IMessageManager.ISimpleCallback() {
+                    @Override
+                    public void onSuccess() {
+                        promise.resolve(true);
+                    }
+
+                    @Override
+                    public void onError(int errorCode) {
+                        promise.reject("error", "Error code: " + errorCode);
+                    }
+                });
     }
 
     /**
@@ -947,7 +968,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         try {
             Conversation conversation = convertMapToConversation(messageMap);
             ImageMessage imageMessage = new ImageMessage();
-            
+
             ReadableMap contentMap = messageMap.getMap("content");
             if (contentMap.hasKey("localPath")) {
                 String path = FileUtils.convertContentUriToFile(getReactApplicationContext(), contentMap.getString("localPath"));
@@ -969,7 +990,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             if (contentMap.hasKey("height")) {
                 imageMessage.setHeight(contentMap.getInt("height"));
             }
-            
+
             Message message = JIM.getInstance().getMessageManager().sendMediaMessage(
                     imageMessage,
                     conversation,
@@ -1010,7 +1031,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                         }
                     }
             );
-            
+
             WritableMap result = convertMessageToMap(message);
             result.putString("messageId", messageId);
             promise.resolve(result);
@@ -1027,7 +1048,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         try {
             Conversation conversation = convertMapToConversation(messageMap);
             FileMessage fileMessage = new FileMessage();
-            
+
             ReadableMap contentMap = messageMap.getMap("content");
             if (contentMap.hasKey("localPath")) {
                 String path = FileUtils.convertContentUriToFile(getReactApplicationContext(), contentMap.getString("localPath"));
@@ -1045,7 +1066,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             if (contentMap.hasKey("type")) {
                 fileMessage.setType(contentMap.getString("type"));
             }
-            
+
             Message message = JIM.getInstance().getMessageManager().sendMediaMessage(
                     fileMessage,
                     conversation,
@@ -1085,7 +1106,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                         }
                     }
             );
-            
+
             WritableMap result = convertMessageToMap(message);
             result.putString("messageId", messageId);
             promise.resolve(result);
@@ -1102,7 +1123,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         try {
             Conversation conversation = convertMapToConversation(messageMap);
             VoiceMessage voiceMessage = new VoiceMessage();
-            
+
             ReadableMap contentMap = messageMap.getMap("content");
             if (contentMap.hasKey("localPath")) {
                 String path = FileUtils.convertContentUriToFile(getReactApplicationContext(), contentMap.getString("localPath"));
@@ -1114,7 +1135,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             if (contentMap.hasKey("duration")) {
                 voiceMessage.setDuration(contentMap.getInt("duration"));
             }
-            
+
             Message message = JIM.getInstance().getMessageManager().sendMediaMessage(
                     voiceMessage,
                     conversation,
@@ -1150,7 +1171,7 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                         }
                     }
             );
-            
+
             WritableMap result = convertMessageToMap(message);
             promise.resolve(result);
         } catch (Exception e) {

package/im-rn-sdk.podspec

@@ -16,5 +16,5 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
-  s.dependency "JuggleIM", "~> 1.8.25"
+  s.dependency "JuggleIM", "~> 1.8.29"
 end

package/ios/JuggleIMManager.m

@@ -1102,6 +1102,28 @@ RCT_EXPORT_METHOD(recallMessage:(NSDictionary *)messageDict
     }
 }
 
+/**
+ * 根据clientMsgNo列表删除消息
+ */
+RCT_EXPORT_METHOD(deleteMessagesByClientMsgNoList:(NSArray<NSNumber *> *)clientMsgNos
+                  conversation:(NSDictionary *)conversationMap
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject) {
+    @try {
+        JConversation *conversation = [self convertDictionaryToConversation:conversationMap];
+        
+        [JIM.shared.messageManager deleteMessagesByClientMsgNoList:clientMsgNos
+                                                      conversation:conversation
+                                                           success:^{
+            resolve(@YES);
+        } error:^(JErrorCode errorCode) {
+            reject(@"DELETE_MESSAGES_ERROR", @"删除消息失败", [NSError errorWithDomain:@"JuggleIM" code:errorCode userInfo:nil]);
+        }];
+    } @catch (NSException *exception) {
+        reject(@"DELETE_MESSAGES_ERROR", exception.reason, nil);
+    }
+}
+
 /**
  * 添加消息反应
  */

package/package.json

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

package/src/index.d.ts

@@ -666,6 +666,13 @@ declare module "im-rn-sdk" {
       extras?: { [key: string]: any }
     ): Promise<Boolean>;
 
+    /**
+     * 根据clientMsgNo列表删除消息
+     * @param conversation 会话
+     * @param clientMsgNos clientMsgNo列表
+     */
+    static deleteMessagesByClientMsgNoList(conversation: Conversation, clientMsgNos: number[]): Promise<boolean>;
+
     /**
      * 添加消息反应
      * @param messageId 消息ID

package/src/index.js

@@ -1,8 +1,7 @@
 import { NativeModules, Platform, NativeEventEmitter } from "react-native";
 
 const { JuggleIM: JMI } = NativeModules;
-// 为避免警告，仅在Android平台传入JMI参数
-const juggleIMEmitter = Platform.OS === 'android' ? new NativeEventEmitter(JMI) : new NativeEventEmitter();
+const juggleIMEmitter = new NativeEventEmitter(JMI);
 
 /**
  * Juggle IM React Native SDK
@@ -544,10 +543,10 @@ class JuggleIM {
     callback = {}
   ) {
     console.log("sendMessage message:", message);
-    
+
     // 生成唯一标识符以避免回调冲突
     const messageId = Math.random().toString(36).substr(2, 9) + Date.now();
-    
+
     const successListener = juggleIMEmitter.addListener(
       "onMessageSent",
       (event) => {
@@ -592,10 +591,10 @@ class JuggleIM {
     callback = {}
   ) {
     console.log("sendImageMessage message...:", message);
-    
+
     // 生成唯一标识符以避免回调冲突
     const messageId = Math.random().toString(36).substr(2, 9) + Date.now();
-    
+
     const progressListener = juggleIMEmitter.addListener(
       "onMediaMessageProgress",
       (event) => {
@@ -671,7 +670,7 @@ class JuggleIM {
   ) {
     // 生成唯一标识符以避免回调冲突
     const messageId = Math.random().toString(36).substr(2, 9) + Date.now();
-    
+
     // 添加监听器
     const progressListener = juggleIMEmitter.addListener(
       "onMediaMessageProgress",
@@ -748,7 +747,7 @@ class JuggleIM {
   ) {
     // 生成唯一标识符以避免回调冲突
     const messageId = Math.random().toString(36).substr(2, 9) + Date.now();
-    
+
     // 添加监听器
     const progressListener = juggleIMEmitter.addListener(
       "onMediaMessageProgress",
@@ -829,7 +828,21 @@ class JuggleIM {
    * @param {Object} extras - kv 扩展信息
    */
   static recallMessage(message, extras = {}) {
-    return JMI.recallMessage(message, extras, callback);
+    return JMI.recallMessage(message, extras);
+  }
+
+  /**
+   * 根据clientMsgNo列表删除消息
+   * @param {object} conversation - 会话对象
+   * @param {number[]} clientMsgNos - clientMsgNo列表
+   * @returns {Promise<boolean>} 删除结果
+   */
+  static deleteMessagesByClientMsgNoList(conversation, clientMsgNos) {
+    if (Platform.OS === "android") {
+      return JMI.deleteMessagesByClientMsgNoList(conversation, clientMsgNos);
+    } else if (Platform.OS === "ios") {
+      return JMI.deleteMessagesByClientMsgNoList(conversation, clientMsgNos);
+    }
   }
 
   /**