From e0a5ebeb7ab4480a89cc22bc1093cea71046edd7 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 14 七月 2025 15:22:43 +0800
Subject: [PATCH] 2025年07月14日14:57:30

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 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 d968dc7..611ad4c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -9,8 +9,9 @@
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.enums.MessageStateType;
 import com.hdl.photovoltaic.jpush.JPushMessageInfoBean;
-import com.hdl.photovoltaic.ui.MyPowerStationActivity;
+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,10 +50,10 @@
     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, MyPowerStationActivity.class);
+                Intent intent = new Intent(context, BPowerStationActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
                 intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
                 context.startActivity(intent);
@@ -66,13 +67,13 @@
         } else {
             if (isOpened) {
                 //浜у搧缁忕悊璇存殏鏃朵笉鍋� 2024骞�03鏈�29鏃�10:34:44
-//                boolean existsActivity = AppManagerUtils.getAppManager().existsActivity(MessageCenterList.class);
+//                boolean existsActivity = AppManagerUtils.getAppManager().existsActivity(MessageCenterListActivity.class);
 //                if (existsActivity) {
 //                    //瀛樺湪鍞竴涓�绉嶅彲鑳藉氨鏄綋鍓嶆椿鍔ㄧ獥鍙e氨鏄畠
 //                    return;
 //                }
 //                //璺宠浆C绔秷鎭腑蹇冪晫闈�
-//                Intent intent = new Intent(context, MessageCenterList.class);
+//                Intent intent = new Intent(context, MessageCenterListActivity.class);
 //                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 //                context.startActivity(intent);
 //                //涓嶇瀛樹笉瀛樺湪杩欎簺Activity(鎵惧埌鎵嶇Щ闄�)锛岄兘瑕佸仛杩欎簺鍔ㄤ綔,鏈夊彲鑳藉綋鍓嶇殑娲诲姩绐楀彛鏄叾涓竴涓�
@@ -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;
             }
@@ -111,7 +117,7 @@
             messageBean.setTitle(jPushMessageInfoBean.getContent());
             messageBean.setDeviceDesc(jPushMessageInfoBean.getContent());
             HdlMessageLogic.getInstance().setListMessage(messageBean, 0);
-            HdlLogLogic.print("鏋佸厜鎺ㄩ��--->娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�--->" + new Gson().toJson(jPushMessageInfoBean));
+            HdlLogLogic.print("鏋佸厜鎺ㄩ��---娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�---" + new Gson().toJson(jPushMessageInfoBean));
         } catch (Exception ignored) {
         }
     }

--
Gitblit v1.8.0