Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java

@@ -9,7 +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.MyPowerStationActivity;
import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

@@ -52,7 +52,7 @@
            this.addPushDataToMemoryList(jPushMessageInfoBean);
            if (isOpened) {
                //安装商跳转界面
                Intent intent = new Intent(context, MyPowerStationActivity.class);
                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);
@@ -111,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) {
        }
    }