github/jpush-phonegap-plugin
github/jpush-phonegap-plugin
4
0
Fork 1
mirror of https://github.com/jpush/jpush-phonegap-plugin.git synced 2025-04-21 15:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse Source
This commit is contained in:
Hevin 2016-06-17 13:41:20 +08:00
commit 8d24ce7c48
15 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "jpush-phonegap-plugin", "name": "jpush-phonegap-plugin",
"version": "2.1.8", "version": "2.2.0",
"description": "JPush for cordova plugin", "description": "JPush for cordova plugin",
"cordova": { "cordova": {
"id": "cn.jpush.phonegap.JPushPlugin", "id": "cn.jpush.phonegap.JPushPlugin",
@ -16,6 +16,7 @@
"keywords": [ "keywords": [
"JPush", "JPush",
"push", "push",
"Push",
"ecosystem:cordova", "ecosystem:cordova",
"cordova-ios", "cordova-ios",
"cordova-android" "cordova-android"

14
plugin.xml
View File

@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
id="cn.jpush.phonegap.JPushPlugin" id="cn.jpush.phonegap.JPushPlugin"
version="2.1.8"> version="2.2.0">
<name>JPush Plugin</name> <name>JPush Plugin</name>
<description>JPush for cordova plugin</description> <description>JPush for cordova plugin</description>
@ -174,12 +174,12 @@
<meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY"/> <meta-data android:name="JPUSH_APPKEY" android:value="$API_KEY"/>
</config-file> </config-file>
<source-file src="src/android/jpush-android-2.1.3.jar" target-dir="libs"/> <source-file src="src/android/jpush-android-2.1.5.jar" target-dir="libs"/>
<source-file src="src/android/armeabi/libjpush213.so" target-dir="libs/armeabi"/> <source-file src="src/android/armeabi/libjpush215.so" target-dir="libs/armeabi"/>
<source-file src="src/android/armeabi-v7a/libjpush213.so" target-dir="libs/armeabi-v7a"/> <source-file src="src/android/armeabi-v7a/libjpush215.so" target-dir="libs/armeabi-v7a"/>
<source-file src="src/android/arm64-v8a/libjpush213.so" target-dir="libs/arm64-v8a"/> <source-file src="src/android/arm64-v8a/libjpush215.so" target-dir="libs/arm64-v8a"/>
<source-file src="src/android/x86/libjpush213.so" target-dir="libs/x86"/> <source-file src="src/android/x86/libjpush215.so" target-dir="libs/x86"/>
<source-file src="src/android/x86_64/libjpush213.so" target-dir="libs/x86_64"/> <source-file src="src/android/x86_64/libjpush215.so" target-dir="libs/x86_64"/>
<!--<source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>--> <!--<source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jpush/phonegap"/>-->
<source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap"/> <source-file src="src/android/MyReceiver.java" target-dir="src/cn/jpush/phonegap"/>

BIN
src/android/arm64-v8a/libjpush213.so
View File

Binary file not shown.

BIN
src/android/arm64-v8a/libjpush215.so Normal file
View File

Binary file not shown.

BIN
src/android/armeabi-v7a/libjpush213.so
View File

Binary file not shown.

BIN
src/android/armeabi-v7a/libjpush215.so Normal file
View File

Binary file not shown.

BIN
src/android/armeabi/libjpush213.so
View File

Binary file not shown.

BIN
src/android/armeabi/libjpush215.so Normal file
View File

Binary file not shown.

BIN
src/android/jpush-android-2.1.3.jar
View File

Binary file not shown.

BIN
src/android/jpush-android-2.1.5.jar Normal file
View File

Binary file not shown.

BIN
src/android/x86/libjpush213.so
View File

Binary file not shown.

BIN
src/android/x86/libjpush215.so Normal file
View File

Binary file not shown.

BIN
src/android/x86_64/libjpush213.so
View File

Binary file not shown.

BIN
src/android/x86_64/libjpush215.so Normal file
View File

Binary file not shown.

10
src/ios/Plugins/JPushPlugin.m
View File

@ -16,7 +16,7 @@ static NSString *const JP_APP_CHANNEL = @"CHANNEL";
static NSString *const JP_APP_ISPRODUCTION = @"IsProduction"; static NSString *const JP_APP_ISPRODUCTION = @"IsProduction";
static NSString *const JP_APP_ISIDFA = @"IsIDFA"; static NSString *const JP_APP_ISIDFA = @"IsIDFA";
static NSString *const JPushConfigFileName = @"PushConfig"; static NSString *const JPushConfigFileName = @"PushConfig";
static NSDictionary *_luanchOptions = nil; static NSDictionary *_launchOptions = nil;
@implementation JPushPlugin @implementation JPushPlugin
@ -92,8 +92,8 @@ static NSDictionary *_luanchOptions = nil;
name:kJPushPluginReceiveNotification name:kJPushPluginReceiveNotification
object:nil]; object:nil];
if (_luanchOptions) { if (_launchOptions) {
NSDictionary *userInfo = [_luanchOptions NSDictionary *userInfo = [_launchOptions
valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey]; valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
if ([userInfo count] >0) { if ([userInfo count] >0) {
NSError *error; NSError *error;
@ -261,7 +261,7 @@ static NSDictionary *_luanchOptions = nil;
#pragma mark- 内部方法 #pragma mark- 内部方法
+(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{ +(void)setLaunchOptions:(NSDictionary *)theLaunchOptions{
_luanchOptions = theLaunchOptions; _launchOptions = theLaunchOptions;
[JPUSHService setDebugMode]; [JPUSHService setDebugMode];
@ -289,7 +289,7 @@ static NSDictionary *_luanchOptions = nil;
if(isIDFA){ if(isIDFA){
advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString]; advertisingId = [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString];
} }
[JPUSHService setupWithOption:_luanchOptions [JPUSHService setupWithOption:_launchOptions
appKey:appkey appKey:appkey
channel:channel channel:channel
apsForProduction:[isProduction boolValue] apsForProduction:[isProduction boolValue]