Merge branch 'dev' of github.com:jpush/jmessage-react-plugin into dev

KenChoi · KenChoi · commit 3102983a0430 · 2018-01-17T11:30:51.000+08:00
diff --git a/example/app/routes/Chat/index.js b/example/app/routes/Chat/index.js
@@ -90,6 +90,13 @@ export default class Chat extends Component {
       auroraMsg.msgType = "video"
     }
 
+    if (jmessage.type === 'event') {
+      // auroraMsg.mediaPath = jmessage.path
+      // auroraMsg.duration = jmessage.duration
+      Alert.alert('event' , jmessage.eventType)
+      auroraMsg.text = jmessage.eventType
+    }
+
     var user = {
       userId: "1",
       displayName: "",
diff --git a/ios/RCTJMessageModule/JMessageHelper.h b/ios/RCTJMessageModule/JMessageHelper.h
@@ -10,6 +10,7 @@
 #import <JMessage/JMessage.h>
 
 #define kJJMessageReceiveMessage     @"kJJMessageReceiveMessage"
+#define kJJMessageReceiveChatRoomMessage     @"kJJMessageReceiveChatRoomMessage"
 #define kJJMessageSendMessageRespone @"kJJMessageSendMessageRespone"
 
 //Conversation 回调
diff --git a/ios/RCTJMessageModule/JMessageHelper.m b/ios/RCTJMessageModule/JMessageHelper.m
@@ -78,6 +78,16 @@ - (void)onReceiveMessage:(JMSGMessage *)message error:(NSError *)error{
   [[NSNotificationCenter defaultCenter] postNotificationName:kJJMessageReceiveMessage object:dict];
 }
 
+- (void)onReceiveChatRoomConversation:(JMSGConversation *)conversation messages:(NSArray<__kindof JMSGMessage *> *)messages {
+
+  NSArray *msgDicArr = [messages mapObjectsUsingBlock:^id(id obj, NSUInteger idx) {
+    JMSGMessage *msg = obj;
+    return [msg messageToDictionary];
+  }];
+  
+  [[NSNotificationCenter defaultCenter] postNotificationName:kJJMessageReceiveChatRoomMessage object:msgDicArr];
+}
+
 - (void)onReceiveNotificationEvent:(JMSGNotificationEvent *)event {
   switch (event.eventType) {
     case kJMSGEventNotificationLoginKicked:
@@ -242,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];
@@ -345,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;
@@ -391,63 +422,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:
@@ -510,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;
diff --git a/ios/RCTJMessageModule/RCTJMessageModule.h b/ios/RCTJMessageModule/RCTJMessageModule.h
@@ -18,6 +18,7 @@
 
 
 #define receiveMsgEvent @"JMessage.ReceiveMsgEvent" // 接收到消息事件
+#define receiveChatRoomMsgEvent @"JMessage.ReceiveChatRoomMsgEvent" // 接收到消息事件
 #define conversationChangeEvent @"JMessage.conversationChange" // 会话变更事件
 #define loginStateChangedEvent @"JMessage.LoginStateChanged" //
 #define clickMessageNotificationEvent @"JMessage.ClickMessageNotification" // 点击推送 Android Only
diff --git a/ios/RCTJMessageModule/RCTJMessageModule.m b/ios/RCTJMessageModule/RCTJMessageModule.m
@@ -62,17 +62,21 @@ -(void)initNotifications {
   [[NSNotificationCenter defaultCenter] removeObserver:self]; 
   
   NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
-  // have
   [defaultCenter addObserver:self
                     selector:@selector(didReceiveJMessageMessage:)
                         name:kJJMessageReceiveMessage
                       object:nil];
   
+  [defaultCenter addObserver:self
+                    selector:@selector(didReceiveJMessageChatRoomMessage:)
+                        name:kJJMessageReceiveChatRoomMessage
+                      object:nil];
+  
   [defaultCenter addObserver:self
                     selector:@selector(conversationChanged:)
                         name:kJJMessageConversationChanged
                       object:nil];
-  // have
+  
   [defaultCenter addObserver:self
                     selector:@selector(didSendMessage:)
                         name:kJJMessageSendMessageRespone
@@ -82,7 +86,7 @@ -(void)initNotifications {
 //                    selector:@selector(unreadChanged:)
 //                        name:kJJMessageUnreadChanged
 //                      object:nil];
-  // have
+  
   [defaultCenter addObserver:self
                     selector:@selector(loginStateChanged:)
                         name:kJJMessageLoginStateChanged
@@ -322,7 +326,7 @@ - (JMSGConversationType)convertStringToConvsersationType:(NSString *)str {
     return kJMSGConversationTypeGroup;
   }
   
-  if ([str isEqualToString:@"chatroom"]) {
+  if ([str isEqualToString:@"chatRoom"]) {
     return kJMSGConversationTypeChatRoom;
   }
   
@@ -399,6 +403,11 @@ - (void)didReceiveJMessageMessage:(NSNotification *)notification {
   [self.bridge.eventDispatcher sendAppEventWithName:receiveMsgEvent body:notification.object];
 }
 
+- (void)didReceiveJMessageChatRoomMessage:(NSNotification *)notification {
+  [self.bridge.eventDispatcher sendAppEventWithName:receiveChatRoomMsgEvent body:notification.object];
+}
+
+
 - (void)conversationChanged:(NSNotification *)notification {
   [self.bridge.eventDispatcher sendAppEventWithName:conversationChangeEvent body:notification.object];
 }
@@ -1717,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;
@@ -2255,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"];
@@ -2292,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) {
@@ -2416,5 +2425,35 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
   }];
 }
 
+RCT_EXPORT_METHOD(getChatRoomOwner:(NSDictionary *)param
+                  successCallback:(RCTResponseSenderBlock)successCallback
+                  failCallBack:(RCTResponseSenderBlock)failCallback) {
+  if (!param[@"roomId"]) {
+    failCallback(@[[self getParamError]]);
+    return;
+  }
+  
+  [JMSGChatRoom getChatRoomInfosWithRoomIds:@[param[@"roomId"]] completionHandler:^(id resultObject, NSError *error) {
+    if (error) {
+      failCallback(@[[error errorToDictionary]]);
+      return;
+    }
+    NSArray *chatRoomArr = resultObject;
+    if (chatRoomArr == nil || chatRoomArr.count == 0) {
+      failCallback(@[[self getErrorWithLog:@"cann't found chat room from this roomId!"]]);
+      return;
+    }
+    JMSGChatRoom *chatRoom = chatRoomArr[0];
+    [chatRoom getChatRoomOwnerInfo:^(id resultObject, NSError *error) {
+      if (error) {
+        failCallback(@[[error errorToDictionary]]);
+        return;
+      }
+      JMSGUser *user = resultObject;
+      successCallback(@[[user userToDictionary]]);
+    }];
+  }];
+}
+
 
 @end
