diff --git a/CoreJPush.xcodeproj/project.pbxproj b/CoreJPush.xcodeproj/project.pbxproj index c180b77..ece007f 100644 --- a/CoreJPush.xcodeproj/project.pbxproj +++ b/CoreJPush.xcodeproj/project.pbxproj @@ -25,7 +25,7 @@ 89C57EDA1BAA5CE300F708E0 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 89C57ED91BAA5CE300F708E0 /* libz.dylib */; }; 89C57EDF1BAA61FE00F708E0 /* CoreJPush.m in Sources */ = {isa = PBXBuildFile; fileRef = 89C57EDE1BAA61FE00F708E0 /* CoreJPush.m */; }; 89FAC4201C59FD77002336F1 /* AppDelegate+JPush+Swift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89FAC41F1C59FD77002336F1 /* AppDelegate+JPush+Swift.swift */; }; - 89FAC4221C59FDC5002336F1 /* jpush-ios-2.1.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 89FAC4211C59FDC5002336F1 /* jpush-ios-2.1.0.a */; }; + 9F16666D1CCDFF040084E354 /* jpush-ios-2.1.6.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F16666B1CCDFF040084E354 /* jpush-ios-2.1.6.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,7 +40,6 @@ /* Begin PBXFileReference section */ 89229F5E1C53329600201995 /* sound.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = sound.caf; sourceTree = ""; }; - 89A459661C532CC900327914 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = ""; }; 89AA26BA1BAA6F3600B5B018 /* AppDelegate+JPush.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+JPush.h"; sourceTree = ""; }; 89AA26BB1BAA6F3600B5B018 /* AppDelegate+JPush.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+JPush.m"; sourceTree = ""; }; 89AA26BC1BAA6F3600B5B018 /* CoreJPushSingleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreJPushSingleton.h; sourceTree = ""; }; @@ -68,8 +67,9 @@ 89C57EDD1BAA61FE00F708E0 /* CoreJPush.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreJPush.h; sourceTree = ""; }; 89C57EDE1BAA61FE00F708E0 /* CoreJPush.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreJPush.m; sourceTree = ""; }; 89FAC41F1C59FD77002336F1 /* AppDelegate+JPush+Swift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AppDelegate+JPush+Swift.swift"; sourceTree = ""; }; - 89FAC4211C59FDC5002336F1 /* jpush-ios-2.1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-2.1.0.a"; sourceTree = ""; }; 89FAC4231C59FE6C002336F1 /* oc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = oc.h; sourceTree = ""; }; + 9F16666B1CCDFF040084E354 /* jpush-ios-2.1.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-2.1.6.a"; sourceTree = ""; }; + 9F16666C1CCDFF040084E354 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -77,8 +77,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 89FAC4221C59FDC5002336F1 /* jpush-ios-2.1.0.a in Frameworks */, 89C57EDA1BAA5CE300F708E0 /* libz.dylib in Frameworks */, + 9F16666D1CCDFF040084E354 /* jpush-ios-2.1.6.a in Frameworks */, 89C57ED81BAA5CDC00F708E0 /* Security.framework in Frameworks */, 89C57ED61BAA5CD000F708E0 /* SystemConfiguration.framework in Frameworks */, 89C57ED41BAA5CC400F708E0 /* CoreTelephony.framework in Frameworks */, @@ -100,8 +100,8 @@ 89A459641C532CC900327914 /* Lib */ = { isa = PBXGroup; children = ( - 89FAC4211C59FDC5002336F1 /* jpush-ios-2.1.0.a */, - 89A459661C532CC900327914 /* JPUSHService.h */, + 9F16666B1CCDFF040084E354 /* jpush-ios-2.1.6.a */, + 9F16666C1CCDFF040084E354 /* JPUSHService.h */, ); path = Lib; sourceTree = ""; diff --git a/CoreJPush.xcodeproj/project.xcworkspace/xcuserdata/Ted.xcuserdatad/UserInterfaceState.xcuserstate b/CoreJPush.xcodeproj/project.xcworkspace/xcuserdata/Ted.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..824b874 Binary files /dev/null and b/CoreJPush.xcodeproj/project.xcworkspace/xcuserdata/Ted.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/CoreJPush.xcodeproj/xcuserdata/Ted.xcuserdatad/xcschemes/CoreJPush.xcscheme b/CoreJPush.xcodeproj/xcuserdata/Ted.xcuserdatad/xcschemes/CoreJPush.xcscheme new file mode 100644 index 0000000..146aee5 --- /dev/null +++ b/CoreJPush.xcodeproj/xcuserdata/Ted.xcuserdatad/xcschemes/CoreJPush.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreJPush.xcodeproj/xcuserdata/Ted.xcuserdatad/xcschemes/xcschememanagement.plist b/CoreJPush.xcodeproj/xcuserdata/Ted.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..f23d148 --- /dev/null +++ b/CoreJPush.xcodeproj/xcuserdata/Ted.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + CoreJPush.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 89C57EA01BAA4A6800F708E0 + + primary + + + 89C57EB91BAA4A6800F708E0 + + primary + + + + + diff --git a/CoreJPush/CoreJPush/Lib/JPUSHService.h b/CoreJPush/CoreJPush/Lib/JPUSHService.h index 15435bd..62f6500 100755 --- a/CoreJPush/CoreJPush/Lib/JPUSHService.h +++ b/CoreJPush/CoreJPush/Lib/JPUSHService.h @@ -9,7 +9,7 @@ * Copyright (c) 2011 ~ 2015 Shenzhen HXHG. All rights reserved. */ -#define JPUSH_VERSION_NUMBER 2.1.0 +#define JPUSH_VERSION_NUMBER 2.1.6 #import @@ -51,6 +51,7 @@ extern NSString *const kJPFServiceErrorNotification; // 错误提示 * @param appKey 一个JPush 应用必须的,唯一的标识. 请参考 JPush 相关说明文档来获取这个标识. * @param channel 发布渠道. 可选. * @param isProduction 是否生产环境. 如果为开发状态,设置为 NO; 如果为生产状态,应改为 YES. + * @param advertisingIdentifier 广告标识符（IDFA） 如果不需要使用IDFA，传nil. * * @discussion 提供SDK启动必须的参数, 来启动 SDK. * 此接口必须在 App 启动时调用, 否则 JPush SDK 将无法正常工作. @@ -61,6 +62,13 @@ extern NSString *const kJPFServiceErrorNotification; // 错误提示 apsForProduction:(BOOL)isProduction; ++ (void)setupWithOption:(NSDictionary *)launchingOption + appKey:(NSString *)appKey + channel:(NSString *)channel + apsForProduction:(BOOL)isProduction + advertisingIdentifier:(NSString *)advertisingId; + + ///---------------------------------------------------- /// @name APNs about 通知相关 ///---------------------------------------------------- @@ -78,6 +86,7 @@ extern NSString *const kJPFServiceErrorNotification; // 错误提示 + (void)registerDeviceToken:(NSData *)deviceToken; + /*! * @abstract 处理收到的 APNs 消息 */ @@ -97,7 +106,7 @@ extern NSString *const kJPFServiceErrorNotification; // 错误提示 + (void) setTags:(NSSet *)tags alias:(NSString *)alias callbackSelector:(SEL)cbSelector - target:(id)theTarget; + target:(id)theTarget __attribute__((deprecated("JPush 2.1.1 版本已过期")));; + (void) setTags:(NSSet *)tags alias:(NSString *)alias @@ -108,9 +117,9 @@ callbackSelector:(SEL)cbSelector callbackSelector:(SEL)cbSelector object:(id)theTarget; -+ (void) setTags:(NSSet *)tags - alias:(NSString *)alias -fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler; ++ (void)setTags:(NSSet *)tags + alias:(NSString *)alias + fetchCompletionHandle:(void (^)(int iResCode, NSSet *iTags, NSString *iAlias))completionHandler; + (void) setTags:(NSSet *)tags aliasInbackground:(NSString *)alias; diff --git a/CoreJPush/CoreJPush/Lib/jpush-ios-2.1.0.a b/CoreJPush/CoreJPush/Lib/jpush-ios-2.1.6.a similarity index 56% rename from CoreJPush/CoreJPush/Lib/jpush-ios-2.1.0.a rename to CoreJPush/CoreJPush/Lib/jpush-ios-2.1.6.a index 319d1a0..fca9af9 100644 Binary files a/CoreJPush/CoreJPush/Lib/jpush-ios-2.1.0.a and b/CoreJPush/CoreJPush/Lib/jpush-ios-2.1.6.a differ