Merge remote-tracking branch 'origin/dev' into dev

Author: Hevin

src/ios/Plugins/JMessageHelper.m

@@ -419,63 +419,63 @@ - (NSMutableDictionary *)messageToDictionary {
 
       switch (eventContent.eventType) {
         case kJMSGEventNotificationAcceptedFriendInvitation: {
-          dict[@"evenType"] = @"acceptedFriendInvitation";
+          dict[@"eventType"] = @"acceptedFriendInvitation";
           break;
         }
         case kJMSGEventNotificationAddGroupMembers: {
-          dict[@"evenType"] = @"group_member_added";
+          dict[@"eventType"] = @"group_member_added";
           break;
         }
         case kJMSGEventNotificationCreateGroup: {
-          dict[@"evenType"] = @"createGroup";
+          dict[@"eventType"] = @"createGroup";
           break;
         }
         case kJMSGEventNotificationCurrentUserInfoChange: {
-          dict[@"evenType"] = @"currentUserInfoChange";
+          dict[@"eventType"] = @"currentUserInfoChange";
           break;
         }
         case kJMSGEventNotificationDeclinedFriendInvitation: {
-          dict[@"evenType"] = @"declinedFriendInvitation";
+          dict[@"eventType"] = @"declinedFriendInvitation";
           break;
         }
         case kJMSGEventNotificationDeletedFriend: {
-          dict[@"evenType"] = @"deletedFriend";
+          dict[@"eventType"] = @"deletedFriend";
           break;
         }
         case kJMSGEventNotificationExitGroup: {
-          dict[@"evenType"] = @"group_member_exit";
+          dict[@"eventType"] = @"group_member_exit";
           break;
         }
         case kJMSGEventNotificationLoginKicked: {
-          dict[@"evenType"] = @"loginKicked";
+          dict[@"eventType"] = @"loginKicked";
           break;
         }
         case kJMSGEventNotificationMessageRetract: {
-          dict[@"evenType"] = @"messageRetract";
+          dict[@"eventType"] = @"messageRetract";
           break;
         }
         case kJMSGEventNotificationReceiveFriendInvitation: {
-          dict[@"evenType"] = @"receiveFriendInvitation";
+          dict[@"eventType"] = @"receiveFriendInvitation";
           break;
         }
         case kJMSGEventNotificationReceiveServerFriendUpdate: {
-          dict[@"evenType"] = @"receiveServerFriendUpdate";
+          dict[@"eventType"] = @"receiveServerFriendUpdate";
           break;
         }
         case kJMSGEventNotificationRemoveGroupMembers: {
-          dict[@"evenType"] = @"group_member_removed";
+          dict[@"eventType"] = @"group_member_removed";
           break;
         }
         case kJMSGEventNotificationServerAlterPassword: {
-          dict[@"evenType"] = @"serverAlterPassword";
+          dict[@"eventType"] = @"serverAlterPassword";
           break;
         }
         case kJMSGEventNotificationUpdateGroupInfo: {
-          dict[@"evenType"] = @"updateGroupInfo";
+          dict[@"eventType"] = @"updateGroupInfo";
           break;
         }
         case kJMSGEventNotificationUserLoginStatusUnexpected: {
-          dict[@"evenType"] = @"userLoginStatusUnexpected";
+          dict[@"eventType"] = @"userLoginStatusUnexpected";
           break;
         }
         default:

src/ios/Plugins/JMessagePlugin.m

@@ -2160,18 +2160,19 @@ - (void)getChatRoomInfoListOfApp:(CDVInvokedUrlCommand *)command {
   NSDictionary * param = [command argumentAtIndex:0];
   NSNumber *start = nil;
   NSNumber *count = nil;
-  if (!param[@"start"]) {
+  if (param[@"start"]) {
     [self returnParamError:command];
-    start = param[@"start"];
     return;
   }
 
-  if (!param[@"count"]) {
+  if (param[@"count"]) {
     [self returnParamError:command];
-    count = param[@"count"];
     return;
   }
 
+  start = param[@"start"];
+  count = param[@"count"];
+  
   NSString *appKey = nil;
   if (param[@"appKey"]) {
     appKey = param[@"appKey"];