From 7c2dce60eeb3b3b54c52890ece8aa472d5512a04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 11 三月 2024 16:03:49 +0800
Subject: [PATCH] 2024年03月11日16:03:42
---
app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 db36dde..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;
@@ -46,13 +48,16 @@
* @param isOpened true=鐐瑰嚮閫氱煡鏍忓洖璋�,false=鏀跺埌鎺ㄩ�侀�氱煡鍥炶皟;
*/
public void JpushPushCommonData(Context context, JPushMessageInfoBean jPushMessageInfoBean, boolean isOpened) {
- //娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�;
+ //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
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);
@@ -66,17 +71,20 @@
* 娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�
*/
private void addPushDataToMemoryList(JPushMessageInfoBean jPushMessageInfoBean) {
- if (TextUtils.isEmpty(jPushMessageInfoBean.getExpantContent())) {
- return;
+ try {
+ if (TextUtils.isEmpty(jPushMessageInfoBean.getExpantContent())) {
+ return;
+ }
+ Gson gson = new Gson();
+ MessageBean messageBean = gson.fromJson(jPushMessageInfoBean.getExpantContent(), MessageBean.class);
+ if (messageBean == null) {
+ return;
+ }
+ messageBean.setTitle(jPushMessageInfoBean.getContent());
+ messageBean.setDeviceDesc(jPushMessageInfoBean.getContent());
+ HdlMessageLogic.getInstance().setListMessage(messageBean, 0);
+ HdlLogLogic.print("鏋佸厜鎺ㄩ��--->娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�--->" + new Gson().toJson(jPushMessageInfoBean));
+ } catch (Exception ignored) {
}
- Gson gson = new Gson();
- MessageBean messageBean = gson.fromJson(jPushMessageInfoBean.getExpantContent(), MessageBean.class);
- if (messageBean == null) {
- return;
- }
- messageBean.setTitle(jPushMessageInfoBean.getTitle());
- messageBean.setDeviceDesc(jPushMessageInfoBean.getContent());
- HdlMessageLogic.getInstance().setListMessage(messageBean, 0);
- HdlLogLogic.print("娣诲姞鍦ㄦ帹閫佹暟鎹埌缂撳瓨鍒楄〃涓�--->鎴愬姛");
}
}
--
Gitblit v1.8.0