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

KenChoi · KenChoi · commit dc607e3ac01c · 2017-09-15T16:51:48.000+08:00
diff --git a/ios/RCTJMessageModule/RCTJMessageModule.m b/ios/RCTJMessageModule/RCTJMessageModule.m
@@ -419,7 +419,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
       NSDictionary *extras = param[@"extras"];
       for (NSString *key in extras.allKeys) {
-        [message updateMessageExtraValue: extras[key] forKey: key];
+        [message.content addStringExtra:extras[key] forKey:key];
       }
     }
     
@@ -446,7 +446,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
       NSDictionary *extras = param[@"extras"];
       for (NSString *key in extras.allKeys) {
-        [message updateMessageExtraValue: extras[key] forKey: key];
+        [message.content addStringExtra:extras[key] forKey:key];
       }
     }
     
@@ -508,7 +508,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
       NSDictionary *extras = param[@"extras"];
       for (NSString *key in extras.allKeys) {
-        [message updateMessageExtraValue: extras[key] forKey: key];
+        [message.content addStringExtra:extras[key] forKey:key];
       }
     }
     [JMSGConversation createSingleConversationWithUsername:param[@"username"]
@@ -540,7 +540,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
       NSDictionary *extras = param[@"extras"];
       for (NSString *key in extras.allKeys) {
-        [message updateMessageExtraValue: extras[key] forKey: key];
+        [message.content addStringExtra:extras[key] forKey:key];
       }
     }
     self.SendMsgCallbackDic[message.msgId] = @[successCallback,failCallback];
