Merge pull request #69 from jpush/dev

JoshLipan · web-flow · commit c7e9843008d6 · 2018-07-18T17:16:49.000+08:00
Dev
diff --git a/android/src/io/jchat/android/JMessageModule.java b/android/src/io/jchat/android/JMessageModule.java
@@ -1073,6 +1073,44 @@ public void onComplete(int status, String desc, File file) {
         }
     }
 
+    @ReactMethod
+    public void downloadThumbImage(ReadableMap map, final Callback success, final Callback fail) {
+        try {
+            Conversation conversation = mJMessageUtils.getConversation(map);
+            if (null == conversation) {
+                mJMessageUtils.handleError(fail, ERR_CODE_CONVERSATION, ERR_MSG_CONVERSATION);
+                return;
+            }
+            final String messageId = map.getString(Constant.MESSAGE_ID);
+            Message msg = conversation.getMessage(Integer.parseInt(messageId));
+            if (null == msg) {
+                mJMessageUtils.handleError(fail, ERR_CODE_MESSAGE, ERR_MSG_MESSAGE);
+                return;
+            }
+            if (msg.getContentType() != ContentType.image) {
+                mJMessageUtils.handleError(fail, ERR_CODE_MESSAGE, "Wrong message type");
+                return;
+            }
+            ImageContent content = (ImageContent) msg.getContent();
+            content.downloadThumbnailImage(msg, new DownloadCompletionCallback() {
+                @Override
+                public void onComplete(int status, String desc, File file) {
+                    if (status == 0) {
+                        WritableMap result = Arguments.createMap();
+                        result.putString(Constant.MESSAGE_ID, messageId);
+                        result.putString(Constant.FILE_PATH, file.getAbsolutePath());
+                        mJMessageUtils.handleCallbackWithObject(status, desc, success, fail, result);
+                    } else {
+                        mJMessageUtils.handleError(fail, status, desc);
+                    }
+                }
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            mJMessageUtils.handleError(fail, ERR_CODE_PARAMETER, ERR_MSG_PARAMETER);
+        }
+    }
+
     @ReactMethod
     public void downloadVoiceFile(ReadableMap map, final Callback success, final Callback fail) {
         try {
diff --git a/document/API.md b/document/API.md
@@ -45,6 +45,7 @@ import JMessage from 'jmessage-react-plugin';
   - [retractMessage](#retractmessage)
   - [getHistoryMessages](#gethistorymessages)
   - [downloadOriginalImage](#downloadoriginalimage)
+  - [downloadThumbImage](#downloadthumbimage)
   - [downloadVoiceFile](#downloadvoicefile)
   - [downloadFile](#downloadfile)
 - [会话](#会话)
@@ -107,7 +108,7 @@ import JMessage from 'jmessage-react-plugin';
 
 
 
-  - [点击消息通知事件（Android Only）](#addclickmessagenotificationlistener)
+- [点击消息通知事件（Android Only）](#addclickmessagenotificationlistener)
     - [addClickMessageNotificationListener](#addclickmessagenotificationlistener)
     - [removeClickMessageNotificationListener](#addclickmessagenotificationlistener)
 
@@ -946,6 +947,33 @@ JMessage.downloadOriginalImage({ type: 'single', username: 'username',
 - groupId: 对象群组 id。当 `type` 为 'group' 时，`groupId` 为必填。
 - messageId: 图片消息 id。
 
+### downloadThumbImage
+
+下载图片消息缩略图。如果已经下载，会直接返回本地文件路径，不会重复下载。
+
+#### 示例
+
+```js
+JMessage.downloadThumbImage({ type: 'single', username: 'username',
+  messageId: 'target_msg_id' },
+  (result) => {
+    var msgId = result.messageId
+    var imgPath = result.filePath
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+
+- type: 会话类型。可以为 'single' 或 'group' 。
+- username: 对方用户的用户名。当 `type` 为 'single' 时，`username` 为必填。
+- appKey: 对方用户所属应用的 AppKey。如果不填，默认为当前应用。
+- groupId: 对象群组 id。当 `type` 为 'group' 时，`groupId` 为必填。
+- messageId: 图片消息 id。
+
 ### downloadVoiceFile
 
 下载语音文件。如果已经下载，会直接返回本地文件路径，不会重复下载。
diff --git a/example/app/routes/Chat/index.js b/example/app/routes/Chat/index.js
diff --git a/index.js b/index.js
@@ -623,7 +623,7 @@ export default class JMessage {
     }
 
     /**
-     * 下载指定图片消息的原图，如果已经下载，会直接返回本地文件路径，不会重复下载。
+     * 下载指定图片消息的缩略图，如果已经下载，会直接返回本地文件路径，不会重复下载。
      *
      * @param {object} params = {
      *  'type': String,            // 'single' / 'group'
@@ -639,6 +639,23 @@ export default class JMessage {
         JMessageModule.downloadOriginalImage(params, success, error)
     }
 
+    /**
+     * 下载指定图片消息的原图，如果已经下载，会直接返回本地文件路径，不会重复下载。
+     *
+     * @param {object} params = {
+     *  'type': String,            // 'single' / 'group'
+     *  'groupId': String,         // 目标群组 id。
+     *  'username': String,        // 目标用户名。
+     *  'appKey': String,          // 目标用户所属 AppKey。
+     *  'messageId': String        // 指定消息 id。
+     * }
+     * @param {function} success = function ({'messageId': String, 'filePath': String}) {}
+     * @param {function} error = function ({'code': '错误码', 'description': '错误信息'}) {}
+     */
+    static downloadThumbImage(params, success, error) {
+        JMessageModule.downloadThumbImage(params, success, error)
+    }
+
     /**
      * 下载语音消息文件，如果已经下载，会直接返回本地文件路径，不会重复下载。
      * 
diff --git a/ios/RCTJMessageModule/JMessage.framework/Headers/JMessage.h b/ios/RCTJMessageModule/JMessage.framework/Headers/JMessage.h
@@ -55,10 +55,10 @@ extern NSString *const kJMSGServiceErrorNotification;                 // 错误
 @interface JMessage : NSObject
 
 /*! JMessage SDK 版本号。用于展示 SDK 的版本信息 */
-#define JMESSAGE_VERSION @"3.6.1"
+#define JMESSAGE_VERSION @"3.6.2"
 
 /*! JMessage SDK 构建ID. 每次构建都会增加 */
-#define JMESSAGE_BUILD 222
+#define JMESSAGE_BUILD 226
 
 /*! API Version - int for program logic. SDK API 有变更时会增加 */
 extern NSInteger const JMESSAGE_API_VERSION;
diff --git a/ios/RCTJMessageModule/JMessage.framework/Info.plist b/ios/RCTJMessageModule/JMessage.framework/Info.plist
diff --git a/ios/RCTJMessageModule/JMessage.framework/JMessage b/ios/RCTJMessageModule/JMessage.framework/JMessage
diff --git a/ios/RCTJMessageModule/RCTJMessageModule.m b/ios/RCTJMessageModule/RCTJMessageModule.m
@@ -1664,6 +1664,62 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
   }];
 }
 
+RCT_EXPORT_METHOD(downloadThumbImage:(NSDictionary *)param
+                  successCallback:(RCTResponseSenderBlock)successCallback
+                  failCallback:(RCTResponseSenderBlock)failCallback) {
+    if (param[@"messageId"] == nil ||
+        param[@"type"] == nil) {
+        failCallback(@[[self getParamError]]);
+        return;
+    }
+    
+    NSString *appKey = nil;
+    if (param[@"appKey"]) {
+        appKey = param[@"appKey"];
+    } else {
+        appKey = [JMessageHelper shareInstance].JMessageAppKey;
+    }
+    
+    if ([param[@"type"] isEqual: @"single"] && param[@"username"] != nil) {
+        
+    } else {
+        if ([param[@"type"] isEqual: @"group"] && param[@"groupId"] != nil) {
+        } else {
+            failCallback(@[[self getParamError]]);
+            return;
+        }
+    }
+    [self getConversationWithDictionary:param callback:^(JMSGConversation *conversation, NSError *error) {
+        if (error) {
+            failCallback(@[[error errorToDictionary]]);
+            return;
+        }
+        
+        JMSGMessage *message = [conversation messageWithMessageId:param[@"messageId"]];
+        if (message == nil) {
+            failCallback(@[[self getErrorWithLog:@"cann't find this message"]]);
+            return;
+        }
+        
+        if (message.contentType != kJMSGContentTypeImage) {
+            failCallback(@[[self getErrorWithLog:@"It is not voice message"]]);
+            return;
+        } else {
+            JMSGImageContent *content = (JMSGImageContent *) message.content;
+            [content thumbImageData:^(NSData *data, NSString *objectId, NSError *error) {
+                if (error) {
+                    failCallback(@[[error errorToDictionary]]);
+                    return;
+                }
+                
+                JMSGMediaAbstractContent *mediaContent = (JMSGMediaAbstractContent *) message.content;
+                successCallback(@[@{@"messageId": message.msgId,
+                                    @"filePath": [content thumbImageLocalPath]}]);
+            }];
+        }
+    }];
+}
+
 RCT_EXPORT_METHOD(downloadVoiceFile:(NSDictionary *)param
                   successCallback:(RCTResponseSenderBlock)successCallback
                   failCallback:(RCTResponseSenderBlock)failCallback) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jmessage-react-plugin",`
`3`		`- "version": "2.3.8",`
	`3`	`+ "version": "2.3.9",`
`4`	`4`	`"description": "a jmessage plugin for react native application",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"repository": {`