3.2.1:android 5.9.0 ios 5.9.0

Author: huangshuni

android/libs/jpush-android-5.8.0.jar android/libs/jpush-android-5.9.0.jarandroid/libs/jpush-android-5.8.0.jar renamed to android/libs/jpush-android-5.9.0.jar

@@ -66,6 +66,7 @@ public class JConstants {
     public static final String LOCAL_NOTIFICATION_EVENT = "LocalNotificationEvent";
     public static final String TAG_ALIAS_EVENT = "TagAliasEvent";
     public static final String MOBILE_NUMBER_EVENT = "MobileNumberEvent";
+    public static final String NOTIFY_BUTTON_CLICK_EVENT = "NotifyButtonClickEvent";
     public static final String COMMAND_EVENT = "CommandEvent";
     public static final String BADGE_NUMBER = "badge";
     public static final String PROPERTIES = "pros";

android/src/main/java/cn/jiguang/plugins/push/common/JConstants.java

@@ -21,6 +21,7 @@
 import cn.jpush.android.api.CustomMessage;
 import cn.jpush.android.api.JPushMessage;
 import cn.jpush.android.api.NotificationMessage;
+import cn.jpush.android.api.NotificationCustomButton;
 
 public class JPushHelper {
 
@@ -72,6 +73,22 @@ public static WritableMap convertCustomMessage(CustomMessage customMessage) {
         return writableMap;
     }
 
+    public static WritableMap convertNotificationCustomButtonToMap(NotificationCustomButton notificationCustomButton) {
+        WritableMap writableMap = Arguments.createMap();
+        try {
+            writableMap.putString("msgId", notificationCustomButton.a);
+            writableMap.putInt("platform", notificationCustomButton.b);
+            writableMap.putString("name", notificationCustomButton.c);
+            writableMap.putInt("actionType", notificationCustomButton.d);
+            writableMap.putString("action", notificationCustomButton.e);
+            writableMap.putString("data", notificationCustomButton.f);
+            return writableMap;
+         } catch (Throwable throwable) {
+            JLogger.w("convertNotificationCustomButtonToMap error:" + throwable.getMessage());
+            return writableMap;
+        }
+    }
+
     public static WritableMap convertJPushMessageToMap(int type, JPushMessage message) {
         WritableMap writableMap = Arguments.createMap();
 

android/src/main/java/cn/jiguang/plugins/push/helper/JPushHelper.java

@@ -14,6 +14,7 @@
 import cn.jpush.android.api.JPushMessage;
 import cn.jpush.android.api.NotificationMessage;
 import cn.jpush.android.service.JPushMessageReceiver;
+import cn.jpush.android.api.NotificationCustomButton;
 
 public class JPushModuleReceiver extends JPushMessageReceiver {
 
@@ -81,6 +82,13 @@ public void onNotifyMessageDismiss(Context context, NotificationMessage notifica
     JPushHelper.sendEvent(JConstants.NOTIFICATION_EVENT, writableMap);
   }
 
+  @Override
+  public void onNotifyButtonClick(Context context, NotificationCustomButton notificationCustomButton) {
+    JLogger.d("onNotifyButtonClick:" + notificationCustomButton.toString());
+    WritableMap writableMap = JPushHelper.convertNotificationCustomButtonToMap(notificationCustomButton);
+    JPushHelper.sendEvent(JConstants.NOTIFY_BUTTON_CLICK_EVENT, writableMap);
+ }
+
   @Override
   public void onRegister(Context context, String registrationId) {
     JLogger.d("onRegister:" + registrationId);

android/src/main/java/cn/jiguang/plugins/push/receiver/JPushModuleReceiver.java

@@ -23,10 +23,11 @@
 请按照以下步骤完成：
 
 1. 找到需要升级的iOS JPush SDK，替换ios/RCTJPushModule/jpush-ios-x.x.x.xcframework 为需要更新的版本。
-2. 找到需要升级的Android JPush SDK，替换android/libs/jpush-android-x.x.x.jar 为需要更新的版本。
-3. 在插件中封装需求中需要封装的SDK方法，并在插件示例demo中提供示例调用代码，注意rn插件新增方法还需要再index.js和index.d.ts文件中声明哦。（如果没有需求中没有需要新增的方法，则跳过该步骤）
-4. 在package.json中更新插件版本号，在现有版本号上 + 0.0.1
-5. 在example/package.json 中 修改示例 插件的集成版本号。 改为最新的插件版本号。涉及到更改的代码
+2. 将/ios/RCTJPushModule.xcodeproj/project.pbxproj中关于jpush-ios-x.x.x.xcframework中引用路径的代码，替换为需要更新的版本。
+3. 找到需要升级的Android JPush SDK，替换android/libs/jpush-android-x.x.x.jar 为需要更新的版本。
+4. 在插件中封装需求中需要封装的SDK方法，并在插件示例demo中提供示例调用代码，注意rn插件新增方法还需要再index.js和index.d.ts文件中声明哦。（如果没有需求中没有需要新增的方法，则跳过该步骤）
+5. 在package.json中更新插件版本号，在现有版本号上 + 0.0.1
+6. 在example/package.json 中 修改示例 插件的集成版本号。 改为最新的插件版本号。涉及到更改的代码
 
     ```
        "dependencies": {

cursor.md

@@ -52,6 +52,7 @@ export default class App extends React.Component {
   }
 
   componentDidMount() {
+    // JPush.setBackgroundEnable(true);
     JPush.init({"appKey":"4fcc3e237eec4c4fb804ad49","channel":"dev","production":1});
     //连接状态
     this.connectListener = result => {
@@ -74,6 +75,11 @@ export default class App extends React.Component {
     console.log("customMessageListener:" + JSON.stringify(result))
   };
     JPush.addCustomMessageListener(this.customMessageListener);
+    //通知按钮点击回调
+    this.notifyButtonClickListener = result => {
+    console.log("notifyButtonClickListener:" + JSON.stringify(result))
+  };
+    JPush.addNotifyButtonClickListener(this.notifyButtonClickListener);
     //应用内消息回调
     JPush.pageEnterTo("HomePage") // 进入首页，当页面退出时请调用 JPush.pageLeave('HomePage')
     this.inappMessageListener = result => {

example/App.js

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "jcore-react-native": "^2.3.0",
-    "jpush-react-native": "^3.1.9",
+    "jpush-react-native": "^3.2.1",
     "react": "18.2.0",
     "react-native": "0.74.1"
   },

example/package.json

@@ -315,6 +315,36 @@ export default class JPush {
     }>
   ): void;
 
+  // 通知按钮点击事件, Android Only
+  static addNotifyButtonClickListener(
+    callback: Callback<{
+      /**
+       * 唯一标识通知按钮点击的 ID
+       */
+      msgId: string;
+      /**
+       * 平台
+       */
+      platform: number;
+      /**
+       * 按钮名称
+       */
+      name: string;
+      /**
+       * 按钮动作类型
+       */
+      actionType: number;
+      /**
+       * 按钮动作
+       */
+      action: string;
+      /**
+       * 按钮数据
+       */
+      data: string;
+    }>
+  ): void;
+
   /**
    * inapp消息事件
    */
@@ -547,4 +577,13 @@ export default class JPush {
   wifi: boolean;
 }): void;
 
+/**
+   * 设置进入后台是否允许长连接
+   * 支持版本：v5.9.0 版本开始
+   * 功能说明：设置进入后台是否允许长连接。默认是NO,进入后台会关闭长连接，回到前台会重新接入。请在初始化函数之前调用。
+   *
+   * @platform iOS
+   */
+ static setBackgroundEnable(enable: boolean): void;
+
 }

index.d.ts

@@ -11,6 +11,7 @@ const ConnectEvent           = 'ConnectEvent'            //连接状态
 const NotificationEvent      = 'NotificationEvent'       //通知事件
 const LocalNotificationEvent = 'LocalNotificationEvent'  //本地通知事件
 const CustomMessageEvent     = 'CustomMessageEvent'      //自定义消息事件
+const NotifyButtonClickEvent = 'NotifyButtonClickEvent'  //通知按钮点击事件
 const InappMessageEvent      = 'InappMessageEvent'       //应用内消息事件
 const TagAliasEvent          = 'TagAliasEvent'           //TagAlias/Pros事件
 const MobileNumberEvent      = 'MobileNumberEvent'       //电话号码事件
@@ -515,6 +516,31 @@ export default class JPush {
             })
     }
 
+    /*
+    * 通知按钮点击事件, Android Only
+    *
+    * @param {Function} callback = (result) => {"msgId":String，"platform":number, "name":string, "actionType":number, "action":string, "data":string}}}
+    *
+    * msgId:唯一标识通知按钮点击的 ID
+    *
+    * platform:平台
+    * 
+    * name:按钮名称
+    *
+    * actionType:按钮动作类型
+    *
+    * action:按钮动作
+    *
+    * data:按钮数据
+    *
+    * */
+    static addNotifyButtonClickListener(callback) {
+        listeners[callback] = DeviceEventEmitter.addListener(
+            NotifyButtonClickEvent, result => {
+                callback(result)
+            })
+    }
+
     /*
     * 应用内消息事件
     *
@@ -752,4 +778,17 @@ export default class JPush {
          }
     }
 
+    /*
+    * 设置进入后台是否允许长连接
+    * 支持版本：v5.9.0 版本开始
+    * 功能说明：设置进入后台是否允许长连接。默认是NO,进入后台会关闭长连接，回到前台会重新接入。请在初始化函数之前调用。
+    * @param enable = boolean
+    * @platform iOS
+    * */
+    static setBackgroundEnable(enable) {
+        if (Platform.OS == "ios") {
+            JPushModule.setBackgroundEnable(enable)
+        }
+    }
+
 }

index.js

@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		5C103CA7236041E7000AD3DA /* RCTJPushEventQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C103CA6236041E7000AD3DA /* RCTJPushEventQueue.m */; };
 		624386D81E096B8800F69E07 /* RCTJPushModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 624386D41E096B8800F69E07 /* RCTJPushModule.m */; };
-		A40EE5272E2F693E00FD1C66 /* jpush-ios-5.7.0.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A40EE5262E2F693E00FD1C66 /* jpush-ios-5.7.0.xcframework */; };
+		A40EE5272E2F693E00FD1C66 /* jpush-ios-5.9.0.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A40EE5262E2F693E00FD1C66 /* jpush-ios-5.9.0.xcframework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -30,15 +30,15 @@
 		624386D31E096B8800F69E07 /* RCTJPushModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTJPushModule.h; sourceTree = "<group>"; };
 		624386D41E096B8800F69E07 /* RCTJPushModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTJPushModule.m; sourceTree = "<group>"; };
 		6280980A1CEDC407000D3A81 /* libRCTJPushModule.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTJPushModule.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		A40EE5262E2F693E00FD1C66 /* jpush-ios-5.7.0.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "jpush-ios-5.7.0.xcframework"; path = "RCTJPushModule/jpush-ios-5.7.0.xcframework"; sourceTree = "<group>"; };
+		A40EE5262E2F693E00FD1C66 /* jpush-ios-5.9.0.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "jpush-ios-5.9.0.xcframework"; path = "RCTJPushModule/jpush-ios-5.9.0.xcframework"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		628098071CEDC407000D3A81 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A40EE5272E2F693E00FD1C66 /* jpush-ios-5.7.0.xcframework in Frameworks */,
+				A40EE5272E2F693E00FD1C66 /* jpush-ios-5.9.0.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -48,7 +48,7 @@
 		5CF8E647231E3A9200B12200 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				A40EE5262E2F693E00FD1C66 /* jpush-ios-5.7.0.xcframework */,
+				A40EE5262E2F693E00FD1C66 /* jpush-ios-5.9.0.xcframework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";