diff --git a/plugin.xml b/plugin.xml index d824af0..c7b213b 100644 --- a/plugin.xml +++ b/plugin.xml @@ -49,7 +49,7 @@ - + diff --git a/src/ios/lib/JPUSHService.h b/src/ios/lib/JPUSHService.h index 8852b64..904da9a 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.1.2 +#define JPUSH_VERSION_NUMBER 3.2.1 #import @@ -148,12 +148,6 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) { /// @name Setup 启动相关 ///---------------------------------------------------- -/*! - * @abstract 启动SDK - * - * @discussion 这是旧版本的启动方法, 依赖于 PushConfig.plist 文件. 建议不要使用, 已经过期. - */ -+ (void)setupWithOption:(NSDictionary *)launchingOption __attribute__((deprecated("JPush 2.1.0 版本已过期"))); /*! * @abstract 启动SDK @@ -163,7 +157,6 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) { * @param channel 发布渠道. 可选. * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES. * App 证书环境取决于profile provision的配置,此处建议与证书环境保持一致. - * @param advertisingIdentifier 广告标识符(IDFA) 如果不需要使用IDFA,传nil. * * @discussion 提供SDK启动必须的参数, 来启动 SDK. * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作. @@ -173,7 +166,19 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) { channel:(NSString *)channel apsForProduction:(BOOL)isProduction; - +/*! + * @abstract 启动SDK + * + * @param launchingOption 启动参数. + * @param appKey 一个JPush 应用必须的,唯一的标识. 请参考 JPush 相关说明文档来获取这个标识. + * @param channel 发布渠道. 可选. + * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES. + * App 证书环境取决于profile provision的配置,此处建议与证书环境保持一致. + * @param advertisingId 广告标识符(IDFA) 如果不需要使用IDFA,传nil. + * + * @discussion 提供SDK启动必须的参数, 来启动 SDK. + * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作. + */ + (void)setupWithOption:(NSDictionary *)launchingOption appKey:(NSString *)appKey channel:(NSString *)channel @@ -385,6 +390,13 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) { */ + (void)registerLbsGeofenceDelegate:(id)delegate withLaunchOptions:(NSDictionary *)launchOptions; +/** + 删除地理围栏 + + @param geofenceId 地理围栏id + */ ++ (void)removeGeofenceWithIdentifier:(NSString *)geofenceId; + ///---------------------------------------------------- /// @name Local Notification 本地通知 ///---------------------------------------------------- @@ -640,7 +652,7 @@ callbackSelector:(SEL)cbSelector * @param response 通知响应对象 * @param completionHandler */ -- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)())completionHandler; +- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void(^)(void))completionHandler; /* * @brief handle UserNotifications.framework [openSettingsForNotification:] diff --git a/src/ios/lib/jpush-ios-3.1.2.a b/src/ios/lib/jpush-ios-3.1.2.a deleted file mode 100755 index 3644697..0000000 Binary files a/src/ios/lib/jpush-ios-3.1.2.a and /dev/null differ diff --git a/src/ios/lib/jpush-ios-3.2.1.a b/src/ios/lib/jpush-ios-3.2.1.a new file mode 100755 index 0000000..6aa3beb Binary files /dev/null and b/src/ios/lib/jpush-ios-3.2.1.a differ