wjc
8 小时以前 329a536dc7ee9cb7bff1f59af9b54604b998c9ce
2025年08月18日16:16:50
3个文件已修改
45 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
@@ -11,16 +11,25 @@
    //mqtt连接需要(语雀接口地址:https://hdl-gz.yuque.com/wnkbmh/cdrglh/totdnt#40b28997)
    public static final String POST_Mqtt_GetRemoteInfo = "/home-wisdom/app/mqtt/getRemoteInfo";
    //region -----警报消息中心(住宅)---------
    //获取未处理消息数量
    //获取未处理消息数量(丢弃)
    public static final String POST_Message_UntreatedCount = "/home-wisdom/app/powerStation/message/unCount";
    //获取未处理/未读消息数量(匹配维修方案)
    public static final String POST_Message_Plan_UntreatedCount = "/home-wisdom/app/powerStation/message/plan/unCount";
    //消息列表
    public static final String POST_Message_List = "/home-wisdom/app/powerStation/message/listByPage";
    //消息列表(匹配维修方案)
    public static final String POST_Message_Plan_List = "/home-wisdom/app/powerStation/message/plan/listByPage";
    //获取消息详情
    public static final String POST_Message_Info = "/home-wisdom/app/powerStation/message/info";
    //获取消息详情(匹配维修方案)
    public static final String POST_Message_Plan_Info = "/home-wisdom/app/powerStation/message/plan/info";
    //消息标记已读(已解除)
    public static final String POST_Message_Solve = "/home-wisdom/app/powerStation/message/solve";
    //消息全部已读
    public static final String POST_Message_AllRead = "/home-wisdom/app/powerStation/message/allRead";
    //消息全部已读(匹配维修方案)
    public static final String POST_Message_Plan_AllRead = "/home-wisdom/app/powerStation/message/plan/allRead";
    //endregion
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -311,7 +311,7 @@
     * @param cloudCallBeak -
     */
    public void getMessageUntreatedCount(String homeId, CloudCallBeak<UnCountBean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Message_UntreatedCount;
        String requestUrl = HttpApi.POST_Message_Plan_UntreatedCount;
        JsonObject json = new JsonObject();
        if (!TextUtils.isEmpty(homeId)) {
            json.addProperty("homeId", homeId);
@@ -378,7 +378,7 @@
     * @param cloudCallBeak    -
     */
    private void getMessageList(String messageStateType, CloudCallBeak<List<MessageBean>> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Message_List;
        String requestUrl = HttpApi.POST_Message_Plan_List;
        JsonObject json = new JsonObject();
        if (!MessageStateType.all.equals(messageStateType)) {
@@ -462,7 +462,7 @@
     * @param cloudCallBeak    -
     */
    public void getPageNoMessageList(int pageNo, String messageStateType, CloudCallBeak<MessageListClass> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Message_List;
        String requestUrl = HttpApi.POST_Message_Plan_List;
        JsonObject json = new JsonObject();
        if (!MessageStateType.all.equals(messageStateType)) {
@@ -524,7 +524,7 @@
            String timeType_filter_key,
            String timeType_filter_value,
            String search_title, CloudCallBeak<MessageListClass> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Message_List;
        String requestUrl = HttpApi.POST_Message_Plan_List;
        JsonObject json = new JsonObject();
        if (!TextUtils.isEmpty(homeId)) {
            json.addProperty("homeId", homeId);
@@ -582,7 +582,7 @@
     * @param cloudCallBeak -
     */
    public void getMessageInfo(String msgId, CloudCallBeak<MessageBean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Message_Info;
        String requestUrl = HttpApi.POST_Message_Plan_Info;
        JsonObject json = new JsonObject();
        json.addProperty("msgId", msgId);
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -647,7 +647,7 @@
     * @param cloudCallBeak -
     */
    public void messageAllRead(String homeId, CloudCallBeak<Boolean> cloudCallBeak) {
        String requestUrl = HttpApi.POST_Message_AllRead;
        String requestUrl = HttpApi.POST_Message_Plan_AllRead;
        JsonObject json = new JsonObject();
        if (!TextUtils.isEmpty(homeId)) {
            json.addProperty("homeId", homeId);
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -95,24 +95,40 @@
                        if (TextUtils.isEmpty(mMessageBean.getTitle())) {
                            viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.GONE);
                        } else {
                            viewBinding.messageInfoEventTitleIn.getRoot().setVisibility(View.VISIBLE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getDescription())) {
                            viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.GONE);
                        } else {
                            viewBinding.messageInfoEventContentIn.getRoot().setVisibility(View.VISIBLE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getRemark())) {
                            viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.GONE);
                        } else {
                            viewBinding.messageInfoRemarkIn.getRoot().setVisibility(View.VISIBLE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getDeviceDesc())) {
                            viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.GONE);
                        } else {
                            viewBinding.messageInfoAlarmDeviceIn.getRoot().setVisibility(View.VISIBLE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getLocationAddress())) {
                            viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.GONE);
                        } else {
                            viewBinding.messageInfoPowerStationLocationIn.getRoot().setVisibility(View.VISIBLE);
                        }
                        if (TextUtils.isEmpty(mMessageBean.getPlan())) {
                        if (UserConfigManage.getInstance().isBAccount()) {
                            if (TextUtils.isEmpty(mMessageBean.getPlan())) {
                                viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
                            } else {
                                viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.VISIBLE);
                            }
                        } else {
                            //C端隐藏
                            viewBinding.messageInfoAlarmTreatmentOptionsIn.getRoot().setVisibility(View.GONE);
                        }
                        if (!TextUtils.isEmpty(mMessageBean.getPlan())) {
                        if (!TextUtils.isEmpty(mMessageBean.getPlan()) && UserConfigManage.getInstance().isBAccount()) {
                            viewBinding.messageInfoAlarmTreatmentOptionsIn.lineV.setVisibility(View.GONE);
                        } else if (!TextUtils.isEmpty(mMessageBean.getCreateTime().toString())) {
                            viewBinding.messageInfoAlarmTimeIn.lineV.setVisibility(View.GONE);