Merge branch 'dev'

README.md

@@ -1,7 +1,7 @@
 # JPush PhoneGap / Cordova Plugin
 
 [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin)
-[![release](https://img.shields.io/badge/release-3.2.12-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases)
+[![release](https://img.shields.io/badge/release-3.2.6-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)
 

doc/Android_detail_api.md

@@ -1,5 +1,7 @@
 # Android API 简介
 
+- [注册成功事件](#注册成功事件)
+- [获取集成日志（同时适用于 iOS）](#获取集成日志同时适用于-ios)
 - [清除通知](#清除通知)
 - [设置允许推送时间](#设置允许推送时间)
 - [设置通知静默时间](#设置通知静默时间)
@@ -7,6 +9,19 @@
 - [设置保留最近通知条数](#设置保留最近通知条数)
 - [本地通知](#本地通知)
 
+## 注册成功事件
+### jpush.receiveRegistrationId
+集成了 JPush SDK 的应用程序在第一次成功注册到 JPush 服务器时，JPush 服务器会给客户端返回一个唯一的该设备的标识 - RegistrationID。
+就会触发这个事件（注意只有第一次会触发该事件，之后如果想要取到 registrationId，可以直接调用 *getRegistrationID* 方法）。
+
+#### 代码示例
+
+```js
+document.addEventListener('jpush.receiveRegistrationId', function (event) {
+  console.log(event.registrationId)
+}, false)
+```
+
 ## 获取集成日志（同时适用于 iOS）
 
 ### API - setDebugMode

doc/Common_detail_api.md

@@ -1,52 +1,15 @@
 # 通用 API 说明（同时适用于 Android 和 iOS 系统）
 
-- [注册成功事件](#注册成功事件)
-  - [jpush.receiveRegistrationId](#jpushreceiveregistrationid)
-- [初始化、停止与恢复推送服务](#初始化停止与恢复推送服务)
-  - [init](#init)
-  - [stopPush](#stoppush)
-  - [resumePush](#resumepush)
-  - [isPushStopped](#ispushstopped)
-- [开启 Debug 模式](#开启-debug-模式)
-  - [setDebugMode](#setdebugmode)
+- [停止与恢复推送服务](#停止与恢复推送服务)
 - [获取 RegistrationID](#获取-registrationid)
-  - [getRegistrationID](#getregistrationid)
 - [设置别名与标签](#设置别名与标签)
-  - [setAlias](#setalias)
-  - [deleteAlias](#deletealias)
-  - [getAlias](#getalias)
-  - [setTags](#settags)
-  - [addTags](#addtags)
-  - [deleteTags](#deletetags)
-  - [cleanTags](#cleantags)
-  - [getAllTags](#getalltags)
-  - [checkTagBindState](#checktagbindstate)
 - [获取点击通知内容](#获取点击通知内容)
-  - [event - jpush.openNotification](#event---jpushopennotification)
 - [获取通知内容](#获取通知内容)
-  - [event - jpush.receiveNotification](#event---jpushreceivenotification)
 - [获取自定义消息推送内容](#获取自定义消息推送内容)
-  - [event - jpush.receiveMessage](#event---jpushreceivemessage)
 - [判断系统设置中是否允许当前应用推送](#判断系统设置中是否允许当前应用推送)
 
-## 注册成功事件
-
-### jpush.receiveRegistrationId
-
-集成了 JPush SDK 的应用程序在第一次成功注册到 JPush 服务器时，JPush 服务器会给客户端返回一个唯一的该设备的标识 - Registration ID。
-此时就会触发这个事件（注意只有第一次会触发该事件，之后如果想要取到 Registration Id，可以直接调用 `getRegistrationID` 方法）。
-
-#### 代码示例
-
-```js
-document.addEventListener('jpush.receiveRegistrationId', function (event) {
-  console.log(event.registrationId)
-}, false)
-```
-
-## 初始化、停止与恢复推送服务
-
-### init
+## 停止与恢复推送服务
+### API - init
 
 调用此 API，用来开启 JPush SDK 提供的推送服务。
 
@@ -64,7 +27,7 @@ document.addEventListener('jpush.receiveRegistrationId', function (event) {
 window.JPush.init()
 ```
 
-### stopPush
+### API - stopPush
 
 - Android:
   - 开发者 App 可以通过调用停止推送服务 API 来停止极光推送服务，当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
@@ -83,7 +46,7 @@ window.JPush.init()
 window.JPush.stopPush()
 ```
 
-### resumePush
+### API - resumePush
 
 恢复推送服务。调用了此 API 后:
 
@@ -99,7 +62,7 @@ window.JPush.stopPush()
 window.JPush.resumePush()
 ```
 
-### isPushStopped
+### API - isPushStopped
 
 - Android 平台:
   - 用来检查 Push Service 是否已经被停止。
@@ -130,7 +93,7 @@ window.JPush.isPushStopped(function (result) {
 ```
 
 ## 开启 Debug 模式
-### setDebugMode
+### API - setDebugMode
 用于开启 Debug 模式，显示更多的日志信息。
 
 #### 代码示例
@@ -140,13 +103,11 @@ window.JPush.setDebugMode(true)
 ```
 
 #### 参数说明
-
-- true: 开启 Debug 模式；
-- false: 关闭 Debug 模式，不显示错误信息之外的日志信息。
+- isOpen: true，开启 Debug 模式；false，关闭 Debug 模式，不显示错误信息之外的日志信息。
 
 ## 获取 RegistrationID
 
-### getRegistrationID
+### API - getRegistrationID
 
 RegistrationID 定义:
 
@@ -400,7 +361,7 @@ window.JPush.checkTagBindState({ sequence: 1, tag: 'tag1' },
 
 ### event - jpush.openNotification
 
-点击通知进入应用程序时触发。
+点击通知进入应用程序时会出发改事件。
 
 #### 代码示例
 
@@ -417,6 +378,8 @@ document.addEventListener("jpush.openNotification", function (event) {
 }, false)
 ```
 
+> ps：点击通知后传递的 json object 保存在 window.JPush.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+
 - Android:
 
 ```json
@@ -455,7 +418,7 @@ document.addEventListener("jpush.openNotification", function (event) {
 
 ### event - jpush.receiveNotification
 
-收到通知时触发。
+收到通知时会触发该事件。
 
 #### 代码示例
 
@@ -473,6 +436,8 @@ document.addEventListener("jpush.receiveNotification", function (event) {
 }, false)
 ```
 
+> ps：点击通知后传递的 json object 保存在 window.JPush.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+
 - Android:
 
 ```json
@@ -511,7 +476,7 @@ document.addEventListener("jpush.receiveNotification", function (event) {
 
 ### event - jpush.receiveMessage
 
-收到自定义消息时触发，推荐使用事件的方式传递。
+收到自定义消息时触发这个事件，推荐使用事件的方式传递。
 
 但同时保留了 `receiveMessageIniOSCallback` 的回调函数，兼容以前的代码。
 
@@ -530,6 +495,8 @@ document.addEventListener("jpush.receiveMessage", function (event) {
 }, false)
 ```
 
+> ps：点击通知后传递的 json object 保存在 window.JPush.receiveMessage，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意。
+
 - Android:
 
 ```json

doc/iOS_API.md

@@ -143,7 +143,7 @@ window.JPush.getRegistrationID(function(data) {
 
 #### event - jpush.openNotification
 
-点击通知启动或唤醒应用程序时会触发该事件
+点击通知启动或唤醒应用程序时会出发该事件
 
 #### 代码示例
 
@@ -437,7 +437,9 @@ window.JPush.clearAllLocalNotifications()
 
 监听 [jpush.receiveNotification](#前台收到推送)、[jpush.openNotification](点击推送通知)，获取推送内容后，通过获取到的 `__JPUSHNotificationKey` 字段（[本地通知](#本地通知) 设置的 `notificationID`）来判断是本地通知，并处理。
 
+### 点击本地通知横幅启动 App
 
+监听 `jpush.startLocalNotification` 事件。
 
 ## 页面的统计
 
@@ -716,10 +718,18 @@ window.JPush.getUserNotificationSettings(callback)
 
 [iOS 7 以后后台收到远程通知](#后台收到推送)
 
+### jpush.setTagsWithAlias
+
+[设置标签别名回调](#返回值说明)
+
 ### jpush.receiveMessage
 
 [获取自定义消息内容](#获取自定义消息内容)
 
+### jpush.startLocalNotification
+
+[点击本地通知横幅启动 App](#点击本地通知横幅启动-app)
+
 ### jpush.receiveLocalNotification
 
 [iOS 10 before 收到本地通知](#ios-10-before-收到本地通知)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "jpush-phonegap-plugin",
-    "version": "3.2.12",
+    "version": "3.2.6",
     "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.2.12">
+  version="3.2.6">
 
     <name>JPush</name>
     <description>JPush for cordova plugin</description>
@@ -38,7 +38,7 @@
         <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.7.a" framework="true" />
+        <source-file src="src/ios/lib/jpush-ios-3.0.6.a" framework="true" />
         <resource-file src="src/ios/JPushConfig.plist" />
 
         <framework src="CFNetwork.framework" weak="true" />

src/android/JPushPlugin.java

@@ -527,6 +527,24 @@ public class JPushPlugin extends CordovaPlugin {
         eventCallbackMap.put(sequence, callbackContext);
     }
 
+    void setTagsWithAlias(JSONArray data, CallbackContext callbackContext) {
+        HashSet<String> tags = new HashSet<String>();
+        String alias;
+        try {
+            alias = data.getString(0);
+            JSONArray tagsArray = data.getJSONArray(1);
+            for (int i = 0; i < tagsArray.length(); i++) {
+                tags.add(tagsArray.getString(i));
+            }
+            JPushInterface.setAliasAndTags(mContext,
+                    alias, tags, mTagWithAliasCallback);
+            callbackContext.success();
+        } catch (JSONException e) {
+            e.printStackTrace();
+            callbackContext.error("Error reading tagAlias JSON");
+        }
+    }
+
     void getConnectionState(JSONArray data, CallbackContext callback) {
         boolean isConnected = JPushInterface.getConnectionState(cordovaActivity.getApplicationContext());
         callback.success(String.valueOf(isConnected));
@@ -535,7 +553,8 @@ public class JPushPlugin extends CordovaPlugin {
     /**
      *   自定义通知行为，声音、震动、呼吸灯等。
      */
-    void setBasicPushNotificationBuilder(JSONArray data, CallbackContext callbackContext) {
+    void setBasicPushNotificationBuilder(JSONArray data,
+                                         CallbackContext callbackContext) {
         BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder(
                 this.cordova.getActivity());
         builder.developerArg0 = "Basic builder 1";

src/ios/Plugins/AppDelegate+JPush.m

@@ -28,36 +28,29 @@
     return [self init_plus];
 }
 
+-(void)fireOpenNotification:(NSTimer*)timer{
+    if (SharedJPushPlugin) {
+        [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[timer.userInfo toJsonString]];
+        [timer invalidate];
+    }
+}
+
 NSDictionary *_launchOptions;
 -(void)applicationDidLaunch:(NSNotification *)notification{
 
-    if (!_jpushEventCache) {
-        _jpushEventCache = @{}.mutableCopy;
-    }
-
-    [JPUSHService registrationIDCompletionHandler:^(int resCode, NSString *registrationID) {
-      NSDictionary *event = @{@"registrationId": registrationID?:@""};
-      [JPushPlugin fireDocumentEvent:JPushDocumentEvent_receiveRegistrationId jsString:[event toJsonString]];
-    }];
 
     if (notification) {
         if (notification.userInfo) {
-          
-          if ([notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey]) {
-            [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[notification.userInfo toJsonString]];
+            NSDictionary *userInfo1 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+            if (userInfo1.count > 0) {
+                [NSTimer scheduledTimerWithTimeInterval:0.01 target:self selector:@selector(fireOpenNotification:) userInfo:userInfo1 repeats:YES];
             }
 
-          if ([notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey]) {
-            UILocalNotification *localNotification = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey];
-            
-            NSDictionary* localNotificationEvent = @{@"content":localNotification.alertBody,
-                                                     @"badge": @(localNotification.applicationIconBadgeNumber),
-                                                     @"extras":localNotification.userInfo,
-                                                     };
-            [JPushPlugin fireDocumentEvent:JPushDocumentEvent_OpenNotification jsString:[localNotificationEvent toJsonString]];
+            NSDictionary *userInfo2 = [notification.userInfo valueForKey:UIApplicationLaunchOptionsLocalNotificationKey];
+            if (userInfo2.count > 0) {
+                [NSTimer scheduledTimerWithTimeInterval:0.01 target:self selector:@selector(fireOpenNotification:) userInfo:userInfo2 repeats:YES];
             }
         }
-      
         [JPUSHService setDebugMode];
 
         NSString *plistPath = [[NSBundle mainBundle] pathForResource:JPushConfig_FileName ofType:@"plist"];
@@ -77,11 +70,6 @@ NSDictionary *_launchOptions;
     [JPushPlugin setupJPushSDK:_launchOptions];
 }
 
-- (void)jpushSDKDidLoginNotification {
-  NSDictionary *event = @{@"registrationId": JPUSHService.registrationID};
-  [JPushPlugin fireDocumentEvent:JPushDocumentEvent_receiveRegistrationId jsString:[event toJsonString]];
-}
-
 -(void)registerForRemoteNotification{
     if ([[UIDevice currentDevice].systemVersion floatValue] >= 10.0) {
 #ifdef NSFoundationVersionNumber_iOS_9_x_Max
@@ -153,12 +141,7 @@ NSDictionary *_launchOptions;
 }
 
 - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification {
-  NSDictionary* localNotificationEvent = @{@"content":notification.alertBody,
-                                           @"badge": @(notification.applicationIconBadgeNumber),
-                                           @"extras":notification.userInfo,
-                                           };
-  
-    [[NSNotificationCenter defaultCenter] postNotificationName:JPushDocumentEvent_ReceiveLocalNotification object:localNotificationEvent];
+    [[NSNotificationCenter defaultCenter] postNotificationName:JPushDocumentEvent_ReceiveLocalNotification object:notification.userInfo];
 }
 
 - (void)applicationWillEnterForeground:(UIApplication *)application {

src/ios/Plugins/JPushDefine.h

@@ -27,6 +27,7 @@ static NSString *const JPushDocumentEvent_OpenNotification          = @"openNoti
 static NSString *const JPushDocumentEvent_BackgroundNotification    = @"backgroundNotification";
 static NSString *const JPushDocumentEvent_SetTagsWithAlias          = @"setTagsWithAlias";
 static NSString *const JPushDocumentEvent_ReceiveMessage            = @"receiveMessage";
+static NSString *const JPushDocumentEvent_StartLocalNotification    = @"startLocalNotification";
 static NSString *const JPushDocumentEvent_ReceiveLocalNotification  = @"receiveLocalNotification";
 
-static NSString *const JPushDocumentEvent_receiveRegistrationId     = @"receiveRegistrationId";
+

src/ios/Plugins/JPushPlugin.h

@@ -8,8 +8,6 @@
 
 #import <Cordova/CDV.h>
 
-static NSMutableDictionary *_jpushEventCache;
-
 @interface JPushPlugin : CDVPlugin{
 
 }
@@ -19,6 +17,8 @@ static NSMutableDictionary *_jpushEventCache;
 
 //以下为js中可调用接口
 //设置标签、别名
+-(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command;
+
 -(void)setTags:(CDVInvokedUrlCommand*)command;
 -(void)addTags:(CDVInvokedUrlCommand*)command;
 -(void)deleteTags:(CDVInvokedUrlCommand*)command;
@@ -76,6 +76,7 @@ static NSMutableDictionary *_jpushEventCache;
 /*
  *  以下为js中可监听到的事件
  *  jpush.openNotification      点击推送消息启动或唤醒app
+ *  jpush.setTagsWithAlias      设置标签、别名完成
  *  jpush.receiveMessage        收到自定义消息
  *  jpush.receiveNotification   前台收到推送
  *  jpush.backgroundNotification 后台收到推送
@@ -89,7 +90,7 @@ static NSMutableDictionary *_jpushEventCache;
 
 @end
 
-static JPushPlugin *SharedJPushPlugin;
+JPushPlugin *SharedJPushPlugin;
 
 @interface NSDictionary (JPush)
 -(NSString*)toJsonString;

src/ios/Plugins/JPushPlugin.m

@@ -79,39 +79,29 @@
                                              selector:@selector(networkDidReceiveMessage:)
                                                  name:kJPFNetworkDidReceiveMessageNotification
                                                object:nil];
-  [[NSNotificationCenter defaultCenter] addObserver:self
-                                           selector:@selector(receiveLocalNotification:)
-                                               name:JPushDocumentEvent_ReceiveLocalNotification
-                                             object:nil];
-  [self dispatchJPushCacheEvent];
-}
-
-- (void)dispatchJPushCacheEvent {
-  for (NSString* key in _jpushEventCache) {
-    NSArray *evenList = _jpushEventCache[key];
-    for (NSString *event in evenList) {
-        [JPushPlugin fireDocumentEvent:key jsString:event];
-    }
-  }
 }
 
 +(void)fireDocumentEvent:(NSString*)eventName jsString:(NSString*)jsString{
-  if (SharedJPushPlugin) {
     dispatch_async(dispatch_get_main_queue(), ^{
         [SharedJPushPlugin.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.%@',%@)", eventName, jsString]];
     });
-    return;
 }
 
-  if (!_jpushEventCache) {
-    _jpushEventCache = @{}.mutableCopy;
-  }
+-(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
+    NSString *alias = [command argumentAtIndex:0];
+    NSArray  *tags  = [command argumentAtIndex:1];
 
-  if (!_jpushEventCache[eventName]) {
-    _jpushEventCache[eventName] = @[].mutableCopy;
+    [JPUSHService setTags:[NSSet setWithArray:tags]
+                    alias:alias
+    fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) {
+        CDVPluginResult *result;
+        if (iResCode == 0) {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil];
+        } else {
+            result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil];
         }
-  
-  [_jpushEventCache[eventName] addObject: jsString];
+        [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
+    }];
 }
 
 -(void)setTags:(CDVInvokedUrlCommand*)command {
@@ -374,50 +364,14 @@
 }
 
 -(void)setLocalNotification:(CDVInvokedUrlCommand*)command{
-  NSNumber     *delay = [command argumentAtIndex:0];
+    NSLog(@"ios 10 after please use UNNotificationRequest to set local notification, see apple doc to learn more");
+
+    NSDate       *date  = [NSDate dateWithTimeIntervalSinceNow:[[command argumentAtIndex:0] intValue]];
     NSString     *alert = [command argumentAtIndex:1];
     NSNumber     *badge = [command argumentAtIndex:2];
     NSString     *idKey = [command argumentAtIndex:3];
-  NSDictionary *userInfo  = [command argumentAtIndex:4];
-  
-  JPushNotificationContent *content = [[JPushNotificationContent alloc] init];
-  
-  if (alert) {
-    content.body = alert;
-  }
-  
-  if (badge) {
-    content.badge = badge;
-  }
-  
-  if (userInfo) {
-    content.userInfo = userInfo;
-  }
-  
-  JPushNotificationTrigger *trigger = [[JPushNotificationTrigger alloc] init];
-  if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 10.0) {
-    if (delay) {
-      trigger.timeInterval = [delay doubleValue];
-    }
-  } else {
-    if (delay) {
-      trigger.fireDate = [NSDate dateWithTimeIntervalSinceNow:[[command argumentAtIndex:0] intValue]];
-    }
-  }
-  
-  JPushNotificationRequest *request = [[JPushNotificationRequest alloc] init];
-  request.content = content;
-  request.trigger = trigger;
-  
-  if (idKey) {
-    request.requestIdentifier = idKey;
-  }
-  
-  request.completionHandler = ^(id result) {
-    NSLog(@"result");
-  };
-  
-  [JPUSHService addNotification:request];
+    NSDictionary *dict  = [command argumentAtIndex:4];
+    [JPUSHService setLocalNotification:date alertBody:alert badge:badge.intValue alertAction:nil identifierKey:idKey userInfo:dict soundName:nil];
 }
 
 -(void)deleteLocalNotificationWithIdentifierKey:(CDVInvokedUrlCommand*)command{
@@ -566,10 +520,4 @@
     }
 }
 
--(void)receiveLocalNotification:(NSNotification *)notification {
-  if (notification && notification.object) {
-    [JPushPlugin fireDocumentEvent:JPushDocumentEvent_ReceiveLocalNotification
-                          jsString:[notification.object toJsonString]];
-  }
-}
 @end

src/ios/lib/JPUSHService.h

@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 3.0.7
+#define JPUSH_VERSION_NUMBER 3.0.6
 
 #import <Foundation/Foundation.h>
 

www/JPushPlugin.js

@@ -70,6 +70,20 @@ JPushPlugin.prototype.clearLocalNotifications = function () {
   }
 }
 
+JPushPlugin.prototype.setTagsWithAlias = function (tags, alias, successCallback, errorCallback) {
+  if (tags == null) {
+    this.setAlias(alias)
+    return
+  }
+  if (alias == null) {
+    this.setTags(tags)
+    return
+  }
+  var arrayTagWithAlias = [tags]
+  arrayTagWithAlias.unshift(alias)
+  this.callNative('setTagsWithAlias', arrayTagWithAlias, successCallback, errorCallback)
+}
+
 /**
  * 设置标签。
  * 注意：该接口是覆盖逻辑，而不是增量逻辑。即新的调用会覆盖之前的设置。