diff --git a/Plugins/iOS/JPUSHService.h b/Plugins/iOS/JPUSHService.h index 47395fe..9238086 100644 --- a/Plugins/iOS/JPUSHService.h +++ b/Plugins/iOS/JPUSHService.h @@ -9,7 +9,7 @@ * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved. */ -#define JPUSH_VERSION_NUMBER 3.2.8 +#define JPUSH_VERSION_NUMBER 3.3.4 #import @@ -22,6 +22,7 @@ @class UNNotification; @protocol JPUSHRegisterDelegate; @protocol JPUSHGeofenceDelegate; +@protocol JPushInMessageDelegate; typedef void (^JPUSHTagsOperationCompletion)(NSInteger iResCode, NSSet *iTags, NSInteger seq); typedef void (^JPUSHTagValidOperationCompletion)(NSInteger iResCode, NSSet *iTags, NSInteger seq, BOOL isBind); @@ -219,12 +220,27 @@ typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) { + (void)registerDeviceToken:(NSData *)deviceToken; - /*! * @abstract 处理收到的 APNs 消息 */ + (void)handleRemoteNotification:(NSDictionary *)remoteInfo; +/*! + * @abstract 向极光服务器提交Token + * + * @param voipToken 推送使用的Voip Token + */ ++ (void)registerVoipToken:(NSData *)voipToken; + + +/*! + * @abstract 处理收到的 Voip 消息 + * + * @param remoteInfo 下发的 Voip 内容 + */ ++ (void)handleVoipNotification:(NSDictionary *)remoteInfo; + + /*! * @abstract 检测通知授权状态 * @param completion 授权结果通过status值返回,详见JPAuthorizationStatus @@ -618,6 +634,22 @@ typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) { */ + (void)setLogOFF; +/*! + * @abstract 设置SDK地理位置权限开关 + * + * @discussion 关闭地理位置之后,SDK地理围栏的相关功能将受到影响,默认是开启。 + * + */ ++ (void)setLocationEanable:(BOOL)isEanble; + +/*! +* @abstract 设置应用内消息的代理 +* +* @discussion 遵守JPushInMessageDelegate的代理对象 +* +*/ ++ (void)setInMessageDelegate:(id)inMessageDelegate; + ///---------------------------------------------------- ///********************下列方法已过期******************** ///**************请使用新版tag/alias操作接口************** @@ -710,3 +742,23 @@ callbackSelector:(SEL)cbSelector - (void)jpushGeofenceIdentifer:(NSString *)geofenceId didExitRegion:(NSDictionary *)userInfo error:(NSError *)error; @end + +@protocol JPushInMessageDelegate + +@optional +/** + *是否允许应用内消息弹出,默认为允许 +*/ +- (BOOL)jPushInMessageIsAllowedInMessagePop; + +/** + *应用内消息已弹出 +*/ +- (void)jPushInMessageAlreadyPop; + +/** + *应用内消息已消失 +*/ +- (void)jPushInMessageAlreadyDisapperar; + +@end diff --git a/Plugins/iOS/jcore-ios-2.1.8.a b/Plugins/iOS/jcore-ios-2.3.4.a similarity index 84% rename from Plugins/iOS/jcore-ios-2.1.8.a rename to Plugins/iOS/jcore-ios-2.3.4.a index f3bef35..f628a2f 100644 Binary files a/Plugins/iOS/jcore-ios-2.1.8.a and b/Plugins/iOS/jcore-ios-2.3.4.a differ diff --git a/Plugins/iOS/jpush-ios-3.2.8.a b/Plugins/iOS/jpush-ios-3.2.8.a deleted file mode 100644 index 6387b4d..0000000 Binary files a/Plugins/iOS/jpush-ios-3.2.8.a and /dev/null differ diff --git a/Plugins/iOS/jpush-ios-3.3.4.a b/Plugins/iOS/jpush-ios-3.3.4.a new file mode 100644 index 0000000..03e688c Binary files /dev/null and b/Plugins/iOS/jpush-ios-3.3.4.a differ diff --git a/README.md b/README.md index 55d504a..5f9f8e2 100644 --- a/README.md +++ b/README.md @@ -20,29 +20,20 @@ 1. 生成 iOS 工程,并打开该工程。 2. 添加必要的框架: - - CoreFoundation.framework + - CFNetwork.framework + - CoreFoundation.framework + - CoreTelephony.framework + - SystemConfiguration.framework + - CoreGraphics.framework + - Foundation.framework + - UIKit.framework + - Security.framework + - libz.tbd(Xcode 7 以下版本是 libz.dylib) + - AdSupport.framework(获取 IDFA 需要;如果不使用 IDFA,请不要添加) + - UserNotifications.framework(Xcode 8 及以上) + - libresolv.tbd(JPush 2.2.0 及以上版本需要,Xcode 7 以下版本是 libresolv.dylib) + - WebKit.framework(JPush 3.3.0 及以上版本需要) - - CFNetwork.framework - - - SystemConfiguration.framework - - - CoreTelephony.framework - - - CoreGraphics.framework - - - Foundation.framework - - - UIKit.framework - - - Security.framework - - - libz.tbd // Xcode7 之前为 libz.dylib 之后为 libz.tbd。 - - - AdSupport.framework // 如需使用广告标识符 IDFA 则添加该库,否则不添加。 - - - libresolv.tbd (JPush 2.2.0及以上版本需要, Xcode7以下版本是libresolv.dylib) - - - UserNotifications.framework (Xcode8及以上) ​