From dcdd7495322c36bc41c7d18fa91dc8884bc976ef Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 18 七月 2025 13:09:24 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
index 4d43c80..611ad4c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -11,6 +11,7 @@
import com.hdl.photovoltaic.jpush.JPushMessageInfoBean;
import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.bean.MessageBean;
+import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -49,7 +50,7 @@
public void JpushPushCommonData(Context context, JPushMessageInfoBean jPushMessageInfoBean, boolean isOpened) {
if (UserConfigManage.getInstance().isBAccount()) {
//娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
- this.addPushDataToMemoryList(jPushMessageInfoBean);
+// this.addPushDataToMemoryList(jPushMessageInfoBean);
if (isOpened) {
//瀹夎鍟嗚烦杞晫闈�
Intent intent = new Intent(context, BPowerStationActivity.class);
@@ -100,6 +101,11 @@
*/
private void addPushDataToMemoryList(JPushMessageInfoBean jPushMessageInfoBean) {
try {
+ boolean isPushAddCache = SharedPreUtils.getBoolean("pushAddCache");
+ if (!isPushAddCache) {
+ //鏈夊彲鑳藉垹闄ゆ帹閫乀oken鎺ュ彛澶辫触锛屾崲璐﹀彿鍚庯紝渚濈劧涔熶細鏀跺埌涓婃璐﹀彿鐨勬帹閫�;
+ return;
+ }
if (TextUtils.isEmpty(jPushMessageInfoBean.getExpantContent())) {
return;
}
--
Gitblit v1.8.0