juggleim-rnsdk 1.0.0 → 1.0.2

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

@@ -585,6 +585,17 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
             map.putString("localPath", img.getLocalPath());
             map.putString("thumbnailLocalPath", img.getThumbnailLocalPath());
             map.putString("thumbnailUrl", img.getThumbnailUrl());
+        } else if (content instanceof VideoMessage) {
+            VideoMessage video = (VideoMessage) content;
+            map.putString("localPath", video.getLocalPath());
+            map.putString("url", video.getUrl());
+            map.putString("snapshotLocalPath", video.getSnapshotLocalPath());
+            map.putString("snapshotUrl", video.getSnapshotUrl());
+            map.putInt("width", video.getWidth());
+            map.putInt("height", video.getHeight());
+            map.putDouble("size", video.getSize());
+            map.putInt("duration", video.getDuration());
+            map.putString("extra", video.getExtra());
         } else if (content instanceof StreamTextMessage) {
             StreamTextMessage streamText = (StreamTextMessage) content;
             map.putBoolean("isFinished", streamText.isFinished());
@@ -592,6 +603,49 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
         return map;
     }
 
+    /**
+     * 读取字符串字段，不存在或为空时返回空字符串。
+     *
+     * @param map 原始消息内容
+     * @param key 字段名
+     * @return 字符串字段值
+     */
+    private String getOptionalString(ReadableMap map, String key) {
+        if (map.hasKey(key) && !map.isNull(key)) {
+            return map.getString(key);
+        }
+        return "";
+    }
+
+    /**
+     * 读取整数字段，不存在或为空时返回 0。
+     *
+     * @param map 原始消息内容
+     * @param key 字段名
+     * @return 整数字段值
+     */
+    private int getOptionalInt(ReadableMap map, String key) {
+        if (map.hasKey(key) && !map.isNull(key)) {
+            return map.getInt(key);
+        }
+        return 0;
+    }
+
+    /**
+     * 读取文件路径并兼容 content:// 和 file://。
+     *
+     * @param map 原始消息内容
+     * @param key 字段名
+     * @return 原生 SDK 可读取的本地文件路径
+     */
+    private String getOptionalFilePath(ReadableMap map, String key) {
+        String path = getOptionalString(map, key);
+        if (path.isEmpty()) {
+            return "";
+        }
+        return FileUtils.convertContentUriToFile(getReactApplicationContext(), path);
+    }
+
     private MessageContent convertMapToMessageContent(ReadableMap map) {
         String contentType = map.getString("contentType");
         switch (contentType) {
@@ -632,6 +686,30 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                     voice.setExtra(map.getString("extra"));
                 }
                 return voice;
+            case "jg:video":
+                VideoMessage video = new VideoMessage();
+                String localPath = getOptionalFilePath(map, "localPath");
+                if (localPath.isEmpty()) {
+                    localPath = getOptionalFilePath(map, "local");
+                }
+                video.setLocalPath(localPath);
+                video.setUrl(getOptionalString(map, "url"));
+                String snapshotUrl = getOptionalString(map, "snapshotUrl");
+                if (snapshotUrl.isEmpty()) {
+                    snapshotUrl = getOptionalString(map, "poster");
+                }
+                video.setSnapshotUrl(snapshotUrl);
+                video.setSnapshotLocalPath(getOptionalFilePath(map, "snapshotLocalPath"));
+                video.setWidth(getOptionalInt(map, "width"));
+                video.setHeight(getOptionalInt(map, "height"));
+                if (map.hasKey("size") && !map.isNull("size")) {
+                    video.setSize((long) map.getDouble("size"));
+                }
+                video.setDuration(getOptionalInt(map, "duration"));
+                if (map.hasKey("extra")) {
+                    video.setExtra(map.getString("extra"));
+                }
+                return video;
             case "jg:streamtext":
                 StreamTextMessage streamText = new StreamTextMessage();
                 if (map.hasKey("content")) {

package/ios/JModelFactory.m

@@ -101,8 +101,8 @@
     JVideoMessage *video = (JVideoMessage *)content;
     NSDictionary *dic = @{
       @"url" : video.url ?: @"",
-      @"local" : video.localPath ?: @"",
-      @"poster" : video.snapshotUrl ?: @"",
+      @"localPath" : video.localPath ?: @"",
+      @"snapshotUrl" : video.snapshotUrl ?: @"",
       @"height" : @(video.height),
       @"width" : @(video.width),
       @"size" : @(video.size),

package/ios/JRNCustomMessageContent.h

@@ -0,0 +1,32 @@
+//
+//  JRNCustomMessageContent.h
+//  juggleim-rnsdk
+//
+//  RN 自定义消息的通用承载类。
+//
+//  原生 JuggleIM SDK 要求自定义消息类型必须通过 messageManager 的
+//  registerContentType: 注册，否则 SDK 无法解析该类型——表现为会话列表的
+//  lastMessage 变成空壳（messageId/contentType 为空，content.contentType
+//  回退成 "jg:unknown"）。详见 JMessageProtocol.h 与 JMessageContent.h
+//  (conversationDigest 注释：会话列表中显示的消息摘要)。
+//
+//  RN 层只持有类型字符串、没有逐类型的 ObjC 类，因此用本类做透传：
+//  decode: 仅保存原始字节，encode 原样返回，由 RN 层自行解析 JSON。
+//  每个 contentType 在运行时动态生成一个子类（仅重写 +contentType）。
+//
+
+#import <JuggleIM/JuggleIM.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface JRNCustomMessageContent : JMessageContent
+
+/// 原始消息内容字节（即业务 JSON），由 SDK decode: 填入、encode 原样取出。
+@property (nonatomic, strong, nullable) NSData *rawData;
+
+/// 为指定 contentType 动态创建并返回可注册的子类（幂等，可重复调用）。
++ (Class)registerableClassForContentType:(NSString *)contentType;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/JRNCustomMessageContent.m

@@ -0,0 +1,69 @@
+//
+//  JRNCustomMessageContent.m
+//  juggleim-rnsdk
+//
+
+#import "JRNCustomMessageContent.h"
+#import <objc/runtime.h>
+
+@implementation JRNCustomMessageContent
+
+// 基类占位，实际类型由动态子类重写返回。
++ (NSString *)contentType {
+  return @"jg:rn:custom";
+}
+
+- (NSData *)encode {
+  return self.rawData ?: [NSData data];
+}
+
+- (void)decode:(NSData *)data {
+  self.rawData = data;
+}
+
+// 会话摘要由 RN 层渲染，这里返回空串即可，
+// 关键是「能被解析」从而让会话列表 lastMessage 正常填充。
+- (NSString *)conversationDigest {
+  return @"";
+}
+
++ (Class)registerableClassForContentType:(NSString *)contentType {
+  if (contentType.length == 0) {
+    return [JRNCustomMessageContent class];
+  }
+
+  // 类名需为合法标识符（去掉冒号等非字母数字字符）；
+  // 注意 +contentType 仍返回原始字符串（含冒号），SDK 据此做类型映射。
+  NSMutableString *safe = [NSMutableString stringWithString:@"JRNCustom_"];
+  for (NSUInteger i = 0; i < contentType.length; i++) {
+    unichar c = [contentType characterAtIndex:i];
+    BOOL isAlnum = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
+                   (c >= '0' && c <= '9');
+    [safe appendString:isAlnum ? [NSString stringWithFormat:@"%C", c] : @"_"];
+  }
+  const char *className = safe.UTF8String;
+
+  Class existing = objc_getClass(className);
+  if (existing) {
+    return existing;
+  }
+
+  Class cls = objc_allocateClassPair([JRNCustomMessageContent class], className, 0);
+  if (!cls) {
+    // 并发/重名兜底
+    return objc_getClass(className) ?: [JRNCustomMessageContent class];
+  }
+
+  // 在元类上重写 + (NSString *)contentType，返回原始 contentType。
+  NSString *typeCopy = [contentType copy];
+  IMP ctImp = imp_implementationWithBlock(^NSString *(id _self) {
+    return typeCopy;
+  });
+  Class meta = object_getClass(cls);
+  class_addMethod(meta, @selector(contentType), ctImp, "@@:");
+
+  objc_registerClassPair(cls);
+  return cls;
+}
+
+@end

package/ios/JuggleIMManager.m

@@ -1,4 +1,5 @@
 #import "JuggleIMManager.h"
+#import "JRNCustomMessageContent.h"
 #import <JuggleIM/JuggleIM.h>
 #import <React/RCTEventEmitter.h>
 
@@ -44,6 +45,15 @@ RCT_EXPORT_METHOD(registerCustomMessageType : (NSString *)contentType) {
     return;
   }
   self.customMessageTypes[contentType] = contentType;
+
+  // fix: 向原生 SDK 注册自定义消息类。
+  // 原因: 未注册的自定义类型，SDK 无法解析会话列表的 lastMessage（详见
+  //       JMessageProtocol.h registerContentType: 注释），导致 lastMessage
+  //       退化为空壳、content.contentType 变为 "jg:unknown"（详情页走 getMessages
+  //       不受影响，故仅会话列表显示 unknown；Android SDK 无此限制故正常）。
+  Class cls = [JRNCustomMessageContent registerableClassForContentType:contentType];
+  [JIM.shared.messageManager registerContentType:cls];
+
   NSLog(@"注册自定义消息类型: %@", contentType);
 }
 
@@ -511,6 +521,17 @@ RCT_EXPORT_METHOD(addConversationDelegate) {
     dict[@"localPath"] = voiceMsg.localPath ?: @"";
     dict[@"duration"] = @(voiceMsg.duration);
     dict[@"extra"] = voiceMsg.extra ?: @"";
+  } else if ([content isKindOfClass:[JVideoMessage class]]) {
+    JVideoMessage *videoMsg = (JVideoMessage *)content;
+    dict[@"url"] = videoMsg.url ?: @"";
+    dict[@"localPath"] = videoMsg.localPath ?: @"";
+    dict[@"snapshotUrl"] = videoMsg.snapshotUrl ?: @"";
+    dict[@"snapshotLocalPath"] = videoMsg.snapshotLocalPath ?: @"";
+    dict[@"width"] = @(videoMsg.width);
+    dict[@"height"] = @(videoMsg.height);
+    dict[@"size"] = @(videoMsg.size);
+    dict[@"duration"] = @(videoMsg.duration);
+    dict[@"extra"] = videoMsg.extra ?: @"";
   } else if ([content isKindOfClass:[JStreamTextMessage class]]) {
     JStreamTextMessage *streamMsg = (JStreamTextMessage *)content;
     dict[@"content"] = streamMsg.content ?: @"";
@@ -1685,6 +1706,20 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
       voice.extra = messageDict[@"extra"];
     }
     return voice;
+  } else if ([contentType isEqualToString:@"jg:video"]) {
+    JVideoMessage *video = [[JVideoMessage alloc] init];
+    video.url = messageDict[@"url"];
+    video.localPath = messageDict[@"localPath"] ?: messageDict[@"local"];
+    video.snapshotUrl = messageDict[@"snapshotUrl"] ?: messageDict[@"poster"];
+    video.snapshotLocalPath = messageDict[@"snapshotLocalPath"];
+    video.width = [messageDict[@"width"] integerValue];
+    video.height = [messageDict[@"height"] integerValue];
+    video.size = [messageDict[@"size"] longLongValue];
+    video.duration = [messageDict[@"duration"] integerValue];
+    if (messageDict[@"extra"]) {
+      video.extra = messageDict[@"extra"];
+    }
+    return video;
   } else if ([contentType isEqualToString:@"jg:streamtext"]) {
     JStreamTextMessage *streamText = [[JStreamTextMessage alloc] init];
     streamText.content = messageDict[@"content"] ?: @"";

package/package.json

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

package/src/types.d.ts

@@ -198,6 +198,31 @@ export class VoiceMessageContent extends MessageContent {
     contentType: string;
 }
 
+/**
+ * 视频消息内容
+ * @property {string} localPath - 视频本地路径：支持 /、file://、content://
+ * @property {string} [url] - 视频远程URL
+ * @property {string} [snapshotUrl] - 视频封面远程URL
+ * @property {string} [snapshotLocalPath] - 视频封面本地路径
+ * @property {number} width - 视频宽度
+ * @property {number} height - 视频高度
+ * @property {number} size - 视频文件大小，单位字节
+ * @property {number} duration - 视频时长，单位秒
+ */
+export class VideoMessageContent extends MessageContent {
+    localPath: string;
+    url?: string;
+    snapshotUrl?: string;
+    snapshotLocalPath?: string;
+    width: number;
+    height: number;
+    size: number;
+    duration: number;
+    extra?: string;
+
+    contentType: string;
+}
+
 /**
  * 通话结束通知消息内容: jg:callfinishntf
  * @property {number} reason - 结束原因

package/src/types.js

@@ -133,6 +133,21 @@ export class VoiceMessageContent extends MessageContent {
     }
 }
 
+/**
+ * 视频消息内容
+ */
+export class VideoMessageContent extends MessageContent {
+    constructor(localPath, width, height, duration, size = 0) {
+        super();
+        this.contentType = "jg:video";
+        this.localPath = localPath;
+        this.width = width;
+        this.height = height;
+        this.duration = duration;
+        this.size = size;
+    }
+}
+
 /**
  * 流式文本消息内容
  */