Feat/update jpush

.npmignore

@@ -1 +1,2 @@
 example/
+cursor.md

JPush.podspec → JPushRN.podspec

@@ -3,7 +3,7 @@ pjson = JSON.parse(File.read('package.json'))
 
 Pod::Spec.new do |s|
 
-  s.name            = "JPush"
+  s.name            = "JPushRN"
   s.version         = pjson["version"]
   s.homepage        = pjson["homepage"]
   s.summary         = pjson["description"]
@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
   s.frameworks      = 'UIKit','CFNetwork','CoreFoundation','CoreTelephony','SystemConfiguration','CoreGraphics','Foundation','Security'
   s.weak_frameworks = 'UserNotifications'
   s.libraries       = 'z','resolv'
-  s.vendored_libraries = "ios/RCTJPushModule/*.a"
+  s.vendored_frameworks = "ios/RCTJPushModule/*.xcframework"
   s.dependency 'React'
 end

android/build.gradle

@@ -5,10 +5,13 @@ def safeExtGet(prop, fallback) {
 }
 
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 27)
+    compileSdkVersion safeExtGet('compileSdkVersion', 34)
+
+    namespace 'cn.jiguang.plugins.push'
+
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 27)
+        minSdkVersion safeExtGet('minSdkVersion', 23)
+        targetSdkVersion safeExtGet('targetSdkVersion', 34)
         versionCode 1
         versionName "1.0"
 

android/src/main/AndroidManifest.xml

@@ -1,38 +1,47 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cn.jiguang.plugins.push">
+    >
 
     <permission
         android:name="${applicationId}.permission.JPUSH_MESSAGE"
         android:protectionLevel="signature" />
-
     <!-- Required -->
     <uses-permission android:name="${applicationId}.permission.JPUSH_MESSAGE" />
-    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <!--华为角标-->
+    <uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
+    <!--vivo 角标-->
+    <uses-permission android:name="com.vivo.notification.permission.BADGE_ICON" />
+    <!--honor 角标-->
+    <uses-permission android:name="com.hihonor.android.launcher.permission.CHANGE_BADGE" />
+    <!--小米 推送必须-->
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <!-- Optional. Required for location feature -->
+    <!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
-    <!-- Optional. Required for location feature -->
-    <!-- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.GET_TASKS" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/> -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> -->
 
     <application>
         <activity
             android:name="cn.jpush.android.ui.PopWinActivity"
-            android:exported="false"
-            android:theme="@style/MyDialogStyle" />
+            android:exported="true"
+            android:theme="@style/MyDialogStyle" >
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="cn.jpush.android.ui.PopWinActivity" />
+                <category android:name="${applicationId}" />
+            </intent-filter>
+        </activity>
 
         <activity
             android:name="cn.jpush.android.ui.PushActivity"
@@ -50,7 +59,7 @@
        <activity
             android:name="cn.jpush.android.service.JNotifyActivity"
             android:exported="true"
-            android:taskAffinity="jpush.custom"
+            android:taskAffinity=""
             android:theme="@style/JPushTheme">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.JNotifyActivity" />
@@ -63,7 +72,7 @@
             android:enabled="true"
             android:exported="false">
             <intent-filter>
-                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
+                <action android:name="cn.jpush.android.intent.RECEIVER_MESSAGE" />
                 <category android:name="${applicationId}" />
             </intent-filter>
         </receiver>
@@ -83,7 +92,7 @@
         <activity
             android:name="cn.android.service.JTransitActivity"
             android:exported="true"
-            android:taskAffinity="jpush.custom"
+            android:taskAffinity=""
             android:theme="@style/JPushTheme" >
             <intent-filter>
                 <action android:name="cn.android.service.JTransitActivity" />
@@ -95,13 +104,18 @@
             android:enabled="true"
             android:exported="true"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
-            android:taskAffinity="jpush.custom">
+            android:taskAffinity="">
             <intent-filter>
                 <action android:name="cn.jpush.android.intent.DActivity"/>
                 <category android:name="${applicationId}" />
             </intent-filter>
         </activity>
-
+        <provider
+            android:name="cn.jpush.android.service.InitProvider"
+            android:authorities="${applicationId}.jiguang.InitProvider"
+            android:exported="false"
+            android:readPermission="${applicationId}.permission.JPUSH_MESSAGE"
+            android:writePermission="${applicationId}.permission.JPUSH_MESSAGE" />
     </application>
 
 </manifest>

android/src/main/java/cn/jiguang/plugins/push/JPushModule.java

@@ -1,6 +1,9 @@
 
 package cn.jiguang.plugins.push;
-
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.net.Uri;
+import android.os.Build;
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
@@ -14,19 +17,23 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableMap;
 
 import org.json.JSONObject;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
