update Android API Doc

add Rich Push callback API.
update npm version
2026-02-08 00:05:13 +08:00 · 2016-05-13 11:23:52 +08:00 · 2016-05-13 11:04:19 +08:00 · 2016-05-13 10:57:56 +08:00 · 2016-05-13 10:49:36 +08:00 · 2016-05-13 10:34:30 +08:00
20 changed files with 276 additions and 99 deletions
--- a/API/iOS_install.md
+++ b/API/iOS_install.md
@@ -1,62 +0,0 @@
-### iOS 手动安装
-
- 下载 JPush PhoneGap 插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
-
- 用 xcode 打开 iOS 工程 将 `$JPUSH_PLUGIN_DIR`/src/ios/Plugins/ 拖到 project 中  
-
- 将 `$JPUSH_PLUGIN_DIR`/src/ios/lib/ 拖到 project 中  
-
- 添加以下框架，打开 xcode，点击 project，选择(Target -> Build Phases -> Link Binary With Libraries)
-
-		CFNetwork.framework
-		CoreFoundation.framework
-		CoreTelephony.framework
-		SystemConfiguration.framework
-		CoreGraphics.framework
-		Foundation.framework
-		UIKit.framework
-
-
- 在你的工程中创建一个新的 Property List 文件
-
-		并将其命名为 PushConfig.plist，填入 Portal 为你的应用提供的 APP_KEY 等参数
-
- 在 AppDelegate.m 中包含头文件
-
-		#import "JPUSHService.h"
-		#import "JPushPlugin.h"
-
- 在 AppDelegate.m 中的下列方法中添加代码，如果方法不存在则增加相应方法与内容
-
-		- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
-		   //原内容保持不变
-		   //Required add
-		   [JPushPlugin setLaunchOptions:launchOptions];
-		    return YES;
-		}
-		- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken   {
-		    //原内容保持不变
-		    // Required add
-		    [JPUSHService registerDeviceToken:deviceToken];
-		}
-		- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-		    //原内容保持不变
-		    // Required add
-		    [JPUSHService handleRemoteNotification:userInfo];
-    		[[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification object:userInfo];
-		}
-
- 修改 phonegap config.xml 文件用来包含 Plugin/ 内的插件
-
-
-		<feature name="JPushPlugin">
-		    <param name="ios-package" value="JPushPlugin" />
-		    <param name="onload" value="true" />
-		</feature>
-
-
- 复制 `$JPUSH_PLUGIN_DIR`/www/JPushPlugin.js 到工程的 www 目录下面  
-
- 在需要使用插件处加入
-
-		<script type="text/javascript" src="JPushPlugin.js"></script>
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@

 [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/jpush/jpush-phonegap-plugin)
