From 1a0aaa0bd03b3a491c751b5ce1bfca16302767b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 19 六月 2024 19:30:12 +0800
Subject: [PATCH] 2024年06月19日19:30:03
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 22 ++++++++++++----------
1 files changed, 12 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 97eea5a..d86dc78 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -5,10 +5,7 @@
import android.os.Process;
import android.os.SystemClock;
import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.Nullable;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -36,8 +33,6 @@
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
-import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.LinkResponse;
@@ -45,7 +40,6 @@
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
-import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import org.greenrobot.eventbus.Subscribe;
@@ -214,7 +208,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++) {
@@ -226,7 +224,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);
+ }
}
}
@@ -338,8 +340,8 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
- if (MqttRecvClient.getInstance().isConnected()) {
- //妫�鏌ユ柇寮�杩炴帴
+ //妫�鏌ユ柇寮�鐘舵��
+ if (!MqttRecvClient.getInstance().isConnected()) {
MqttRecvClient.getInstance().reConnect();
}
if (!MqttRecvClient.getInstance().isInit()) {
--
Gitblit v1.8.0