Merge pull request #933 from LcTerry/master

更新JPush 520
jpush · Sep 21, 2023 · 6caa607 · 6caa607
2 parents 66fd0ce + b12deec
commit 6caa607
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -17,5 +17,5 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.facebook.react:react-native:+'
+    implementation 'com.facebook.react:react-native:0.63.0'
 }
diff --git a/android/libs/jpush-android-5.0.4.jar → android/libs/jpush-android-5.2.0.jar b/android/libs/jpush-android-5.0.4.jar → android/libs/jpush-android-5.2.0.jar
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -63,15 +63,15 @@
                 <category android:name="${applicationId}" />
             </intent-filter>
         </activity>
-        <receiver
+        <service
             android:name=".receiver.JPushModuleReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
                 <category android:name="${applicationId}" />
             </intent-filter>
-        </receiver>
+        </service>
 
         <receiver
             android:name=".receiver.JPushBroadcastReceiver"

diff --git a/android/src/main/java/cn/jiguang/plugins/push/receiver/JPushModuleReceiver.java b/android/src/main/java/cn/jiguang/plugins/push/receiver/JPushModuleReceiver.java
@@ -13,9 +13,9 @@
 import cn.jpush.android.api.CustomMessage;
 import cn.jpush.android.api.JPushMessage;
 import cn.jpush.android.api.NotificationMessage;
-import cn.jpush.android.service.JPushMessageReceiver;
+import cn.jpush.android.service.JPushMessageService;
 
-public class JPushModuleReceiver extends JPushMessageReceiver {
+public class JPushModuleReceiver extends JPushMessageService {
 
   @Override
   public void onMessage(Context context, CustomMessage customMessage) {

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -25,13 +25,13 @@ android {
     }
 
     defaultConfig {
-        applicationId "com.jmessage.sdk"                          //在此替换你的applicationId
+        applicationId "com.HuananThirdPush.cn"                          //在此替换你的applicationId
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 9999
+        versionName "9999.0"
         manifestPlaceholders = [
-                JPUSH_APPKEY: "129c21dc4cb5e6f6de194003",         //在此替换你的APPKey
+                JPUSH_APPKEY: "eb67142502ec9f5556875b9a",         //在此替换你的APPKey
                 JPUSH_CHANNEL: "default"                          //在此替换你的channel
         ]
     }
@@ -70,7 +70,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'com.facebook.react:react-native:0.63.0'
+
     implementation project(':jpush-react-native')  // 添加 jpush 依赖
     implementation project(':jcore-react-native')  // 添加 jcore 依赖
 

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -38,3 +38,14 @@ allprojects {
 
     }
 }
+def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
+
+allprojects {
+    configurations.all {
+        resolutionStrategy {
+            // Remove this override in 0.65+, as a proper fix is included in react-native itself.
+            force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
+        }
+    }
+
+}