update iOS plugin add chatroom api

Author: huangminlinux

ios/RCTJMessageModule/JMessageHelper.m

@@ -252,15 +252,25 @@ @implementation JMSGConversation (JMessage)
 -(NSMutableDictionary*)conversationToDictionary{
   NSMutableDictionary *dict = [NSMutableDictionary dictionary];
 
-  if (self.conversationType == kJMSGConversationTypeSingle) {
-    JMSGUser *user = self.target;
-    dict[@"target"] = [user userToDictionary];
-    dict[@"conversationType"] = @"single";
-    
-  } else {
-    JMSGGroup *group = self.target;
-    dict[@"target"] = [group groupToDictionary];
-    dict[@"conversationType"] = @"group";
+  switch (self.conversationType) {
+    case kJMSGConversationTypeSingle:{
+      JMSGUser *user = self.target;
+      dict[@"target"] = [user userToDictionary];
+      dict[@"conversationType"] = @"single";
+      break;
+    }
+    case kJMSGConversationTypeGroup:{
+      JMSGGroup *group = self.target;
+      dict[@"target"] = [group groupToDictionary];
+      dict[@"conversationType"] = @"group";
+      break;
+    }
+    case kJMSGConversationTypeChatRoom:{
+      JMSGChatRoom *chatRoom = self.target;
+      dict[@"target"] = [chatRoom chatRoomToDictionary];
+      dict[@"conversationType"] = @"chatRoom";
+      break;
+    }
   }
 
   dict[@"latestMessage"] = [self.latestMessage messageToDictionary];
@@ -355,12 +365,23 @@ - (NSMutableDictionary *)messageToDictionary {
     dict[@"extras"] = self.content.extras;
   }
 
-  if (self.targetType == kJMSGConversationTypeSingle) {
-    JMSGUser *user = self.target;
-    dict[@"target"] = [user userToDictionary];
-  } else {
-    JMSGGroup *group = self.target;
-    dict[@"target"] = [group groupToDictionary];
+  switch (self.targetType) {
+    case kJMSGConversationTypeSingle: {
+      JMSGUser *user = self.target;
+      dict[@"target"] = [user userToDictionary];
+      break;
+    }
+      
+    case kJMSGConversationTypeGroup:{
+      JMSGGroup *group = self.target;
+      dict[@"target"] = [group groupToDictionary];
+      break;
+    }
+    case kJMSGConversationTypeChatRoom:{
+      JMSGChatRoom *chatRoom= self.target;
+      dict[@"target"] = [chatRoom chatRoomToDictionary];
+      break;
+    }
   }
 
   dict[@"createTime"] = self.timestamp;
@@ -520,7 +541,7 @@ - (NSDictionary *)errorToDictionary {
 @implementation JMSGChatRoom (JMessage)
 - (NSMutableDictionary *)chatRoomToDictionary {
   NSMutableDictionary *dict = @{}.mutableCopy;
-  dict[@"type"] = @"chatroom";
+  dict[@"type"] = @"chatRoom";
   dict[@"roomId"] = self.roomID;
   dict[@"roomName"] = self.name;
   dict[@"appKey"] = self.appkey;

ios/RCTJMessageModule/RCTJMessageModule.m

@@ -326,7 +326,7 @@ - (JMSGConversationType)convertStringToConvsersationType:(NSString *)str {
     return kJMSGConversationTypeGroup;
   }
 
-  if ([str isEqualToString:@"chatroom"]) {
+  if ([str isEqualToString:@"chatRoom"]) {
     return kJMSGConversationTypeChatRoom;
   }
 
@@ -1726,15 +1726,13 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     return;
   }
 
-  if ([param[@"type"] isEqual: @"single"] && param[@"username"] != nil) {
+  if (([param[@"type"] isEqual: @"single"] && param[@"username"] != nil) ||
+      ([param[@"type"] isEqual: @"group"] && param[@"groupId"] != nil)   ||
+      ([param[@"type"] isEqual: @"chatRoom"] && param[@"roomId"] != nil)) {
 
   } else {
-    if ([param[@"type"] isEqual: @"group"] && param[@"groupId"] != nil) {
-      
-    } else {
-      failCallback(@[[self getParamError]]);
-      return;
-    }
+    failCallback(@[[self getParamError]]);
+    return;
   }
 
   NSString *appKey = nil;
@@ -2264,15 +2262,18 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
   NSNumber *start = nil;
   NSNumber *count = nil;
   if (!param[@"start"]) {
-    start = param[@"start"];
+    failCallback(@[[self getParamError]]);
     return;
   }
 
   if (!param[@"count"]) {
-    count = param[@"count"];
+    failCallback(@[[self getParamError]]);
     return;
   }
 
+  start = param[@"start"];
+  count = param[@"count"];
+  
   NSString *appKey = nil;
   if (param[@"appKey"]) {
     appKey = param[@"appKey"];
@@ -2301,8 +2302,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
  * @param {function} error = function ({'code': '错误码', 'description': '错误信息'}) {}
  */
 //static getChatRoomListByUser(success, error) {
-RCT_EXPORT_METHOD(getChatRoomListByUser:(NSDictionary *)param
-                  successCallback:(RCTResponseSenderBlock)successCallback
+RCT_EXPORT_METHOD(getChatRoomListByUser:(RCTResponseSenderBlock)successCallback
                   failCallBack:(RCTResponseSenderBlock)failCallback) {
   [JMSGChatRoom getMyChatRoomListCompletionHandler:^(id resultObject, NSError *error) {
     if (error) {