From 8814f3f0828e6ac652a29cc9de9f971fd55bca5b Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 07 五月 2025 14:54:42 +0800 Subject: [PATCH] 2025年05月07日14:54:39 --- app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 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 7384f10..1755c8a 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,7 @@ 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.BPowerStationActivity; import com.hdl.photovoltaic.ui.bean.MessageBean; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; @@ -53,8 +52,8 @@ this.addPushDataToMemoryList(jPushMessageInfoBean); if (isOpened) { //瀹夎鍟嗚烦杞晫闈� - Intent intent = new Intent(context, MyPowerStationActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + 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); @@ -63,6 +62,34 @@ bus.setTopic(ConstantManage.message_function_push_post); bus.setType(MessageStateType.untreated); EventBus.getDefault().post(bus); + } + } else { + if (isOpened) { + //浜у搧缁忕悊璇存殏鏃朵笉鍋� 2024骞�03鏈�29鏃�10:34:44 +// boolean existsActivity = AppManagerUtils.getAppManager().existsActivity(MessageCenterList.class); +// if (existsActivity) { +// //瀛樺湪鍞竴涓�绉嶅彲鑳藉氨鏄綋鍓嶆椿鍔ㄧ獥鍙e氨鏄畠 +// return; +// } +// //璺宠浆C绔秷鎭腑蹇冪晫闈� +// Intent intent = new Intent(context, MessageCenterList.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); } } } @@ -84,7 +111,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