From 01839abf9c452d6a92bdb23013d42a92650cb225 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 11 五月 2024 19:01:49 +0800
Subject: [PATCH] 2024年05月11日19:01:44
---
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 6 +++++-
app/build.gradle | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 4e27706..a01b02a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -131,7 +131,7 @@
implementation project(path: ':third-zxing')
//Link鏈湴搴擄紙鍦ㄧ嚎渚濊禆缃戠粶搴擄級
implementation 'com.hdl.android:pmsdk:1.0.2'
- implementation 'com.hdl.android:debugsdk:1.0.16'
+ implementation 'com.hdl.android:debugsdk:1.0.22'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
index 936b0f0..39c22aa 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -444,12 +444,16 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
+ if (MqttRecvClient.getInstance().isConnected()) {
+ //妫�鏌ユ柇寮�杩炴帴
+ MqttRecvClient.getInstance().reConnect();
+ }
if (!MqttRecvClient.getInstance().isInit()) {
HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
@Override
public void onSuccess(MqttInfo info) {
if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(), null);
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
MqttRecvClient.getInstance().connect();
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index 9c08e08..73893f0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -108,6 +108,7 @@
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_USERINFO = "refresh_userinfo";//鍒锋柊鐢ㄦ埛淇℃伅
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_TEMPERATURE = "temperature_format_changed";//鍒锋柊鍗曚綅娓╁害
public final static String UNI_EVENT_NOTIFICATION_DEVICE_REFRESH_REFRESH_UNREAD_NUMBER = "refresh_unread_messages_number";//鍒锋柊鏈娑堟伅鏁伴噺
+ public final static String UNI_EVENT_NOTIFICATION_MQTT_CONNECT_SUCCESS= "mqtt_connect_success";//閫氱煡mqtt杩炴帴鎴愬姛
public final static String UNI_EVENT_NOTIFICATION_REMOVE_VIEW = "remove_view";//閫氱煡uni绉婚櫎鐣岄潰
public final static String UNI_EVENT_NOTIFICATION_DEVICE_ADD = "add";//璁惧娣诲姞
public final static String UNI_EVENT_NOTIFICATION_DEVICE_DEL = "del";//璁惧鍒犻櫎
--
Gitblit v1.8.0