Merge branch 'dev'

1.JPush 3.0.1，JCore 1.1.0

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin)
 [![QQ Group](https://img.shields.io/badge/QQ%20Group-413602425-red.svg)]()
-[![release](https://img.shields.io/badge/release-2.2.7-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-3.0.3-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
 [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jpush-phonegap-plugin)
 [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1)
 
@@ -17,15 +17,15 @@
 
 - 通过 Cordova Plugins 安装，要求 Cordova CLI 5.0+：
 
-  	    cordova plugin add jpush-phonegap-plugin --variable API_KEY=your_jpush_appkey
+  	    cordova plugin add jpush-phonegap-plugin --variable APP_KEY=your_jpush_appkey
 
 - 或直接通过 url 安装：
 
-        cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable API_KEY=your_jpush_appkey  
+        cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git --variable APP_KEY=your_jpush_appkey  
 
 - 或下载到本地安装：
 
-        cordova plugin add Your_Plugin_Path  --variable API_KEY=your_jpush_appkey
+        cordova plugin add Your_Plugin_Path  --variable APP_KEY=your_jpush_appkey
 
 
 ## Usage

doc/iOS_API.md

@@ -1,5 +1,6 @@
 # iOS API
 
+- [延迟注册和启动推送通知服务](#延迟注册和启动推送通知服务)
 - [开始与停止推送服务](#开始与停止推送服务)
 - [获取 RegistrationID](#获取-registrationid)
 - [别名与标签](#别名与标签)
@@ -19,6 +20,32 @@
 - [获取用户推送设置](#获取用户推送设置)
 - [监听事件统一说明](#监听事件统一说明)
 
+
+
+## 延迟注册和启动推送通知服务
+
+本插件默认在 App 启动完成之后，立即「注册苹果通知服务」+「启动 JPush SDK」，其中：
+
+- 「注册苹果通知服务」会弹出提示窗口向用户请求权限。
+- 「启动 JPush SDK」是使用 JPush 各项 API 的必要条件。
+
+开发者可以根据自己的需求，延迟注册和启动，需做以下操作：
+
+1. 查找并配置 `PushConfig.plist` 文件中的 `Delay` 字段为 `YES`，表明会延迟使用，此时插件不再自动注册、启动通知。
+2. 在需要注册并启动通知的地方调用 API - startJPushSDK。
+
+### API - startJPushSDK
+
+注册苹果通知服务，并启动 JPush SDK。
+
+#### 接口定义
+
+```
+window.plugins.jPushPlugin.startJPushSDK()
+```
+
+
+
 ## 开始与停止推送服务
 
 ### API - init

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jpush-phonegap-plugin",
-  "version": "2.2.8",
+  "version": "3.0.3",
   "description": "JPush for cordova plugin",
   "cordova": {
     "id": "jpush-phonegap-plugin",

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="jpush-phonegap-plugin"
-  version="3.0.1">
+  version="3.0.3">
 
     <name>JPush Plugin</name>
     <description>JPush for cordova plugin</description>
@@ -10,7 +10,7 @@
     <keywords>JPush,push</keywords>
     <license>MIT License</license>
 
-    <preference name="API_KEY" />
+    <preference name="APP_KEY" />
 
     <engines>
         <engine name="cordova" version=">=3.0" />
@@ -37,9 +37,9 @@
         <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/jpush-ios-3.0.1.a" framework="true" />
-        <source-file src="src/ios/lib/jcore-ios-1.0.0.a" framework="true" />
+        <source-file src="src/ios/lib/jcore-ios-1.1.0.a" framework="true" />
-        <resource-file src="src/ios/PushConfig.plist" />
+        <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />
         <framework src="CoreFoundation.framework" weak="true" />
@@ -54,9 +54,8 @@
         <framework src="UserNotifications.framework" weak="true" />
         <framework src="libresolv.tbd" weak="true" />
 
-
+        <config-file target="*JPushConfig.plist" parent="Appkey">
-        <config-file target="*PushConfig.plist" parent="Appkey">
+            <string>$APP_KEY</string>
-            <string>$API_KEY</string>
         </config-file>
     </platform>
 
@@ -81,8 +80,10 @@
             <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
             <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
             <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-            <permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
+            <permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
+               android:protectionLevel="signature" />
         </config-file>
+
         <config-file target="AndroidManifest.xml" parent="/manifest/application">
             <!-- Required SDK核心功能-->
             <activity android:name="cn.jpush.android.ui.PushActivity"
@@ -140,7 +141,9 @@
 
             <!-- since 1.8.0 option 可选项。用于同一设备中不同应用的JPush服务相互拉起的功能。 -->
             <!-- 若不启用该功能可删除该组件，将不拉起其他应用也不能被其他应用拉起 -->
-            <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true">
+            <service android:name="cn.jpush.android.service.DaemonService"
+               android:enabled="true"
+               android:exported="true">
                 <intent-filter>
                     <action android:name="cn.jpush.android.intent.DaemonService" />
                     <category android:name="$PACKAGE_NAME" />
@@ -173,16 +176,16 @@
             <receiver android:name="cn.jpush.android.service.AlarmReceiver" />
             <!-- Required. Enable it you can get statistics data with channel -->
             <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
-            <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY" />
+            <meta-data android:name="JPUSH_APPKEY" android:value="$APP_KEY" />
         </config-file>
 
-        <source-file src="src/android/libs/jpush-android_v3.0.0.jar" target-dir="libs" />
+        <source-file src="src/android/libs/jpush-android_v3.0.1.jar" target-dir="libs" />
-        <source-file src="src/android/libs/jcore-android_v1.0.0.jar" target-dir="libs" />
+        <source-file src="src/android/libs/jcore-android_v1.1.0.jar" target-dir="libs" />
-        <source-file src="src/android/libs/armeabi/libjcore100.so" target-dir="libs/armeabi" />
+        <source-file src="src/android/libs/armeabi/libjcore110.so" target-dir="libs/armeabi" />
-        <source-file src="src/android/libs/armeabi-v7a/libjcore100.so" target-dir="libs/armeabi-v7a" />
+        <source-file src="src/android/libs/armeabi-v7a/libjcore110.so" target-dir="libs/armeabi-v7a" />
-        <source-file src="src/android/libs/arm64-v8a/libjcore100.so" target-dir="libs/arm64-v8a" />
+        <source-file src="src/android/libs/arm64-v8a/libjcore110.so" target-dir="libs/arm64-v8a" />
-        <source-file src="src/android/libs/x86/libjcore100.so" target-dir="libs/x86" />
+        <source-file src="src/android/libs/x86/libjcore110.so" target-dir="libs/x86" />
-        <source-file src="src/android/libs/x86_64/libjcore100.so" target-dir="libs/x86_64" />
+        <source-file src="src/android/libs/x86_64/libjcore110.so" target-dir="libs/x86_64" />
 
         <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap" />
         <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap" />

src/ios/JPushConfig.plist

@@ -5,10 +5,12 @@
 	<key>Appkey</key>
 	<string></string>
 	<key>Channel</key>
-	<string>Subscription</string>
+	<string>channel name</string>
 	<key>IsProduction</key>
 	<false/>
 	<key>IsIDFA</key>
 	<false/>
+	<key>Delay</key>
+	<false/>
 </dict>
 </plist>

src/ios/Plugins/AppDelegate+JPush.h

@@ -12,4 +12,5 @@
 
 @interface AppDelegate (JPush) <JPUSHRegisterDelegate>
 -(void)registerForRemoteNotification;
+-(void)startJPushSDK;
 @end

src/ios/Plugins/AppDelegate+JPush.m

@@ -28,24 +28,51 @@
     return [self init_plus];
 }
 
+NSDictionary *_launchOptions;
+
 -(void)applicationDidLaunch:(NSNotification *)notification{
+
     if (notification) {
         if (notification.userInfo) {
             NSDictionary *userInfo1 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
             if (userInfo1.count > 0) {
-                [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo1 toJsonString]];
+                [NSTimer scheduledTimerWithTimeInterval:0.1 repeats:YES block:^(NSTimer * _Nonnull timer) {
+                    if (SharedJPushPlugin) {
+                        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo1 toJsonString]];
+                        [timer invalidate];
+                    }
+                }];
             }
             NSDictionary *userInfo2 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey];
             if (userInfo2.count > 0) {
-                [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_StartLocalNotification jsString:[userInfo1 toJsonString]];
+                [NSTimer scheduledTimerWithTimeInterval:0.1 repeats:YES block:^(NSTimer * _Nonnull timer) {
+                    if (SharedJPushPlugin) {
+                        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo2 toJsonString]];
+                        [timer invalidate];
+                    }
+                }];
             }
         }
         [JPUSHService setDebugMode];
-        [self registerForRemoteNotification];
+
-        [JPushPlugin setupJPushSDK:notification.userInfo];
+        NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfig_FileName ofType:@"plist"];
+        NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
+        NSNumber *delay       = [plistData valueForKey:JPushConfig_Delay];
+
+        _launchOptions = notification.userInfo;
+
+        if (![delay boolValue]) {
+            [self startJPushSDK];
+        }
+
     }
 }
 
+-(void)startJPushSDK{
+    [self registerForRemoteNotification];
+    [JPushPlugin setupJPushSDK:_launchOptions];
+}
+
 -(void)registerForRemoteNotification{
     if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) {
 #ifdef NSFoundationVersionNumber_iOS_9_x_Max
@@ -75,7 +102,7 @@
 -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
     [JPUSHService handleRemoteNotification:userInfo];
 
-    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
+    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
 }
 
 -(void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler{
@@ -94,13 +121,13 @@
         default:
             break;
     }
-    [SharedJPushPlugin jpushFireDocumentEvent:eventName jsString:[userInfo toJsonString]];
+    [JPushPlugin fireDocumentEvent:eventName jsString:[userInfo toJsonString]];
     completionHandler(UIBackgroundFetchResultNewData);
 }
 
 -(void)jpushNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(NSInteger))completionHandler{
     NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:notification.request.content.userInfo];
-    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
+    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveNotification jsString:[userInfo toJsonString]];
     completionHandler(UNNotificationPresentationOptionBadge|UNNotificationPresentationOptionSound|UNNotificationPresentationOptionAlert);
 }
 
