fix fir android sdk 1.7.5 plugin.xml

change iOS sdk from v1.8.2 to 1.8.3
change android sdk form 1.7.3 to 1.7.5
2026-02-08 00:05:13 +08:00 · 2015-07-10 17:45:19 +08:00 · 2015-07-10 17:45:19 +08:00 · 2015-07-10 17:45:18 +08:00 · 2015-07-10 17:45:18 +08:00 · 2015-07-10 17:45:18 +08:00
23 changed files with 1927 additions and 392 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
--- a/README.md
+++ b/README.md
@@ -1,255 +1,230 @@
-## JPush PhoneGap Plugin ##
-###创建项目###
+l## JPush PhoneGap Plugin ##
+
+
+###准备工作
+
 1. cordova create 文件夹名字 包名 应用名字
-```
-cordova create Myproj com.myproj.jpush MyTestProj
-```

+		cordova create Myproj com.myproj.jpush MyTestProj
+		
 2. 添加平台
-```	
-cd Myproj :不进行这一步可能会出现[RangeError:Maximum call stack size exceeded]
-cordova platform add android  
-```

-### Android自动安装 ###
+		cd Myproj 
+		cordova platform add android  
+		cordova platform add ios

-1. 使用 phonegap 或者 cordova cli 添加插件(建议在git客户端下使用，在windows 的cmd界面下 该命令提示git command line tool 不可用):
-```
-cordova plugin add https://github.com/jpush/jpush-phonegap-plugin.git
-```
+		ps:这里请注意iOS平台，必须先执行 `cordova platform add ios`,
+		然后再执行`cordova plugin add xxxxx`命令，不然有一些必须要的链接库需要手动添加
+		

-2. 修改www/config.xml文件，添加或者覆盖以下字段
+###Cordova CLI/Phonegap 安装 Android & iOS

-####IOS使用PhoneGap/Cordova CLI自动安装
-
-1.使用PhoneGap/Cordova CLI命令安装
-```
-cordova plugin add https://github.com/zhangqinghe/test.phonegap.git
-cordova platforms add ios
-cordova build ios
-```
-
-2.修改Resources/PushConfig.plist文件
-```
-在APP_KEY和CHANNLE字段 分别添加您的appkey和channle
-```
-3.添加监听系统事件，相应地调用 JPush SDK 提供的 API 来实现功能
-```
-
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
-    self.window.backgroundColor = [UIColor whiteColor];
-    [self.window makeKeyAndVisible];
-    // Required
-    [APService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
-                                                    UIRemoteNotificationTypeSound |
-                                                    UIRemoteNotificationTypeAlert)];
-    // Required
-    [APService setupWithOption:launchOptions];
-    return YES;
-}
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-    // Required
-    [APService registerDeviceToken:deviceToken];
-}
- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-    // Required
-    [APService handleRemoteNotification:userInfo];
-}
-```
+3. 使用git命令将jpush phonegap插件下载的本地,将这个目录标记为`$JPUSH_PLUGIN_DIR`
+		
+		git clone https://github.com/jpush/jpush-phonegap-plugin.git


