Merge remote-tracking branch 'refs/remotes/origin/dev'

jpush · Apr 6, 2017 · 5fbc82f · 5fbc82f
2 parents c830746 + 4f91d1a
commit 5fbc82f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "jmessage-phonegap-plugin",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "description": "JMessage Cordova Plugin.",
     "cordova": {
         "id": "jmessage-phonegap-plugin",

diff --git a/plugin.xml b/plugin.xml
@@ -2,9 +2,9 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="jmessage-phonegap-plugin"
-        version="2.3.0">
+        version="2.3.1">
 
-    <name>JMessage PhoneGap Plugin</name>
+    <name>JMessage</name>
     <description>集成极光 IM 和推送功能</description>
     <author>JPush</author>
     <keywords>JMessage, JPush</keywords>
@@ -159,7 +159,7 @@
         </config-file>
 
         <source-file src="src/android/libs/gson-2.3.1.jar" target-dir="libs"/>
-        <source-file src="src/android/libs/jmessage-android-2.0.0.jar" target-dir="libs"/>
+        <source-file src="src/android/libs/jmessage-android_v2.1.1.jar" target-dir="libs"/>
         <source-file src="src/android/JMessagePlugin.java" target-dir="src/cn/jmessage/phonegap"/>
     </platform>
 </plugin>
diff --git a/src/android/libs/jmessage-android-2.0.0.jar b/src/android/libs/jmessage-android-2.0.0.jar
diff --git a/src/android/libs/jmessage-android_v2.1.1.jar b/src/android/libs/jmessage-android_v2.1.1.jar
diff --git a/src/ios/Plugins/JMessagePlugin.m b/src/ios/Plugins/JMessagePlugin.m
@@ -24,7 +24,7 @@
 #define ResultSuccess(method) [NSString stringWithFormat:@"success - %@",method]
 #define ResultFailed(method)  [NSString stringWithFormat:@"failed  - %@",method]
 
-@interface JMessagePlugin ()<JMSGEventDelegate,UIApplicationDelegate>
+@interface JMessagePlugin ()<JMessageDelegate, JMSGEventDelegate, UIApplicationDelegate>
 
 @end
 
@@ -57,6 +57,7 @@ - (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
 -(void)initPlugin{
     if (!SharedJMessagePlugin) {
         SharedJMessagePlugin = self;
+        [JMessage addDelegate:self withConversation:nil];
     }
 }