diff --git a/package.json b/package.json index b753558..80bcfdf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "jpush-phonegap-plugin", - "version": "3.7.2", + "version": "3.7.3", "description": "JPush for cordova plugin", "cordova": { "id": "jpush-phonegap-plugin", diff --git a/plugin.xml b/plugin.xml index b902c26..323fe03 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="3.7.3"> JPush JPush for cordova plugin @@ -49,7 +49,7 @@ - + @@ -249,7 +249,7 @@ - + diff --git a/src/android/libs/jpush-android-3.3.4.jar b/src/android/libs/jpush-android-3.3.4.jar deleted file mode 100755 index fef22f8..0000000 Binary files a/src/android/libs/jpush-android-3.3.4.jar and /dev/null differ diff --git a/src/android/libs/jpush-android-3.3.8.jar b/src/android/libs/jpush-android-3.3.8.jar new file mode 100755 index 0000000..6e2d51a Binary files /dev/null and b/src/android/libs/jpush-android-3.3.8.jar differ diff --git a/src/ios/lib/JPUSHService.h b/src/ios/lib/JPUSHService.h old mode 100755 new mode 100644 index 904da9a..ec1b3bd --- a/src/ios/lib/JPUSHService.h +++ b/src/ios/lib/JPUSHService.h @@ -9,7 +9,7 @@ * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved. */ -#define JPUSH_VERSION_NUMBER 3.2.1 +#define JPUSH_VERSION_NUMBER 3.2.6 #import @@ -45,7 +45,7 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) { JPAuthorizationOptionCriticalAlert NS_AVAILABLE_IOS(12.0) = (1 << 4) , //The ability to play sounds for critical alerts. JPAuthorizationOptionProvidesAppNotificationSettings NS_AVAILABLE_IOS(12.0) = (1 << 5) , //An option indicating the system should display a button for in-app notification settings. JPAuthorizationOptionProvisional NS_AVAILABLE_IOS(12.0) = (1 << 6) , //The ability to post noninterrupting notifications provisionally to the Notification Center. - + JPAuthorizationOptionAnnouncement NS_AVAILABLE_IOS(13.0) = (1 << 7) , //The ability for Siri to automatically read out messages over AirPods. }; /*! @@ -108,6 +108,7 @@ typedef NS_OPTIONS(NSUInteger, JPAuthorizationOptions) { @property (nonatomic, copy) NSString *launchImageName NS_AVAILABLE_IOS(10_0); // 启动图片名,iOS10以上有效,从推送启动时将会用到 @property (nonatomic, copy) NSString *summaryArgument NS_AVAILABLE_IOS(12.0); //插入到通知摘要中的部分参数。iOS12以上有效。 @property (nonatomic, assign) NSUInteger summaryArgumentCount NS_AVAILABLE_IOS(12.0); //插入到通知摘要中的项目数。iOS12以上有效。 +@property (nonatomic, copy) NSString *targetContentIdentifier NS_AVAILABLE_IOS(13.0); // An identifier for the content of the notification used by the system to customize the scene to be activated when tapping on a notification. @end @@ -659,7 +660,7 @@ callbackSelector:(SEL)cbSelector * @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 @@ -672,7 +673,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; /** 离开地理围栏区域 @@ -681,6 +682,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 diff --git a/src/ios/lib/jpush-ios-3.2.1.a b/src/ios/lib/jpush-ios-3.2.6.a old mode 100755 new mode 100644 similarity index 61% rename from src/ios/lib/jpush-ios-3.2.1.a rename to src/ios/lib/jpush-ios-3.2.6.a index 6aa3beb..0faba55 Binary files a/src/ios/lib/jpush-ios-3.2.1.a and b/src/ios/lib/jpush-ios-3.2.6.a differ