@@ -605,7 +605,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
       NSDictionary *extras = param[@"extras"];
       for (NSString *key in extras.allKeys) {
-        [message updateMessageExtraValue: extras[key] forKey: key];
+        [message.content addStringExtra:extras[key] forKey:key];
       }
     }
     [JMSGConversation createSingleConversationWithUsername:param[@"username"] appKey:appKey completionHandler:^(id resultObject, NSError *error) {
@@ -629,7 +629,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
       if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
         NSDictionary *extras = param[@"extras"];
         for (NSString *key in extras.allKeys) {
-          [message updateMessageExtraValue: extras[key] forKey: key];
+          [message.content addStringExtra:extras[key] forKey:key];
         }
       }
       self.SendMsgCallbackDic[message.msgId] = @[successCallback, failCallback];
@@ -738,7 +738,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
       NSDictionary *extras = param[@"extras"];
       for (NSString *key in extras.allKeys) {
-        [message updateMessageExtraValue: extras[key] forKey: key];
+        [message.content addStringExtra:extras[key] forKey:key];
       }
     }
     [JMSGConversation createSingleConversationWithUsername:param[@"username"] appKey:appKey completionHandler:^(id resultObject, NSError *error) {
@@ -765,7 +765,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
       if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
         NSDictionary *extras = param[@"extras"];
         for (NSString *key in extras.allKeys) {
-          [message updateMessageExtraValue: extras[key] forKey: key];
+          [message.content addStringExtra:extras[key] forKey:key];
         }
       }
       
@@ -827,7 +827,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
     if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
       NSDictionary *extras = param[@"extras"];
       for (NSString *key in extras.allKeys) {
-        [message updateMessageExtraValue: extras[key] forKey: key];
+        [message.content addStringExtra:extras[key] forKey:key];
       }
     }
     [JMSGConversation createSingleConversationWithUsername:param[@"username"] appKey:appKey completionHandler:^(id resultObject, NSError *error) {
@@ -857,7 +857,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
       if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
         NSDictionary *extras = param[@"extras"];
         for (NSString *key in extras.allKeys) {
-          [message updateMessageExtraValue: extras[key] forKey: key];
+          [message.content addStringExtra:extras[key] forKey:key];
         }
       }
       
@@ -2334,7 +2334,7 @@ - (JMSGOptionalContent *)convertDicToJMSGOptionalContent:(NSDictionary *)dic {
         if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {
           NSDictionary *extras = param[@"extras"];
           for (NSString *key in extras.allKeys) {
-            [message updateMessageExtraValue: extras[key] forKey: key];
+            [message.content addStringExtra:extras[key] forKey:key];
           }
         }
         callback(@[[message messageToDictionary]]);

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`419`	`419`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`420`	`420`	`NSDictionary *extras = param[@"extras"];`
`421`	`421`	`for (NSString *key in extras.allKeys) {`
`422`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`422`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
`@@ -446,7 +446,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`446`	`446`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`447`	`447`	`NSDictionary *extras = param[@"extras"];`
`448`	`448`	`for (NSString *key in extras.allKeys) {`
`449`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`449`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`
`@@ -508,7 +508,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`508`	`508`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`509`	`509`	`NSDictionary *extras = param[@"extras"];`
`510`	`510`	`for (NSString *key in extras.allKeys) {`
`511`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`511`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`512`	`512`	`}`
`513`	`513`	`}`
`514`	`514`	`[JMSGConversation createSingleConversationWithUsername:param[@"username"]`
`@@ -540,7 +540,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`540`	`540`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`541`	`541`	`NSDictionary *extras = param[@"extras"];`
`542`	`542`	`for (NSString *key in extras.allKeys) {`
`543`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`543`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`544`	`544`	`}`
`545`	`545`	`}`
`546`	`546`	`self.SendMsgCallbackDic[message.msgId] = @[successCallback,failCallback];`
`@@ -605,7 +605,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`605`	`605`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`606`	`606`	`NSDictionary *extras = param[@"extras"];`
`607`	`607`	`for (NSString *key in extras.allKeys) {`
`608`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`608`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`609`	`609`	`}`
`610`	`610`	`}`
`611`	`611`	`[JMSGConversation createSingleConversationWithUsername:param[@"username"] appKey:appKey completionHandler:^(id resultObject, NSError *error) {`
`@@ -629,7 +629,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`629`	`629`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`630`	`630`	`NSDictionary *extras = param[@"extras"];`
`631`	`631`	`for (NSString *key in extras.allKeys) {`
`632`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`632`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`633`	`633`	`}`
`634`	`634`	`}`
`635`	`635`	`self.SendMsgCallbackDic[message.msgId] = @[successCallback, failCallback];`
`@@ -738,7 +738,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`738`	`738`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`739`	`739`	`NSDictionary *extras = param[@"extras"];`
`740`	`740`	`for (NSString *key in extras.allKeys) {`
`741`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`741`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`742`	`742`	`}`
`743`	`743`	`}`
`744`	`744`	`[JMSGConversation createSingleConversationWithUsername:param[@"username"] appKey:appKey completionHandler:^(id resultObject, NSError *error) {`
`@@ -765,7 +765,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`765`	`765`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`766`	`766`	`NSDictionary *extras = param[@"extras"];`
`767`	`767`	`for (NSString *key in extras.allKeys) {`
`768`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`768`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`769`	`769`	`}`
`770`	`770`	`}`
`771`	`771`
`@@ -827,7 +827,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`827`	`827`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`828`	`828`	`NSDictionary *extras = param[@"extras"];`
`829`	`829`	`for (NSString *key in extras.allKeys) {`
`830`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`830`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`831`	`831`	`}`
`832`	`832`	`}`
`833`	`833`	`[JMSGConversation createSingleConversationWithUsername:param[@"username"] appKey:appKey completionHandler:^(id resultObject, NSError *error) {`
`@@ -857,7 +857,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`857`	`857`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`858`	`858`	`NSDictionary *extras = param[@"extras"];`
`859`	`859`	`for (NSString *key in extras.allKeys) {`
`860`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`860`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`861`	`861`	`}`
`862`	`862`	`}`
`863`	`863`
`@@ -2334,7 +2334,7 @@ - (JMSGOptionalContent )convertDicToJMSGOptionalContent:(NSDictionary )dic {`
`2334`	`2334`	`if (param[@"extras"] && [param[@"extras"] isKindOfClass: [NSDictionary class]]) {`
`2335`	`2335`	`NSDictionary *extras = param[@"extras"];`
`2336`	`2336`	`for (NSString *key in extras.allKeys) {`
`2337`		`- [message updateMessageExtraValue: extras[key] forKey: key];`
	`2337`	`+ [message.content addStringExtra:extras[key] forKey:key];`
`2338`	`2338`	`}`
`2339`	`2339`	`}`
`2340`	`2340`	`callback(@[[message messageToDictionary]]);`