@@ -110,7 +137,7 @@
         [userInfo setValue:[response valueForKey:@"userText"] forKey:@"userText"];
     } @catch (NSException *exception) { }
     [userInfo setValue:response.actionIdentifier forKey:@"actionIdentifier"];
-    [SharedJPushPlugin jpushFireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo toJsonString]];
+    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[userInfo toJsonString]];
     completionHandler();
 }
 

src/ios/Plugins/JPushDefine.h

@@ -15,15 +15,16 @@
 
 #define WEAK_SELF(weakSelf)  __weak __typeof(&*self)weakSelf = self;
 
+static NSString *const JPushConfig_FileName     = @"JPushConfig";
 static NSString *const JPushConfig_Appkey       = @"Appkey";
 static NSString *const JPushConfig_Channel      = @"Channel";
 static NSString *const JPushConfig_IsProduction = @"IsProduction";
 static NSString *const JPushConfig_IsIDFA       = @"IsIDFA";
-static NSString *const JPushConfig_FileName     = @"PushConfig";
+static NSString *const JPushConfig_Delay        = @"Delay";
 
 static NSString *const JPushDocumentEvent_ReceiveNotification       = @"receiveNotification";
 static NSString *const JPushDocumentEvent_OpenNotification          = @"openNotification";
-static NSString *const JPushDocumentEvent_BackgroundNotification    = @"backgroundNotification";
+static NSString *const JPushDocumentEvent_BackgroundNotification    = @"backgroundNotification";
 static NSString *const JPushDocumentEvent_SetTagsWithAlias          = @"setTagsWithAlias";
 static NSString *const JPushDocumentEvent_ReceiveMessage            = @"receiveMessage";
 static NSString *const JPushDocumentEvent_StartLocalNotification    = @"startLocalNotification";