+import java.lang.*;
 
 import cn.jiguang.plugins.push.common.JConstants;
 import cn.jiguang.plugins.push.common.JLogger;
 import cn.jiguang.plugins.push.helper.JPushHelper;
 import cn.jiguang.plugins.push.receiver.JPushBroadcastReceiver;
 import cn.jpush.android.api.BasicPushNotificationBuilder;
 import cn.jpush.android.api.JPushInterface;
+import cn.jpush.android.data.JPushCollectControl;
 import cn.jpush.android.data.JPushLocalNotification;
 
 public class JPushModule extends ReactContextBaseJavaModule {
@@ -59,6 +66,7 @@ public void init() {
             JPushHelper.sendEvent(JConstants.NOTIFICATION_EVENT, writableMap);
             JPushBroadcastReceiver.NOTIFICATION_BUNDLE = null;
         }
+        JPushInterface.setNotificationCallBackEnable(reactContext,true);
     }
 
     @ReactMethod
@@ -95,6 +103,92 @@ public void setChannel(ReadableMap readableMap) {
         }
     }
     @ReactMethod
+    public void setChannelAndSound(ReadableMap readableMap) {
+        if (readableMap == null) {
+            JLogger.w(JConstants.PARAMS_NULL);
+            return;
+        }
+        String channel = readableMap.getString(JConstants.CHANNEL);
+        String sound = readableMap.getString(JConstants.SOUND);
+        String channelId = readableMap.getString(JConstants.CHANNELID);
+        try {
+            NotificationManager manager= (NotificationManager) reactContext.getSystemService("notification");
+            if(Build.VERSION.SDK_INT<26){
+                return;
+            }
+            if(TextUtils.isEmpty(channel)||TextUtils.isEmpty(channelId)){
+                return;
+            }
+            NotificationChannel channel1=new NotificationChannel(channelId,channel, NotificationManager.IMPORTANCE_HIGH);
+            if(!TextUtils.isEmpty(sound)){
+                channel1.setSound(Uri.parse("android.resource://"+reactContext.getPackageName()+"/raw/"+sound),null);
+            }
+            manager.createNotificationChannel(channel1);
+            JPushInterface.setChannel(reactContext,channel);
+        }catch (Throwable throwable){
+        }
+    }
+    @ReactMethod
+    public void setLinkMergeEnable(boolean enable) {
+        JPushInterface.setLinkMergeEnable(reactContext, enable);
+    }
+
+    @ReactMethod
+    public void setSmartPushEnable(boolean enable) {
+        JPushInterface.setSmartPushEnable(reactContext, enable);
+    }
+
+    @ReactMethod
+    public void setDataInsightsEnable(boolean enable) {
+        JPushInterface.setDataInsightsEnable(reactContext, enable);
+    }
+
+    @ReactMethod
+    public void setGeofenceEnable(boolean enable) {
+        JPushInterface.setGeofenceEnable(reactContext, enable);
+    }
+
+    @ReactMethod
+    public void setCollectControl(ReadableMap readableMap) {
+        if (readableMap == null) {
+            JLogger.w(JConstants.PARAMS_NULL);
+            return;
+        }
+        boolean hadValue = false;
+        JPushCollectControl.Builder builder = new JPushCollectControl.Builder();
+        if (readableMap.hasKey(JConstants.IMEI)) {
+            hadValue = true;
+            builder.imei(readableMap.getBoolean(JConstants.IMEI));
+        }
+        if (readableMap.hasKey(JConstants.IMSI)) {
+            hadValue = true;
+            builder.imsi(readableMap.getBoolean(JConstants.IMSI));
+        }
+        if (readableMap.hasKey(JConstants.MAC)) {
+            hadValue = true;
+            builder.mac(readableMap.getBoolean(JConstants.MAC));
+        }
+        if (readableMap.hasKey(JConstants.WIFI)) {
+            hadValue = true;
+            builder.wifi(readableMap.getBoolean(JConstants.WIFI));
+        }
+        if (readableMap.hasKey(JConstants.BSSID)) {
+            hadValue = true;
+            builder.bssid(readableMap.getBoolean(JConstants.BSSID));
+        }
+        if (readableMap.hasKey(JConstants.SSID)) {
+            hadValue = true;
+            builder.ssid(readableMap.getBoolean(JConstants.SSID));
+        }
+        if (readableMap.hasKey(JConstants.CELL)) {
+            hadValue = true;
+            builder.cell(readableMap.getBoolean(JConstants.CELL));
+        }
+        if (hadValue) {
+            JPushInterface.setCollectControl(reactContext, builder.build());
+        }
+    }
+    @ReactMethod
     public void setBadgeNumber(ReadableMap readableMap) {
         if (readableMap == null) {
             JLogger.w(JConstants.PARAMS_NULL);
@@ -213,7 +307,48 @@ public void filterValidTags(ReadableMap readableMap, Callback callback) {
             JLogger.w("there are no " + JConstants.TAGS);
         }
     }
+    @ReactMethod
+    public void setProperties(ReadableMap readableMap) {
+        if (readableMap == null) {
+            JLogger.w(JConstants.PARAMS_NULL);
+            return;
+        }
+        if (readableMap.hasKey(JConstants.PROPERTIES)) {
+            int sequence = readableMap.getInt(JConstants.SEQUENCE);
+            ReadableMap readMap = readableMap.getMap(JConstants.PROPERTIES);
+            ReadableNativeMap map= (ReadableNativeMap) readMap;
+            HashMap properties=map.toHashMap();
+            JPushInterface.setProperties(reactContext,sequence,properties);
+        } else {
+            JLogger.w("there are no " + JConstants.PROPERTIES);
+        }
+    }
+    @ReactMethod
+    public void deleteProperties(ReadableMap readableMap) {
+        if (readableMap == null) {
+            JLogger.w(JConstants.PARAMS_NULL);
+            return;
+        }
+        if (readableMap.hasKey(JConstants.PROPERTIES)) {
+            int sequence = readableMap.getInt(JConstants.SEQUENCE);
+            ReadableMap readMap = readableMap.getMap(JConstants.PROPERTIES);
+            ReadableNativeMap map= (ReadableNativeMap) readMap;
+            HashMap properties=map.toHashMap();
+            JPushInterface.deleteProperties(reactContext,sequence,properties);
+        } else {
+            JLogger.w("there are no " + JConstants.PROPERTIES);
+        }
 
+    }
+    @ReactMethod
+    public void cleanProperties(ReadableMap readableMap) {
+        if (readableMap == null) {
+            JLogger.w(JConstants.PARAMS_NULL);
+            return;
+        }
+        int sequence = readableMap.getInt(JConstants.SEQUENCE);
+        JPushInterface.cleanProperties(reactContext,sequence);
+    }
     @ReactMethod
     public void setTags(ReadableMap readableMap) {
         if (readableMap == null) {
@@ -390,15 +525,61 @@ public void addLocalNotification(ReadableMap readableMap) {
         int id = Integer.valueOf(notificationID);
         String notificationTitle = readableMap.hasKey(JConstants.TITLE) ? readableMap.getString(JConstants.TITLE) : reactContext.getPackageName();
         String notificationContent = readableMap.hasKey(JConstants.CONTENT) ? readableMap.getString(JConstants.CONTENT) : reactContext.getPackageName();
+        String broadcastTime = readableMap.hasKey(JConstants.BROADCAST_TIME) ? readableMap.getString(JConstants.BROADCAST_TIME) : "0";
         JPushLocalNotification notification = new JPushLocalNotification();
         notification.setNotificationId(id);
         notification.setTitle(notificationTitle);
         notification.setContent(notificationContent);
+        try {
+            notification.setBroadcastTime(Long.parseLong(broadcastTime));
+        }catch (Throwable throwable){
+        }
         if (readableMap.hasKey(JConstants.EXTRAS)) {
             ReadableMap notificationExtra = readableMap.getMap(JConstants.EXTRAS);
             JSONObject notificationExtraJson = new JSONObject(notificationExtra.toHashMap());
             notification.setExtras(notificationExtraJson.toString());
         }
+
+        // 设置BuilderId
+        if (readableMap.hasKey(JConstants.BUILDER_NAME)) {
+            try {
+                String layoutFileName = readableMap.getString(JConstants.BUILDER_NAME);
+                if (!TextUtils.isEmpty(layoutFileName)) {
+                    // 通过布局文件名获取资源ID
+                    int builderId = reactContext.getResources().getIdentifier(
+                        layoutFileName, 
+                        "layout", 
+                        reactContext.getPackageName()
+                    );
+                    if (builderId != 0) {
+                        notification.setBuilderId(builderId);
+                    } else {
+                        JLogger.w("Layout file not found: " + layoutFileName);
+                    }
+                }
+            } catch (Exception e) {
+                JLogger.w("Failed to set BuilderId: " + e.getMessage());
+            }
+        }
+
+        // 设置Category
+        if (readableMap.hasKey(JConstants.CATEGORY)) {
+            String category = readableMap.getString(JConstants.CATEGORY);
+            if (!TextUtils.isEmpty(category)) {
+                notification.setCategory(category);
+            }
+        }
+
+        // 设置Priority
+        if (readableMap.hasKey(JConstants.PRIORITY)) {
+            try {
+                int priority = readableMap.getInt(JConstants.PRIORITY);
+                notification.setPriority(priority);
+            } catch (Exception e) {
+                JLogger.w("Priority must be a number");
+            }
+        }
+
         JPushInterface.addLocalNotification(reactContext, notification);
     }