From 29ca25fb0843b575f4367290d5cd0d649b51019c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 04 十二月 2025 15:11:47 +0800
Subject: [PATCH] 支持离线6kw逆变器和离线8kw逆变器配置文件
---
app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java b/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
index f270fda..492b4cf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
+++ b/app/src/main/java/com/hdl/photovoltaic/push/fcm/MyFirebaseMessagingService.java
@@ -26,6 +26,7 @@
import com.hdl.photovoltaic.push.PushMessageInfoBean;
import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.StartActivity;
+import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -37,6 +38,9 @@
import cn.jpush.android.api.NotificationMessage;
+/**
+ * 璋锋瓕鎺ㄩ�佹秷鎭帴鏀舵柟娉�
+ */
public class MyFirebaseMessagingService extends FirebaseMessagingService {
private static final String TAG = "FCMService";
@@ -72,12 +76,13 @@
title = remoteMessage.getNotification().getTitle();
content = remoteMessage.getNotification().getBody();
}
- if (isAppInForeground(this)) {
+ //鍘熺敓鍦ㄥ墠鍙版垨鑰卽ni鍦ㄥ墠鍙�
+ if (isAppInForeground(this) || HDLUniMPSDKManager.getInstance().showUniMP()) {
// 妫�鏌ユ秷鎭槸鍚﹀寘鍚暟鎹礋杞�
if (!remoteMessage.getData().isEmpty()) {
PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing(title, content, JSON.toJSONString(remoteMessage.getData()));
HdlPushLogic.getInstance().PushPushCommonData(this, pushMessageInfoBean, false);
-// handleDataMessage(remoteMessage.getData());
+// this.showCustomNotification(pushMessageInfoBean);
}
} else {
// 妫�鏌ユ秷鎭槸鍚﹀寘鍚�氱煡璐熻浇
@@ -112,7 +117,7 @@
.setWhen(System.currentTimeMillis());
// 璁剧疆鐐瑰嚮鎰忓浘,涓洪�氱煡娣诲姞鐐瑰嚮鍚庣殑璺宠浆鎰忓浘
- Intent intent = createNotificationIntent(pushMessageInfoBean.getExpandData());
+ Intent intent = createNotificationIntent(pushMessageInfoBean);
PendingIntent pendingIntent = PendingIntent.getActivity(
this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
builder.setContentIntent(pendingIntent);
@@ -133,10 +138,10 @@
notificationManager.createNotificationChannel(channel);
}
- private Intent createNotificationIntent(String data) {
+ private Intent createNotificationIntent(PushMessageInfoBean pushMessageInfoBean) {
Intent intent = new Intent(this, StartActivity.class);
intent.putExtra("from_fcm", true);
- intent.putExtra("pushData", data);
+ intent.putExtra("pushData", JSONObject.toJSONString(pushMessageInfoBean));
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
return intent;
}
--
Gitblit v1.8.0