From ac7e902dca62fe00f442094a751048a802d13f90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 16 九月 2025 09:15:28 +0800
Subject: [PATCH] 2025年09月16日09:15:27
---
app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 14 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..611ad4c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java
@@ -6,10 +6,12 @@
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.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;
@@ -46,18 +48,50 @@
* @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()) {
+ //娣诲姞鎺ㄩ�佹暟鎹埌缂撳瓨鍒楄〃涓�;
+// this.addPushDataToMemoryList(jPushMessageInfoBean);
+ if (isOpened) {
+ //瀹夎鍟嗚烦杞晫闈�
+ 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);
+
+ } else {
+ BaseEventBus bus = new BaseEventBus();
+ bus.setTopic(ConstantManage.message_function_push_post);
+ bus.setType(MessageStateType.untreated);
+ EventBus.getDefault().post(bus);
+ }
} else {
- BaseEventBus bus = new BaseEventBus();
- bus.setTopic(ConstantManage.message_function_push_post);
- bus.setType(MessageStateType.untreated);
- EventBus.getDefault().post(bus);
+ if (isOpened) {
+ //浜у搧缁忕悊璇存殏鏃朵笉鍋� 2024骞�03鏈�29鏃�10:34:44
+// boolean existsActivity = AppManagerUtils.getAppManager().existsActivity(MessageCenterListActivity.class);
+// if (existsActivity) {
+// //瀛樺湪鍞竴涓�绉嶅彲鑳藉氨鏄綋鍓嶆椿鍔ㄧ獥鍙ｅ氨鏄畠
+// return;
+// }
+// //璺宠浆C绔秷鎭腑蹇冪晫闈�
+// Intent intent = new Intent(context, MessageCenterListActivity.class);
+// intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+// context.startActivity(intent);
+// //涓嶇瀛樹笉瀛樺湪杩欎簺Activity(鎵惧埌鎵嶇Щ闄�)锛岄兘瑕佸仛杩欎簺鍔ㄤ綔,鏈夊彲鑳藉綋鍓嶇殑娲诲姩绐楀彛鏄叾涓竴涓�
+// AppManagerUtils.getAppManager().finishActivity(AccountAndSecurityActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(AsRegardsActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(BindMailActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(BindPhoneActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(languageSelectionActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(MeChangePasswordActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(PersonalDataActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(SetActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(TemperatureUnitActivity.class);
+// AppManagerUtils.getAppManager().finishActivity(WebActivity.class);
+// //閫氱煡uni绉婚櫎鐣岄潰
+// HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+// uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_REMOVE_VIEW);
+// HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+ }
}
}
@@ -67,6 +101,11 @@
*/
private void addPushDataToMemoryList(JPushMessageInfoBean jPushMessageInfoBean) {
try {
+ boolean isPushAddCache = SharedPreUtils.getBoolean("pushAddCache");
+ if (!isPushAddCache) {
+ //鏈夊彲鑳藉垹闄ゆ帹閫乀oken鎺ュ彛澶辫触锛屾崲璐﹀彿鍚庯紝渚濈劧涔熶細鏀跺埌涓婃璐﹀彿鐨勬帹閫�;
+ return;
+ }
if (TextUtils.isEmpty(jPushMessageInfoBean.getExpantContent())) {
return;
}
@@ -75,10 +114,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