-###Android 手工安装###
-1. 复制src/android/*.java 到cn/jpush/phonega/目录下(即：cn.jpush.phonegap的包下)
-2. 复制src/android/armeabi/libjpush.so 到lib/armeabi/
-3. 复制src/android/jpush-sdk-release1.5.0.jar 到lib/
-4. 复制src/android/test_notification_layout.xml到res/layout/
-5. 复制src/android/jpush_notification_icon.png 到res/drawable/
-6. 修改 AndroidManifest.xml 在 manifest 节点下添加以下权限
+4. 将`$JPUSH_PLUGIN_DIR/plugin.xml`文件中的AppKey替换为在Portal上注册该应用的的Key,例如（9fed5bcb7b9b87413678c407）
+		
+		<meta-data android:name="JPUSH_APPKEY" android:value="your appkey"/>

-```
-        <!-- Required  一些系统要求的权限，如访问网络等-->
-        <uses-permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"/>
-        <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
-        <uses-permission android:name="android.permission.INTERNET"/>
-        <uses-permission android:name="android.permission.WAKE_LOCK"/>
-        <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-        <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-        <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-        <uses-permission android:name="android.permission.VIBRATE"/>
-        <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-        <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-        <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-        <permission
-                android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
-                android:protectionLevel="signature"/>
-```
-7. 修改AndroidManifest.xml 在 manifest/application 节点下添加SDK相关组件声明
+5. 在`$JPUSH_PLUGIN_DIR/src/android/JPushPlugin.java` 文件`import your.package.name.R`替换为在Portal上注册该应用的包名，例如(com.thi.pushtest)

-```
-	 <activity
-                    android:name="cn.jpush.android.ui.PushActivity"
-                    android:theme="@android:style/Theme.Translucent.NoTitleBar"
-                    android:configChanges="orientation|keyboardHidden">
-                <intent-filter>
-                    <action android:name="cn.jpush.android.ui.PushActivity"/>
-                    <category android:name="android.intent.category.DEFAULT"/>
-                    <category android:name="$PACKAGE_NAME"/>
-                </intent-filter>
-            </activity>
-            <!-- Required  SDK核心功能-->
-            <service
-                    android:name="cn.jpush.android.service.DownloadService"
-                    android:enabled="true"
-                    android:exported="false">
-            </service>
-            <!-- Required SDK 核心功能-->
-            <service
-                    android:name="cn.jpush.android.service.PushService"
-                    android:enabled="true"
-                    android:exported="false">
-                <intent-filter>
-                    <action android:name="cn.jpush.android.intent.REGISTER"/>
-                    <action android:name="cn.jpush.android.intent.REPORT"/>
-                    <action android:name="cn.jpush.android.intent.PushService"/>
-                    <action android:name="cn.jpush.android.intent.PUSH_TIME"/>

-                </intent-filter>
-            </service>
-            <!-- Required SDK核心功能-->
-            <receiver
-                    android:name="cn.jpush.android.service.PushReceiver"
-                    android:enabled="true">
-                <intent-filter android:priority="1000">
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
-                    <!--Required  显示通知栏 -->
-                    <category android:name="$PACKAGE_NAME"/>
-                </intent-filter>
-                <intent-filter>
-                    <action android:name="android.intent.action.USER_PRESENT"/>
-                    <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
-                </intent-filter>
-                <!-- Optional -->
-                <intent-filter>
-                    <action android:name="android.intent.action.PACKAGE_ADDED"/>
-                    <action android:name="android.intent.action.PACKAGE_REMOVED"/>
-                    <data android:scheme="package"/>
-                </intent-filter>
-            </receiver>
+6. cordova cli 添加jpush phonegap插件和依赖的device插件: 

-            <!-- User defined.  For test only  用户自定义的广播接收器 -->
-            <receiver
-                    android:name="cn.jpush.phonegap.MyReceiver"
-                    android:enabled="true">
-                <intent-filter android:priority="1000">
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
-                    <!-- Required  显示通知栏 -->
-                    <category android:name="$PACKAGE_NAME"/>
-                </intent-filter>
-                <intent-filter>
-                    <action android:name="cn.jpush.android.intent.REGISTRATION"/>
-                    <!-- Required  用户注册SDK的intent -->
-                    <action android:name="cn.jpush.android.intent.UNREGISTRATION"/>
-                    <action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED"/>
-                    <!-- Required  用户接收SDK消息的intent -->
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED"/>
-                    <!-- Required  用户接收SDK通知栏信息的intent -->
-                    <action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/>
-                    <!-- Required  用户打开自定义通知栏的intent -->
-                    <action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK"/>
-                    <!-- Optional 用户接受Rich Push Javascript 回调函数的intent -->
-                    <category android:name="$PACKAGE_NAME"/>
-                </intent-filter>
-            </receiver>
-            <!-- Required SDK核心功能-->
-            <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="299d0fee887820e7d90a68b2"/>
+		cordova plugin add $JPUSH_PLUGIN_DIR
+		cordova plugin add org.apache.cordova.device
+
+7. iOS添加初始化JPush sdk代码 如果你要先部署android平台，可以先忽略这一步，当需要iOS 平台时，只加上这个步骤即可
+	
+	+ 用xcode 打开 Myproj下的iOS工程 
+	+ 打开xcode右边工程目录下`Resources/PushConfig.plist`
+		
+			在APP_KEY和CHANNLE字段 分别添加您的appkey和channle
+		
+	+ 打开xcode右边工程目录下`AppDelegate.m`,包含以下头文件
+
+			#import "APService.h"
+		    #import "JPushPlugin.h"
+
+	+ 在AppDelegate.m文件中，添加JPush SDK 提供的 API 来实现功能
+
+			- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
+			   //原内容保持不变
+			   //Required add 
+			   [JPushPlugin setLaunchOptions:launchOptions];
+			    return YES;
+			}
+			- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken   {
+			    //原内容保持不变
+			    // Required add
+			    [APService registerDeviceToken:deviceToken];
+			}
+			- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
+			    //原内容保持不变
+			    // Required
+			    [APService handleRemoteNotification:userInfo];
+	    		[[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
+	                                                               object:userInfo];
+			}
+			- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
+
+			  // IOS 7 Support Required
+			  [APService handleRemoteNotification:userInfo];
+			  [[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
+	                                                              object:userInfo];
+
+			  completionHandler(UIBackgroundFetchResultNewData);
+			}
+
+	
+7. 在js中调用函数,初始化jpush sdk
+
+		 window.plugins.jPushPlugin.init();	
+		 //由于phonegap插件采用了Lazy load的特性，	所以这里建议在js文件能执行的最开始就加
+
+### Android 手工安装
+
+[Android 手工安装文档地址](document/Android_handle_install.md)
+	

-```
 ### IOS手工安装

-1.添加src/ios/Plugins/到project中  
-2.添加src/ios/lib/到project中  
-3.设置 Search Paths 下的 User Header Search Paths 和 Library Search Paths  
-```
+[IOS手工安装文档地址](document/iOS_handle_install.md)

-比如SDK文件夹（默认为lib）与工程文件在同一级目录下，则都设置为"$(SRCROOT)/[文件夹名称]"即可。
-```

-4.确认一下的框架是存在的(Target -> Build Phases -> Link Binary With Libraries)
-```
-
-CFNetwork.framework
-CoreFoundation.framework
-CoreTelephony.framework
-SystemConfiguration.framework
-CoreGraphics.framework
-Foundation.framework
-UIKit.framework
-```
-
-5.在你的工程中创建一个新的Property List文件
-```
-
-并将其命名为PushConfig.plist，填入Portal为你的应用提供的APP_KEY等参数
-```
-
-6.调用代码,监听系统事件，相应地调用 JPush SDK 提供的 API 来实现功能
-```
-
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease];
-    self.window.backgroundColor = [UIColor whiteColor];
-    [self.window makeKeyAndVisible];
- 
-    // Required
-    [APService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
-                                                    UIRemoteNotificationTypeSound |
-                                                    UIRemoteNotificationTypeAlert)];
-    // Required
-    [APService setupWithOption:launchOptions];
-     
-    return YES;
-}
- 
- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-     
-    // Required
-    [APService registerDeviceToken:deviceToken];
-}
- 
- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-     
-    // Required
-    [APService handleRemoteNotification:userInfo];
-}
-```
-
-7.修改phonegap config.xml文件用来包含Plugin/内的插件
-```
-
-<feature name="JPushPlugin">
-    <param name="ios-package" value="JPushPlugin" />
-    <param name="onload" value="true" />
-</feature>
-```
-
-8.复制www/PushNotification.js到工程的www目录下面  
-9.在需要使用插件处加入
-```
-
-<script type="text/javascript" src="JPushPlugin.js"></script>
-```
 ###示例
-1.完整的示例可以点击网页右侧的"Download Zip"下载，下载完成后在文件的"src/ios/example"文件夹内找到并拷贝以下文件
-```

-src/ios/example/index.html to www/index.html
-src/ios/example/css/* to www/css
-src/ios/example/js/* to www/js
-```
+1. "$JPUSH_PLUGIN_DIR/example"文件夹内找到并拷贝以下文件

+		src/example/index.html to www/index.html
+		src/example/css/* to www/css
+		src/example/js/* to www/js
+
+###关于'phonegap build'云服务
+
+该项目基于cordova实现，目前无法使用'phonegap build'云服务进行打包，建议使用本地环境进行打包
+
+###常见错误
+1. androd
+
+		eclipse中phonegap工程import之后出现:`Type CallbackContext cannot be resolved to a type`
+		解决方案：eclipse中右键单击工程名，Build Path->Config Build Path->Projects->选中 工程名称－CordovaLib->点击 add
+
+### API说明
+
+插件的API集中在JPushPlugin.js文件中,这个文件的位置如下
+
+*  android:[YOUR__ANDROID_PROJECT]/assets/www/plugins/cn.jpush.phonegap.JPushPlugin/www
+*  iOS:[YOUR_iOS_PROJEcT]/www/plugins/cn.jpush.phonegap.JPushPlugin/www
+
+具体的API请参考这里
+
+#### iOS和adnroid通用API简介
+
+ 停止与恢复推送服务 API
+		
+		window.plugins.jPushPlugin.init()
+		window.plugins.jPushPlugin.stopPush()
+		window.plugins.jPushPlugin.resumePush()
+		window.plugins.jPushPlugin.isPushStopped(callback)
+
+
+ 获取 RegistrationID API
+
+		window.plugins.jPushPlugin.getRegistrationID(callback)
+		
+ 别名与标签 API
+	
+		window.plugins.jPushPlugin.setTagsWithAlias(tags,alias)
+		window.plugins.jPushPlugin.setTags(tags)
+		window.plugins.jPushPlugin.setAlias(alias)
+ 获取点击通知内容
+		
+		event - jpush.openNotification
+ 获取通知内容
+		
+		event - jpush.receiveNotification
+
+ 获取自定义消息推送内容
+
+		event - jpush.receiveMessage
+
+
+[通用API详细说明](document/Common_detail_api.md)
+
+#### iOS API简介
+
+ 获取自定义消息推送内容
+
+		event - jpush.receiveMessage
+		//推荐使用事件的方式传递，但同时保留了receiveMessageIniOSCallback的回调函数，兼容以前的代码
+		window.plugins.jPushPlugin.receiveMessageIniOSCallback(data)
+		
+ 页面的统计
+	
+		window.plugins.jPushPlugin.startLogPageView (pageName)
+		window.plugins.jPushPlugin.stopLogPageView (pageName)
+		window.plugins.jPushPlugin.beginLogPageView (pageName,duration)
+ 设置Badge
+
+		window.plugins.jPushPlugin.setBadge(value)
+		window.plugins.jPushPlugin.resetBadge()
+		window.plugins.jPushPlugin.setApplicationIconBadgeNumber(badge)
+ 本地通知
+
+	+ 后续版本加入
+		
+ 日志等级设置
+	
+		window.plugins.jPushPlugin.setDebugModeFromIos ()
+		window.plugins.jPushPlugin.setLogOFF()
+		
+		
+[iOS API详细说明](document/iOS_detail_api.md)
+
+
+#### adnroid API简介
+		
+ 获取集成日志
+		window.plugins.jPushPlugin.setDebugMode(mode)
+
+ 接收推送消息和点击通知
+		
+		//下面这两个api 是兼容旧有的代码
+		window.plugins.jPushPlugin.receiveMessageInAndroidCallback(data)
+		window.plugins.jPushPlugin.openNotificationInAndroidCallback(data)
+
+ 统计分析 API
+
+		onResume / onPause(java api)
+			
+ 清除通知 API
+
+		window.plugins.jPushPlugin.clearAllNotification()
+
+ 通知栏样式定制 API
+
+		window.plugins.jPushPlugin.setBasicPushNotificationBuilder = function()
+		window.plugins.jPushPlugin.setCustomPushNotificationBuilder = function()
+
+ 设置保留最近通知条数 API
+		
+		window.plugins.jPushPlugin.setLatestNotificationNum(num)
+		
+ 本地通知API
+		
+		window.plugins.jPushPlugin.addLocalNotification(builderId,
+												    content,
+												    title,
+												    notificaitonID,
+												    broadcastTime,
+											 	    extras)
+		window.plugins.jPushPlugin.removeLocalNotification(notificationID)
+		window.plugins.jPushPlugin.clearLocalNotifications()
+
+[Android API详细说明](document/Android_detail_api.md)
+
+###更多
+ [JPush官网文档](http://docs.jpush.io/)
--- a/document/Android_detail_api.md
+++ b/document/Android_detail_api.md
@@ -0,0 +1,185 @@
+## adnroid API简介
+
+
+
+### 获取集成日志
+
+#### API - setDebugMode
+
+用于开启调试模式，可以查看集成JPush过程中的log，如果集成失败，可方便定位问题所在
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.setDebugMode (mode)
+
+##### 参数说明
+
+- mode的值
+
+	- true  显示集成日志
+	- false 不显示集成日志
+
+
+###  接收消息和点击通知事件
+#### API - receiveMessageInAndroidCallback
+
+用于android收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.receiveMessageInAndroidCallback = function(data)
+	
+##### 参数说明
+- data 接收到的js字符串，包含的key:value请进入该函数体查看
+
+##### 代码示例
+
+#### API - openNotificationInAndroidCallback
+
+当点击android手机的通知栏进入应用程序时,会调用这个函数，这个函数不需要主动调用，是作为回调函数来用的
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.openNotificationInAndroidCallback = function(data)
+	
+##### 参数说明
+- data js字符串
+
+##### 代码示例
+
+###  统计分析 API
+
+#### API - onResume / onPause
+这是一个 android local api，不是js的api，请注意
+本 API 用于“用户使用时长”，“活跃用户”，“用户打开次数”的统计，并上报到服务器，在 Portal 上展示给开发者。
+
+
+
+####接口定义
+
+		public static void onResume(final Activity activity)
+		public static void onPause(final Activity activity)
+####参数说明
+
+ ＋ Activity activity 当前所在的Activity。
+####调用说明
+
+应在所有的 Activity 的 onResume / onPause 方法里调用。
+
+####代码示例
+
+	@Override
+	protected void onResume() {
+	    super.onResume();
+	    JPushInterface.onResume(this);
+	}
+	@Override
+	protected void onPause() {
+	    super.onPause();
+	    JPushInterface.onPause(this);
+	}
+
+
+#### API - reportNotificationOpened
+
+用于上报用户的通知栏被打开，或者用于上报用户自定义消息被展示等客户端需要统计的事件。
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.reportNotificationOpened(msgID)
+	
+##### 参数说明
+- msgID
+	-收到的通知或者自定义消息的id 	
+
+
+###  清除通知 API
+
+#### API - clearAllNotification
+
+推送通知到客户端时，由 JPush SDK 展现通知到通知栏上。
+
+此 API 提供清除通知的功能，包括：清除所有 JPush 展现的通知（不包括非 JPush SDK 展现的）
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.clearAllNotification = function()
+
+###  设置允许推送时间 API
+###  设置通知静默时间 API
+###  通知栏样式定制 API
+
+#### API - setBasicPushNotificationBuilder,setCustomPushNotificationBuilder
+
+当用户需要定制默认的通知栏样式时，则可调用此方法。
+极光 Push SDK 提供了 2 个用于定制通知栏样式的构建类：
+
+- setBasicPushNotificationBuilder 
+	- Basic 用于定制 Android Notification 里的 defaults / flags / icon 等基础样式（行为）
+- setCustomPushNotificationBuilder
+	- 继承 Basic 进一步让开发者定制 Notification Layout
+	
+如果不调用此方法定制，则极光Push SDK 默认的通知栏样式是：Android标准的通知栏提示。
+
+##### 接口定义 
+
+	window.plugins.jPushPlugin.setBasicPushNotificationBuilder = function()
+	window.plugins.jPushPlugin.setCustomPushNotificationBuilder = function()
+
+
+###  设置保留最近通知条数 API
+
+#### API - setLatestNotificationNum
+
+通过极光推送，推送了很多通知到客户端时，如果用户不去处理，就会有很多保留在那里。
+
+新版本 SDK (v1.3.0) 增加此功能，限制保留的通知条数。默认为保留最近 5 条通知。
+
+开发者可通过调用此 API 来定义为不同的数量。
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.setLatestNotificationNum(num)
+	
+##### 参数说明
+
+- num 保存的条数
+
+
+###  本地通知API
+#### API - addLocalNotification,removeLocalNotification,clearLocalNotifications
+
+
+本地通知API不依赖于网络，无网条件下依旧可以触发
+
+本地通知与网络推送的通知是相互独立的，不受保留最近通知条数上限的限制
+
+本地通知的定时时间是自发送时算起的，不受中间关机等操作的影响
+
+
+三个接口的功能分别为：添加一个本地通知，删除一个本地通知，删除所有的本地通知
+
+#####接口定义
+
+	window.plugins.jPushPlugin.addLocalNotification = function(builderId,
+											    content,
+												title,
+												notificaitonID,
+												broadcastTime,
+												extras)
+	window.plugins.jPushPlugin.removeLocalNotification = function(notificationID)
+	window.plugins.jPushPlugin.clearLocalNotifications = function()
+
+##### 参数说明
+
+- builderId 设置本地通知样式
+- content 设置本地通知的content
+- title 设置本地通知的title
+- notificaitonID 设置本地通知的ID
+- broadcastTime 设置本地通知触发时间，为距离当前时间的数值，单位是毫秒
+- extras 设置额外的数据信息extras为json字符串
+
+
--- a/document/Android_handle_install.md
+++ b/document/Android_handle_install.md
@@ -0,0 +1,108 @@
+#Android 手工安装
+
+下载jpush phonegap插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
+
+1. 复制：`$JPUSH_PLUGIN_DIR`/src/android/*.java 到cn/jpush/phonega/目录下(即：cn.jpush.phonegap的包下)
+2. 复制：`$JPUSH_PLUGIN_DIR`/src/android/armeabi/libjpush.so 到lib/armeabi/
+3. 复制：`$JPUSH_PLUGIN_DIR`/src/android/jpush-sdk-release1.5.0.jar 到lib/
+4. 复制：`$JPUSH_PLUGIN_DIR`/src/android/test_notification_layout.xml到res/layout/
+5. 复制：`$JPUSH_PLUGIN_DIR`/src/android/jpush_notification_icon.png 到res/drawable/
+6. 修改 AndroidManifest.xml 在 manifest 节点下添加以下权限
+
+		<!-- Required  一些系统要求的权限，如访问网络等-->
+		<uses-permission android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"/>
+		<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
+		<uses-permission android:name="android.permission.INTERNET"/>
+		<uses-permission android:name="android.permission.WAKE_LOCK"/>
+		<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+		<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+		<uses-permission android:name="android.permission.VIBRATE"/>
+		<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+		<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+		<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+		<permission
+		      android:name="$PACKAGE_NAME.permission.JPUSH_MESSAGE"
+		      android:protectionLevel="signature"/>
+
+7. 修改AndroidManifest.xml 在 manifest/application 节点下添加SDK相关组件声明
+
+		<activity
+			android:name="cn.jpush.android.ui.PushActivity"
+			android:theme="@android:style/Theme.Translucent.NoTitleBar"
+			android:configChanges="orientation|keyboardHidden">
+			<intent-filter>
+			<action android:name="cn.jpush.android.ui.PushActivity"/>
+			<category android:name="android.intent.category.DEFAULT"/>
+			<category android:name="$PACKAGE_NAME"/>
+			</intent-filter>
+		</activity>
+		<!-- Required  SDK核心功能-->
+		<service
+			android:name="cn.jpush.android.service.DownloadService"
+			android:enabled="true"
+			android:exported="false">
+		</service>
+		<!-- Required SDK 核心功能-->
+		<service
+			android:name="cn.jpush.android.service.PushService"
+			android:enabled="true"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="cn.jpush.android.intent.REGISTER"/>
+				<action android:name="cn.jpush.android.intent.REPORT"/>
+				<action android:name="cn.jpush.android.intent.PushService"/>
+				<action android:name="cn.jpush.android.intent.PUSH_TIME"/>
+			
+			</intent-filter>
+		</service>
+		<!-- Required SDK核心功能-->
+		<receiver
+		android:name="cn.jpush.android.service.PushReceiver"
+		android:enabled="true">
+			<intent-filter android:priority="1000">
+				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
+				<!--Required  显示通知栏 -->
+				<category android:name="$PACKAGE_NAME"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.USER_PRESENT"/>
+				<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+			</intent-filter>
+			<!-- Optional -->
+			<intent-filter>
+				<action android:name="android.intent.action.PACKAGE_ADDED"/>
+				<action android:name="android.intent.action.PACKAGE_REMOVED"/>
+				<data android:scheme="package"/>
+			</intent-filter>
+		</receiver>
+		
+		<!-- User defined.  For test only  用户自定义的广播接收器 -->
+		<receiver
+		android:name="cn.jpush.phonegap.MyReceiver"
+		android:enabled="true">
+			<intent-filter android:priority="1000">
+				<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
+				<!-- Required  显示通知栏 -->
+				<category android:name="$PACKAGE_NAME"/>
+				</intent-filter>
+			<intent-filter>
+			<action android:name="cn.jpush.android.intent.REGISTRATION"/>
+			<!-- Required  用户注册SDK的intent -->
+			<action android:name="cn.jpush.android.intent.UNREGISTRATION"/>
+			<action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED"/>
+			<!-- Required  用户接收SDK消息的intent -->
+			<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED"/>
+			<!-- Required  用户接收SDK通知栏信息的intent -->
+			<action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/>
+			<!-- Required  用户打开自定义通知栏的intent -->
+			<action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK"/>
+			<!-- Optional 用户接受Rich Push Javascript 回调函数的intent -->
+			<category android:name="$PACKAGE_NAME"/>
+			</intent-filter>
+		</receiver>
+		<!-- Required SDK核心功能-->
+		<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="299d0fee887820e7d90a68b2"/>
--- a/document/Common_detail_api.md
+++ b/document/Common_detail_api.md
@@ -0,0 +1,375 @@
+#通用API说明
+
+
+## 停止与恢复推送服务 API	
+### API - init
+
+调用此API,用来开启
+JPush SDK 提供的推送服务。
+
+开发者App可以通过调用停止推送服务API来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
+
+```
+本功能是一个完全本地的状态操作。也就是说：停止推送服务的状态不会保存到服务器上。
+
+如果停止推送服务后，开发者App被重新安装，或者被清除数据，
+
+JPush SDK 会恢复正常的默认行为。（因为保存在本地的状态数据被清除掉了）。 
+本功能其行为类似于网络中断的效果，即：推送服务停止期间推送的消息，
+
+恢复推送服务后，如果推送的消息还在保留的时长范围内，则客户端是会收到离线消息。
+```
+
+#### 接口定义
+
+	window.plugins.jPushPlugin.init()
+
+### API - stopPush
+ 在android平台 
+
+	+ 开发者App可以通过调用停止推送服务API来停止极光推送服务。当又需要使用极光推送服务时，则必须要调用恢复推送服务 API。
+	
+	
+	+ 调用了本 API 后，JPush 推送服务完全被停止。具体表现为：
+		
+		+ JPush Service 不在后台运行
+		+ 收不到推送消息
+		+ 不能通过 JPushInterface.init 恢复，需要调用resumePush恢复
+		+ 极光推送所有的其他 API 调用都无效
+
+ iOS平台
+
+	+ 不推荐调用，因为这个API只是让你的DeviceToken失效，在设置－通知 中您的应用程序没有任何变化
+    + 推荐：设置一个UI界面， 提醒用户在在设置－通知关闭推送服务
+
+### 接口定义 
+    
+    window.plugins.jPushPlugin.stopPush()
+	
+
+#### API - resumePush
+
+
+恢复推送服务。调用了此 API 后
+
+ 在android平台 
+
+	+ 极光推送完全恢复正常工作，
+
+ iOS平台
+	
+	+ 重新去APNS注册
+
+
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.resumePush()
+
+#### API - isPushStopped
+
+ 在android平台 
+
+	+ 用来检查 Push Service 是否已经被停止
+
+ iOS平台
+	
+	+ 平台检查推送服务是否注册
+
+
+##### 接口定义
+
+	    window.plugins.jPushPlugin.isPushStopped(callback)
+
+
+##### 参数说明
+
+ callback 回调函数，用来通知JPush的推送服务是否开启
+
+####代码示例
+	    window.plugins.jPushPlugin.resumePush(callback)
+		var onCallback = function(data) {
+		    if(data>0){
+		    	//开启
+		    }else{
+		    	//关闭
+		    }
+		}
+
+
+##获取 RegistrationID API
+
+### API - getRegistrationID
+
+RegistrationID 定义
+
+集成了 JPush SDK 的应用程序在第一次成功注册到 JPush 服务器时，JPush 服务器会给客户端返回一个唯一的该设备的标识 - RegistrationID。JPush SDK 会以广播的形式发送 RegistrationID 到应用程序。
+
+应用程序可以把此 RegistrationID 保存以自己的应用服务器上，然后就可以根据 RegistrationID 来向设备推送消息或者通知。
+
+#### 接口定义
+
+	JPushPlugin.prototype.getRegistrationID = function(callback)
+
+##### 参数说明
+无
+#### 返回值
+
+调用此 API 来取得应用程序对应的 RegistrationID。 只有当应用程序成功注册到 JPush 的服务器时才返回对应的值，否则返回空字符串。
+
+#### 调用示例
+
+ 	window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+	var onGetRegistradionID = function(data) {
+		try{
+			console.log("JPushPlugin:registrationID is "+data)		}
+		catch(exception){
+			console.log(exception);
+		}
+	}
+
+##别名与标签 API
+
+### API - setTagsWithAlias,setTags,setAlias
+
+提供几个相关 API 用来设置别名（alias）与标签（tags）。
+
+这几个 API 可以在 App 里任何地方调用。
+
+别名 alias
+
+为安装了应用程序的用户，取个别名来标识。以后给该用户 Push 消息时，就可以用此别名来指定。
+
+每个用户只能指定一个别名。
+
+同一个应用程序内，对不同的用户，建议取不同的别名。这样，尽可能根据别名来唯一确定用户。
+
+系统不限定一个别名只能指定一个用户。如果一个别名被指定到了多个用户，当给指定这个别名发消息时，服务器端API会同时给这多个用户发送消息。
+
+举例：在一个用户要登录的游戏中，可能设置别名为 userid。游戏运营时，发现该用户 3 天没有玩游戏了，则根据 userid 调用服务器端API发通知到客户端提醒用户。
+
+标签 tag
+
+为安装了应用程序的用户，打上标签。其目的主要是方便开发者根据标签，来批量下发 Push 消息。
+
+可为每个用户打多个标签。
+
+不同应用程序、不同的用户，可以打同样的标签。
+
+举例： game, old_page, women
+
+#### 接口定义
+
+	JPushPlugin.prototype.setTagsWithAlias = function(tags,alias)
+	JPushPlugin.prototype.setTags = function(tags)
+	JPushPlugin.prototype.setAlias = function(alias)
+
+####使用平台
+android iOS
+
+
+#### 参数说明
+* tags
+	* 参数类型为数组	
+	* nil 此次调用不设置此值
+	* 空集合表示取消之前的设置 
+	* 每次调用至少设置一个 tag，覆盖之前的设置，不是新增
+	* 有效的标签组成：字母（区分大小写）、数字、下划线、汉字
+	* 限制：每个 tag 命名长度限制为 40 字节，最多支持设置 100 个 tag，但总长度不得超过1K字节。（判断长度需采用UTF-8编码）
+	* 单个设备最多支持设置 100 个 tag。App 全局 tag 数量无限制。
+* alias 
+	* 参数类型为字符串
+	* nil 此次调用不设置此值
+	* 空字符串 （""）表示取消之前的设置
+	* 有效的别名组成：字母（区分大小写）、数字、下划线、汉字。
+	* 限制：alias 命名长度限制为 40 字节。（判断长度需采用UTF-8编码）
+	
+#### 返回值说明
+
+函数本身无返回值，但需要注册`jpush.setTagsWithAlias	`事件来监听设置结果
+	
+	document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
+    var onTagsWithAlias = function(event){
+       try{
+           console.log("onTagsWithAlias");    
+           var result="result code:"+event.resultCode+" ";
+           result+="tags:"+event.tags+" ";
+           result+="alias:"+event.alias+" ";
+           $("#tagAliasResult").html(result);
+       }
+       catch(exception){
+           console.log(exception)
+       }
+   }
+
+####错误码定义
+
+
+
+
+|Code|描述|详细解释|
+|-|-|-|
+|6001|	无效的设置，tag/alias 不应参数都为 null||	
+|6002|	设置超时|	建议重试|
+|6003|	alias| 字符串不合法	有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
+|6004|	alias超长。最多 40个字节	中文 UTF-8 是 3 个字节|
+|6005|	某一个 tag 字符串不合法|	有效的别名、标签组成：字母（区分大小写）、数字、下划线、汉字。|
+|6006|	某一个 tag 超长。|一个 tag 最多 40个字节	中文 UTF-8 是 3 个字节|
+|6007|	tags 数量超出限制。最多 100个|	这是一台设备的限制。一个应用全局的标签数量无限制。|
+|6008|	tag/alias 超出总长度限制。|总长度最多 1K 字节|
+|6011|	10s内设置tag或alias大于3次|	短时间内操作过于频繁|
+
+### 获取点击通知内容
+
+#### event - jpush.openNotification
+
+点击通知进入应用程序时会出发改事件
+
+#####代码示例
+
+- 在你需要接收通知的的js文件中加入:
+	           
+		document.addEventListener("jpush.openNotification", onOpenNotification, false);
+
+- onOpenNotification需要这样写：
+		
+		
+                    var alertContent
+                    if(device.platform == "Android"){
+                        alertContent=window.plugins.jPushPlugin.openNotification.alert;
+                    }else{
+                        alertContent   = event.aps.alert;
+                    }
+                    alert("open Notificaiton:"+alertContent);
+
+ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.openNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+	
+ android
+
+		{"alert":"ding",
+		"extras":{
+			     "cn.jpush.android.MSG_ID":"1691785879",
+			     "app":"com.thi.pushtest",
+			     "cn.jpush.android.ALERT":"ding",
+			     "cn.jpush.android.EXTRA":{},
+			     "cn.jpush.android.PUSH_ID":"1691785879",
+			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
+			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
+		
+ iOS 
+
+		{
+		"aps":{
+			  "badge":1,
+			  "sound":"default",
+			  "alert":"今天去哪儿"
+			  },
+		"_j_msgid":154604475
+		}
+
+### 获取通知内容
+
+#### event - jpush.receiveNotification
+
+点击通知进入应用程序时会出发改事件
+
+#####代码示例
+
+- 在你需要接收通知的的js文件中加入:
+	           
+		document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+
+- onReceiveNotification需要这样写：
+		
+		
+                    var alertContent
+                    if(device.platform == "Android"){
+                        alertContent=window.plugins.jPushPlugin.openNotification.alert;
+                    }else{
+                        alertContent   = event.aps.alert;
+                    }
+                    alert("open Notificaiton:"+alertContent);
+
+ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+	
+ android
+
+		{"alert":"ding",
+		"extras":{
+			     "cn.jpush.android.MSG_ID":"1691785879",
+			     "app":"com.thi.pushtest",
+			     "cn.jpush.android.ALERT":"ding",
+			     "cn.jpush.android.EXTRA":{},
+			     "cn.jpush.android.PUSH_ID":"1691785879",
+			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
+			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
+		
+ iOS 
+
+		{
+		"aps":{
+			  "badge":1,
+			  "sound":"default",
+			  "alert":"今天去哪儿"
+			  },
+		"_j_msgid":154604475
+		}
+
+
+### 获取自定义消息推送内容
+
+
+####event - jpush.receiveMessage
+
+收到应用内消息时触发这个事件
+
+`推荐使用事件的方式传递，但同时保留了receiveMessageIniOSCallback的回调函数，兼容以前的代码`
+
+
+#####代码示例
+
+- 在你需要接收通知的的js文件中加入:
+	           
+		document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+
+- onReceiveMessage需要这样写：
+		
+		
+            var onReceiveMessage = function(event){
+                try{
+                    var message
+                    if(device.platform == "Android"){
+                  		 message = window.plugins.jPushPlugin.receiveMessage.message;
+                    }else{
+                         message   = event.content;
+                    }          
+                     $("#messageResult").html(message);
+                     
+                }
+                catch(exception){
+                    console.log("JPushPlugin:onReceiveMessage-->"+exception);
+                }
+            }
+
+ps：点击通知后传递的json object 保存在window.plugins.jPushPlugin.receiveNotification，直接访问即可，字段示例，根据实际推送情况，可能略有差别，请注意
+
+ android
+
+		{"message":"今天去哪儿",
+		"extras"{
+				"cn.jpush.android.MSG_ID":"154378013",
+				"cn.jpush.android.CONTENT_TYPE":"",
+				"cn.jpush.android.EXTRA":{"key":"不添没有"}
+				}
+		}
+ iOS
+
+		 {
+		 "content":"今天去哪儿",
+		 "extras":
+		          {
+		 		  "key":"不填写没有"
+		 		  }
+		 }
+	
+
--- a/document/iOS_detail_api.md
+++ b/document/iOS_detail_api.md
@@ -0,0 +1,127 @@
+## iOS API简介
+
+### 获取 APNs（通知） 推送内容
+
+
+#### API - receiveMessageIniOSCallback
+
+用于iOS收到应用内消息的回调函数(请注意和通知的区别)，该函数不需要主动调用
+不推荐使用回调函数
+
+##### 接口定义
+
+	JPushPlugin.prototype.receiveMessageIniOSCallback = function(data)
+
+#####参数说明
+
+- data 	是一个js字符串使用如下代码解析，js具体key根据应用内消息来确定
+	
+		var bToObj = JSON.parse(data);
+		
+#####返回值
+无
+
+#####  代码示例
+
+
+### 页面的统计
+#### API - startLogPageView,stopLogPageView,beginLogPageView
+
+本 API 用于“用户指定页面使用时长”的统计，并上报到服务器，在 Portal 上展示给开发者。页面统计集成正确，才能够获取正确的页面访问路径、访问深度（PV）的数据。
+
+##### 接口定义
+	window.plugins.jPushPlugin.startLogPageView = function(pageName)
+	window.plugins.jPushPlugin.stopLogPageView = function(pageName)
+	window.plugins.jPushPlugin.beginLogPageView = function(pageName,duration)
+#####参数说明
+pageName 需要统计页面自定义名称
+duration 自定义的页面时间
+#####调用说明
+应在所有的需要统计得页面得 viewWillAppear 和 viewWillDisappear 加入 startLogPageView 和 stopLogPageView 来统计当前页面的停留时间。
+
+	或者直接使用 beginLogPageView 来自定义加入页面和时间信息。
+#####返回值说明
+无
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.beginLogPageView("newPage",5);
+		window.plugins.jPushPlugin.startLogPageView("onePage");
+		window.plugins.jPushPlugin.stopLogPageView("onePage");
+	}
+### 设置Badge
+#### API - setBadge,resetBadge
+
+badge是iOS用来标记应用程序状态的一个数字，出现在程序图标右上角。 JPush封装badge功能，允许应用上传badge值至JPush服务器，由JPush后台帮助管理每个用户所对应的推送badge值，简化了设置推送badge的操作。
+
+实际应用中，开发者可以直接对badge值做增减操作，无需自己维护用户与badge值之间的对应关系。
+##### 接口定义
+
+	window.plugins.jPushPlugin.setBadge(value)
+	window.plugins.jPushPlugin.reSetBadge()
+
+`resetBadge相当于setBadge(0)`
+##### 参数说明
+value 取值范围：[0,99999]
+##### 返回值
+无，控制台会有log打印设置结果
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setBadge(5);
+		window.plugins.jPushPlugin.reSetBadge();
+	}
+
+#### API - setApplicationIconBadgeNumber
+
+设置iOS的角标，当设置badge＝0时为清除角标
+
+##### 接口定义
+
+	window.plugins.jPushPlugin.setApplicationIconBadgeNumber(badge)
+	
+##### 参数说明
+
+- badge 整形,例如0，1，2
+- 当badge为0时，角标被清除
+
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
+	}
+
+
+### 本地通知
+
+### 日志等级设置
+#### API - setDebugModeFromIos
+API 用于开启Debug模式，显示更多的日志信息
+
+建议调试时开启这个选项，不调试的时候注释这句代码，这个函数setLogOFF是相反的一对
+##### 接口定义
+
+	window.plugins.jPushPlugin.reSetBadge.setDebugModeFromIos()
+	
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setDebugModeFromIos();
+	}
+
+#### API - setLogOFF
+
+API用来关闭日志信息（除了必要的错误信息）
+
+不需要任何调试信息的时候，调用此API （发布时建议调用此API，用来屏蔽日志信息，节省性能消耗)
+
+##### 接口定义 
+
+	window.plugins.jPushPlugin.reSetBadge.setLogOFF ()
+
+#####代码示例
+
+	if(window.plugins.jPushPlugin.isPlatformIOS()){
+		window.plugins.jPushPlugin.setLogOFF();
+	}
+
--- a/document/iOS_handle_install.md
+++ b/document/iOS_handle_install.md
@@ -0,0 +1,62 @@
+### IOS手工安装
+
+下载jpush phonegap插件，并解压缩，标记插件目录为：`$JPUSH_PLUGIN_DIR`
+
+
+1. 用xcode打开iOS工程 将`$JPUSH_PLUGIN_DIR`/src/ios/Plugins/拖到project中  
+2. 将`$JPUSH_PLUGIN_DIR`/src/ios/lib/拖到project中  
+
+4. 添加以下框架，打开xocode，点击project，选择(Target -> Build Phases -> Link Binary With Libraries)
+
+		CFNetwork.framework
+		CoreFoundation.framework
+		CoreTelephony.framework
+		SystemConfiguration.framework
+		CoreGraphics.framework
+		Foundation.framework
+		UIKit.framework
+
+
+5. 在你的工程中创建一个新的Property List文件
+
+		并将其命名为PushConfig.plist，填入Portal为你的应用提供的APP_KEY等参数
+
+10. 在AppDelegate.m中包含头文件
+
+		#import "APService.h"
+	    #import "JPushPlugin.h"
+
+6. 调用代码,监听系统事件，相应地调用 JPush SDK 提供的 API 来实现功能
+
+		- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
+		   //原内容保持不变
+		   //Required add 
+		   [JPushPlugin setLaunchOptions:launchOptions];
+		    return YES;
+		}
+		- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken   {
+		    //原内容保持不变
+		    // Required add
+		    [APService registerDeviceToken:deviceToken];
+		}
+		- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
+		    //原内容保持不变
+		    // Required
+		    [APService handleRemoteNotification:userInfo];
+    		[[NSNotificationCenter defaultCenter] postNotificationName:kJPushPluginReceiveNotification
+                                                               object:userInfo];
+		}
+
+7. 修改phonegap config.xml文件用来包含Plugin/内的插件
+
+
+		<feature name="JPushPlugin">
+		    <param name="ios-package" value="JPushPlugin" />
+		    <param name="onload" value="true" />
+		</feature>
+
+
+8. 复制`$JPUSH_PLUGIN_DIR`/www/PushNotification.js到工程的www目录下面  
+9. 在需要使用插件处加入
+
+		<script type="text/javascript" src="JPushPlugin.js"></script>
--- a/example/index.html
+++ b/example/index.html
@@ -11,9 +11,20 @@
            <script type="text/javascript" src="cordova.js"></script>
            <script type="text/javascript"> 
            var onDeviceReady   = function(){
-                console.log("Device ready!")
+                console.log("JPushPlugin:Device ready!")
                initiateUI();
-            }            
+            }
+            var onGetRegistradionID = function(data) {
+                try{
+                    console.log("JPushPlugin:registrationID is "+data)
+                    
+                    $("#registrationid").html(data);
+                }
+                catch(exception){
+                    console.log(exception);
+                }
+            }
+
            var onTagsWithAlias = function(event){
                try{
                    console.log("onTagsWithAlias");    
@@ -26,31 +37,71 @@
                    console.log(exception)
                }
            }
-            var onGetRegistradionID = function(data) {
+            var onOpenNotification = function(event){
                try{
-                    console.log("index.registrationID:"+data)
+                    var alertContent
+                    if(device.platform == "Android"){
+                        alertContent=window.plugins.jPushPlugin.openNotification.alert;
+                    }else{
+                        alertContent   = event.aps.alert;
+                    }
+                    alert("open Notificaiton:"+alertContent);
                    
-                    $("#registrationid").html(data);
                }
                catch(exception){
-                    console.log(exception);
+                    console.log("JPushPlugin:onOpenNotification"+exception);
                }
            }
+            var onReceiveNotification = function(event){
+                try{
+                	var alert
+                    if(device.platform == "Android"){
+                  		 alert = window.plugins.jPushPlugin.receiveNotification.alert;
+                    }else{
+                         alert   = event.aps.alert;
+                    }
+                    $("#notificationResult").html(alert);
+                    
+                }
+                catch(exeption){
+                    console.log(exception)
+                }
+            }
+            var onReceiveMessage = function(event){
+                try{
+                
+                    var message
+                    if(device.platform == "Android"){
+                  		 message = window.plugins.jPushPlugin.receiveMessage.message;
+                    }else{
+                         message   = event.content;
+                    }                    
+                     //var extras = window.plugins.jPushPlugin.extras
+    
+                     $("#messageResult").html(message);
+                     
+                }
+                catch(exception){
+                    console.log("JPushPlugin:onReceiveMessage-->"+exception);
+                }
+            }
+
            var initiateUI = function(){
            
-                window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
-                //test android interface
-                //window.plugins.jPushPlugin.getNotification(onNotification);
-                //window.plugins.jPushPlugin.stopPush()
-                //window.plugins.jPushPlugin.resumePush();
-                //window.plugins.jPushPlugin.clearAllNoticication();
-                //window.plugins.jPushPlugin.setLatestNotificationNum(5);
-                //window.plugins.jPushPlugin.stopPush();
-                //window.plugins.jPushPlugin.isPushStopped(onIsPushStopped);
-                //window.plugins.jPushPlugin.init();
-                //window.plugins.jPushPlugin.setDebugable(true);
-                //window.plugins.jPushPlugin.startLogPageView("mianPage");
-                
+            	try{
+                    window.plugins.jPushPlugin.init();
+                    window.plugins.jPushPlugin.getRegistrationID(onGetRegistradionID);
+                    
+                    if(device.platform != "Android"){
+                        window.plugins.jPushPlugin.setDebugModeFromIos();
+                        window.plugins.jPushPlugin.setApplicationIconBadgeNumber(0);
+                    }else{
+                        window.plugins.jPushPlugin.setDebugMode(true);
+                    }
+            	}
+            	catch(exception){
+            		console.log(exception);
+            	}
               $("#setTagWithAliasButton").click(function(ev) {
                    try{
                        var tag1 = $("#tagText1").attr("value");
@@ -81,17 +132,18 @@
                })
            }
            document.addEventListener("jpush.setTagsWithAlias", onTagsWithAlias, false);
-            document.addEventListener("deviceready", onDeviceReady, false);            
+            document.addEventListener("deviceready", onDeviceReady, false); 
+            document.addEventListener("jpush.openNotification", onOpenNotification, false);
+            document.addEventListener("jpush.receiveNotification", onReceiveNotification, false);
+            document.addEventListener("jpush.receiveMessage", onReceiveMessage, false);
+
+
+            //jpush.receiveMessage
        </script>
    </head>
    <body>
        <div data-role="page" id="page">
            
-            <div data-role="header" class="ui-bar ui-bar-b">
-                <center>
-                    <img border="0" src="img/logo.png" alt="Urban Airship" align="center" />
-                </center>
-            </div>
            <div data-role="content">
                <form>
                    <div class="ui-body ui-body-b">
@@ -134,8 +186,19 @@
                            <input type="button" id="setTagWithAliasButton" value="Add tag and alias" />
                        </div>
                        <div data-role="fieldcontain">
+                            <label id="tagAliasPrompt" >设置tag/alias结果：  </label>
                            <label id="tagAliasResult" >null</label>
                        </div>
+                        <div data-role="fieldcontain">
+                            <label id="notificationPrompt" >接受的通知内容:</label>
+                            <label id="notificationResult" >null</label>
+                        </div>
+                        <div data-role="fieldcontain">
+                            <label id="messagePrompt" >接受的自定义消息:</label>
+                            <label id="messageResult" >null</label>
+                        </div>
+
+
                    </div>
                </form>
            </div>
--- 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="1.5.3">
+        version="2.0.2">

    <name>JPush Plugin</name>
    <description>JPush for cordova plugin</description>
@@ -29,18 +29,17 @@
            <source-file src="src/ios/Plugins/JPushPlugin.m"/>
           
            <header-file src="src/ios/lib/APService.h" />
-            <source-file src="src/ios/lib/libPushSDK.a" framework="true" />
+            <source-file src="src/ios/lib/libPushSDK-1.8.3.a" framework="true" />
            
            <resource-file src="src/ios/PushConfig.plist" />
                
            <framework src="CFNetwork.framework" weak="true" />
            <framework src="CoreFoundation.framework" weak="true" />
+            <framework src="CoreTelephony.framework" weak="true" />
            <framework src="SystemConfiguration.framework" weak="true" />
            <framework src="CoreGraphics.framework" weak="true" />
            <framework src="Foundation.framework" weak="true" />
-            <framework src="CoreFoundation.framework" weak="true" />
            <framework src="UIKit.framework" weak="true" />
-            <framework src="CoreTelephony.framework" weak="true" />
            <framework src="Security.framework" weak="true" />
            <framework src="libz.dylib" weak="true" />
            
@@ -153,10 +152,13 @@
            <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="299d0fee887820e7d90a68b2"/>
+            <meta-data android:name="JPUSH_APPKEY" android:value="your appkey"/>
        </config-file>
-        <source-file src="src/android/jpush-sdk-release1.6.1.jar" target-dir="libs"/>
-        <source-file src="src/android/libjpush.so" target-dir="libs/armeabi"/>
+        <source-file src="src/android/jpush-sdk-release1.7.5.jar" target-dir="libs"/>
+        <source-file src="src/android/armeabi/libjpush175.so" target-dir="libs/armeabi"/>
+        <source-file src="src/android/armeabi-v7a/libjpush175.so" target-dir="libs/armeabi-v7a"/>
+        <source-file src="src/android/arm64-v8a/libjpush175.so" target-dir="libs/armeabi-v8a"/>
+        
        <source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>
        <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"/>
--- a/src/android/JPushPlugin.java
+++ b/src/android/JPushPlugin.java
@@ -17,12 +17,14 @@ import org.apache.cordova.CordovaWebView;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import java.util.Map.Entry;

-import com.thi.pushtest.R;
+import your.package.name.R;

 import cn.jpush.android.api.BasicPushNotificationBuilder;
 import cn.jpush.android.api.CustomPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
+import cn.jpush.android.data.JPushLocalNotification;
 import cn.jpush.android.api.TagAliasCallback;

 public class JPushPlugin extends CordovaPlugin {
@@ -37,19 +39,25 @@ public class JPushPlugin extends CordovaPlugin {
 					"setCustomPushNotificationBuilder",
 					"setPushTime",
 					"init",
-					"setDebugable",
+					"setDebugMode",
 					"stopPush",
 					"resumePush",
 					"isPushStopped",
 					"setLatestNotificationNum",
 					"setPushTime",
-					"clearAllNotification");
+					"clearAllNotification",
+					"addLocalNotification",
+					"removeLocalNotification",
+					"clearLocalNotifications",
+					"onResume",
+					"onPause",
+					"reportNotificationOpened");
 	
 	private ExecutorService threadPool = Executors.newFixedThreadPool(1);
 	private static JPushPlugin instance;

 	public static String notificationAlert;
-	public static Map<String, String> notificationExtras=new HashMap<String, String>();
+	public static Map<String, Object> notificationExtras=new HashMap<String, Object>();

 	public JPushPlugin() {
 		instance = this;
@@ -58,32 +66,132 @@ public class JPushPlugin extends CordovaPlugin {
 	@Override
 	public void initialize(CordovaInterface cordova, CordovaWebView webView) {
 		super.initialize(cordova, webView);
-		JPushInterface.setDebugMode(true);
-		JPushInterface.init(cordova.getActivity().getApplicationContext());
+		//JPushInterface.setDebugMode(true);
+		//JPushInterface.init(cordova.getActivity().getApplicationContext());
 	}

+
 	private static JSONObject notificationObject(String message,
-			Map<String, String> extras) {
+			Map<String, Object> extras) {
 		JSONObject data = new JSONObject();
 		try {
 			data.put("message", message);
-			data.put("extras", new JSONObject(extras));
+			JSONObject jExtras = new JSONObject();
+			for(Entry<String,Object> entry:extras.entrySet()){
+				if(entry.getKey().equals("cn.jpush.android.EXTRA")){
+					JSONObject jo = new JSONObject((String)entry.getValue());
+                    jExtras.put("cn.jpush.android.EXTRA", jo);
+                } else {
+                    jExtras.put(entry.getKey(),entry.getValue());
+                }
+			}
+			if(jExtras.length()>0)
+			{
+				data.put("extras", jExtras);
+			}		
 		} catch (JSONException e) {

 		}
 		return data;
 	}

-	static void transmitPush(String message, Map<String, String> extras) {
+	private static JSONObject openNotificationObject(String alert,
+			Map<String, Object> extras){
+		JSONObject data = new JSONObject();
+		try{
+			data.put("alert", alert);
+			JSONObject jExtras = new JSONObject();
+			for(Entry<String,Object> entry:extras.entrySet()){
+				if(entry.getKey().equals("cn.jpush.android.EXTRA")){
+					JSONObject jo = new JSONObject((String)entry.getValue());
+					jExtras.put("cn.jpush.android.EXTRA", jo);
+				}else{
+					jExtras.put(entry.getKey(),entry.getValue());
+				}
+			}
+			if(jExtras.length()>0)
+			{
+				data.put("extras", jExtras);
+			}
+		} catch (JSONException e) {
+
+		}
+		return data;
+	}
+	static void transmitPush(String message, Map<String, Object> extras) {
 		if (instance == null) {
 			return;
 		}
 		JSONObject data = notificationObject(message, extras);
 		String js = String
-				.format("window.plugins.jPushPlugin.pushCallback(%s);",
+				.format("window.plugins.jPushPlugin.receiveMessageInAndroidCallback('%s');",
 						data.toString());
+		
+		
 		try {
 			instance.webView.sendJavascript(js);
+			
+//			String jsEvent=String
+//					.format("cordova.fireDocumentEvent('jpush.receiveMessage',%s)",
+//							data.toString());
+//			instance.webView.sendJavascript(jsEvent);
+		} catch (NullPointerException e) {
+
+		} catch (Exception e) {
+
+		}
+	}
+	static void transmitOpen(String alert, Map<String, Object> extras) {
+		if (instance == null) {
+			return;
+		}
+		JSONObject data = openNotificationObject(alert, extras);
+		String js = String
+				.format("window.plugins.jPushPlugin.openNotificationInAndroidCallback('%s');",
+						data.toString());
+//		{"alert":"ding",
+//		"extras":{
+//			     "cn.jpush.android.MSG_ID":"1691785879",
+//			     "app":"com.thi.pushtest",
+//			     "cn.jpush.android.ALERT":"ding",
+//			     "cn.jpush.android.EXTRA":{},
+//			     "cn.jpush.android.PUSH_ID":"1691785879",
+//			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
+//			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
+		try {
+			instance.webView.sendJavascript(js);
+			
+//			String jsEvent=String
+//    					.format("cordova.fireDocumentEvent('jpush.openNotification',%s)",
+//    							data.toString());
+//    		instance.webView.sendJavascript(jsEvent);
+		} catch (NullPointerException e) {
+
+		} catch (Exception e) {
+
+		}
+	}
+	static void transmitReceive(String alert, Map<String, Object> extras) {
+		if (instance == null) {
+			return;
+		}
+		JSONObject data = openNotificationObject(alert, extras);
+		String js = String
+				.format("window.plugins.jPushPlugin.receiveNotificationInAndroidCallback('%s');",
+						data.toString());
+//		{"alert":"ding",
+//		"extras":{
+//			     "cn.jpush.android.MSG_ID":"1691785879",
+//			     "app":"com.thi.pushtest",
+//			     "cn.jpush.android.ALERT":"ding",
+//			     "cn.jpush.android.EXTRA":{},
+//			     "cn.jpush.android.PUSH_ID":"1691785879",
+//			     "cn.jpush.android.NOTIFICATION_ID":1691785879,
+//			     "cn.jpush.android.NOTIFICATION_TYPE":"0"}}
+		try {
+			
+			instance.webView.sendJavascript(js);
+
 		} catch (NullPointerException e) {

 		} catch (Exception e) {
@@ -114,20 +222,21 @@ public class JPushPlugin extends CordovaPlugin {
 	
 	void init(JSONArray data,CallbackContext callbackContext){
 		JPushInterface.init(this.cordova.getActivity().getApplicationContext());
-		callbackContext.success();
+		//callbackContext.success();
 	}
 	
-	void setDebugable(JSONArray data, CallbackContext callbackContext) {
-		String mode;
+	void setDebugMode(JSONArray data, CallbackContext callbackContext) {
+		boolean mode;
 		try {
-			mode = data.getString(0);
-			if (mode.equals("true")) {
-				JPushInterface.setDebugMode(true);
-			} else if (mode.equals("false")) {
-				JPushInterface.setDebugMode(false);
-			} else {
-				callbackContext.error("error mode");
-			}
+			mode = data.getBoolean(0);
+			// if (mode.equals("true")) {
+			// 	JPushInterface.setDebugMode(true);
+			// } else if (mode.equals("false")) {
+			// 	JPushInterface.setDebugMode(false);
+			// } else {
+			// 	callbackContext.error("error mode");
+			// }
+			JPushInterface.setDebugMode(mode);
 			callbackContext.success();
 		} catch (JSONException e) {
 		}
@@ -147,8 +256,8 @@ public class JPushPlugin extends CordovaPlugin {
 	
 	void isPushStopped(JSONArray data,
 			CallbackContext callbackContext){
-		boolean isStoped =JPushInterface.isPushStopped(this.cordova.getActivity().getApplicationContext());
-		if(isStoped){
+		boolean isStopped =JPushInterface.isPushStopped(this.cordova.getActivity().getApplicationContext());
+		if(isStopped){
 			callbackContext.success(1);
 		}else{
 			callbackContext.success(0);
@@ -165,7 +274,7 @@ public class JPushPlugin extends CordovaPlugin {
 			callbackContext.error("error reading num json");
 		}
 		if(num != -1){
-			JPushInterface.setLatestNotifactionNumber(this.cordova.getActivity().getApplicationContext(), num);
+			JPushInterface.setLatestNotificationNumber(this.cordova.getActivity().getApplicationContext(), num);
 		}else{
 			callbackContext.error("error num");
 		}
@@ -174,13 +283,13 @@ public class JPushPlugin extends CordovaPlugin {
 	void setPushTime(JSONArray data,
 			CallbackContext callbackContext){
 		Set<Integer> days = new HashSet<Integer>();
-		JSONArray dayArr;
+		JSONArray dayArray;
 		int startHour = -1;
 		int endHour = -1;
 		try {
-			dayArr = data.getJSONArray(0);
-			for (int i = 0; i < dayArr.length(); i++) {
-				days.add(dayArr.getInt(i));
+			dayArray = data.getJSONArray(0);
+			for (int i = 0; i < dayArray.length(); i++) {
+				days.add(dayArray.getInt(i));
 			}
 		} catch (JSONException e) {
 			e.printStackTrace();
@@ -200,6 +309,23 @@ public class JPushPlugin extends CordovaPlugin {
 		String regID= JPushInterface.getRegistrationID(this.cordova.getActivity().getApplicationContext());
 		callbackContext.success(regID);

+	}
+	void onResume(JSONArray data, CallbackContext callbackContext) {
+		JPushInterface.onResume(this.cordova.getActivity());
+	}
+	void onPause(JSONArray data, CallbackContext callbackContext) {
+		JPushInterface.onPause(this.cordova.getActivity());
+	}
+	void reportNotificationOpened(JSONArray data, CallbackContext callbackContext) {
+		try {
+			String msgID;
+			msgID = data.getString(0);
+			JPushInterface.reportNotificationOpened(this.cordova.getActivity(),msgID);
+		} catch (JSONException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
 	}
 	void setTags(JSONArray data, CallbackContext callbackContext) {

@@ -212,8 +338,11 @@ public class JPushPlugin extends CordovaPlugin {
 				tags= new HashSet<String>();
 			}else{
 				tagStr = data.getString(0);
-				String[] tagArr = tagStr.split(",");
-				for (String tag : tagArr) {
+				String[] tagArray = tagStr.split(",");
+				for (String tag : tagArray) {
+					if(tags==null){
+						tags= new HashSet<String>();
+					}
 					tags.add(tag);
 				}
 			}
@@ -244,9 +373,9 @@ public class JPushPlugin extends CordovaPlugin {
 		String alias;
 		try {
 			alias = data.getString(0);
-			JSONArray tagsArr = data.getJSONArray(1);
-			for (int i = 0; i < tagsArr.length(); i++) {
-				tags.add(tagsArr.getString(i));
+			JSONArray tagsArray = data.getJSONArray(1);
+			for (int i = 0; i < tagsArray.length(); i++) {
+				tags.add(tagsArray.getString(i));
 			}

 			JPushInterface.setAliasAndTags(this.cordova.getActivity()
@@ -258,23 +387,23 @@ public class JPushPlugin extends CordovaPlugin {
 		}
 	}

-	void getNotification(JSONArray data, CallbackContext callBackContext) {
-		String alert = JPushPlugin.notificationAlert;
-		Map<String, String> extras = JPushPlugin.notificationExtras;
-
-		JSONObject jsonData = new JSONObject();
-		try {
-			jsonData.put("message", alert);
-			jsonData.put("extras", new JSONObject(extras));
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		callBackContext.success(jsonData);
-
-		JPushPlugin.notificationAlert = "";
-		JPushPlugin.notificationExtras = new HashMap<String, String>();
-	}
+//	void getNotification(JSONArray data, CallbackContext callBackContext) {
+//		String alert = JPushPlugin.notificationAlert;
+//		Map<String, String> extras = JPushPlugin.notificationExtras;
+//
+//		JSONObject jsonData = new JSONObject();
+//		try {
+//			jsonData.put("message", alert);
+//			jsonData.put("extras", new JSONObject(extras));
+//		} catch (JSONException e) {
+//			e.printStackTrace();
+//		}
+//
+//		callBackContext.success(jsonData);
+//
+//		JPushPlugin.notificationAlert = "";
+//		JPushPlugin.notificationExtras = new HashMap<String, Obl>();
+//	}

 	void setBasicPushNotificationBuilder(JSONArray data,
 			CallbackContext callbackContext) {
@@ -288,7 +417,7 @@ public class JPushPlugin extends CordovaPlugin {
 		} catch (JSONException e) {
 			e.printStackTrace();
 		}
-		callbackContext.success(obj);
+		//callbackContext.success(obj);
 	}

 	void setCustomPushNotificationBuilder(JSONArray data,
@@ -305,13 +434,13 @@ public class JPushPlugin extends CordovaPlugin {
 		} catch (JSONException e) {
 			e.printStackTrace();
 		}
-		callbackContext.success(obj);
+		//callbackContext.success(obj);
 	}
 	
 	void clearAllNotification(JSONArray data,
 			CallbackContext callbackContext){
 		JPushInterface.clearAllNotifications(this.cordova.getActivity());
-		callbackContext.success();
+		//callbackContext.success();
 	}
 	
 	void clearNotificationById(JSONArray data,
@@ -329,6 +458,41 @@ public class JPushPlugin extends CordovaPlugin {
 			callbackContext.error("error id");
 		}
 	}
+	void addLocalNotification(JSONArray data,
+			CallbackContext callbackContext) throws JSONException{
+		//builderId,content,title,notificaitonID,broadcastTime,extras
+		
+		int builderId=data.getInt(0);
+		String content =data.getString(1);
+		String title  = data.getString(2);
+		int notificationID= data.getInt(3);
+		int broadcastTime=data.getInt(4);
+		JSONObject extras=data.getJSONObject(5);
+		
+		JPushLocalNotification ln = new JPushLocalNotification();
+		ln.setBuilderId(builderId);
+		ln.setContent(content);
+		ln.setTitle(title);
+		ln.setNotificationId(notificationID) ;
+		ln.setBroadcastTime(System.currentTimeMillis() + broadcastTime);
+
+ 		ln.setExtras(extras.toString()) ;
+		JPushInterface.addLocalNotification(this.cordova.getActivity(), ln);
+		
+	}
+	void removeLocalNotification(JSONArray data,
+			CallbackContext callbackContext) throws JSONException{
+		
+		int notificationID=data.getInt(0);
+		JPushInterface.removeLocalNotification(this.cordova.getActivity(),notificationID);
+
+	}
+	void clearLocalNotifications(JSONArray data,
+			CallbackContext callbackContext){
+		
+		JPushInterface.clearLocalNotifications(this.cordova.getActivity());
+
+	}
 	
 	private final TagAliasCallback mTagWithAliasCallback = new TagAliasCallback() {

@@ -348,10 +512,6 @@ public class JPushPlugin extends CordovaPlugin {
    					.format("cordova.fireDocumentEvent('jpush.setTagsWithAlias',%s)",
    							data.toString());
    			instance.webView.sendJavascript(jsEvent);
-    			String js = String
-    					.format("window.plugins.jPushPlugin.pushCallback('%s');",
-    							data.toString());
-    			instance.webView.sendJavascript(js);


    		} catch (JSONException e) {
--- a/src/android/MyReceiver.java
+++ b/src/android/MyReceiver.java
@@ -23,6 +23,7 @@ public class MyReceiver extends BroadcastReceiver {
        } else if (JPushInterface.ACTION_MESSAGE_RECEIVED.equals(intent.getAction())) {
        	handlingReceivedMessage(intent);
        } else if (JPushInterface.ACTION_NOTIFICATION_RECEIVED.equals(intent.getAction())) {
+        	handlingNotificationReceive(context,intent);
        	
        } else if (JPushInterface.ACTION_NOTIFICATION_OPENED.equals(intent.getAction())) {
        	handlingNotificationOpen(context,intent);
@@ -35,13 +36,14 @@ public class MyReceiver extends BroadcastReceiver {
 	}
 	private void handlingReceivedMessage(Intent intent) {
 		String msg = intent.getStringExtra(JPushInterface.EXTRA_MESSAGE);
-		Map<String,String> extras = getNotificationExtras(intent);
+		Map<String,Object> extras = getNotificationExtras(intent);
+		
 		
 		JPushPlugin.transmitPush(msg, extras);
 	}
 	 private void handlingNotificationOpen(Context context,Intent intent){
 		 String alert = intent.getStringExtra(JPushInterface.EXTRA_ALERT);
-		 Map<String,String> extras = getNotificationExtras(intent);
+		 Map<String,Object> extras = getNotificationExtras(intent);
 		 
 		 Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
 		 launch.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -50,19 +52,38 @@ public class MyReceiver extends BroadcastReceiver {
 		 JPushPlugin.notificationAlert = alert;
 		 JPushPlugin.notificationExtras = extras;
 		 
+		 JPushPlugin.transmitOpen(alert, extras);
+
 		 context.startActivity(launch);
 	 }
-	 private Map<String, String> getNotificationExtras(Intent intent) {
-		 Map<String, String> extrasMap = new HashMap<String, String>();
+	 private void handlingNotificationReceive(Context context,Intent intent){
+		 String alert = intent.getStringExtra(JPushInterface.EXTRA_ALERT);
+		 Map<String,Object> extras = getNotificationExtras(intent);
+		 
+		 Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+		 launch.addCategory(Intent.CATEGORY_LAUNCHER);
+		 launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK|Intent.FLAG_ACTIVITY_SINGLE_TOP);
+		 
+		 JPushPlugin.notificationAlert = alert;
+		 JPushPlugin.notificationExtras = extras;
+		 
+		 JPushPlugin.transmitReceive(alert, extras);
+	 }
+	 private Map<String, Object> getNotificationExtras(Intent intent) {
+		 Map<String, Object> extrasMap = new HashMap<String, Object>();
 		 
 		 for (String key : intent.getExtras().keySet()) {
 			 if (!IGNORED_EXTRAS_KEYS.contains(key)) {
-				 Log.e("key","key:"+key);
-				 extrasMap.put(key, intent.getStringExtra(key));
+			    Log.e("key","key:"+key);
+		     	if (key.equals(JPushInterface.EXTRA_NOTIFICATION_ID)){
+		     		extrasMap.put(key, intent.getIntExtra(key,0));
+		     	}else{
+		     		extrasMap.put(key, intent.getStringExtra(key));
+		        }
 			 }
 		 }
 		 return extrasMap;
 	 }
 	 private static final List<String> IGNORED_EXTRAS_KEYS = 
-			 Arrays.asList("cn.jpush.android.TITLE","cn.jpush.android.MESSAGE","cn.jpush.android.APPKEY");
+			 Arrays.asList("cn.jpush.android.TITLE","cn.jpush.android.MESSAGE","cn.jpush.android.APPKEY","cn.jpush.android.NOTIFICATION_CONTENT_TITLE");
 }
--- a/src/android/arm64-v8a/libjpush175.so
+++ b/src/android/arm64-v8a/libjpush175.so
--- a/src/android/armeabi-v7a/libjpush175.so
+++ b/src/android/armeabi-v7a/libjpush175.so
--- a/src/android/armeabi/libjpush175.so
+++ b/src/android/armeabi/libjpush175.so
--- a/src/android/jpush-sdk-release1.6.1.jar
+++ b/src/android/jpush-sdk-release1.6.1.jar
--- a/src/android/jpush-sdk-release1.7.5.jar
+++ b/src/android/jpush-sdk-release1.7.5.jar
--- a/src/android/libjpush.so
+++ b/src/android/libjpush.so
--- a/src/ios/Plugins/JPushPlugin.h
+++ b/src/ios/Plugins/JPushPlugin.h
@@ -8,10 +8,13 @@

 #import <Cordova/CDV.h>

+#define kJPushPluginReceiveNotification @"JPushPluginReceiveNofication"
+
@interface JPushPlugin : CDVPlugin{
  
 }

+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions;
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command;
 -(void)setTags:(CDVInvokedUrlCommand*)command;
 -(void)setAlias:(CDVInvokedUrlCommand*)command;
--- a/src/ios/Plugins/JPushPlugin.m
+++ b/src/ios/Plugins/JPushPlugin.m
@@ -8,14 +8,67 @@

 #import "JPushPlugin.h"
 #import "APService.h"
+#import <UIKit/UIKit.h>
+
+static NSDictionary *_luanchOptions=nil;

@implementation JPushPlugin

+
+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{
+    _luanchOptions=theLaunchOptions;
+    [APService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
+                                                   UIUserNotificationTypeSound |
+                                                   UIUserNotificationTypeAlert)
+                                       categories:nil];
+    [APService setupWithOption:_luanchOptions];
+}
+
+-(void)initial:(CDVInvokedUrlCommand*)command{
+    //do nithng,because Cordova plugin use lazy load mode.
+    
+}
+- (CDVPlugin*)initWithWebView:(UIWebView*)theWebView{
+    if (self=[super initWithWebView:theWebView]) {
+        
+        NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
+        [defaultCenter addObserver:self
+                          selector:@selector(networkDidReceiveMessage:)
+                              name:kJPFNetworkDidReceiveMessageNotification
+                            object:nil];
+        
+        [defaultCenter addObserver:self
+                          selector:@selector(networkDidReceiveNotification:)
+                              name:kJPushPluginReceiveNotification
+                            object:nil];
+
+        if (_luanchOptions) {
+            NSDictionary *userInfo = [_luanchOptions
+                                      valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+            if ([userInfo count] >0) {
+                NSError  *error;
+                NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
+                NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+                if (!error) {
+                    
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",jsonString]];
+                    });
+                    
+                }
+            }
+
+        }
+        
+    }
+    return self;
+}
+
 -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{
    
    NSArray *arguments=command.arguments;
    if (!arguments||[arguments count]<2) {
-        [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.pushCallback('%@')",@""]];
+//        [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.pushCallback('%@')",@""]];
        return ;
    }
    NSString *alias=[arguments objectAtIndex:0];
@@ -26,7 +79,46 @@
      callbackSelector:@selector(tagsWithAliasCallback:tags:alias:)
                object:self];
 }
-    
+
+-(void)resumePush:(CDVInvokedUrlCommand*)command{
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1
+   if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+    //可以添加自定义categories
+    [APService registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
+                                                   UIUserNotificationTypeSound |
+                                                   UIUserNotificationTypeAlert)
+                                       categories:nil];
+	} else {
+	//categories 必须为nil
+	[APService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+												   UIRemoteNotificationTypeSound |
+												   UIRemoteNotificationTypeAlert)
+									   categories:nil];
+	}
+#else
+    //categories 必须为nil
+	[APService registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+												 UIRemoteNotificationTypeSound |
+												 UIRemoteNotificationTypeAlert)
+									 categories:nil];
+#endif
+
+}
+-(void)isPushStopped:(CDVInvokedUrlCommand*)command{
+
+    NSNumber *result;
+    if ([[UIApplication sharedApplication] isRegisteredForRemoteNotifications ]) {
+        result=@(1);
+    }else{
+        result=@(0);
+    }
+    CDVPluginResult * pushResult=[self pluginResultForValue:result];
+    if (pushResult) {
+        [self succeedWithPluginResult:pushResult withCallbackID:command.callbackId];
+    } else {
+        [self failWithCallbackID:command.callbackId];
+}}
 -(void)setTags:(CDVInvokedUrlCommand *)command{
    

@@ -51,8 +143,8 @@

 -(void)getRegistrationID:(CDVInvokedUrlCommand*)command{
    
-    NSString* registratonID = [APService registrionID];
-    CDVPluginResult *result=[self pluginResultForValue:registratonID];
+    NSString* registrationID = [APService registrationID];
+    CDVPluginResult *result=[self pluginResultForValue:registrationID];
    if (result) {
        [self succeedWithPluginResult:result withCallbackID:command.callbackId];
    } else {
@@ -78,7 +170,7 @@

    dispatch_async(dispatch_get_main_queue(), ^{
      [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.setTagsWithAlias',%@)",jsonString]];
-      [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.pushCallback('%@')",jsonString]];
+//      [self writeJavascript:[NSString stringWithFormat:@"window.plugins.jPushPlugin.pushCallback('%@')",jsonString]];
    });
    
 }
@@ -106,7 +198,44 @@
    }

 }
+-(void)beginLogPageView:(CDVInvokedUrlCommand*)command{
+    NSArray *arguments=command.arguments;
+    if (!arguments||[arguments count]<2) {
+        NSLog(@"beginLogPageView argument  error");
+        return ;
+    }
+    NSString * pageName=[arguments objectAtIndex:0];
+    int duration=[[arguments objectAtIndex:0]intValue];
+    if (pageName) {
+        [APService beginLogPageView:pageName duration:duration];
+    }

+}
+-(void)setBadge:(CDVInvokedUrlCommand*)command{
+    NSArray *argument=command.arguments;
+    if ([argument count]<1) {
+        NSLog(@"setBadge argument error!");
+        return;
+    }
+    NSNumber *badge=[argument objectAtIndex:0];
+    [APService setBadge:[badge intValue]];
+}
+-(void)resetBadge:(CDVInvokedUrlCommand*)command{
+    [APService resetBadge];
+}
+-(void)setDebugModeFromIos:(CDVInvokedUrlCommand*)command{
+    
+    [APService setDebugMode];
+}
+-(void)setLogOFF:(CDVInvokedUrlCommand*)command{
+    
+    [APService setLogOFF];
+}
+-(void)stopPush:(CDVInvokedUrlCommand*)command{
+    
+    [[UIApplication sharedApplication]unregisterForRemoteNotifications];
+
+}
 - (void)failWithCallbackID:(NSString *)callbackID {
    CDVPluginResult *result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
    [self.commandDelegate sendPluginResult:result callbackId:callbackID];
@@ -114,6 +243,19 @@
 - (void)succeedWithPluginResult:(CDVPluginResult *)result withCallbackID:(NSString *)callbackID {
    [self.commandDelegate sendPluginResult:result callbackId:callbackID];
 }
+-(void)setApplicationIconBadgeNumber:(CDVInvokedUrlCommand*)command{
+    //
+    NSArray *argument=command.arguments;
+    if ([argument count]<1) {
+        NSLog(@"setBadge argument error!");
+        return;
+    }
+    NSNumber *badge=[argument objectAtIndex:0];
+    [UIApplication sharedApplication].applicationIconBadgeNumber=[badge intValue];
+}
+
+
+
 - (CDVPluginResult *)pluginResultForValue:(id)value {
    
    CDVPluginResult *result;
@@ -141,5 +283,60 @@
    return result;
 }

+- (void)networkDidReceiveMessage:(NSNotification *)notification {
+
+    NSDictionary *userInfo = [notification userInfo];
+    //NSLog(@"%@",userInfo);
+    
+    NSError  *error;
+    NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
+    NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+ 
+    //NSLog(@"%@",jsonString);
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        
+        [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveMessage',%@)",jsonString]];
+
+        [self.commandDelegate evalJs:[NSString stringWithFormat:@"window.plugins.jPushPlugin.receiveMessageIniOSCallback('%@')",jsonString]];
+        
+        
+    });
+
+}
+
+-(void)networkDidReceiveNotification:(id)notification{
+    
+    NSError  *error;
+    NSDictionary *userInfo = [notification object];
+
+    NSData   *jsonData   = [NSJSONSerialization dataWithJSONObject:userInfo options:0 error:&error];
+    NSString *jsonString = [[NSString alloc]initWithData:jsonData encoding:NSUTF8StringEncoding];
+    switch ([UIApplication sharedApplication].applicationState) {
+        case UIApplicationStateActive:
+            {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.receiveNotification',%@)",jsonString]];
+                });
+
+            }
+            break;
+        case UIApplicationStateInactive:
+        case UIApplicationStateBackground:
+            {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self.commandDelegate evalJs:[NSString stringWithFormat:@"cordova.fireDocumentEvent('jpush.openNotification',%@)",jsonString]];
+                });
+                
+            }
+            break;
+        default:
+            //do nothing
+            break;
+    }
+    
+
+}
+

@end
--- a/src/ios/lib/APService.h
+++ b/src/ios/lib/APService.h
@@ -4,23 +4,27 @@
 //
 //  Created by JPush on 12-8-15.
 //  Copyright (c) 2012年 HXHG. All rights reserved.
-//  Version: 1.7.1
+//  Version: 1.8.3

-#import <Foundation/Foundation.h>
+@class CLRegion;
+@class UILocalNotification;

-extern NSString *const kAPNetworkDidSetupNotification;     // 建立连接
-extern NSString *const kAPNetworkDidCloseNotification;     // 关闭连接
-extern NSString *const kAPNetworkDidRegisterNotification;  // 注册成功
-extern NSString *const kAPNetworkDidLoginNotification;     // 登录成功
+extern NSString *const kJPFNetworkDidSetupNotification;     // 建立连接
+extern NSString *const kJPFNetworkDidCloseNotification;     // 关闭连接
+extern NSString *const kJPFNetworkDidRegisterNotification;  // 注册成功
+extern NSString *const kJPFNetworkDidLoginNotification;     // 登录成功
 extern NSString *const
-    kAPNetworkDidReceiveMessageNotification;         // 收到消息(非APNS)
-extern NSString *const kAPServiceErrorNotification;  // 错误提示
+    kJPFNetworkDidReceiveMessageNotification;         // 收到消息(非APNS)
+extern NSString *const kJPFServiceErrorNotification;  // 错误提示

+@class CLLocation;
@interface APService : NSObject

+#pragma - mark 基本功能
 // 以下四个接口是必须调用的
 + (void)setupWithOption:(NSDictionary *)launchingOption;  // 初始化
-+ (void)registerForRemoteNotificationTypes:(int)types;    // 注册APNS类型
+ (void)registerForRemoteNotificationTypes:(NSUInteger)types
+                                categories:(NSSet *)categories;  // 注册APNS类型
 + (void)registerDeviceToken:(NSData *)deviceToken;  // 向服务器上报Device Token
 + (void)handleRemoteNotification:(NSDictionary *)
    remoteInfo;  // 处理收到的APNS消息，向服务器上报收到APNS消息
@@ -44,6 +48,7 @@ extern NSString *const kAPServiceErrorNotification;  // 错误提示
 // 用于过滤出正确可用的tags，如果总数量超出最大限制则返回最大数量的靠前的可用tags
 + (NSSet *)filterValidTags:(NSSet *)tags;

+#pragma - mark 上报日志
 /**
 *  记录页面停留时间功能。
 *  startLogPageView和stopLogPageView为自动计算停留时间
@@ -57,12 +62,114 @@ extern NSString *const kAPServiceErrorNotification;  // 错误提示
 + (void)beginLogPageView:(NSString *)pageName duration:(int)seconds;

 /**
- *  get the UDID
- */
-+ (NSString *)openUDID DEPRECATED_ATTRIBUTE;  // UDID
+ *  开启Crash日志收集, 默认是关闭状态.
+*/
+ (void)crashLogON;

 /**
- *  get RegistionID
+ *  地理位置设置
+ *  为了更精确的统计用户地理位置，可以调用此方法传入经纬度信息
+ *  需要链接 CoreLocation.framework 并且 #import <CoreLocation/CoreLocation.h>
+ *  @param latitude 纬度.
+ *  @param longitude 经度.
+ *  @param location 直接传递CLLocation *型的地理信息
 */
