add conversation extension , updateMyinfo add extra, user and conversation to json add extras key

Author: huangminlinux

index.js

@@ -117,10 +117,11 @@ export default class JMessage {
      *
      * @param {object} params = {'field': '需要更新的字段值'}
      *
-     *  field 包括：nickname（昵称）, birthday（生日）, signature（签名）, gender（性别）, region（地区）, address（具体地址）。
+     *  field 包括：nickname（昵称）, birthday（生日）, signature（签名）, gender（性别）, region（地区）, address（具体地址），extras （附加信息）。
      *  如：{
      *    'birthday': Number,  // 生日日期的微秒数
      *    'gender': String,    // 'male' / 'female' / 'unknown'
+     *    'extras': {String: String} // 附加字段
      *    ...                  // 其余皆为 String 类型
      *  }
      * @param {function} success = function () {}
@@ -781,6 +782,25 @@ export default class JMessage {
         JMessageModule.downloadOriginalGroupAvatar(params, success, error)
     }
 
+    /**
+     * 增加或更新扩展字段,可扩展会话属性，比如：会话置顶、标识特殊会话等
+     *
+     * @param {object} params = {
+     *  'extra': Object            // 附加字段对象
+     *  'type': String,            // 'single' / 'group'
+     *  'groupId': String,         // 目标群组 id。
+     *  'username': String,        // 目标用户名。
+     *  'appKey': String,          // 目标用户所属 AppKey。
+     * }
+     * @param {function} success = function ({'id': String, 'filePath': String}) {}
+     * @param {function} error = function ({'code': '错误码', 'description': '错误信息'}) {}
+     */
+    static setConversationExtras(params, success, error) {
+        JMessageModule.setConversationExtras(params, success, error)
+    }
+
+
+
     /**
      * 
      * JMessage Events

ios/RCTJMessageModule/JMessageHelper.m

@@ -256,6 +256,7 @@ -(NSMutableDictionary*)conversationToDictionary{
   dict[@"latestMessage"] = [self.latestMessage messageToDictionary];
   dict[@"unreadCount"] = self.unreadCount;
   dict[@"title"] = [self title];
+  dict[@"extras"] = [self getConversationExtras];
   return dict;
 }
 
@@ -278,6 +279,7 @@ -(NSMutableDictionary*)userToDictionary{
   dict[@"isNoDisturb"] = @(self.isNoDisturb);
   dict[@"isInBlackList"] = @(self.isInBlacklist);
   dict[@"isFriend"] = @(self.isFriend);
+  dict[@"extras"] = self.extras;
 
   if([[NSFileManager defaultManager] fileExistsAtPath: [self thumbAvatarLocalPath] ?: @""]){
     dict[@"avatarThumbPath"] = [self thumbAvatarLocalPath];

ios/RCTJMessageModule/RCTJMessageModule.m

@@ -290,15 +290,14 @@ - (void)conversationChanged:(NSNotification *)notification {
   if([[NSFileManager defaultManager] fileExistsAtPath: mediaPath]){
     mediaPath = mediaPath;
     NSData *img = [NSData dataWithContentsOfFile: mediaPath];
-    
-    [JMSGUser updateMyInfoWithParameter:img userFieldType:kJMSGUserFieldsAvatar completionHandler:^(id resultObject, NSError *error) {
-      if (!error) {
-        successCallback(@[]);
-      } else {
-        failCallback(@[[error errorToDictionary]]);
-      }
+
+    [JMSGUser updateMyAvatarWithData:img avatarFormat:[mediaPath pathExtension] completionHandler:^(id resultObject, NSError *error) {
+        if (!error) {
+          successCallback(@[]);
+        } else {
+          failCallback(@[[error errorToDictionary]]);
+        }
     }];
-    
   } else {
     failCallback(@[[self getParamError]]);
   }
@@ -323,6 +322,10 @@ - (void)conversationChanged:(NSNotification *)notification {
     info.signature = param[@"signature"];
   }
 
+  if (param[@"extras"]) {
+    info.extras = param[@"extras"];
+  }
+  
   if (param[@"gender"]) {
     if ([param[@"gender"] isEqualToString:@"male"]) {
       info.gender = kJMSGUserGenderMale;
@@ -498,7 +501,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
 
   if ([param[@"type"] isEqual: @"single"] && param[@"username"] != nil) {
     JMSGImageContent *content = [[JMSGImageContent alloc] initWithImageData: [NSData dataWithContentsOfFile: mediaPath]];
-    
+    content.format = [mediaPath pathExtension];
     content.uploadHandler = ^(float percent, NSString *msgID) {
       [self.bridge.eventDispatcher sendAppEventWithName:uploadProgressEvent body:@{@"messageId": msgID,
                                                                                    @"progress": @(percent)}];
@@ -529,7 +532,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
 
   } else if ([param[@"type"] isEqual: @"group"] && param[@"groupId"] != nil) {
     JMSGImageContent *content = [[JMSGImageContent alloc] initWithImageData: [NSData dataWithContentsOfFile: mediaPath]];
-    
+    content.format = [mediaPath pathExtension];
     content.uploadHandler = ^(float percent, NSString *msgID) {
 
       [self.bridge.eventDispatcher sendAppEventWithName:uploadProgressEvent body:@{@"messageId": msgID,
@@ -1946,6 +1949,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
   }
 
   if ([param[@"type"] isEqualToString:@"single"]) {
+    
     [JMSGConversation createSingleConversationWithUsername:param[@"username"]
                                                     appKey:appKey
                                          completionHandler:^(id resultObject, NSError *error) {
@@ -2255,7 +2259,9 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
   }
 
   if ([param[@"messageType"] isEqualToString:@"image"]) {
-    content = [[JMSGImageContent alloc] initWithImageData: [NSData dataWithContentsOfFile: mediaPath]];
+    JMSGImageContent *imgContent = [[JMSGImageContent alloc] initWithImageData: [NSData dataWithContentsOfFile: mediaPath]];
+    imgContent.format = [mediaPath pathExtension];
+    content = imgContent;
   }
 
   if ([param[@"messageType"] isEqualToString:@"voice"]) {
@@ -2498,7 +2504,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
 
   if([[NSFileManager defaultManager] fileExistsAtPath: mediaPath]){
     mediaPath = mediaPath;
-    NSData *img = [[NSData dataWithContentsOfFile: mediaPath];
+    NSData *img = [NSData dataWithContentsOfFile: mediaPath];
 
     [JMSGGroup updateGroupAvatarWithGroupId:param[@"id"] avatarData:img avatarFormat:[mediaPath pathExtension] completionHandler:^(id resultObject, NSError *error) {
         if (!error) {