From 8814f3f0828e6ac652a29cc9de9f971fd55bca5b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 五月 2025 14:54:42 +0800
Subject: [PATCH] 2025年05月07日14:54:39

---
 app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java |   70 +++++++++++++++++++++++++++++++---
 1 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java b/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java
index fa78d29..aa577c5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java
+++ b/app/src/main/java/com/hdl/photovoltaic/jpush/JPushReceiverService.java
@@ -1,9 +1,15 @@
 package com.hdl.photovoltaic.jpush;
 
 import android.content.Context;
+import android.text.TextUtils;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import com.hdl.photovoltaic.other.HdlJpushLogic;
 import com.hdl.photovoltaic.other.HdlLogLogic;
+
+import java.util.Objects;
 
 import cn.jpush.android.api.CustomMessage;
 import cn.jpush.android.api.NotificationMessage;
@@ -14,6 +20,7 @@
  */
 public class JPushReceiverService extends JPushMessageService {
 
+
     /**
      * 鑷畾涔夋秷鎭洖璋�
      *
@@ -22,7 +29,7 @@
      */
     public void onMessage(Context context, CustomMessage customMessage) {
 
-        HdlLogLogic.print("鏋佸厜--->鑷畾涔夋秷鎭洖璋�--->" + new Gson().toJson(customMessage), true);
+        HdlLogLogic.print("鏋佸厜---鑷畾涔夋秷鎭洖璋�---" + new Gson().toJson(customMessage), false);
     }
 
     /**
@@ -32,8 +39,10 @@
      * @param message 鎺ユ敹鍒扮殑閫氱煡鍐呭
      */
     public void onNotifyMessageOpened(Context context, NotificationMessage message) {
-        HdlLogLogic.print("鏋佸厜--->鐐瑰嚮閫氱煡鍥炶皟--->" + new Gson().toJson(message), true);
-
+        JPushMessageInfoBean jPushMessageInfoBean = pushDataProcessing(message);
+        HdlJpushLogic.getInstance().JpushPushCommonData(context, jPushMessageInfoBean, true);
+//        //鐐瑰嚮鍚庡垹闄ゆ湰鍦伴�氱煡
+//        JPushInterface.clearAllNotifications(context);
     }
 
     /**
@@ -43,8 +52,8 @@
      * @param message 鎺ユ敹鍒扮殑閫氱煡鍐呭
      */
     public void onNotifyMessageArrived(Context context, NotificationMessage message) {
-        HdlLogLogic.print("鏋佸厜--->鎺ユ敹鍒扮殑閫氱煡鍐呭--->" + new Gson().toJson(message), true);
-
+        JPushMessageInfoBean jPushMessageInfoBean = pushDataProcessing(message);
+        HdlJpushLogic.getInstance().JpushPushCommonData(context, jPushMessageInfoBean, false);
     }
 
     /**
@@ -54,7 +63,7 @@
      * @param registrationId 娉ㄥ唽 id
      */
     public void onRegister(Context context, String registrationId) {
-        HdlLogLogic.print("鏋佸厜--->娉ㄥ唽鎴愬姛鍥炶皟Id--->" + registrationId, true);
+        HdlLogLogic.print("鏋佸厜---娉ㄥ唽鎴愬姛鍥炶皟Id:" + registrationId, false);
     }
 
     /**
@@ -64,7 +73,54 @@
      * @param isConnected 闀胯繛鎺ョ姸鎬�
      */
     public void onConnected(Context context, boolean isConnected) {
-        HdlLogLogic.print("鏋佸厜--->闀胯繛鎺ョ姸鎬佸洖璋�--->" + isConnected, true);
+        HdlLogLogic.print("鏋佸厜---闀胯繛鎺ョ姸鎬佸洖璋�:" + isConnected, false);
+    }
+
+    /**
+     * 鎺ㄩ�佹暟鎹綔澶勭悊
+     */
+    private JPushMessageInfoBean pushDataProcessing(NotificationMessage message) {
+        try {
+            JPushMessageInfoBean jPushMessageInfoBean = new JPushMessageInfoBean();
+            String title = message.notificationTitle;
+            String content = message.notificationContent;
+            String pushData = message.notificationExtras;
+            jPushMessageInfoBean.setTitle(title);
+            jPushMessageInfoBean.setContent(content);
+            if (TextUtils.isEmpty(pushData)) {
+                return jPushMessageInfoBean;
+            }
+            JSONObject expandDataObject = JSON.parseObject(pushData);
+            if (expandDataObject.containsKey("expandData")) {
+                String expandDataJson = Objects.requireNonNull(expandDataObject.get("expandData")).toString();
+                if (TextUtils.isEmpty(expandDataJson)) {
+                    return jPushMessageInfoBean;
+                }
+                jPushMessageInfoBean.setExpandData(expandDataJson);
+                JSONObject expantContentObject = JSON.parseObject(expandDataJson);
+                if (expantContentObject.containsKey("messageType")) {
+                    String messageType = Objects.requireNonNull(expantContentObject.get("messageType")).toString();
+                    if (!TextUtils.isEmpty(messageType)) {
+                        jPushMessageInfoBean.setMessageType(messageType);
+                    }
+                }
+                if (expantContentObject.containsKey("homeId")) {
+                    String homeId = Objects.requireNonNull(expantContentObject.get("homeId")).toString();
+                    if (!TextUtils.isEmpty(homeId)) {
+                        jPushMessageInfoBean.setHomeId(homeId);
+                    }
+                }
+                if (expantContentObject.containsKey("expantContent")) {
+                    String expantContentJosn = Objects.requireNonNull(expantContentObject.get("expantContent")).toString();
+                    if (!TextUtils.isEmpty(expantContentJosn)) {
+                        jPushMessageInfoBean.setExpantContent(expantContentJosn);
+                    }
+                }
+            }
+            return jPushMessageInfoBean;
+        } catch (Exception e) {
+            return new JPushMessageInfoBean();
+        }
     }
 
 }

--
Gitblit v1.8.0