Merge branch 'dev'

jpush · Jan 17, 2017 · 7d868be · 7d868be
2 parents b1a7766 + 7b65a1f
commit 7d868be
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -37,8 +37,8 @@
         <source-file src="src/ios/Plugins/AppDelegate+JPush.m" />
 
         <header-file src="src/ios/lib/JPUSHService.h" />
-        <source-file src="src/ios/lib/jpush-ios-3.0.0.a" framework="true" />
-        <source-file src="src/ios/lib/jcore-ios-1.0.0.a" framework="true" />
+        <source-file src="src/ios/lib/jpush-ios-3.0.1.a" framework="true" />
+        <source-file src="src/ios/lib/jcore-ios-1.1.0.a" framework="true" />
         <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />

diff --git a/src/ios/Plugins/JPushPlugin.m b/src/ios/Plugins/JPushPlugin.m
@@ -91,7 +91,9 @@ -(void)initPlugin{
 }
 
 +(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{
-     [SharedJPushPlugin.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [SharedJPushPlugin.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
+    });
 }
 
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{

diff --git a/src/ios/lib/JPUSHService.h b/src/ios/lib/JPUSHService.h
@@ -6,10 +6,10 @@
  *  | |    | |   / /\ \   | |    | |  \ \______| |
  *  | |    | |  /_/  \_\  | |    | |   \_________|
  *
- * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
+ * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 3.0.0
+#define JPUSH_VERSION_NUMBER 3.0.1
 
 #import <Foundation/Foundation.h>
 

diff --git a/src/ios/lib/jcore-ios-1.0.0.a → src/ios/lib/jcore-ios-1.1.0.a b/src/ios/lib/jcore-ios-1.0.0.a → src/ios/lib/jcore-ios-1.1.0.a
diff --git a/src/ios/lib/jpush-ios-3.0.0.a → src/ios/lib/jpush-ios-3.0.1.a b/src/ios/lib/jpush-ios-3.0.0.a → src/ios/lib/jpush-ios-3.0.1.a