-+ (NSString *)registrionID;
+ (void)setLatitude:(double)latitude longitude:(double)longitude;
+ (void)setLocation:(CLLocation *)location;
+
+#pragma - mark 本地通知
+/**
+* 本地推送，最多支持64个
+* @param fireDate 本地推送触发的时间
+* @param alertBody 本地推送需要显示的内容
+* @param badge 角标的数字。如果不需要改变角标传-1
+* @param alertAction 弹框的按钮显示的内容（IOS 8默认为"打开",其他默认为"启动"）
+* @param notificationKey 本地推送标示符
+* @param userInfo 自定义参数，可以用来标识推送和增加附加信息
+* @param soundName 自定义通知声音，设置为nil为默认声音
+
+* IOS8新参数
+* @param region 自定义参数
+* @param regionTriggersOnce 自定义参数
+* @param category 自定义参数
+*/
+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
+                                    alertBody:(NSString *)alertBody
+                                        badge:(int)badge
+                                  alertAction:(NSString *)alertAction
+                                identifierKey:(NSString *)notificationKey
+                                     userInfo:(NSDictionary *)userInfo
+                                    soundName:(NSString *)soundName;
+
+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate
+                                    alertBody:(NSString *)alertBody
+                                        badge:(int)badge
+                                  alertAction:(NSString *)alertAction
+                                identifierKey:(NSString *)notificationKey
+                                     userInfo:(NSDictionary *)userInfo
+                                    soundName:(NSString *)soundName
+                                       region:(CLRegion *)region
+                           regionTriggersOnce:(BOOL)regionTriggersOnce
+                                     category:(NSString *)category
+    NS_AVAILABLE_IOS(8_0);
+
+/**
+* 本地推送在前台推送。默认App在前台运行时不会进行弹窗，在程序接收通知调用此接口可实现指定的推送弹窗。
+* @param notification 本地推送对象
+* @param notificationKey 需要前台显示的本地推送通知的标示符
+*/
+ (void)showLocalNotificationAtFront:(UILocalNotification *)notification
+                       identifierKey:(NSString *)notificationKey;
+/**
+* 删除本地推送
+* @param notificationKey 本地推送标示符
+* @param myUILocalNotification 本地推送对象
+*/
+ (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey;
+ (void)deleteLocalNotification:(UILocalNotification *)localNotification;
+
+/**
+* 获取指定通知
+* @param notificationKey 本地推送标示符
+* @return  本地推送对象数组,[array count]为0时表示没找到
+*/
+ (NSArray *)findLocalNotificationWithIdentifier:(NSString *)notificationKey;
+
+/**
+* 清除所有本地推送对象
+*/
+ (void)clearAllLocalNotifications;
+
+#pragma - mark 设置Badge
+/**
+ *  set setBadge
+ *  @param value 设置JPush服务器的badge的值
+ *  本地仍须调用UIApplication:setApplicationIconBadgeNumber函数,来设置脚标
+ */
+ (BOOL)setBadge:(NSInteger)value;
+/**
+ *  set setBadge
+ *  @param value 清除JPush服务器对badge值的设定.
+ *  本地仍须调用UIApplication:setApplicationIconBadgeNumber函数,来设置脚标
+ */
+
+ (void)resetBadge;
+
+/**
+ *  get RegistrationID
+ */
+ (NSString *)registrationID;
+
+#pragma - mark 打印日志信息配置
+/**
+ *  setDebugMode获取更多的Log信息
+ *  开发过程中建议开启DebugMode
+ *
+ *  setLogOFF关闭除了错误信息外的所有Log
+ *  发布时建议开启LogOFF用于节省性能开销
+ *
+ *  默认为不开启DebugLog,只显示基本的信息
+ */
+ (void)setDebugMode;
+ (void)setLogOFF;
@end
--- a/src/ios/lib/libPushSDK-1.8.3.a
+++ b/src/ios/lib/libPushSDK-1.8.3.a
--- a/src/ios/lib/libPushSDK.a
+++ b/src/ios/lib/libPushSDK.a
--- a/www/JPushPlugin.js
+++ b/www/JPushPlugin.js
@@ -1,6 +1,14 @@
+
 var JPushPlugin = function(){
 };

+//private plugin function
+
+JPushPlugin.prototype.receiveMessage={}
+JPushPlugin.prototype.openNotification={}
+JPushPlugin.prototype.receiveNotification={}
+
+
 JPushPlugin.prototype.isPlatformIOS = function(){
 	return device.platform == "iPhone" || device.platform == "iPad" || device.platform == "iPod touch" || device.platform == "iOS"
 }
@@ -14,16 +22,28 @@ JPushPlugin.prototype.call_native = function(name, args, callback){
 	ret = cordova.exec(callback,this.error_callback,'JPushPlugin',name,args);
 	return ret;
 }
+//public plugin function

-JPushPlugin.prototype.startLogPageView = function(data){  
+JPushPlugin.prototype.startLogPageView = function(pageName){  
    if(this.isPlatformIOS()){
-		this.call_native( "startLogPageView",[data],null); 
+		this.call_native( "startLogPageView",[pageName],null); 
    }      
 }

-JPushPlugin.prototype.stopLogPageView = function(data){
+JPushPlugin.prototype.stopLogPageView = function(pageName){
    if(this.isPlatformIOS()){
-		this.call_native( "stopLogPageView",[data],null);   
+		this.call_native( "stopLogPageView",[pageName],null);   
+	}
+}
+
+JPushPlugin.prototype.beginLogPageView = function(pageName,duration){
+    if(this.isPlatformIOS()){
+		this.call_native( "beginLogPageView",[pageName,duration],null);   
+	}
+}
+JPushPlugin.prototype.setApplicationIconBadgeNumber = function(badge){
+    if(this.isPlatformIOS()){
+		this.call_native( "setApplicationIconBadgeNumber",[badge],null);   
 	}
 }

@@ -46,7 +66,24 @@ JPushPlugin.prototype.setTagsWithAlias = function(tags,alias){
 	}

 }
+JPushPlugin.prototype.setTags = function(tags){
+        
+	try{
+		this.call_native("setTags",tags,null);
+	}
+	catch(exception){
+		console.log(exception);
+	}
+}

+JPushPlugin.prototype.setAlias = function(alias){
+	try{             
+		this.call_native("setAlias",[alias],null);
+	}
+	catch(exception){             
+		console.log(exception);
+	}
+}
 JPushPlugin.prototype.getRegistrationID = function(callback){
        
 	try{
@@ -57,33 +94,121 @@ JPushPlugin.prototype.getRegistrationID = function(callback){
 		console.log(exception);
 	}
 }
-JPushPlugin.prototype.setTags = function(data){
-        
-	try{
-		this.call_native("setTags",data,null);
+
+JPushPlugin.prototype.setBadge = function(value){
+               
+   if(this.isPlatformIOS()){     
+       try{
+       this.call_native("setBadge",[value],null);
+       }
+       catch(exception){
+       console.log(exception);
+       }
+
+   }
+}
+JPushPlugin.prototype.resetBadge = function(){
+               
+    if(this.isPlatformIOS()){
+       try{
+           var data=[];
+           this.call_native("resetBadge",[data],null);
+       }
+       catch(exception){
+           console.log(exception);
+       }
+    }
+}
+JPushPlugin.prototype.setDebugModeFromIos = function(){
+	if(this.isPlatformIOS()){
+		   var data=[];
+           this.call_native("setDebugModeFromIos",[data],null);
 	}
-	catch(exception){
-		console.log(exception);
+
+}
+JPushPlugin.prototype.setLogOFF = function(){
+	if(this.isPlatformIOS()){
+        	var data=[];
+            this.call_native("setLogOFF",[data],null);
+	}
+}
+JPushPlugin.prototype.receiveMessageIniOSCallback = function(data){
+	try{
+		console.log("JPushPlugin:receiveMessageIniOSCallback--data:"+data);
+		var bToObj = JSON.parse(data);
+		var content = bToObj.content;
+        console.log(content);
+	}
+	catch(exception){               
+		console.log("JPushPlugin:receiveMessageIniOSCallback"+exception);
+	}
+}
+JPushPlugin.prototype.receiveMessageInAndroidCallback = function(data){
+	try{
+		console.log("JPushPlugin:receiveMessageInAndroidCallback");
+		var bToObj  = JSON.parse(data);
+		this.receiveMessage=bToObj
+		cordova.fireDocumentEvent('jpush.receiveMessage',null);
+		//console.log(data);
+		//var message  = bToObj.message;
+		//var extras  = bToObj.extras;
+
+		//console.log(message);
+		//console.log(extras['cn.jpush.android.MSG_ID']);
+		//console.log(extras['cn.jpush.android.CONTENT_TYPE']);
+		//console.log(extras['cn.jpush.android.EXTRA']);
+	}
+	catch(exception){               
+		console.log("JPushPlugin:pushCallback "+exception);
 	}
 }

-JPushPlugin.prototype.setAlias = function(data){
-	try{             
-		this.call_native("setAlias",[data],null);
+//
+JPushPlugin.prototype.openNotificationInAndroidCallback = function(data){
+	try{
+		console.log("JPushPlugin:openNotificationInAndroidCallback");
+		var bToObj  = JSON.parse(data);
+		this.openNotification=bToObj;	
+		cordova.fireDocumentEvent('jpush.openNotification',null);
+	
+		//console.log(data);
+		//var bToObj  = JSON.parse(data);
+		//var alert   = bToObj.alert;
+		//var extras  = bToObj.extras;
+		//console.log(alert);
+
+		//console.log(extras['cn.jpush.android.MSG_ID']);
+		//console.log(extras['app']);
+		//console.log(extras['cn.jpush.android.NOTIFICATION_CONTENT_TITLE']);
+		//console.log(extras['cn.jpush.android.EXTRA']);
+		//console.log(extras['cn.jpush.android.PUSH_ID']);
+		//console.log(extras['cn.jpush.android.NOTIFICATION_ID']);
+		//console.log("JPushPlugin:openNotificationCallback is ready");
 	}
-	catch(exception){             
+	catch(exception){               
 		console.log(exception);
 	}
 }
-
-JPushPlugin.prototype.pushCallback = function(data){
+JPushPlugin.prototype.receiveNotificationInAndroidCallback = function(data){
 	try{
-		console.log(data);
-		var bToObj=JSON.parse(data);
-		var code  = bToObj.resultCode;
-		var tags  = bToObj.resultTags;
-		var alias = bToObj.resultAlias;
-		console.log("JPushPlugin:callBack--code is "+code+" tags is "+tags + " alias is "+alias);
+		console.log("JPushPlugin:receiveNotificationInAndroidCallback");
+		var bToObj  = JSON.parse(data);
+		this.receiveNotification=bToObj;	
+		cordova.fireDocumentEvent('jpush.receiveNotification',null);
+	
+		//console.log(data);
+		//var bToObj  = JSON.parse(data);
+		//var alert   = bToObj.alert;
+		//var extras  = bToObj.extras;
+		//console.log(alert);
+
+		//console.log(extras['cn.jpush.android.MSG_ID']);
+		//console.log(extras['app']);
+		//console.log(extras['cn.jpush.android.NOTIFICATION_CONTENT_TITLE']);
+		//console.log(extras['cn.jpush.android.EXTRA']);
+		//console.log(extras['cn.jpush.android.PUSH_ID']);
+		//console.log(extras['cn.jpush.android.NOTIFICATION_ID']);
+		//console.log("JPushPlugin:openNotificationCallback is ready");
 	}
 	catch(exception){               
 		console.log(exception);
@@ -91,13 +216,6 @@ JPushPlugin.prototype.pushCallback = function(data){
 }
 //android single

-JPushPlugin.prototype.getNotification = function (callback) {
-  if(device.platform == "Android") {
-    data=[];
-  	this.call_native("getNotification",data,callback);
-  }
-}
-
 JPushPlugin.prototype.setBasicPushNotificationBuilder = function(){
 	if(device.platform == "Android") {
 		data=[]
@@ -113,20 +231,22 @@ JPushPlugin.prototype.setCustomPushNotificationBuilder = function(){
 }

 JPushPlugin.prototype.stopPush = function(){
-	if(device.platform == "Android") {
-		data=[];
-		this.call_native("stopPush",data,null);
-	}
+	data=[];
+	this.call_native("stopPush",data,null);
 }

 JPushPlugin.prototype.resumePush = function(){
-	if(device.platform == "Android") {
 		data=[]
 		this.call_native("resumePush",data,null);
+	
+}
+JPushPlugin.prototype.setDebugMode = function(mode){
+	if(device.platform == "Android") {
+		this.call_native("setDebugMode",[mode],null);
 	}
 }
-
-JPushPlugin.prototype.clearAllNoticication = function(){
+//setDebugMode
+JPushPlugin.prototype.clearAllNotification = function(){
 	if(device.platform == "Android") {
 		data=[]
 		this.call_native("clearAllNotification",data,null);
@@ -140,26 +260,55 @@ JPushPlugin.prototype.setLatestNotificationNum = function(num){
 }

 JPushPlugin.prototype.isPushStopped = function(callback){
-	if(device.platform == "Android") {
+
 	    data=[];
 		this.call_native("isPushStopped",data,callback)
-	}
+	
 }

 JPushPlugin.prototype.init = function(){
+    if(this.isPlatformIOS()){
+       var data=[];
+       this.call_native("initial",data,null);
+    }else{
+       data=[];
+       this.call_native("init",data,null);
+
+    }
+	
+}
+
+JPushPlugin.prototype.setDebugMode = function(mode){
 	if(device.platform == "Android") {
-	    data=[];
-		this.call_native("init",data,null);
+		this.call_native("setDebugMode",[mode],null);
+	}
+}
+JPushPlugin.prototype.addLocalNotification = function(builderId,content,title,notificaitonID,broadcastTime,extras){
+	if(device.platform == "Android") {
+		data=[builderId,content,title,notificaitonID,broadcastTime,extras];
+		this.call_native("addLocalNotification",data,null);
+	}
+}
+JPushPlugin.prototype.removeLocalNotification = function(notificationID){
+	if(device.platform == "Android") {
+		this.call_native("removeLocalNotification",[notificationID],null);
+	}
+}
+JPushPlugin.prototype.clearLocalNotifications = function(){
+	if(device.platform == "Android") {
+		data=[]
+		this.call_native("clearLocalNotifications",data,null);
 	}
 }

-JPushPlugin.prototype.setDebugable = function(mode){
+JPushPlugin.prototype.reportNotificationOpened = function(msgID){
 	if(device.platform == "Android") {
-		this.call_native("setDebugable",[mode],null);
+	
+		this.call_native("reportNotificationOpened",[msgID],null);
 	}
 }

-//ios  single
+//iOS  single


 if(!window.plugins){
Author	SHA1	Message	Date
zhangqinghe	7984b8acf0	fix fir android sdk 1.7.5 plugin.xml	2015-07-10 17:45:19 +08:00
zhangqinghe	1fbc14b677	change iOS sdk from v1.8.2 to 1.8.3	2015-07-10 17:45:19 +08:00
zhangqinghe	5fdd31b960	change android sdk form 1.7.3 to 1.7.5	2015-07-10 17:45:18 +08:00
zhangqinghe	b3e404ef12	修正JPushPlugin.prototype.receiveMessageInAndroidCallback的bug	2015-07-10 17:45:18 +08:00
zhangqinghe	1082fbd8c4	修改关于jpush.receiveNotification的文档，并删除旧有说明	2015-07-10 17:45:18 +08:00
zhangqinghe	c420ae20e5	add jpush.receiveNotificaiton event in platform android	2015-07-10 17:45:18 +08:00
zhangqinghe	c90c9b7b01	fix #47	2015-07-03 16:39:25 +08:00
zhangqinghe	4e2b2d6bb6	fix document about ios in content-avalible	2015-04-24 14:49:20 +08:00
zhangqinghe	8b3aa0b90e	fix /strios/example to example	2015-04-16 14:56:06 +08:00
zhangqinghe	2e5cfdaa5a	fix document about example position	2015-04-16 14:15:11 +08:00
zhangqinghe	7fcefce3ce	fix android message and notification event	2015-04-15 16:59:32 +08:00
zhangqinghe	ce8ca9f8f8	fix when app not launch tap notification,and not receice jpush.openNotification	2015-04-14 16:15:25 +08:00
zhangqinghe	93fbc893ca	ducument add event jpush.receiveMessage	2015-04-14 15:11:21 +08:00
zhangqinghe	7545a948bd	demo add openNotification receiveNotification receiveMessage code	2015-04-14 14:47:57 +08:00
zhangqinghe	2510289d95	about lazy load mode explanation	2015-04-14 13:35:29 +08:00
zhangqinghe	41c5c04dc1	move android api position	2015-04-14 13:08:41 +08:00
zhangqinghe	82dd47eefa	move andorid init api to common api document	2015-04-14 11:35:27 +08:00
zhangqinghe	f0c6374409	fix Cordova CLI auto install in document	2015-04-14 11:21:09 +08:00
zhangqinghe	40828ff145	move jpush sdk inital method to JPushPlugin static method	2015-04-14 10:05:14 +08:00
zhangqinghe	cbca41a513	Adjustment documents structure	2015-04-14 09:58:44 +08:00
zhangqinghe	fbd98732c8	fix dicument about open notification event when app is launching	2015-04-10 13:45:15 +08:00
zhangqinghe	ff86dc1230	add open notification evnet when app is launching	2015-04-10 13:42:25 +08:00
zhangqinghe	2dbd0cb248	add 'jpush.openNotificaiton'event in iOS ducoment	2015-04-10 11:11:26 +08:00
zhangqinghe	a049e2e62d	add open notificaiton event when app run background	2015-04-10 11:04:56 +08:00
zhangqinghe	bf003c84c1	add registrationID in document	2015-03-30 11:13:52 +08:00
zhangqinghe	ced9ad3a1e	fix abot api isPushStoped and resumePush in document	2015-03-30 11:02:33 +08:00
zhangqinghe	27378f6ca0	add new iterface 'isPushStopped' and 'resumePush' for platform iOS	2015-03-30 10:28:01 +08:00
zhangqinghe	58b8cd45b2	增加设置本地的badge值的api	2015-03-25 16:11:04 +08:00
qinghe.zhang	6d668101c5	Merge pull request #32 from yaonie084/master fix README.md for use cordovar 4.x	2015-03-19 15:29:27 +08:00
ethan	67ca37d55a	fix README.md for cordovar 4.x	2015-03-19 14:41:19 +08:00
zhangqinghe	e78d5bd544	fix jpush.receiveNotification in document	2015-03-19 13:37:48 +08:00
zhangqinghe	d92723301e	delete OnPuase in Document	2015-03-18 17:07:38 +08:00
zhangqinghe	605fcf4a62	remove deprecated interface writeJavascript	2015-03-18 15:34:16 +08:00
zhangqinghe	e66336f670	update android sdk version to v1.7.3	2015-03-17 14:18:12 +08:00
zhangqinghe	2797bdd0e7	add ducoment about with JPushPlugin.h	2015-03-10 17:38:14 +08:00
zhangqinghe	a197975d03	upadte js event 'jpush.receiveNotification'	2015-03-10 16:58:09 +08:00
zhangqinghe	27c4fe7b26	add event jpush.receiveNotification in object-c file	2015-03-10 16:46:44 +08:00
zhangqinghe	aae9e8314a	add js event jpush.receiveNotification	2015-03-10 16:37:08 +08:00
zhangqinghe	7d489c7f20	Merge branch 'dev' of ssh://github.com/jpush/jpush-phonegap-plugin into dev	2015-02-14 16:26:05 +08:00
zhangqinghe	c3cfa01e60	delete openNotificaiton error simple	2015-02-14 16:24:09 +08:00
zhangqinghe	27ebdd6809	增加了打开通知的event回调	2015-02-14 16:24:09 +08:00
qinghe.zhang	e945bcf53d	Merge pull request #29 from Samurais/master #28 stream cn.jpush.android.EXTRA from JSONObject to String	2015-02-14 16:23:01 +08:00
Samurais	cc858c2464	#28 stream cn.jpush.android.EXTRA from JSONObject to String	2015-02-14 16:07:31 +08:00
zhangqinghe	1b93f5e026	delete openNotificaiton error simple	2015-01-27 18:31:05 +08:00
zhangqinghe	46e0c1879c	增加了打开通知的event回调	2015-01-27 18:19:16 +08:00
zhangqinghe	fe7c52f2c9	add open notificaiton event interface's document	2015-01-27 15:40:46 +08:00
zhangqinghe	f217eda463	添加统计代码	2015-01-26 14:40:44 +08:00
zhangqinghe	95fc690dd3	fix ducoment's error	2015-01-26 14:30:28 +08:00
zhangqinghe	260c298f6b	增加统计接口	2015-01-26 14:23:45 +08:00
zhangqinghe	7c1c29a7ec	add interface init and setDebugMode in example	2015-01-19 17:48:41 +08:00
qinghe.zhang	0aed054039	Merge pull request #22 from Samurais/master #21 fix json parse issue in openNotificationInAndroidCallback	2015-01-19 17:07:01 +08:00
zhangqinghe	b018a2748c	change plugin vertion to 2.0.0	2015-01-19 16:49:37 +08:00
zhangqinghe	39b7987b25	修正安装文档，使安装过程更简洁	2015-01-19 16:37:44 +08:00
zhangqinghe	2c3bd5ab38	升级android sdk 到1.7.2	2015-01-19 13:32:56 +08:00
zhangqinghe	3e23fb9129	调整参数名称和函数在文件的位置	2015-01-16 15:09:26 +08:00
zhangqinghe	495497f3ac	添加api说明文档	2015-01-16 15:02:06 +08:00
zhangqinghe	ca72c5eba1	修改统计功能的参数	2015-01-16 10:50:31 +08:00
zhangqinghe	4e687db4d3	增加了benginLogPageView	2015-01-16 10:42:06 +08:00
zhangqinghe	3d74b92952	android增加本地通知	2015-01-15 10:31:43 +08:00
zhangqinghe	5a33f0c6e2	Merge branch 'dev' of ssh://github.com/jpush/jpush-phonegap-plugin into dev	2015-01-04 09:42:26 +08:00
zhangqinghe	f80c4ca59c	add gitignore file	2015-01-04 09:41:29 +08:00
zhangqinghe	da08b93e43	添加了ios 停止推送的js接口	2015-01-04 09:39:28 +08:00
zhangqinghe	9279611fcd	add ios sdk 1.8.1	2015-01-04 09:36:19 +08:00
zhangqinghe	3aec197d1d	change document	2015-01-04 09:34:16 +08:00
qinghe.zhang	abd2a5bac9	Update index.html	2014-12-30 18:04:24 +08:00
Samurais	95194695fe	#21 fix json parse issue in openNotificationInAndroidCallback	2014-12-15 17:07:55 +08:00
zhangqinghe	360cdd4c95	Merge branch 'dev' of ssh://github.com/jpush/jpush-phonegap-plugin into dev Conflicts: README.md	2014-12-09 14:41:57 +08:00
zhangqinghe	9fbd45c7c7	in JPushPlugin.java add import xxx.entry	2014-12-09 14:35:08 +08:00
zhangqinghe	894c2f902d	在文档中添加 import xxx.R	2014-12-08 11:59:54 +08:00
zhangqinghe	70e2d6d9e2	修改点击通知的参数传递方式（android）	2014-12-08 11:01:49 +08:00
zhangqinghe	ae42986fc9	添加了ios 停止推送的js接口	2014-11-20 10:24:49 +08:00
zhangqinghe	1b2ffe13d8	fix document	2014-11-20 10:24:49 +08:00
reyoung	1b0c64f235	Fix receive typo in JPushPlugin Fix typo, make jpush can receive message in android...	2014-11-20 10:24:48 +08:00
zhangqinghe	219ae72758	添加了ios 停止推送的js接口	2014-11-18 14:01:18 +08:00
zhangqinghe	9536989082	fix document	2014-09-24 20:33:55 +08:00
zhangqinghe	b1e00baeb8	add ios sdk 1.8.1	2014-09-24 20:05:50 +08:00
zhangqinghe	e24a929ed3	change document	2014-09-24 20:05:49 +08:00
zhangqinghe	2610f4ea9e	add android 1.6.4 and change plugin.xml	2014-09-24 20:05:49 +08:00
zhangqinghe	aa53b5a214	add ios sdk 1.8.1	2014-09-24 20:02:07 +08:00
zhangqinghe	acaff1c403	change document	2014-09-24 09:19:32 +08:00
zhangqinghe	288253169a	add android 1.6.4 and change plugin.xml	2014-09-22 10:21:01 +08:00
qinghe.zhang	95587f9379	Merge pull request #10 from reyoung/patch-1 Fix receive typo in JPushPlugin	2014-08-11 11:19:58 +08:00
reyoung	0eda4d42df	Fix receive typo in JPushPlugin Fix typo, make jpush can receive message in android...	2014-08-06 17:43:01 +08:00
zhangqinghe	206efc7b2c	change sdk vertion 1.7.3	2014-07-31 13:39:04 +08:00
zhangqinghe	5c671fadc9	fix openNotification crash in plugin for android	2014-07-28 20:11:27 +08:00
zhangqinghe	904384d8ae	document about build	2014-07-25 10:14:32 +08:00
zhangqinghe	4215437bd6	document add abaut phoengap cloud build	2014-07-25 10:06:06 +08:00
zhangqinghe	8db89c9f2e	fix document in appkey	2014-07-24 19:09:29 +08:00
zhangqinghe	992246235d	delete callback not used	2014-07-24 16:41:42 +08:00
zhangqinghe	8e0fee7276	fix last commit error	2014-07-24 14:52:14 +08:00
zhangqinghe	734077536b	add new JPushPlugin ,else plugin not loaded	2014-07-23 17:08:13 +08:00
zhangqinghe	bce9508ec5	find back receive message form android	2014-07-23 14:46:02 +08:00
zhangqinghe	ea685713db	delete openNotificationForIos	2014-07-23 14:39:47 +08:00
zhangqinghe	4c810fcaa9	change verion to v1.5.4	2014-07-23 09:52:18 +08:00
zhangqinghe	213e5b7bb1	spelling mistakes	2014-07-22 20:14:01 +08:00
zhangqinghe	1af99fe4bf	add message in app	2014-07-22 18:51:48 +08:00
zhangqinghe	3e55f6f2c4	fix android open notification and message callback in js	2014-07-17 09:51:45 +08:00
zhangqinghe	ec40fd3e58	delete more log	2014-07-16 15:24:59 +08:00
zhangqinghe	e6819f54e2	fix log	2014-07-10 18:09:06 +08:00
zhangqinghe	386d1282e9	delete space in document	2014-07-10 15:51:06 +08:00
zhangqinghe	d55a46c54c	fix document	2014-07-10 15:46:30 +08:00
zhangqinghe	bfe0a76ae0	fix a part Android Doc form READ.me	2014-07-10 15:03:30 +08:00
zhangqinghe	7cc3239e1b	fix push notificaiton and add open notificaiotn evet	2014-07-10 14:57:03 +08:00
qinghe.zhang	34857a1eea	Update README.md	2014-06-27 10:05:27 +08:00