From c660f059d4e07a1b784442a1bbb4a5109b82e837 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 25 六月 2024 09:51:45 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 12 ++----------
1 files changed, 2 insertions(+), 10 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 d6baefb..2cb2967 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -211,11 +211,7 @@
List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
if (HouseIdList.size() == 0) {
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
- if (delay) {
- HdlUniLogic.getInstance().openUniMPDelay(path, null);
- } else {
- HdlUniLogic.getInstance().openUniMP(path, null);
- }
+ HdlUniLogic.getInstance().openUniMP(path, null);
} else {
int select_home = 0;
for (int i = 0; i < HouseIdList.size(); i++) {
@@ -227,11 +223,7 @@
HouseIdBean houseIdBean = HouseIdList.get(select_home);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
- if (delay) {
- HdlUniLogic.getInstance().openUniMPDelay(path, null);
- } else {
- HdlUniLogic.getInstance().openUniMP(path, null);
- }
+ HdlUniLogic.getInstance().openUniMP(path, null);
}
}
--
Gitblit v1.8.0