From 4a2d7f9ac055d10ba7baf58df690e0ad62826f52 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 13 三月 2024 17:34:51 +0800
Subject: [PATCH] 2024年03月13日17:23:53

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java |   17 +++++++++++------
 1 files changed, 11 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 73c71d0..a181146 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -6,8 +6,10 @@
 
 import com.google.gson.Gson;
 import com.hdl.photovoltaic.config.ConstantManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.enums.MessageStateType;
 import com.hdl.photovoltaic.jpush.JPushMessageInfoBean;
+import com.hdl.photovoltaic.ui.CPowerStationActivity;
 import com.hdl.photovoltaic.ui.MyPowerStationActivity;
 import com.hdl.photovoltaic.ui.bean.MessageBean;
 import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
@@ -49,10 +51,13 @@
         //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
         this.addPushDataToMemoryList(jPushMessageInfoBean);
         if (isOpened) {
-            Intent intent = new Intent(context, MyPowerStationActivity.class);
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
-            context.startActivity(intent);
+            if (UserConfigManage.getInstance().isBAccount()) {
+                //瀹夎鍟嗚烦杞晫闈�
+                Intent intent = new Intent(context, MyPowerStationActivity.class);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
+                context.startActivity(intent);
+            }
         } else {
             BaseEventBus bus = new BaseEventBus();
             bus.setTopic(ConstantManage.message_function_push_post);
@@ -75,10 +80,10 @@
             if (messageBean == null) {
                 return;
             }
-            messageBean.setTitle(jPushMessageInfoBean.getTitle());
+            messageBean.setTitle(jPushMessageInfoBean.getContent());
             messageBean.setDeviceDesc(jPushMessageInfoBean.getContent());
             HdlMessageLogic.getInstance().setListMessage(messageBean, 0);
-            HdlLogLogic.print("娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�--->鎴愬姛");
+            HdlLogLogic.print("鏋佸厜鎺ㄩ��--->娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�--->" + new Gson().toJson(jPushMessageInfoBean));
         } catch (Exception ignored) {
         }
     }

--
Gitblit v1.8.0