Merge pull request #530 from jpush/dev

Dev

Author: huangminlinux

index.d.ts

@@ -6,6 +6,22 @@ interface JInfoMap {
   myVersion: string
 }
 
+type ExtraData = {
+  [key: string]: any
+}
+
+interface LocalNotificationOptions {
+  buildId: 1 | 2     // 设置通知样式，1 为基础样式，2 为自定义样式。自定义样式需要先调用 setStyleCustom 接口设置自定义样式。(Android Only)
+  id: number         // 通知的 id, 可用于取消通知
+  title: string      // 通知标题
+  content: string    // 通知内容
+  fireTime: number   // 通知触发时间的时间戳（毫秒）
+  extra?: ExtraData  // extra 字段
+  badge?: number     // 本地推送触发后应用角标的 badge 值  （iOS Only）
+  soundName?: string // 指定推送的音频文件 （iOS Only）
+  subtitle?: string  // 子标题 （iOS10+ Only）
+}
+
 type JSuccessCallback<T = undefined> = (result: T) => void
 type JFailCallback = (result: { errorCode: number }) => void
 type JResultCallback<T = undefined> = (result: T) => void
@@ -291,7 +307,7 @@ declare class JPush {
      *    'subtitle': String    // 子标题 （iOS10+ Only）
 	 *  }
 	 */
-  static sendLocalNotification(notification: Object): void
+  static sendLocalNotification(notification: LocalNotificationOptions): void
 
   /**
    * iOS Only

ios/RCTJPushModule.xcodeproj/project.pbxproj

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		624386D71E096B8800F69E07 /* RCTJPushActionQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */; };
 		624386D81E096B8800F69E07 /* RCTJPushModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D41E096B8800F69E07 /* RCTJPushModule.m */; };
-		62854FE720F76769001F09E3 /* libjpush-ios-3.0.9.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62854FE620F76769001F09E3 /* libjpush-ios-3.0.9.a */; };
+		6296D38521251A7600E77B5E /* libjpush-ios-3.1.0.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6296D38321251A7600E77B5E /* libjpush-ios-3.1.0.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -30,16 +30,16 @@
 		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; };
-		62854FE520F76769001F09E3 /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
-		62854FE620F76769001F09E3 /* libjpush-ios-3.0.9.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libjpush-ios-3.0.9.a"; sourceTree = "<group>"; };
+		6296D38321251A7600E77B5E /* libjpush-ios-3.1.0.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libjpush-ios-3.1.0.a"; sourceTree = "<group>"; };
+		6296D38421251A7600E77B5E /* JPUSHService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JPUSHService.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		628098071CEDC407000D3A81 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				62854FE720F76769001F09E3 /* libjpush-ios-3.0.9.a in Frameworks */,
+				6296D38521251A7600E77B5E /* libjpush-ios-3.1.0.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -65,8 +65,8 @@
 		6280980C1CEDC407000D3A81 /* RCTJPushModule */ = {
 			isa = PBXGroup;
 			children = (
-				62854FE520F76769001F09E3 /* JPUSHService.h */,
-				62854FE620F76769001F09E3 /* libjpush-ios-3.0.9.a */,
+				6296D38421251A7600E77B5E /* JPUSHService.h */,
+				6296D38321251A7600E77B5E /* libjpush-ios-3.1.0.a */,
 				624386D11E096B8800F69E07 /* RCTJPushActionQueue.h */,
 				624386D21E096B8800F69E07 /* RCTJPushActionQueue.m */,
 				624386D31E096B8800F69E07 /* RCTJPushModule.h */,

ios/RCTJPushModule/JPUSHService.h

@@ -9,7 +9,7 @@
  * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved.
  */
 
-#define JPUSH_VERSION_NUMBER 3.0.9
+#define JPUSH_VERSION_NUMBER 3.1.0
 
 #import <Foundation/Foundation.h>
 
@@ -304,23 +304,26 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) {
  * @abstract 开始记录页面停留
  *
  * @param pageName 页面名称
+ * @discussion JCore 1.1.8 版本后，如需统计页面流，请使用 JAnalytics
  */
-+ (void)startLogPageView:(NSString *)pageName;
++ (void)startLogPageView:(NSString *)pageName __attribute__((deprecated("JCore 1.1.8 版本已过期")));
 
 /*!
  * @abstract 停止记录页面停留
  *
  * @param pageName 页面
+ * @discussion JCore 1.1.8 版本后，如需统计页面流，请使用 JAnalytics
  */
-+ (void)stopLogPageView:(NSString *)pageName;
++ (void)stopLogPageView:(NSString *)pageName __attribute__((deprecated("JCore 1.1.8 版本已过期")));
 
 /*!
  * @abstract 直接上报在页面的停留时间
  *
  * @param pageName 页面
  * @param seconds 停留的秒数
+ * @discussion JCore 1.1.8 版本后，如需统计页面流，请使用 JAnalytics
  */
-+ (void)beginLogPageView:(NSString *)pageName duration:(int)seconds;
++ (void)beginLogPageView:(NSString *)pageName duration:(int)seconds __attribute__((deprecated("JCore 1.1.8 版本已过期")));
 
 /*!
  * @abstract 开启Crash日志收集
@@ -375,7 +378,7 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) {
  * @abstract 查找推送 (支持iOS10，并兼容iOS10以下版本)
  *
  * JPush 2.1.9新接口
- * @param identifier JPushNotificationIdentifier类型，iOS10以上可以通过设置identifier.delivered和identifier.identifiers来查找相应在通知中心显示推送或待推送请求，identifier.identifiers如果设置为nil或空数组则返回相应标志下所有在通知中心显示推送或待推送请求；iOS10以下identifier.delivered属性无效，identifier.identifiers如果设置nil或空数组则返回所有推送。须要设置identifier.findCompletionHandler回调才能得到查找结果，通过(NSArray *results)返回相应对象数组。
+ * @param identifier JPushNotificationIdentifier类型，iOS10以上可以通过设置identifier.delivered和identifier.identifiers来查找相应在通知中心显示推送或待推送请求，identifier.identifiers如果设置为nil或空数组则返回相应标志下所有在通知中心显示推送或待推送请求；iOS10以下identifier.delivered属性无效，identifier.identifiers如果设置nil或空数组则返回所有未触发的推送。须要设置identifier.findCompletionHandler回调才能得到查找结果，通过(NSArray *results)返回相应对象数组。
  * @discussion 旧的查找推送接口被废弃，使用此接口可以替换
  *
  */

ios/RCTJPushModule/libjpush-ios-3.0.9.a ios/RCTJPushModule/libjpush-ios-3.1.0.aios/RCTJPushModule/libjpush-ios-3.0.9.a renamed to ios/RCTJPushModule/libjpush-ios-3.1.0.a

@@ -1,6 +1,6 @@
 {
   "name": "jpush-react-native",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "a jpush plugin for react native application",
   "main": "index.js",
   "scripts": {