From 329a536dc7ee9cb7bff1f59af9b54604b998c9ce Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 18 八月 2025 16:16:52 +0800
Subject: [PATCH] 2025年08月18日16:16:50
---
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java | 11 ++++++++++-
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 22 +++++++++++++++++++---
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java | 12 ++++++------
3 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
index 69ff5e8..7837e3f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
+++ b/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
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
index 05d0f10..ad21ee7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
+++ b/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);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
index b4a9ca8..1d71d07 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
+++ b/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);
--
Gitblit v1.8.0