add custom message

guangyao · guangyao · commit 4e93cb03b911 · 2018-04-23T10:47:30.000+08:00
diff --git a/im/Session.js b/im/Session.js
@@ -185,6 +185,15 @@ class Session {
     sendBankTransferMessage(amount, comments, serialNo){
         return RNNeteaseIm.sendBankTransferMessage(amount, comments, serialNo)
     }
+    /**
+     * 发送自定义消息
+     * @param attachment 自定义消息内容{Width:260,Height:100,pushContent:'发来一条自定义消息',recentContent:'[自定义消息]'}
+     * Width 消息宽度，Height：消息高度， pushContent：推送消息内容， recentContent：最近会话显示的内容，
+     * @returns {*}
+     */
+    sendCustomMessage(attachment){
+        return RNNeteaseIm.sendCustomMessage(attachment);
+    }
     /**
      * 开启录音权限
      * @returns {*}
diff --git a/ios/RNNeteaseIm/RNNeteaseIm.xcodeproj/xcuserdata/Dowin.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/RNNeteaseIm/RNNeteaseIm.xcodeproj/xcuserdata/Dowin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>RNNeteaseIm.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>55</integer>
+			<integer>15</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.h b/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.h
@@ -36,7 +36,7 @@ typedef void(^Errors)(id erro);
 //发送视频
 -(void)sendTextMessage:(  NSString *)path duration:(  NSString *)duration width:(  NSString *)width height:(  NSString *)height displayName:(  NSString *)displayName;
 //发送自定义消息
--(void)sendCustomMessage:(  NSString *)attachment config:(  NSString *)config;
+-(void)sendCustomMessage:(NSDictionary *)dataDict;
 //发送地理位置消息
 -(void)sendLocationMessage:(  NSString *)latitude longitude:(  NSString *)longitude address:(  NSString *)address;
 //发送提醒消息
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m b/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m
@@ -90,7 +90,7 @@ - (void)resendMessage:(NSString *)messageID{
         }
     }
 }
-
+//聊天界面历史记录
 -(void)localSession:(NSInteger)index cerrentmessageId:(NSString *)currentMessageID success:(Success)succe err:(Errors)err{
     _index = index;
     [[NIMSDK sharedSDK].conversationManager markAllMessagesReadInSession:_session];
@@ -320,6 +320,12 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
                         [dic setObject:@"card" forKey:@"msgType"];
                     }
                         break;
+                    case CustomMessgeTypeCustom://自定义
+                    {
+                        [dic setObject:obj.dataDict  forKey:@"extend"];
+                        [dic setObject:@"custom" forKey:@"msgType"];
+                    }
+                        break;
                     default:
                     {
                         [dic setObject:obj.dataDict  forKey:@"extend"];
@@ -418,16 +424,27 @@ -(void)sendTextMessage:(  NSString *)path duration:(  NSString *)duration width:
 }
 
 //发送自定义消息
--(void)sendCustomMessage:(  NSString *)attachment config:(  NSString *)config{
+-(void)sendCustomMessage:(NSDictionary *)dataDict{
+    NSString *strW = [dataDict objectForKey:@"Width"] ? [NSString stringWithFormat:@"%@",[dataDict objectForKey:@"Width"]] : @"0";
+    NSString *strH = [dataDict objectForKey:@"Height"] ? [NSString stringWithFormat:@"%@",[dataDict objectForKey:@"Height"]] : @"0";
+    [dataDict setValue:strW forKey:@"Width"];
+    [dataDict setValue:strH forKey:@"Height"];
+    [self sendCustomMessage:CustomMessgeTypeCustom data:dataDict];
+}
+
+//发送自定义消息2
+-(void)sendCustomMessage:(NSInteger )custType data:(NSDictionary *)dataDict{
     NIMMessage *message;
-    NIMObject *obj = [NIMObject initNIMObject];
-    obj.attachment =attachment;
-    message = [NIMMessageMaker msgWithCustom:obj andeSession:_session];
+    DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];
+    obj.custType = custType;
+    obj.dataDict = dataDict;
+    message = [NIMMessageMaker msgWithCustomAttachment:obj andeSession:_session];
     if ([self isFriendToSendMessage:message]) {
         [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
     }
 }
 
+
 //发送地理位置消息
 -(void)sendLocationMessage:(  NSString *)latitude longitude:(  NSString *)longitude address:(  NSString *)address{
     NIMLocationObject *locaObj = [[NIMLocationObject alloc]initWithLatitude:[latitude doubleValue] longitude:[longitude doubleValue] title:address];
@@ -437,17 +454,6 @@ -(void)sendLocationMessage:(  NSString *)latitude longitude:(  NSString *)longit
         [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
     }
 }
-//发送自定义消息2
--(void)sendCustomMessage:(NSInteger )custType data:(NSDictionary *)dataDict{
-    NIMMessage *message;
-    DWCustomAttachment *obj = [[DWCustomAttachment alloc]init];
-    obj.custType = custType;
-    obj.dataDict = dataDict;
-    message = [NIMMessageMaker msgWithCustomAttachment:obj andeSession:_session];
-    if ([self isFriendToSendMessage:message]) {
-        [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
-    }
-}
 
 //发送提醒消息
 -(void)sendTipMessage:( NSString *)content{
@@ -943,7 +949,6 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from {
         [dic2 setObject:notiObj forKey:@"extend"];
         
     }else if (message.messageType == NIMMessageTypeCustom) {
-//            [dic setObject:@"custom" forKey:@"msgType"];
         NIMCustomObject *customObject = message.messageObject;
         DWCustomAttachment *obj = customObject.attachment;
         if (obj) {
@@ -992,6 +997,12 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from {
                     [dic2 setObject:@"card" forKey:@"msgType"];
                 }
                     break;
+                case CustomMessgeTypeCustom://自定义
+                {
+                    [dic2 setObject:obj.dataDict  forKey:@"extend"];
+                    [dic2 setObject:@"custom" forKey:@"msgType"];
+                }
+                    break;
                 default:
                 {
                     [dic2 setObject:obj.dataDict  forKey:@"extend"];
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/DWCustomAttachment.m b/ios/RNNeteaseIm/RNNeteaseIm/DWCustomAttachment.m
@@ -31,6 +31,9 @@ - (NSString *)encodeAttachment{
         case CustomMessgeTypeBusinessCard:
             strType = @"card";
             break;
+        case CustomMessgeTypeCustom:
+            strType = @"custom";
+            break;
         default:
             strType = @"unknown";
             break;
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/DWCustomAttachmentDecoder.m b/ios/RNNeteaseIm/RNNeteaseIm/DWCustomAttachmentDecoder.m
@@ -35,6 +35,8 @@ @implementation DWCustomAttachmentDecoder
                 custType = CustomMessgeTypeRedPacketOpenMessage;
             }else if([strType isEqualToString:@"card"]){//名片
                 custType = CustomMessgeTypeBusinessCard;
+            }else if([strType isEqualToString:@"custom"]){//自定义
+                custType = CustomMessgeTypeCustom;
             }else{//未知消息类型
                 custType = CustomMessgeTypeUnknown;
             }
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m b/ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m
@@ -397,6 +397,11 @@ - (NSString *)getCustomType:(NIMMessage *)message{
                 }
             }
                 break;
+            case CustomMessgeTypeCustom: //自定义
+            {
+                text = [self dealWithCustomData:obj.dataDict];
+            }
+                break;
             default:
                 text = @"[未知消息]";
                 break;
@@ -405,6 +410,12 @@ - (NSString *)getCustomType:(NIMMessage *)message{
     return text;
 }
 
+//处理自定义消息
+- (NSString *)dealWithCustomData:(NSDictionary *)dict{
+    NSString *recentContent = [self stringFromKey:@"recentContent" andDict:dict];
+    return recentContent;
+}
+
 //处理拆红包消息
 - (NSString *)dealWithData:(NSDictionary *)dict{
     NSString *strOpenId = [self stringFromKey:@"openId" andDict:dict];
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/PrefixHeader.pch b/ios/RNNeteaseIm/RNNeteaseIm/PrefixHeader.pch
@@ -40,5 +40,6 @@ static DDLogLevel ddLogLevel = DDLogLevelInfo;
 #define CustomMessgeTypeAccountNotice  8   //账户通知，与账户金额相关变动 account_notice
 #define CustomMessgeTypeRedPacketOpenMessage  9     //发送拆红包
 #define CustomMessgeTypeBusinessCard  10     //名片
+#define CustomMessgeTypeCustom  102     //名片
 
 #endif /* PrefixHeader_pch */
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m b/ios/RNNeteaseIm/RNNeteaseIm/RNNeteaseIm.m
@@ -336,8 +336,8 @@ - (void)removAllRecentSessions{
     [[ConversationViewController initWithConversationViewController]sendAudioMessage:file duration:duration];
 }
 //发送自定义消息
-RCT_EXPORT_METHOD(sendCustomMessage:(nonnull  NSString *)attachment config:(nonnull  NSString *)config){
-    [[ConversationViewController initWithConversationViewController]sendCustomMessage:attachment config:config];
+RCT_EXPORT_METHOD(sendCustomMessage:(nonnull  NSDictionary *)attachment){
+    [[ConversationViewController initWithConversationViewController]sendCustomMessage:attachment];
 }
 //发送视频消息
 RCT_EXPORT_METHOD(sendVideoMessage:(nonnull  NSString *)file duration:(nonnull  NSString *)duration width:(nonnull  NSString *)width height:(nonnull  NSString *)height displayName:(nonnull  NSString *)displayName){
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/Util/NIMMessageMaker.m b/ios/RNNeteaseIm/RNNeteaseIm/Util/NIMMessageMaker.m
@@ -84,6 +84,11 @@ + (NIMMessage*)msgWithCustomAttachment:(DWCustomAttachment *)attachment andeSess
             text = [NSString stringWithFormat:@"[名片]%@", [attachment.dataDict objectForKey:@"name"]];
         }
             break;
+        case CustomMessgeTypeCustom: //自定义
+        {
+            text = [NSString stringWithFormat:@"%@", [attachment.dataDict objectForKey:@"pushContent"]];
+        }
+            break;
         default:
             text = @"发来了一条未知消息";
             break;

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ @implementation DWCustomAttachmentDecoder`
`35`	`35`	`custType = CustomMessgeTypeRedPacketOpenMessage;`
`36`	`36`	`}else if([strType isEqualToString:@"card"]){//名片`
`37`	`37`	`custType = CustomMessgeTypeBusinessCard;`
	`38`	`+ }else if([strType isEqualToString:@"custom"]){//自定义`
	`39`	`+ custType = CustomMessgeTypeCustom;`
`38`	`40`	`}else{//未知消息类型`
`39`	`41`	`custType = CustomMessgeTypeUnknown;`
`40`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -336,8 +336,8 @@ - (void)removAllRecentSessions{`
`336`	`336`	`[[ConversationViewController initWithConversationViewController]sendAudioMessage:file duration:duration];`
`337`	`337`	`}`
`338`	`338`	`//发送自定义消息`
`339`		`-RCT_EXPORT_METHOD(sendCustomMessage:(nonnull NSString )attachment config:(nonnull NSString )config){`
`340`		`- [[ConversationViewController initWithConversationViewController]sendCustomMessage:attachment config:config];`
	`339`	`+RCT_EXPORT_METHOD(sendCustomMessage:(nonnull NSDictionary *)attachment){`
	`340`	`+ [[ConversationViewController initWithConversationViewController]sendCustomMessage:attachment];`
`341`	`341`	`}`
`342`	`342`	`//发送视频消息`
`343`	`343`	`RCT_EXPORT_METHOD(sendVideoMessage:(nonnull NSString )file duration:(nonnull NSString )duration width:(nonnull NSString )width height:(nonnull NSString )height displayName:(nonnull NSString *)displayName){`