juggleim-rnsdk 0.4.4 → 1.0.1

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,11 +603,57 @@ 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) {
             case "jg:text":
                 TextMessage text = new TextMessage(map.getString("content"));
+                if (map.hasKey("extra")) {
+                    text.setExtra(map.getString("extra"));
+                }
                 return text;
             case "jg:img":
                 ImageMessage img = new ImageMessage();
@@ -606,6 +663,9 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 img.setThumbnailUrl(map.getString("thumbnailUrl"));
                 img.setWidth(map.getInt("width"));
                 img.setHeight(map.getInt("height"));
+                if (map.hasKey("extra")) {
+                    img.setExtra(map.getString("extra"));
+                }
                 return img;
             case "jg:file":
                 FileMessage file = new FileMessage();
@@ -613,13 +673,43 @@ public class JuggleIMManager extends ReactContextBaseJavaModule {
                 file.setType(map.getString("type"));
                 file.setName(map.getString("name"));
                 file.setSize(map.getInt("size"));
+                if (map.hasKey("extra")) {
+                    file.setExtra(map.getString("extra"));
+                }
                 return file;
             case "jg:voice":
                 VoiceMessage voice = new VoiceMessage();
                 voice.setUrl(map.getString("url"));
                 voice.setLocalPath(map.getString("localPath"));
                 voice.setDuration(map.getInt("duration"));
+                if (map.hasKey("extra")) {
+                    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/JuggleIMManager.m

@@ -511,6 +511,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 ?: @"";
@@ -1650,6 +1661,9 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
   if ([contentType isEqualToString:@"jg:text"]) {
     JTextMessage *text =
         [[JTextMessage alloc] initWithContent:messageDict[@"content"] ?: @""];
+    if (messageDict[@"extra"]) {
+      text.extra = messageDict[@"extra"];
+    }
     return text;
   } else if ([contentType isEqualToString:@"jg:img"]) {
     JImageMessage *img = [[JImageMessage alloc] init];
@@ -1659,6 +1673,9 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
     img.thumbnailUrl = messageDict[@"thumbnailUrl"];
     img.width = [messageDict[@"width"] integerValue];
     img.height = [messageDict[@"height"] integerValue];
+    if (messageDict[@"extra"]) {
+      img.extra = messageDict[@"extra"];
+    }
     return img;
   } else if ([contentType isEqualToString:@"jg:file"]) {
     JFileMessage *file = [[JFileMessage alloc] init];
@@ -1666,13 +1683,33 @@ RCT_EXPORT_METHOD(removeMessageReaction : (
     file.type = messageDict[@"type"];
     file.name = messageDict[@"name"];
     file.size = [messageDict[@"size"] longLongValue];
+    if (messageDict[@"extra"]) {
+      file.extra = messageDict[@"extra"];
+    }
     return file;
   } else if ([contentType isEqualToString:@"jg:voice"]) {
     JVoiceMessage *voice = [[JVoiceMessage alloc] init];
     voice.url = messageDict[@"url"];
     voice.localPath = messageDict[@"localPath"];
     voice.duration = [messageDict[@"duration"] integerValue];
+    if (messageDict[@"extra"]) {
+      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": "0.4.4",
+  "version": "1.0.1",
   "description": "React Native wrapper for Juggle IM SDK",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -19,6 +19,7 @@
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
+    "test:video-media-bridge": "node scripts/check-video-media-bridge.js",
     "app": "cd app && npm start",
     "prepare": "npm run build",
     "build": "echo \"Build completed\""

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;
+    }
+}
+
 /**
  * 流式文本消息内容
  */