From 9695405b73d4de40135a0ec05e4ae9d18ae4d344 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 09:48:51 +0800
Subject: [PATCH] 2024年06月25日09:48:48
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 97db0db..d6baefb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -193,6 +193,9 @@
} else if (event.getTopic().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL) && event.getType().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK)) {
//鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢)
killProcessApp();
+ } else if (event.getTopic().contains(HDLUniMP.UNI_EVENT_REPLY_HOME_MODEL) && event.getType().contains(HDLUniMP.UNI_EVENT_REPLY_HOME_DEl)) {
+ //C绔數绔欒鎯呴噷闈㈠垹闄ゅ悗锛屼細璺戞潵杩欓噷锛�
+ startAppAutomaticallyOpenUni(false);
}
}
@@ -208,7 +211,11 @@
List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
if (HouseIdList.size() == 0) {
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
- HdlUniLogic.getInstance().openUniMP(path, null);
+ if (delay) {
+ HdlUniLogic.getInstance().openUniMPDelay(path, null);
+ } else {
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
} else {
int select_home = 0;
for (int i = 0; i < HouseIdList.size(); i++) {
@@ -220,7 +227,11 @@
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();
- HdlUniLogic.getInstance().openUniMP(path, null);
+ if (delay) {
+ HdlUniLogic.getInstance().openUniMPDelay(path, null);
+ } else {
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
}
}
@@ -332,8 +343,8 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
- if (MqttRecvClient.getInstance().isConnected()) {
- //妫�鏌ユ柇寮�杩炴帴
+ //妫�鏌ユ柇寮�鐘舵��
+ if (!MqttRecvClient.getInstance().isConnected()) {
MqttRecvClient.getInstance().reConnect();
}
if (!MqttRecvClient.getInstance().isInit()) {
--
Gitblit v1.8.0