From 06107f3db3950f1ac69c17cd54cc4c6203aafe01 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 02 四月 2024 17:21:13 +0800 Subject: [PATCH] 2024年04月02日17:21:08 --- app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 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..68753a4 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java @@ -5,6 +5,7 @@ import android.text.TextUtils; import com.google.gson.Gson; +import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.enums.MessageStateType; @@ -12,6 +13,19 @@ import com.hdl.photovoltaic.ui.CPowerStationActivity; import com.hdl.photovoltaic.ui.MyPowerStationActivity; import com.hdl.photovoltaic.ui.bean.MessageBean; +import com.hdl.photovoltaic.ui.me.AccountAndSecurityActivity; +import com.hdl.photovoltaic.ui.me.AsRegardsActivity; +import com.hdl.photovoltaic.ui.me.BindMailActivity; +import com.hdl.photovoltaic.ui.me.BindPhoneActivity; +import com.hdl.photovoltaic.ui.me.MeChangePasswordActivity; +import com.hdl.photovoltaic.ui.me.PersonalDataActivity; +import com.hdl.photovoltaic.ui.me.SetActivity; +import com.hdl.photovoltaic.ui.me.TemperatureUnitActivity; +import com.hdl.photovoltaic.ui.me.WebActivity; +import com.hdl.photovoltaic.ui.me.languageSelectionActivity; +import com.hdl.photovoltaic.ui.newC.MessageCenterList; +import com.hdl.photovoltaic.uni.HDLUniMP; +import com.hdl.photovoltaic.utils.AppManagerUtils; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import org.greenrobot.eventbus.EventBus; @@ -54,7 +68,7 @@ if (isOpened) { //瀹夎鍟嗚烦杞晫闈� Intent intent = new Intent(context, MyPowerStationActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈� context.startActivity(intent); @@ -64,6 +78,34 @@ 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); + } } } -- Gitblit v1.8.0