Skip to content

Commit

Permalink
1、升级极光推送至2.1.6版本。
Browse files Browse the repository at this point in the history
  • Loading branch information
Ted.Liu authored and Ted.Liu committed Apr 25, 2016
1 parent fe77736 commit 0f50f64
Show file tree
Hide file tree
Showing 6 changed files with 148 additions and 11 deletions.
12 changes: 6 additions & 6 deletions CoreJPush.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -40,7 +40,6 @@

/* Begin PBXFileReference section */
89229F5E1C53329600201995 /* sound.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = sound.caf; sourceTree = "<group>"; };
89A459661C532CC900327914 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
89AA26BA1BAA6F3600B5B018 /* AppDelegate+JPush.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+JPush.h"; sourceTree = "<group>"; };
89AA26BB1BAA6F3600B5B018 /* AppDelegate+JPush.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+JPush.m"; sourceTree = "<group>"; };
89AA26BC1BAA6F3600B5B018 /* CoreJPushSingleton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreJPushSingleton.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -68,17 +67,18 @@
89C57EDD1BAA61FE00F708E0 /* CoreJPush.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreJPush.h; sourceTree = "<group>"; };
89C57EDE1BAA61FE00F708E0 /* CoreJPush.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreJPush.m; sourceTree = "<group>"; };
89FAC41F1C59FD77002336F1 /* AppDelegate+JPush+Swift.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AppDelegate+JPush+Swift.swift"; sourceTree = "<group>"; };
89FAC4211C59FDC5002336F1 /* jpush-ios-2.1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-2.1.0.a"; sourceTree = "<group>"; };
89FAC4231C59FE6C002336F1 /* oc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = oc.h; sourceTree = "<group>"; };
9F16666B1CCDFF040084E354 /* jpush-ios-2.1.6.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "jpush-ios-2.1.6.a"; sourceTree = "<group>"; };
9F16666C1CCDFF040084E354 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
89C57E9E1BAA4A6800F708E0 /* Frameworks */ = {
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 */,
Expand All @@ -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 = "<group>";
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89C57EA01BAA4A6800F708E0"
BuildableName = "CoreJPush.app"
BlueprintName = "CoreJPush"
ReferencedContainer = "container:CoreJPush.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89C57EB91BAA4A6800F708E0"
BuildableName = "CoreJPushTests.xctest"
BlueprintName = "CoreJPushTests"
ReferencedContainer = "container:CoreJPush.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89C57EA01BAA4A6800F708E0"
BuildableName = "CoreJPush.app"
BlueprintName = "CoreJPush"
ReferencedContainer = "container:CoreJPush.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89C57EA01BAA4A6800F708E0"
BuildableName = "CoreJPush.app"
BlueprintName = "CoreJPush"
ReferencedContainer = "container:CoreJPush.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "89C57EA01BAA4A6800F708E0"
BuildableName = "CoreJPush.app"
BlueprintName = "CoreJPush"
ReferencedContainer = "container:CoreJPush.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>CoreJPush.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>89C57EA01BAA4A6800F708E0</key>
<dict>
<key>primary</key>
<true/>
</dict>
<key>89C57EB91BAA4A6800F708E0</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
19 changes: 14 additions & 5 deletions CoreJPush/CoreJPush/Lib/JPUSHService.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 <Foundation/Foundation.h>

Expand Down Expand Up @@ -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 将无法正常工作.
Expand All @@ -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 通知相关
///----------------------------------------------------
Expand All @@ -78,6 +86,7 @@ extern NSString *const kJPFServiceErrorNotification; // 错误提示

+ (void)registerDeviceToken:(NSData *)deviceToken;


/*!
* @abstract 处理收到的 APNs 消息
*/
Expand All @@ -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
Expand All @@ -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;
Expand Down
Binary file not shown.

0 comments on commit 0f50f64

Please sign in to comment.