-[![release](https://img.shields.io/badge/release-2.1.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-plugin)
+[![release](https://img.shields.io/badge/release-2.1.5-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)

 支持 iOS, Android 的 Cordova 推送插件。
@@ -55,14 +55,14 @@
    git clone https://github.com/jpush/jpush-phonegap-plugin.git
    cordova plugin add $JPUSH_PLUGIN_DIR  --variable API_KEY=your_jpush_appkey

-[Android 手动安装文档地址](API/Android_handle_install.md)
+[Android 手动安装文档地址](/doc/Android_handle_install.md)

-[IOS 手动安装文档地址](API/iOS_install.md)
+[IOS 手动安装文档地址](/doc/iOS_install.md)


-#### 2.安装 org.apache.cordova.device 插件
+#### 2.安装 cordova device 插件

-     cordova plugin add org.apache.cordova.device
+     cordova plugin add cordova-plugin-device


 #### 3.在 js 中调用函数，初始化 JPush
@@ -97,11 +97,11 @@ iOS:

 ### 具体的 API 请参考：

- [公共 API](https://github.com/jpush/jpush-phonegap-plugin/blob/dev/API/Common_detail_api.md)
+- [公共 API](/doc/Common_detail_api.md)

- [iOS API](https://github.com/jpush/jpush-phonegap-plugin/blob/dev/API/iOS%20API.md)
+- [iOS API](/doc/iOS_API.md)

- [Android API](https://github.com/jpush/jpush-phonegap-plugin/blob/dev/API/Android_detail_api.md)
+- [Android API](/doc/Android_detail_api.md)


 ## 常见问题
@@ -117,19 +117,18 @@ eclipse 中 import PhoneGap 工程之后出现：`Type CallbackContext cannot be

 ### 2. iOS

- 设置 / 修改 APP_KEY:
-
-    在 PushConfig.plist 中修改。
-	PushConfig.plist 中其他值说明：
-
-	- CHANNEL: 渠道标识。
-	- IsProduction: 是否生产环境（暂未启用）。
-
-
 - 收不到推送:

 	请首先按照正确方式再次配置证书、描述文件
-	[iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)。
+	[iOS 证书设置指南](http://docs.jpush.io/client/ios_tutorials/#ios_1)
+
+- 设置 PushConfig.plist：
+
+	- APP_KEY：应用标识
+	- CHANNEL：渠道标识
+	- IsProduction：是否生产环境
+	- IsIDFA：是否使用 IDFA 启动 sdk
+


 ## 更多
--- a/doc/Android_detail_api.md
+++ b/doc/Android_detail_api.md
@@ -12,7 +12,7 @@
 - [通知栏样式定制](#通知栏样式定制)
 - [设置保留最近通知条数](#设置保留最近通知条数)
 - [本地通知](#本地通知)
-
+- [富媒体页面 JavaScript 回调 API](#富媒体页面-javascript-回调-api)

 ## 接收通知时获得通知的内容

@@ -261,3 +261,64 @@ JPush SDK 提供了 2 个用于定制通知栏样式的构建类：
 - notificaitonID: 设置本地通知的 ID。
 - broadcastTime: 设置本地通知触发时间，为距离当前时间的数值，单位是毫秒。
 - extras: 设置额外的数据信息 extras 为 json 字符串。
+
+
+## 富媒体页面 JavaScript 回调 API
+富媒体推送通知时，用户可以用自定义的Javascript 函数来控制页面，如关闭当前页面，点击按钮跳转到指定的 Activity，通知应用程序做一些指定的动作等。
+
+此 API 提供的回调函数包括：关闭当前页面、打开应用的主 Activity、根据 Activity 名字打开对应的 Activity、以广播的形式传递页面参数到应用程序等功能。
+
+### API - 关闭当前页面
+
+    JPushWeb.close();   // 在富文本 HTML 页面中调用后会关闭当前页面。
+
+### API - 打开主 Activity
+
+    JPushWeb.startMainActivity(String params);
+
+在HTML中调用此函数后,会打开程序的主Activity， 并在对应的 Intent 传入参数 ”params“ ，Key 为 JPushInterface.EXTRA_EXTRA。
+
+对应 Activity 获取 params 示例代码：
+
+    Intent intent = getIntent();
+    if (null != intent ) {
+        String params = intent.getStringExtra(JPushInterface.EXTRA_EXTRA);
+    }
+
+### API - 触发应用中的操作
+
+    JPushWeb.triggerNativeAction(String params);
+
+调用了该方法后需要在 MyReceiver.java 中实现后面的业务逻辑：
+
+    if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(intent.getAction())) {
+        Log.d(TAG, "用户收到到RICH PUSH CALLBACK: " + bundle.getString(JPushInterface.EXTRA_EXTRA));
+        //在这里根据 JPushInterface.EXTRA_EXTRA 的内容触发客户端动作，比如打开新的Activity 、打开一个网页等。
+    }
+
+#### 代码示例
+
+    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+    <html>
+     <head>
+      <title>JPush Webview Test</title>
+      <script>
+           function clickButton() {
+             JPushWeb.close();
+           }
+
+          function openUrl() {
+             var json = "{'action':'open', 'url':'www.jpush.cn'}";
+             JPushWeb.triggerNativeAction(json);
+             JPushWeb.close(); //客服端在广播中收到json 后，可以打开对应的URL。
+          }
+     </script>
+     </head>
+     <body>
+         <button onclick="javascript:clickButton(this);return false;">Close</button>
+         <button onclick="javascript:JPushWeb.startMainActivity('test - startMainActivity');return false;">StartMainActivity</button>
+         <button onclick="javascript:JPushWeb.triggerNativeAction('test - triggerNativeAction');Javascript:JPushWeb.close();">triggerNativeAction and Close current webwiew</button>
+         <button onclick="javascript:JPushWeb.startActivityByName('com.example.jpushdemo.TestActivity','test - startActivityByName');">startActivityByName</button>
+         <button onclick="javascript:openUrl();">open a url</button>
+     </body>
+    </html>
--- a/doc/Android_handle_install.md
+++ b/doc/Android_handle_install.md
--- a/doc/Common_detail_api.md
+++ b/doc/Common_detail_api.md
--- a/doc/iOS_API.md
+++ b/doc/iOS_API.md
--- a/doc/iOS_install.md
+++ b/doc/iOS_install.md
@@ -0,0 +1,35 @@
+## iOS 手动安装
+
+- 下载 JPush PhoneGap Plugin 插件，并解压
+
+- 将 [/src/ios](/src/ios) 文件夹及内容在 xcode 中拖到你的工程里，并配置 [/src/ios/PushConfig.plist](/src/ios/PushConfig.plist) 中相应参数：
+
+		APP_KEY：     应用标识 
+		CHANNEL：     渠道标识
+		IsProduction：是否生产环境
+		IsIDFA：      是否使用 IDFA 启动 sdk
+
+- 打开 xcode，点击工程目录中顶部的 工程，选择(Target -> Build Phases -> Link Binary With Libraries)，添加以下框架：
+
+		CFNetwork.framework
+		CoreFoundation.framework
+		CoreTelephony.framework
+		SystemConfiguration.framework
+		CoreGraphics.framework
+		Foundation.framework
+		UIKit.framework
+		AdSupport.framework
+		libz.tbd(若存在 libz.dylib 则替换为 libz.tbd)
+
+- 修改 phonegap config.xml 文件以添加 JPushPlugin 插件
+
+		<feature name="JPushPlugin">
+		    <param name="ios-package" value="JPushPlugin" />
+		    <param name="onload" value="true" />
+		</feature>
+
+- 将 [/www/JPushPlugin.js](/www/JPushPlugin.js) 在 xcode 中拖到工程的 www 目录下面  
+
+- 在需要使用插件处加入以下代码，并根据 [iOS API](/doc/iOS_API.md) 文档说明调用相应接口
+
+		<script type="text/javascript" src="JPushPlugin.js"></script>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jpush-phonegap-plugin",
-  "version": "2.1.6",
+  "version": "2.1.7",
  "description": "JPush for cordova plugin",
  "cordova": {
    "id": "cn.jpush.phonegap.JPushPlugin",
--- 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="cn.jpush.phonegap.JPushPlugin"
-        version="2.1.6">
+        version="2.1.7">

    <name>JPush Plugin</name>
    <description>JPush for cordova plugin</description>
@@ -31,7 +31,7 @@
            <source-file src="src/ios/Plugins/JPushPlugin.m"/>

            <header-file src="src/ios/lib/JPUSHService.h" />
-            <source-file src="src/ios/lib/jpush-ios-2.1.0.a" framework="true" />
+            <source-file src="src/ios/lib/jpush-ios-2.1.6.a" framework="true" />
            <header-file src="src/ios/Plugins/AppDelegate+JPush.h"/>
            <source-file src="src/ios/Plugins/AppDelegate+JPush.m"/>
            <resource-file src="src/ios/PushConfig.plist" />
@@ -43,7 +43,8 @@
            <framework src="Foundation.framework" weak="true" />
            <framework src="UIKit.framework" weak="true" />
            <framework src="Security.framework" weak="true" />
-            <framework src="libz.dylib" weak="true" />
+            <framework src="libz.tbd" weak="true" />
+            <framework src="AdSupport.framework" weak="true" />

            <config-file target="*PushConfig.plist" parent="APP_KEY">
                <string>$API_KEY</string>
@@ -94,6 +95,13 @@
                </intent-filter>
            </activity>

+            <!-- Rich push 核心功能 since 2.0.6-->
+            <activity
+                android:name="cn.jpush.android.ui.PopWinActivity"
+                android:theme="@style/MyDialogStyle"
+                android:exported="false">
+            </activity>
+
            <!-- Required  SDK核心功能-->
            <service
                    android:name="cn.jpush.android.service.DownloadService"
@@ -165,6 +173,7 @@
            <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
            <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY"/>
        </config-file>
+
        <source-file src="src/android/jpush-android-2.1.3.jar" target-dir="libs"/>
        <source-file src="src/android/armeabi/libjpush213.so" target-dir="libs/armeabi"/>
        <source-file src="src/android/armeabi-v7a/libjpush213.so" target-dir="libs/armeabi-v7a"/>
@@ -176,5 +185,14 @@
        <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap"/>
    	<source-file src="src/android/test_notification_layout.xml" target-dir="res/layout"/>
    	<source-file src="src/android/jpush_notification_icon.png" target-dir="res/drawable"/>
+
+        <!-- Rich Push resources  -->
+        <source-file src="src/android/ic_richpush_actionbar_back.png" target-dir="res/drawable" />
+        <source-file src="src/android/ic_richpush_actionbar_divider.png" target-dir="res/drawable" />
+        <source-file src="src/android/richpush_btn_selector.xml" target-dir="res/drawable" />
+        <source-file src="src/android/jpush_popwin_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/jpush_webview_layout.xml" target-dir="res/layout" />
+        <source-file src="src/android/jpush_style.xml" target-dir="res/values" />
+
    </platform>
 </plugin>
--- a/src/android/MyReceiver.java
+++ b/src/android/MyReceiver.java
@@ -30,6 +30,10 @@ public class MyReceiver extends BroadcastReceiver {
            handlingNotificationReceive(context, intent);
        } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(action)) {
            handlingNotificationOpen(context, intent);
+        } else if (JPushInterface.ACTION_RICHPUSH_CALLBACK.equals(action)) {
+            // 当在 HTML 页面中调用 JPushWeb.triggerNativeAction(String params) 方法时触发此方法，
+            // 再进行相关的操作。
+            
        } else {
            Log.d(TAG, "Unhandled intent - " + action);
        }
--- a/src/android/ic_richpush_actionbar_back.png
+++ b/src/android/ic_richpush_actionbar_back.png
--- a/src/android/ic_richpush_actionbar_divider.png
+++ b/src/android/ic_richpush_actionbar_divider.png
--- a/src/android/jpush_popwin_layout.xml
+++ b/src/android/jpush_popwin_layout.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/popLayoutId"
+    style="@style/MyDialogStyle"
+    android:orientation="vertical"
+    android:layout_width="280dp"
+    android:layout_height="250dp" >
+
+        <WebView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/wvPopwin"/>
+
+</LinearLayout>
--- a/src/android/jpush_style.xml
+++ b/src/android/jpush_style.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <style name="MyDialogStyle">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:backgroundDimEnabled">true</item>
+    </style>
+</resources>
--- a/src/android/jpush_webview_layout.xml
+++ b/src/android/jpush_webview_layout.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cn.jpush.android.ui.FullScreenView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/actionbarLayoutId"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <RelativeLayout
+        android:id="@+id/rlRichpushTitleBar"
+        android:layout_width="match_parent"
+        android:layout_height="40.0dp"
+        android:background="#29313a">
+
+        <ImageButton
+            android:id="@+id/imgRichpushBtnBack"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/richpush_btn_selector" />
+
+        <ImageView
+            android:id="@+id/imgView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/imgRichpushBtnBack"
+            android:clickable="false"
+            android:src="@drawable/ic_richpush_actionbar_divider" />
+
+        <TextView
+            android:id="@+id/tvRichpushTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="7dp"
+            android:layout_toRightOf="@id/imgView"
+            android:clickable="false"
+            android:text=" "
+            android:textSize="20sp"
+            android:textColor="#ffffff" />
+    </RelativeLayout>
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/fullWebView"
+        android:background="#000000" />
+
+</cn.jpush.android.ui.FullScreenView>
--- a/src/android/richpush_btn_selector.xml
+++ b/src/android/richpush_btn_selector.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?> 
+<selector xmlns:android="http://schemas.android.com/apk/res/android" > 
+    <!-- 获得焦点但未按下时的背景图片 --> 
+    <item 
+        android:state_focused="true" 
+        android:state_enabled="true" 
+        android:state_pressed="false" 
+        android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+     <!-- 按下时的背景图片 --> 
+    <item 
+        android:state_enabled="true" 
+        android:state_pressed="true" 
+        android:drawable="@android:color/darker_gray" /> 
+    <!-- 按下时的背景图片 --> 
+    <item 
+        android:state_enabled="true" 
+        android:state_checked="true" 
+        android:drawable="@android:color/darker_gray" /> 
+    <!-- 默认时的背景图片 --> 
+    <item android:drawable="@drawable/ic_richpush_actionbar_back" /> 
+</selector> 
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -9,10 +9,12 @@
 #import "JPushPlugin.h"
 #import "JPUSHService.h"
 #import <UIKit/UIKit.h>
+#import <AdSupport/AdSupport.h>

-static NSString *const JM_APP_KEY = @"APP_KEY";
-static NSString *const JM_APP_CHANNEL = @"CHANNEL";
-static NSString *const JM_APP_ISPRODUCTION = @"IsProduction";
+static NSString *const JP_APP_KEY = @"APP_KEY";
+static NSString *const JP_APP_CHANNEL = @"CHANNEL";
+static NSString *const JP_APP_ISPRODUCTION = @"IsProduction";
+static NSString *const JP_APP_ISIDFA = @"IsIDFA";
 static NSString *const JPushConfigFileName = @"PushConfig";
 static NSDictionary *_luanchOptions = nil;

@@ -273,17 +275,26 @@ static NSDictionary *_luanchOptions = nil;
    }

    NSMutableDictionary *plistData = [[NSMutableDictionary alloc] initWithContentsOfFile:plistPath];
-    NSString * appkey       = [plistData valueForKey:JM_APP_KEY];
-    NSString * channel      = [plistData valueForKey:JM_APP_CHANNEL];
-    NSNumber * isProduction = [plistData valueForKey:JM_APP_ISPRODUCTION];
+    NSString * appkey       = [plistData valueForKey:JP_APP_KEY];
+    NSString * channel      = [plistData valueForKey:JP_APP_CHANNEL];
+    NSNumber * isProduction = [plistData valueForKey:JP_APP_ISPRODUCTION];
+    NSNumber *isIDFA        = [plistData valueForKey:JP_APP_ISIDFA];

    if (!appkey || appkey.length == 0) {
        NSLog(@"error: app key not found in PushConfig.plist ");
        assert(0);
    }

-    [JPUSHService setupWithOption:_luanchOptions appKey:appkey
-                          channel:channel apsForProduction:[isProduction boolValue] ];
+    NSString *advertisingId = nil;
+    if(isIDFA){
+        advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
+    }
+    [JPUSHService setupWithOption:_luanchOptions
+                           appKey:appkey
+                          channel:channel
+                 apsForProduction:[isProduction boolValue]
+            advertisingIdentifier:advertisingId];
+
 }

 #pragma mark 将参数返回给js
--- a/src/ios/PushConfig.plist
+++ b/src/ios/PushConfig.plist
@@ -8,5 +8,7 @@
 	<string>Subscription</string>
 	<key>IsProduction</key>
 	<false/>
+	<key>IsIDFA</key>
+	<true/>
 </dict>
 </plist>
--- a/src/ios/lib/JPUSHService.h
+++ b/src/ios/lib/JPUSHService.h
@@ -9,7 +9,7 @@
 * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved.
 */

-#define JPUSH_VERSION_NUMBER 2.1.0
+#define JPUSH_VERSION_NUMBER 2.1.6

 #import <Foundation/Foundation.h>

@@ -51,6 +51,7 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
 * @param appKey 一个JPush 应用必须的,唯一的标识. 请参考 JPush 相关说明文档来获取这个标识.
 * @param channel 发布渠道. 可选.
 * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES.
+ * @param advertisingIdentifier 广告标识符（IDFA） 如果不需要使用IDFA，传nil.
 *
 * @discussion 提供SDK启动必须的参数, 来启动 SDK.
 * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作.
@@ -61,6 +62,13 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
       apsForProduction:(BOOL)isProduction;


+ (void)setupWithOption:(NSDictionary *)launchingOption
+                 appKey:(NSString *)appKey
+                channel:(NSString *)channel
+       apsForProduction:(BOOL)isProduction
+  advertisingIdentifier:(NSString *)advertisingId;
+
+
 ///----------------------------------------------------
 /// @name APNs about 通知相关
 ///----------------------------------------------------
@@ -78,6 +86,7 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示

 + (void)registerDeviceToken:(NSData *)deviceToken;

+
 /*!
 * @abstract 处理收到的 APNs 消息
 */
@@ -97,7 +106,7 @@ extern NSString *const kJPFServiceErrorNotification;  // 错误提示
 + (void) setTags:(NSSet *)tags
           alias:(NSString *)alias
 callbackSelector:(SEL)cbSelector
-          target:(id)theTarget;
+          target:(id)theTarget __attribute__((deprecated("JPush 2.1.1 版本已过期")));;

 + (void) setTags:(NSSet *)tags
           alias:(NSString *)alias
@@ -108,9 +117,9 @@ callbackSelector:(SEL)cbSelector
 callbackSelector:(SEL)cbSelector
          object:(id)theTarget;

-+ (void)      setTags:(NSSet *)tags
-                alias:(NSString *)alias
-fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler;
+ (void)setTags:(NSSet *)tags
+          alias:(NSString *)alias
+    fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler;

 + (void)  setTags:(NSSet *)tags
 aliasInbackground:(NSString *)alias;
--- a/src/ios/lib/jpush-ios-2.1.6.a
+++ b/src/ios/lib/jpush-ios-2.1.6.a
Author	SHA1	Message	Date
Hevin	380c09283d	update Android API Doc add Rich Push callback API.	2016-05-13 11:23:52 +08:00
Hevin	730b93d82a	update npm version	2016-05-13 11:04:19 +08:00
Hevin	39d65d61c8	Merge branch 'dev'	2016-05-13 10:57:56 +08:00
Hevin	4ed844e0c5	support rich push.	2016-05-13 10:49:36 +08:00
Hevin	1f2499a893	Merge branch 'master' into dev	2016-05-13 10:34:30 +08:00
Hevin	bca6853a4e	Merge branch 'dev'	2016-05-10 14:12:57 +08:00
Hevin	0015cd23e4	update README	2016-05-10 14:11:29 +08:00
Hevin	8b5efdcdcc	Merge branch 'master' into dev	2016-05-10 14:11:16 +08:00
Hevin	4bc24e66d4	Merge branch 'dev'	2016-04-28 09:27:32 +08:00
Hevin	53dcfa0087	update READEME 更新 cordova device 插件安装命令。	2016-04-28 09:25:42 +08:00
Hevin	c9755d4f64	Merge branch 'master' into dev	2016-04-28 09:24:01 +08:00
E.B	6409ce4934	Merge branch 'dev'	2016-04-27 10:37:30 +08:00
E.B	aa3a4a218c	iOS - update 1.更新目录 2.更新 README.md 3.重写 iOS_install.md	2016-04-26 14:43:52 +08:00
E.B	79fb3b76ca	iOS - update 1.更新 iOS sdk 2.更改启动 sdk 的方法 3.PushConfig.plist 添加 isIDFA 字段	2016-04-26 14:02:35 +08:00