diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/build.gradle b/PLuginsAndroidAARCode/jpush-unity-plugin/build.gradle index 52e7068..d466de6 100644 --- a/PLuginsAndroidAARCode/jpush-unity-plugin/build.gradle +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/build.gradle @@ -35,6 +35,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_6 targetCompatibility JavaVersion.VERSION_1_6 } + lintOptions { + abortOnError false + } } dependencies { diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.2.4.jar b/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.2.4.jar deleted file mode 100644 index 6e652bc..0000000 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.2.4.jar and /dev/null differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.4.2.jar b/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.4.2.jar new file mode 100644 index 0000000..b49dc55 Binary files /dev/null and b/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.4.2.jar differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.5.4.jar b/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.5.4.jar deleted file mode 100644 index 251691d..0000000 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.5.4.jar and /dev/null differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.7.0.jar b/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.7.0.jar new file mode 100644 index 0000000..03478cf Binary files /dev/null and b/PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.7.0.jar differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore224.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore242.so similarity index 68% rename from PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore224.so rename to PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore242.so index b7e5e72..5a89c30 100644 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore224.so and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore242.so differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore224.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore242.so similarity index 59% rename from PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore224.so rename to PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore242.so index 7d315fb..6a2c6ef 100644 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore224.so and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore242.so differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore224.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore242.so similarity index 67% rename from PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore224.so rename to PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore242.so index a04c8b9..eba061c 100644 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore224.so and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore242.so differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore224.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore224.so deleted file mode 100644 index 3e6a338..0000000 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore224.so and /dev/null differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore242.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore242.so new file mode 100644 index 0000000..469f6ef Binary files /dev/null and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore242.so differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore224.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore224.so deleted file mode 100644 index 389e573..0000000 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore224.so and /dev/null differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore242.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore242.so new file mode 100644 index 0000000..9c597fa Binary files /dev/null and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore242.so differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore224.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore242.so similarity index 72% rename from PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore224.so rename to PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore242.so index 9a4d47b..5d6920d 100644 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore224.so and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore242.so differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore224.so b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore242.so similarity index 70% rename from PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore224.so rename to PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore242.so index 802d9ee..5b0bb75 100644 Binary files a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore224.so and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore242.so differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_cancle.png b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_cancle.png new file mode 100644 index 0000000..473abfe Binary files /dev/null and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_cancle.png differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close.png b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close.png new file mode 100644 index 0000000..4c6e670 Binary files /dev/null and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close.png differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close2.png b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close2.png new file mode 100644 index 0000000..bcedf3c Binary files /dev/null and b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close2.png differ diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification.xml new file mode 100644 index 0000000..630ab7b --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification.xml @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification_large.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification_large.xml new file mode 100644 index 0000000..a779f1f --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification_large.xml @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification_middle.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification_middle.xml new file mode 100644 index 0000000..e856534 --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification_middle.xml @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/jpush_inapp_banner.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/jpush_inapp_banner.xml new file mode 100644 index 0000000..a2f16df --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/jpush_inapp_banner.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification.xml new file mode 100644 index 0000000..1642235 --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification.xml @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification_large.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification_large.xml new file mode 100644 index 0000000..c93a22c --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification_large.xml @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification_middle.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification_middle.xml new file mode 100644 index 0000000..2ca2deb --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout/push_notification_middle.xml @@ -0,0 +1,297 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/values-zh/jpush_string.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/values-zh/jpush_string.xml new file mode 100644 index 0000000..069b6f4 --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/values-zh/jpush_string.xml @@ -0,0 +1,7 @@ + + + 不重要 + 不重要 + 普通 + 重要 + \ No newline at end of file diff --git a/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/values/jpush_string.xml b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/values/jpush_string.xml new file mode 100644 index 0000000..70a4ea7 --- /dev/null +++ b/PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/values/jpush_string.xml @@ -0,0 +1,8 @@ + + + LOW + LOW + NORMAL + HIGH + + \ No newline at end of file diff --git a/Plugins/Android/AndroidManifest.xml b/Plugins/Android/AndroidManifest.xml index cf574b2..1754229 100755 --- a/Plugins/Android/AndroidManifest.xml +++ b/Plugins/Android/AndroidManifest.xml @@ -1,14 +1,14 @@ - + @@ -65,7 +65,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -118,7 +118,7 @@ android:exported="false"> - + @@ -140,7 +140,7 @@ - + @@ -152,7 +152,7 @@ android:theme="@android:style/Theme.Translucent.NoTitleBar"> - + @@ -168,7 +168,7 @@ - + diff --git a/Plugins/Android/jpush.aar b/Plugins/Android/jpush.aar index 33015b3..6bc9119 100644 Binary files a/Plugins/Android/jpush.aar and b/Plugins/Android/jpush.aar differ diff --git a/Plugins/iOS/JPUSHService.h b/Plugins/iOS/JPUSHService.h index 47395fe..9238086 100644 --- a/Plugins/iOS/JPUSHService.h +++ b/Plugins/iOS/JPUSHService.h @@ -9,7 +9,7 @@ * Copyright (c) 2011 ~ 2017 Shenzhen HXHG. All rights reserved. */ -#define JPUSH_VERSION_NUMBER 3.2.8 +#define JPUSH_VERSION_NUMBER 3.3.4 #import @@ -22,6 +22,7 @@ @class UNNotification; @protocol JPUSHRegisterDelegate; @protocol JPUSHGeofenceDelegate; +@protocol JPushInMessageDelegate; typedef void (^JPUSHTagsOperationCompletion)(NSInteger iResCode, NSSet *iTags, NSInteger seq); typedef void (^JPUSHTagValidOperationCompletion)(NSInteger iResCode, NSSet *iTags, NSInteger seq, BOOL isBind); @@ -219,12 +220,27 @@ typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) { + (void)registerDeviceToken:(NSData *)deviceToken; - /*! * @abstract 处理收到的 APNs 消息 */ + (void)handleRemoteNotification:(NSDictionary *)remoteInfo; +/*! + * @abstract 向极光服务器提交Token + * + * @param voipToken 推送使用的Voip Token + */ ++ (void)registerVoipToken:(NSData *)voipToken; + + +/*! + * @abstract 处理收到的 Voip 消息 + * + * @param remoteInfo 下发的 Voip 内容 + */ ++ (void)handleVoipNotification:(NSDictionary *)remoteInfo; + + /*! * @abstract 检测通知授权状态 * @param completion 授权结果通过status值返回,详见JPAuthorizationStatus @@ -618,6 +634,22 @@ typedef NS_ENUM(NSUInteger, JPAuthorizationStatus) { */ + (void)setLogOFF; +/*! + * @abstract 设置SDK地理位置权限开关 + * + * @discussion 关闭地理位置之后,SDK地理围栏的相关功能将受到影响,默认是开启。 + * + */ ++ (void)setLocationEanable:(BOOL)isEanble; + +/*! +* @abstract 设置应用内消息的代理 +* +* @discussion 遵守JPushInMessageDelegate的代理对象 +* +*/ ++ (void)setInMessageDelegate:(id)inMessageDelegate; + ///---------------------------------------------------- ///********************下列方法已过期******************** ///**************请使用新版tag/alias操作接口************** @@ -710,3 +742,23 @@ callbackSelector:(SEL)cbSelector - (void)jpushGeofenceIdentifer:(NSString *)geofenceId didExitRegion:(NSDictionary *)userInfo error:(NSError *)error; @end + +@protocol JPushInMessageDelegate + +@optional +/** + *是否允许应用内消息弹出,默认为允许 +*/ +- (BOOL)jPushInMessageIsAllowedInMessagePop; + +/** + *应用内消息已弹出 +*/ +- (void)jPushInMessageAlreadyPop; + +/** + *应用内消息已消失 +*/ +- (void)jPushInMessageAlreadyDisapperar; + +@end diff --git a/Plugins/iOS/jcore-ios-2.1.8.a b/Plugins/iOS/jcore-ios-2.3.4.a similarity index 84% rename from Plugins/iOS/jcore-ios-2.1.8.a rename to Plugins/iOS/jcore-ios-2.3.4.a index f3bef35..f628a2f 100644 Binary files a/Plugins/iOS/jcore-ios-2.1.8.a and b/Plugins/iOS/jcore-ios-2.3.4.a differ diff --git a/Plugins/iOS/jpush-ios-3.2.8.a b/Plugins/iOS/jpush-ios-3.2.8.a deleted file mode 100644 index 6387b4d..0000000 Binary files a/Plugins/iOS/jpush-ios-3.2.8.a and /dev/null differ diff --git a/Plugins/iOS/jpush-ios-3.3.4.a b/Plugins/iOS/jpush-ios-3.3.4.a new file mode 100644 index 0000000..03e688c Binary files /dev/null and b/Plugins/iOS/jpush-ios-3.3.4.a differ diff --git a/README.md b/README.md index 55d504a..5f9f8e2 100644 --- a/README.md +++ b/README.md @@ -20,29 +20,20 @@ 1. 生成 iOS 工程,并打开该工程。 2. 添加必要的框架: - - CoreFoundation.framework + - CFNetwork.framework + - CoreFoundation.framework + - CoreTelephony.framework + - SystemConfiguration.framework + - CoreGraphics.framework + - Foundation.framework + - UIKit.framework + - Security.framework + - libz.tbd(Xcode 7 以下版本是 libz.dylib) + - AdSupport.framework(获取 IDFA 需要;如果不使用 IDFA,请不要添加) + - UserNotifications.framework(Xcode 8 及以上) + - libresolv.tbd(JPush 2.2.0 及以上版本需要,Xcode 7 以下版本是 libresolv.dylib) + - WebKit.framework(JPush 3.3.0 及以上版本需要) - - CFNetwork.framework - - - SystemConfiguration.framework - - - CoreTelephony.framework - - - CoreGraphics.framework - - - Foundation.framework - - - UIKit.framework - - - Security.framework - - - libz.tbd // Xcode7 之前为 libz.dylib 之后为 libz.tbd。 - - - AdSupport.framework // 如需使用广告标识符 IDFA 则添加该库,否则不添加。 - - - libresolv.tbd (JPush 2.2.0及以上版本需要, Xcode7以下版本是libresolv.dylib) - - - UserNotifications.framework (Xcode8及以上) ​