From 770c89ab981b7659faabf8a812a25d99a11bdebf Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 16 四月 2026 08:40:43 +0800
Subject: [PATCH] 2026年04月16日08:40:19
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index e370028..ede6310 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -137,6 +137,10 @@
if (obj != null && !obj.getData().isEmpty()) {
UserConfigManage.getInstance().setConversationId(obj.getData().get(0).getId());
UserConfigManage.getInstance().Save();
+ } else {
+ //娌℃湁鎷垮埌瀵硅瘽鍒楄〃,鎶婃棫鐨勫綋鍓嶄細璇滻D娓呯┖
+ UserConfigManage.getInstance().setConversationId("");
+ HdlLogLogic.print("娌℃湁鎷垮埌瀵硅瘽鍒楄〃,鎶婃棫鐨勫綋鍓嶄細璇滻D娓呯┖ ", true);
}
}
@@ -342,7 +346,7 @@
//闃叉app鍚姩鐨勬椂鍊欐病鏈夌綉缁�(app涔熺櫥褰曚笉浜�),瀵艰嚧鑾峰彇涓嶄簡mqtt杩滅▼杩炴帴淇℃伅;
initMqttClient();
- HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
+ HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), UserConfigManage.getInstance().getPowerStationType(), new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> obj) {
// AppManagerUtils.getAppManager().hideLoading();
@@ -423,8 +427,7 @@
}
HouseIdBean houseIdBean = HouseIdList.get(select_home);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean, false);
- String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
- HdlUniLogic.getInstance().openUniMP(path, null);
+ HdlResidenceLogic.getInstance().openPowerStationDetails(houseIdBean);
}
}
@@ -700,6 +703,7 @@
jsonObject.addProperty("homeId", houseIdBean.getHomeId());
jsonObject.addProperty("homeName", houseIdBean.getHomeName());
jsonObject.addProperty("powerStationStatus", houseIdBean.getPowerStationStatus() + "");
+ jsonObject.addProperty("powerStationType", houseIdBean.getPowerStationType());
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_DETAILS);
uniCallBackBaseBean.setData(jsonObject);
--
Gitblit v1.8.0