diff --git a/README.md b/README.md index d3b085f..e19ad47 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # JPush PhoneGap / Cordova Plugin [![Build Status](https://travis-ci.org/jpush/jpush-phonegap-plugin.svg?branch=master)](https://travis-ci.org/jpush/jpush-phonegap-plugin) -[![release](https://img.shields.io/badge/release-3.2.7-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases) +[![release](https://img.shields.io/badge/release-3.2.8-blue.svg)](https://github.com/jpush/jpush-phonegap-plugin/releases) [![platforms](https://img.shields.io/badge/platforms-iOS%7CAndroid-lightgrey.svg)](https://github.com/jpush/jpush-phonegap-plugin) [![weibo](https://img.shields.io/badge/weibo-JPush-blue.svg)](http://weibo.com/jpush?refer_flag=1001030101_&is_all=1) diff --git a/doc/iOS_API.md b/doc/iOS_API.md index c100fa3..694ce62 100644 --- a/doc/iOS_API.md +++ b/doc/iOS_API.md @@ -716,10 +716,6 @@ window.JPush.getUserNotificationSettings(callback) [iOS 7 以后后台收到远程通知](#后台收到推送) -### jpush.setTagsWithAlias - -[设置标签别名回调](#返回值说明) - ### jpush.receiveMessage [获取自定义消息内容](#获取自定义消息内容) diff --git a/package.json b/package.json index d4318c9..488c627 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "3.2.7", + "version": "3.2.8", "description": "JPush for cordova plugin", "cordova": { "id": "jpush-phonegap-plugin", diff --git a/plugin.xml b/plugin.xml index 552eb74..541a18c 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="3.2.8"> JPush JPush for cordova plugin @@ -38,7 +38,7 @@ - + diff --git a/src/android/JPushPlugin.java b/src/android/JPushPlugin.java index f0491f0..18ac51a 100644 --- a/src/android/JPushPlugin.java +++ b/src/android/JPushPlugin.java @@ -527,24 +527,6 @@ public class JPushPlugin extends CordovaPlugin { eventCallbackMap.put(sequence, callbackContext); } - void setTagsWithAlias(JSONArray data, CallbackContext callbackContext) { - HashSet tags = new HashSet(); - String alias; - try { - alias = data.getString(0); - JSONArray tagsArray = data.getJSONArray(1); - for (int i = 0; i < tagsArray.length(); i++) { - tags.add(tagsArray.getString(i)); - } - JPushInterface.setAliasAndTags(mContext, - alias, tags, mTagWithAliasCallback); - callbackContext.success(); - } catch (JSONException e) { - e.printStackTrace(); - callbackContext.error("Error reading tagAlias JSON"); - } - } - void getConnectionState(JSONArray data, CallbackContext callback) { boolean isConnected = JPushInterface.getConnectionState(cordovaActivity.getApplicationContext()); callback.success(String.valueOf(isConnected)); @@ -553,8 +535,7 @@ public class JPushPlugin extends CordovaPlugin { /** * 自定义通知行为，声音、震动、呼吸灯等。 */ - void setBasicPushNotificationBuilder(JSONArray data, - CallbackContext callbackContext) { + void setBasicPushNotificationBuilder(JSONArray data, CallbackContext callbackContext) { BasicPushNotificationBuilder builder = new BasicPushNotificationBuilder( this.cordova.getActivity()); builder.developerArg0 = "Basic builder 1"; diff --git a/src/ios/Plugins/JPushPlugin.h b/src/ios/Plugins/JPushPlugin.h index 7c7da19..2228d04 100644 --- a/src/ios/Plugins/JPushPlugin.h +++ b/src/ios/Plugins/JPushPlugin.h @@ -17,8 +17,6 @@ //以下为js中可调用接口 //设置标签、别名 --(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command; - -(void)setTags:(CDVInvokedUrlCommand*)command; -(void)addTags:(CDVInvokedUrlCommand*)command; -(void)deleteTags:(CDVInvokedUrlCommand*)command; @@ -76,7 +74,6 @@ /* * 以下为js中可监听到的事件 * jpush.openNotification 点击推送消息启动或唤醒app - * jpush.setTagsWithAlias 设置标签、别名完成 * jpush.receiveMessage 收到自定义消息 * jpush.receiveNotification 前台收到推送 * jpush.backgroundNotification 后台收到推送 diff --git a/src/ios/Plugins/JPushPlugin.m b/src/ios/Plugins/JPushPlugin.m index 5281292..3351702 100644 --- a/src/ios/Plugins/JPushPlugin.m +++ b/src/ios/Plugins/JPushPlugin.m @@ -87,23 +87,6 @@ }); } --(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{ - NSString *alias = [command argumentAtIndex:0]; - NSArray *tags = [command argumentAtIndex:1]; - - [JPUSHService setTags:[NSSet setWithArray:tags] - alias:alias - fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) { - CDVPluginResult *result; - if (iResCode == 0) { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil]; - } else { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil]; - } - [self.commandDelegate sendPluginResult:result callbackId:command.callbackId]; - }]; -} - -(void)setTags:(CDVInvokedUrlCommand*)command { NSDictionary* params = [command.arguments objectAtIndex:0]; NSNumber* sequence = params[@"sequence"]; diff --git a/src/ios/lib/JPUSHService.h b/src/ios/lib/JPUSHService.h index 37deb15..2545263 100755 --- a/src/ios/lib/JPUSHService.h +++ b/src/ios/lib/JPUSHService.h @@ -9,7 +9,7 @@ * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved. */ -#define JPUSH_VERSION_NUMBER 3.0.6 +#define JPUSH_VERSION_NUMBER 3.0.7 #import diff --git a/src/ios/lib/jpush-ios-3.0.6.a b/src/ios/lib/jpush-ios-3.0.7.a similarity index 60% rename from src/ios/lib/jpush-ios-3.0.6.a rename to src/ios/lib/jpush-ios-3.0.7.a index beffffa..c16efd8 100755 Binary files a/src/ios/lib/jpush-ios-3.0.6.a and b/src/ios/lib/jpush-ios-3.0.7.a differ diff --git a/www/JPushPlugin.js b/www/JPushPlugin.js index a9c3266..e822a8b 100644 --- a/www/JPushPlugin.js +++ b/www/JPushPlugin.js @@ -70,20 +70,6 @@ JPushPlugin.prototype.clearLocalNotifications = function () { } } -JPushPlugin.prototype.setTagsWithAlias = function (tags, alias, successCallback, errorCallback) { - if (tags == null) { - this.setAlias(alias) - return - } - if (alias == null) { - this.setTags(tags) - return - } - var arrayTagWithAlias = [tags] - arrayTagWithAlias.unshift(alias) - this.callNative('setTagsWithAlias', arrayTagWithAlias, successCallback, errorCallback) -} - /** * 设置标签。 * 注意：该接口是覆盖逻辑，而不是增量逻辑。即新的调用会覆盖之前的设置。