Merge pull request #913 from LcTerry/master

更新JPush 500：适配新回调
jpush · Apr 11, 2023 · 5feb793 · 5feb793
2 parents d44d379 + 05b0228
commit 5feb793
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/android/src/main/java/cn/jiguang/plugins/push/common/JConstants.java b/android/src/main/java/cn/jiguang/plugins/push/common/JConstants.java
@@ -58,12 +58,14 @@ public class JConstants {
     //event
     public static final String CONNECT_EVENT = "ConnectEvent";
     public static final String NOTIFICATION_EVENT = "NotificationEvent";
+    public static final String INAPP_MESSAGE_EVENT = "InappMessageEvent";
     public static final String CUSTOM_MESSAGE_EVENT = "CustomMessageEvent";
     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 COMMAND_EVENT = "CommandEvent";
     public static final String BADGE_NUMBER = "badge";
     public static final String PROPERTIES = "pros";
-    public static final String IN_APP_MESSAGE = "inapp";
+    public static final String IN_APP_MESSAGE_CLICK = "inappClick";
+    public static final String IN_APP_MESSAGE_SHOW = "inappShow";
 }
diff --git a/android/src/main/java/cn/jiguang/plugins/push/helper/JPushHelper.java b/android/src/main/java/cn/jiguang/plugins/push/helper/JPushHelper.java
@@ -43,7 +43,7 @@ public static WritableMap convertNotificationToMap(String eventType, Notificatio
     }
     public static WritableMap convertInAppMessageToMap(String eventType, NotificationMessage message) {
         WritableMap writableMap = Arguments.createMap();
-        writableMap.putString(JConstants.NOTIFICATION_EVENT_TYPE, eventType);
+        writableMap.putString(JConstants.INAPP_MESSAGE_EVENT, eventType);
         writableMap.putString(JConstants.MESSAGE_ID, message.msgId);
         writableMap.putString(JConstants.TITLE, message.inAppMsgTitle);
         writableMap.putString(JConstants.CONTENT, message.inAppMsgContentBody);

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
@@ -56,8 +56,8 @@ public void onInAppMessageShow(Context context, NotificationMessage notification
     JLogger.d("onInAppMessageShow:" + notificationMessage.toString());
     if (JPushModule.reactContext != null) {
       if (!JPushModule.isAppForeground) JPushHelper.launchApp(context);
-      WritableMap writableMap = JPushHelper.convertInAppMessageToMap(JConstants.IN_APP_MESSAGE, notificationMessage);
-      JPushHelper.sendEvent(JConstants.NOTIFICATION_EVENT, writableMap);
+      WritableMap writableMap = JPushHelper.convertInAppMessageToMap(JConstants.IN_APP_MESSAGE_SHOW, notificationMessage);
+      JPushHelper.sendEvent(JConstants.INAPP_MESSAGE_EVENT, writableMap);
     } else {
       super.onInAppMessageShow(context, notificationMessage);
     }
@@ -67,8 +67,8 @@ public void onInAppMessageClick(Context context, NotificationMessage notificatio
     JLogger.d("onInAppMessageClick:" + notificationMessage.toString());
     if (JPushModule.reactContext != null) {
       if (!JPushModule.isAppForeground) JPushHelper.launchApp(context);
-      WritableMap writableMap = JPushHelper.convertInAppMessageToMap(JConstants.IN_APP_MESSAGE, notificationMessage);
-      JPushHelper.sendEvent(JConstants.NOTIFICATION_EVENT, writableMap);
+      WritableMap writableMap = JPushHelper.convertInAppMessageToMap(JConstants.IN_APP_MESSAGE_CLICK, notificationMessage);
+      JPushHelper.sendEvent(JConstants.INAPP_MESSAGE_EVENT, writableMap);
     } else {
       super.onInAppMessageClick(context, notificationMessage);
     }