src/ios/Plugins/JPushPlugin.h

@@ -12,6 +12,9 @@
 
 }
 
+//注册通知服务并启动 SDK
+-(void)startJPushSDK:(CDVInvokedUrlCommand*)command;
+
 //以下为js中可调用接口
 //设置标签、别名
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command;
@@ -72,13 +75,13 @@
 
 # pragma mark - private
 
--(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString;
++(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString;
 
 +(void)setupJPushSDK:(NSDictionary*)userInfo;
 
 @end
 
-static JPushPlugin *SharedJPushPlugin;
+JPushPlugin *SharedJPushPlugin;
 
 @interface NSDictionary (JPush)
 -(NSString*)toJsonString;

src/ios/Plugins/JPushPlugin.m

@@ -1,3 +1,4 @@
+
 //
 //  PushTalkPlugin.m
 //  PushTalk
@@ -38,6 +39,10 @@
 
 @implementation JPushPlugin
 
+-(void)startJPushSDK:(CDVInvokedUrlCommand*)command{
+    [(AppDelegate*)[UIApplication sharedApplication].delegate startJPushSDK];
+}
+
 #pragma mark- 外部接口
 -(void)stopPush:(CDVInvokedUrlCommand*)command{
     [[UIApplication sharedApplication]unregisterForRemoteNotifications];
@@ -60,7 +65,7 @@
 
 - (void)pluginInitialize {
     NSLog(@"### pluginInitialize ");
-    SharedJPushPlugin = self;
+    [self initPlugin];
 }
 
 #else
@@ -69,14 +74,25 @@
     NSLog(@"### initWithWebView ");
     if (self=[super initWithWebView:theWebView]) {
     }
+    [self initPlugin];
     return self;
 }
 
 #endif
 
--(void)jpushFireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{
+-(void)initPlugin{
+    if (!SharedJPushPlugin) {
+        SharedJPushPlugin = self;
+    }
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(networkDidReceiveMessage:)
+                                                 name:kJPFNetworkDidReceiveMessageNotification
+                                               object:nil];
+}
+
++(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{
     dispatch_async(dispatch_get_main_queue(), ^{
-        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
+        [SharedJPushPlugin.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
     });
 }
 
@@ -306,12 +322,12 @@
                            @"tags"      :tags  == nil ? [NSNull null] : [tags allObjects],
                            @"alias"     :alias == nil ? [NSNull null] : alias
                            };
-    [self jpushFireDocumentEvent:JPushDocumentEvent_SetTagsWithAlias jsString:[dict toJsonString]];
+    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_SetTagsWithAlias jsString:[dict toJsonString]];
 }
 
 - (void)networkDidReceiveMessage:(NSNotification *)notification {
     if (notification && notification.userInfo) {
-        [self jpushFireDocumentEvent:JPushDocumentEvent_ReceiveMessage jsString:[notification.userInfo  toJsonString]];
+        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveMessage jsString:[notification.userInfo  toJsonString]];
     }
 }
 

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>
 

www/JPushPlugin.js

@@ -49,6 +49,11 @@ JPushPlugin.prototype.isPushStopped = function (callback) {
 }
 
 // iOS methods
+
+JPushPlugin.prototype.startJPushSDK = function () {
+  this.call_native('startJPushSDK', [] , null)
+}
+
 JPushPlugin.prototype.setTagsWithAlias = function (tags, alias) {
   if (tags == null) {
     this.setAlias(alias)