Skip to content

Commit 01cdefa

Browse files
authored
Merge pull request #59 from LcTerry/master
更新Android Jpush 4.8.1+JCore 3.3.4
2 parents eecb768 + f641579 commit 01cdefa

File tree

23 files changed

+213
-47
lines changed

23 files changed

+213
-47
lines changed

PLuginsAndroidAARCode/jpush-unity-plugin/build.gradle

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
buildscript {
22
repositories {
3-
jcenter()
4-
maven {
5-
url 'https://maven.google.com/'
6-
name 'Google'
7-
}
3+
google()
4+
maven { url 'https://maven.aliyun.com/repository/google' }
5+
maven { url 'https://maven.aliyun.com/repository/jcenter' }
6+
maven { url 'http://maven.aliyun.com/nexus/content/groups/public' }
7+
mavenCentral()
8+
maven{ url'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
9+
810
}
911
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
12+
classpath 'com.android.tools.build:gradle:4.0.0'
1113

1214
// NOTE: Do not place your application dependencies here; they belong
1315
// in the individual module build.gradle files
@@ -17,12 +19,12 @@ buildscript {
1719
apply plugin: 'com.android.library'
1820

1921
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "27.0.3"
22+
compileSdkVersion 30
23+
buildToolsVersion "30.0.0"
2224

2325
defaultConfig {
2426
minSdkVersion 14
25-
targetSdkVersion 25
27+
targetSdkVersion 30
2628
versionCode 1
2729
versionName "1.0"
2830
}
@@ -32,10 +34,12 @@ android {
3234
}
3335
}
3436
compileOptions {
35-
sourceCompatibility JavaVersion.VERSION_1_6
36-
targetCompatibility JavaVersion.VERSION_1_6
37+
sourceCompatibility JavaVersion.VERSION_1_8
38+
targetCompatibility JavaVersion.VERSION_1_8
3739
}
40+
3841
lintOptions {
42+
checkReleaseBuilds false
3943
abortOnError false
4044
}
4145
}

PLuginsAndroidAARCode/jpush-unity-plugin/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
7+
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

PLuginsAndroidAARCode/jpush-unity-plugin/src/main/java/cn/jiguang/unity/push/JPushBridge.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public void setDebug(boolean enable) {
4949
public void initPush(String gameObject) {
5050
JPushBridge.gameObject = gameObject;
5151
mContext = UnityPlayer.currentActivity.getApplicationContext();
52+
JPushInterface.setNotificationCallBackEnable(mContext,true);
5253
JPushInterface.init(mContext);
5354

5455
if (!receiveNotiStrCache.isEmpty()) {

PLuginsAndroidAARCode/jpush-unity-plugin/src/main/java/cn/jiguang/unity/push/JPushEventReceiver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ public void onNotifyMessageArrived(Context context, NotificationMessage notifica
154154
public void onNotifyMessageOpened(Context context, NotificationMessage notificationMessage) {
155155
JPushInterface.reportNotificationOpened(context, notificationMessage.msgId);//bundle.getString(JPushInterface.EXTRA_MSG_ID)
156156

157-
Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
158-
if (launch != null) {
159-
launch.addCategory(Intent.CATEGORY_LAUNCHER);
160-
launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
161-
context.startActivity(launch);
162-
}
157+
// Intent launch = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
158+
// if (launch != null) {
159+
// launch.addCategory(Intent.CATEGORY_LAUNCHER);
160+
// launch.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
161+
// context.startActivity(launch);
162+
// }
163163

164164
String title = notificationMessage.notificationTitle;//bundle.getString(JPushInterface.EXTRA_NOTIFICATION_TITLE);
165165
String content = notificationMessage.notificationContent;//bundle.getString(JPushInterface.EXTRA_ALERT);

PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore242.so renamed to PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore334.so

5.7 KB
Binary file not shown.

PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore242.so renamed to PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore334.so

13.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)