Merge branch 'V3'

jpush · Sep 15, 2017 · 38e5e1d · 38e5e1d
2 parents ac1724b + 5ba9f3f
commit 38e5e1d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # JMessage PhoneGap / Cordova Plugin
 
-[![release](https://img.shields.io/badge/release-3.0.16-blue.svg)](https://github.com/jpush/jmessage-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-3.0.17-blue.svg)](https://github.com/jpush/jmessage-phonegap-plugin/releases)
 [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-green.svg)](https://github.com/jpush/jmessage-phonegap-plugin)
 [![Code Triagers Badge](https://www.codetriage.com/jpush/jmessage-phonegap-plugin/badges/users.svg)](https://www.codetriage.com/jpush/jmessage-phonegap-plugin)
 [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jmessage-phonegap-plugin",
-    "version": "3.0.16",
+    "version": "3.0.17",
     "description": "JMessage Cordova Plugin.",
     "cordova": {
         "id": "jmessage-phonegap-plugin",

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="jmessage-phonegap-plugin"
-        version="3.0.16">
+        version="3.0.17">
 
     <name>JMessage</name>
     <description>集成极光 IM 和推送功能</description>

diff --git a/src/ios/Plugins/JMessagePlugin.m b/src/ios/Plugins/JMessagePlugin.m
@@ -519,7 +519,7 @@ - (void)sendTextMessage:(CDVInvokedUrlCommand *)command {
         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];
             }
         }
 
@@ -546,7 +546,7 @@ - (void)sendTextMessage:(CDVInvokedUrlCommand *)command {
             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];
                 }
             }
 
@@ -601,7 +601,7 @@ - (void)sendImageMessage:(CDVInvokedUrlCommand *)command {
         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"]
@@ -626,7 +626,7 @@ - (void)sendImageMessage:(CDVInvokedUrlCommand *)command {
             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] = command.callbackId;
@@ -691,7 +691,7 @@ - (void)sendVoiceMessage:(CDVInvokedUrlCommand *)command {
         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) {
@@ -715,7 +715,7 @@ - (void)sendVoiceMessage:(CDVInvokedUrlCommand *)command {
             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] = command.callbackId;
@@ -822,7 +822,7 @@ - (void)sendLocationMessage:(CDVInvokedUrlCommand *)command {
         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) {
@@ -849,7 +849,7 @@ - (void)sendLocationMessage:(CDVInvokedUrlCommand *)command {
             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];
                 }
             }
 
@@ -904,7 +904,7 @@ - (void)sendFileMessage:(CDVInvokedUrlCommand *)command {
         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) {
@@ -928,7 +928,7 @@ - (void)sendFileMessage:(CDVInvokedUrlCommand *)command {
             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];
                 }
             }