ios-更新到JPush3.2.2

Author: 詹强

ios/RCTJPushModule.xcodeproj/project.pbxproj

@@ -7,9 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		624386D71E096B8800F69E07 /* RCTJPushActionQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */; };
+		5CF8E64A231E3A9300B12200 /* jpush-ios-3.2.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CF8E648231E3A9300B12200 /* jpush-ios-3.2.2.a */; };
 		624386D81E096B8800F69E07 /* RCTJPushModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D41E096B8800F69E07 /* RCTJPushModule.m */; };
-		62DA93BE21E8679300208462 /* libjpush-ios-3.1.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62DA93BD21E8679300208462 /* libjpush-ios-3.1.2.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -25,32 +24,39 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		624386D11E096B8800F69E07 /* RCTJPushActionQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJPushActionQueue.h; sourceTree = "<group>"; };
-		624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJPushActionQueue.m; sourceTree = "<group>"; };
+		5CF8E648231E3A9300B12200 /* jpush-ios-3.2.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "jpush-ios-3.2.2.a"; path = "RCTJPushModule/jpush-ios-3.2.2.a"; sourceTree = "<group>"; };
 		624386D31E096B8800F69E07 /* RCTJPushModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJPushModule.h; sourceTree = "<group>"; };
 		624386D41E096B8800F69E07 /* RCTJPushModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJPushModule.m; sourceTree = "<group>"; };
 		6280980A1CEDC407000D3A81 /* libRCTJPushModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTJPushModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		62DA93BC21E8679300208462 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
-		62DA93BD21E8679300208462 /* libjpush-ios-3.1.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libjpush-ios-3.1.2.a"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		628098071CEDC407000D3A81 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				62DA93BE21E8679300208462 /* libjpush-ios-3.1.2.a in Frameworks */,
+				5CF8E64A231E3A9300B12200 /* jpush-ios-3.2.2.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		5CF8E647231E3A9200B12200 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5CF8E648231E3A9300B12200 /* jpush-ios-3.2.2.a */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		628098011CEDC407000D3A81 = {
 			isa = PBXGroup;
 			children = (
 				6280980C1CEDC407000D3A81 /* RCTJPushModule */,
 				6280980B1CEDC407000D3A81 /* Products */,
+				5CF8E647231E3A9200B12200 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -66,9 +72,6 @@
 			isa = PBXGroup;
 			children = (
 				62DA93BC21E8679300208462 /* JPUSHService.h */,
-				62DA93BD21E8679300208462 /* libjpush-ios-3.1.2.a */,
-				624386D11E096B8800F69E07 /* RCTJPushActionQueue.h */,
-				624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */,
 				624386D31E096B8800F69E07 /* RCTJPushModule.h */,
 				624386D41E096B8800F69E07 /* RCTJPushModule.m */,
 			);
@@ -114,6 +117,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 628098011CEDC407000D3A81;
@@ -132,7 +136,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				624386D81E096B8800F69E07 /* RCTJPushModule.m in Sources */,
-				624386D71E096B8800F69E07 /* RCTJPushActionQueue.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/RCTJPushModule/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.2
 
 #import <Foundation/Foundation.h>
 
@@ -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<JPUSHGeofenceDelegate>)delegate withLaunchOptions:(NSDictionary *)launchOptions;
 
+/**
+ 删除地理围栏
+ 
+ @param geofenceId 地理围栏id
+ */
++ (void)removeGeofenceWithIdentifier:(NSString *)geofenceId;
+
 ///----------------------------------------------------
 /// @name Local Notification 本地通知
 ///----------------------------------------------------
@@ -640,14 +652,14 @@ 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:]
  * @param center [UNUserNotificationCenter currentNotificationCenter] 新特性用户通知中心
  * @param notification 当前管理的通知对象
  */
-- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center openSettingsForNotification:(nullable UNNotification *)notification NS_AVAILABLE_IOS(12.0);
+- (void)jpushNotificationCenter:(UNUserNotificationCenter *)center openSettingsForNotification:(UNNotification *)notification NS_AVAILABLE_IOS(12.0);
 
 @end
 
@@ -660,7 +672,7 @@ callbackSelector:(SEL)cbSelector
  @param userInfo 地理围栏触发时返回的信息
  @param error 错误信息
  */
-- (void)jpushGeofenceIdentifer:(NSString * _Nonnull)geofenceId didEnterRegion:(NSDictionary * _Nullable)userInfo error:(NSError * _Nullable)error;
+- (void)jpushGeofenceIdentifer:(NSString *)geofenceId didEnterRegion:(NSDictionary *)userInfo error:(NSError *)error;
 
 /**
  离开地理围栏区域
@@ -669,6 +681,6 @@ callbackSelector:(SEL)cbSelector
  @param userInfo 地理围栏触发时返回的信息
  @param error 错误信息
  */
-- (void)jpushGeofenceIdentifer:(NSString * _Nonnull)geofenceId didExitRegion:(NSDictionary * _Nullable)userInfo error:(NSError * _Nullable)error;
+- (void)jpushGeofenceIdentifer:(NSString *)geofenceId didExitRegion:(NSDictionary *)userInfo error:(NSError *)error;
 
 @end

ios/RCTJPushModule/JPushNotificationExtensionService.h

@@ -0,0 +1,41 @@
+/*
+ *	| |    | |  \ \  / /  | |    | |   / _______|
+ *	| |____| |   \ \/ /   | |____| |  / /
+ *	| |____| |    \  /    | |____| |  | |   _____
+ * 	| |    | |    /  \    | |    | |  | |  |____ |
+ *  | |    | |   / /\ \   | |    | |  \ \______| |
+ *  | |    | |  /_/  \_\  | |    | |   \_________|
+ *
+ * Copyright (c) 2017 Shenzhen HXHG. All rights reserved.
+ */
+
+#import <Foundation/Foundation.h>
+
+#define JPUSH_EXTENSION_VERSION_NUMBER 1.1.2
+
+@class UNNotificationRequest;
+
+@interface JPushNotificationExtensionService : NSObject
+
+
+/**
+ 设置appkey（需要与main target中的appkey相同）
+ */
++ (void)jpushSetAppkey:(NSString *)appkey;
+
+/**
+ apns送达
+ @param request apns请求
+ @param completion 回调
+ */
++ (void)jpushReceiveNotificationRequest:(UNNotificationRequest *)request with:(void (^)(void))completion;
+
+/**
+ 关闭日志
+ 默认为开启
+ 建议发布时关闭以减少不必要的IO
+ */
++ (void)setLogOff;
+
+
+@end

ios/RCTJPushModule/RCTJPushActionQueue.h

@@ -1,30 +1,22 @@
-//
-//  JPushHelper.h
-//  PushDemo
-//
-//  Created by oshumini on 16/3/14.
-//  Copyright © 2016年 Facebook. All rights reserved.
-//
-
 #import <Foundation/Foundation.h>
 
-#if __has_include(<React/RCTBridgeModule.h>)
-#import <React/RCTBridgeModule.h>
-#elif __has_include("RCTBridgeModule.h")
-#import "RCTBridgeModule.h"
-#elif __has_include("React/RCTBridgeModule.h")
-#import "React/RCTBridgeModule.h"
+#if __has_include(<React/RCTBridge.h>)
+#import <React/RCTEventEmitter.h>
+#import <React/RCTRootView.h>
+#import <React/RCTBridge.h>
+#elif __has_include("RCTBridge.h")
+#import "RCTEventEmitter.h"
+#import "RCTRootView.h"
+#import "RCTBridge.h"
 #endif
 
 #import "JPUSHService.h"
 
-#define kJPFDidReceiveRemoteNotification  @"kJPFDidReceiveRemoteNotification"
-
-#define kJPFOpenNotification @"kJPFOpenNotification" // 通过点击通知事件
-#define kJPFOpenNotificationToLaunchApp @"kJPFOpenNotificationToLaunchApp" // 通过点击通知启动应用
+#define J_APNS_NOTIFICATION_ARRIVED_EVENT @"J_APNS_NOTIFICATION_ARRIVED_EVENT"
+#define J_APNS_NOTIFICATION_OPENED_EVENT  @"J_APNS_NOTIFICATION_OPENED_EVENT"
+#define J_CUSTOM_NOTIFICATION_EVENT       @"J_CUSTOM_NOTIFICATION_EVENT"
+#define J_LOCAL_NOTIFICATION_EVENT        @"J_LOCAL_NOTIFICATION_EVENT"
 
-@interface RCTJPushModule : NSObject <RCTBridgeModule, JPUSHRegisterDelegate>
-@property(strong,nonatomic)RCTResponseSenderBlock asyCallback;
+@interface RCTJPushModule : RCTEventEmitter <RCTBridgeModule>
 
-- (void)didRegistRemoteNotification:(NSString *)token;
 @end