From 907f9314657fd0554fecda06e919b98768b0aeea Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 11 十月 2023 18:00:56 +0800
Subject: [PATCH] 2023年10月11日18:00:50
---
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java | 7 +
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java | 44 ++++++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 7 +
app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java | 4 +
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 2
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java | 27 ++++--
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java | 11 ++
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java | 15 ++-
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 57 ++++++++++++++
HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/LinkRequest.java | 4
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 1
13 files changed, 160 insertions(+), 23 deletions(-)
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
index 5f01513..256bcb7 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/common/event/EventDispatcher.java
@@ -24,7 +24,7 @@
private static final LockList<EventListener> ALL_TOPICS_EVENT = new LockList<EventListener>();//鎵�鏈変富棰樻秷鎭�
-// private static final ArrayMap<String, List<EventListener>> EVENT = new ArrayMap<>();
+ // private static final ArrayMap<String, List<EventListener>> EVENT = new ArrayMap<>();
private static final LockArrayMap<String, List<EventListener>> EVENT = new LockArrayMap<String, List<EventListener>>();
private static final ExecutorService ioThread = ThreadToolUtils.getInstance().newFixedThreadPool(2);
@@ -99,7 +99,7 @@
if (ev != null && !ev.isEmpty()) {
// TYPE.remove(listener);
ev.remove(listener);
- LogUtils.i(String.format("绉婚櫎璁㈤槄涓婚:%s,褰撳墠鍥炶皟鏁伴噺:%s",tag,ev.size()));
+ LogUtils.i(String.format("绉婚櫎璁㈤槄涓婚:%s,褰撳墠鍥炶皟鏁伴噺:%s", tag, ev.size()));
}
}
} catch (Exception e) {
@@ -112,11 +112,12 @@
/**
* 涓や釜涓婚鏄惁鍖归厤
- * @param desString 瀛楀吀涓殑涓婚
+ *
+ * @param desString 瀛楀吀涓殑涓婚
* @param sourceString 鎺ユ敹鍒扮殑涓婚
* @return
*/
- boolean isMatch(String desString,String sourceString) {
+ boolean isMatch(String desString, String sourceString) {
String[] des = desString.split("/");
String[] source = sourceString.split("/");
if (des.length != source.length) {
@@ -135,8 +136,9 @@
/**
* 浜嬩欢鍒嗗彂鍣紝鍒嗗彂鎵�鏈夊湪鎺ュ彛鍒楄〃涓殑浜嬩欢
+ *
* @param topicTag -
- * @param o -
+ * @param o -
*/
public synchronized void post(String topicTag, final Object o) {
try {
@@ -171,13 +173,13 @@
// ThreadToolUtils.getInstance().runOnUiThread(new Runnable() {
// @Override
// public void run() {
- if (listener != null) {
- listener.onMessage(o);
- }
+ if (listener != null) {
+ listener.onMessage(o);
+ }
// }
// });
}
- }catch (Exception e){
+ } catch (Exception e) {
LogUtils.e(e.getMessage());
}
@@ -189,8 +191,10 @@
public synchronized void filePost() {
//TODO
}
+
/**
* 娉ㄥ唽鎵�鏈変富棰樻秷鎭殑鐩戝惉
+ *
* @param listener
*/
public synchronized void registerAllTopicsListener(EventListener listener) {
@@ -206,6 +210,7 @@
/**
* 鍙栨秷鎵�鏈変富棰樻秷鎭殑鐩戝惉
+ *
* @param listener
*/
public synchronized void removeAllTopicsListener(EventListener listener) {
@@ -224,13 +229,13 @@
});
}
- public synchronized void clear() {
+ private synchronized void clear() {
ALL_TOPICS_EVENT.clear();
EVENT.clear();
// TYPE.clear();
}
- public synchronized void release() {
+ private synchronized void release() {
clear();
ioThread.shutdownNow();
}
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/LinkRequest.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/LinkRequest.java
index 2f8e8d7..b874aeb 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/LinkRequest.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/LinkRequest.java
@@ -4,6 +4,8 @@
import com.hdl.sdk.link.common.utils.ByteUtils;
+import java.nio.charset.StandardCharsets;
+
/**
* Created by Tong on 2021/9/29.
@@ -123,7 +125,7 @@
"Length:" +
getLength() +
"\r\n\r\n";
- return ByteUtils.concatBytes(header.getBytes("utf-8"), getData());
+ return ByteUtils.concatBytes(header.getBytes(StandardCharsets.UTF_8), getData());
} catch (Exception e) {
return new byte[]{};
}
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
index c94bd40..38dd20e 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/bean/gateway/GatewayBean.java
@@ -82,6 +82,9 @@
private String sid;
+ private String spk = "energy.hdl_inverter";
+
+
private String systemStatusDesc;//浜戠-鐘舵��
private String hwVersion;//浜戠-杞欢鐗堟湰鍙�
@@ -423,4 +426,12 @@
public void setTotalElectricityPvToday(String totalElectricityPvToday) {
this.totalElectricityPvToday = totalElectricityPvToday;
}
+
+ public String getSpk() {
+ return spk == null ? "" : spk;
+ }
+
+ public void setSpk(String spk) {
+ this.spk = spk;
+ }
}
\ No newline at end of file
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java
index 9fc5d40..549d298 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/connect/HDLConnectHelper.java
@@ -21,6 +21,8 @@
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -112,7 +114,7 @@
/**
* 鍙兘杩斿洖code灞炴�у彲鑳芥病鏈� 娌℃湁鐨勮瘽鐩存帴鎴愬姛 鏈夌殑璇濆彧鏈�200鎵嶄細鎴愬姛
*/
- if (code == null || code.intValue() == 200 || code.intValue() == 0) {
+ if (code == null || code == 200 || code == 0) {
notifySucceed(msg);
} else {
notifyFailure(ErrorUtils.getByCode(code));
@@ -332,12 +334,20 @@
if (MqttRecvClient.getInstance() != null) {
MqttRecvClient.getInstance().send(requestTopic, encryBytes);
}
- LogUtils.i("杩滅▼鍙戦�佹暟鎹細" + linkRequest.getCloudTopic() + "\r\n" + new String(linkRequest.getCloudSendBytes()));
+ if (HDLConnectHelper.isInverterTopic(linkRequest.getCloudTopic())) {
+ LogUtils.i("杩滅▼鍙戦�佹暟鎹細" + linkRequest.getCloudTopic() + "\r\n" + Arrays.toString(byteArrayConvertIntArray(linkRequest.getCloudSendBytes())));
+ } else {
+ LogUtils.i("杩滅▼鍙戦�佹暟鎹細" + linkRequest.getCloudTopic() + "\r\n" + new String(linkRequest.getCloudSendBytes()));
+ }
}
//鏈湴TCP
else {
if (!linkRequest.getTopic().endsWith("heartbeat")) {//蹇冭烦涓婚鏁版嵁杩囧锛岃繃婊や笅
- LogUtils.i("鏈湴鍙戦�佹暟鎹細\r\n" + new String(linkRequest.getSendBytes()));
+ if (HDLConnectHelper.isInverterTopic(linkRequest.getTopic())) {
+ LogUtils.i("鏈湴鍙戦�佹暟鎹細\r\n" + Arrays.toString(byteArrayConvertIntArray(linkRequest.getSendBytes())));
+ } else {
+ LogUtils.i("鏈湴鍙戦�佹暟鎹細\r\n" + new String(linkRequest.getSendBytes()));
+ }
}
HDLTcpConnect.getTcpSocketBoot(ipAddress).sendMsg(EncryptUtil.getEncryBytes(linkRequest));
}
@@ -408,6 +418,7 @@
}
}
+
/**
* 鏀寔姣背绫诲瀷
*
@@ -433,4 +444,31 @@
listener = null;
}
}
+
+
+ public static boolean isInverterTopic(String topic) {
+ if (TextUtils.isEmpty(topic)) {
+ return false;
+ }
+ return topic.endsWith("custom/native/inverter/down_reply")
+ || topic.endsWith("custom/native/inverter/down")
+ || topic.endsWith("custom/native/inverter/up");
+ }
+
+ /**
+ * byte鏁扮粍杞崲鎴恑nt鏁扮粍(涓轰簡鎵撳嵃鍑烘棤绗﹀彿鐨刡tye鏁扮粍鏁版嵁)
+ *
+ * @param bytes 鏁扮粍
+ * @return
+ */
+ public static Integer[] byteArrayConvertIntArray(byte[] bytes) {
+ if (bytes == null || bytes.length == 0) {
+ return new Integer[]{};
+ }
+ Integer[] arr = new Integer[bytes.length];
+ for (int i = 0; i < bytes.length; i++) {
+ arr[i] = bytes[i] & 0xff;
+ }
+ return arr;
+ }
}
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java
index 2dddfd4..1aac1f7 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/QueueUtils.java
@@ -10,6 +10,7 @@
import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.LinkedList;
import java.util.Queue;
import java.util.concurrent.ExecutorService;
@@ -113,17 +114,21 @@
response.setByteData(bodyBytes);
} else {
LogUtils.e("瑙ｅ瘑澶辫触\r\n" + linkPacket.getTopic() + "\r\n" + ByteUtils.encodeHexString(linkPacket.getBody()));
- response.setData(new String(linkPacket.getBody(), "utf-8"));
+ response.setData(new String(linkPacket.getBody(), StandardCharsets.UTF_8));
response.setByteData(linkPacket.getBody());
}
} else {
- response.setData(new String(linkPacket.getBody(), "utf-8"));
+ response.setData(new String(linkPacket.getBody(), StandardCharsets.UTF_8));
response.setByteData(linkPacket.getBody());
}
- // if (HDLConnectHelper.isLocal()) {
- LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData());
- // }
+ if (HDLConnectHelper.isLocal()) {
+ if (HDLConnectHelper.isInverterTopic(response.getTopic())) {
+ LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + Arrays.toString(HDLConnectHelper.byteArrayConvertIntArray(response.getByteData())));
+ } else {
+ LogUtils.i("鏈湴鎺ユ敹鍒版暟鎹�:\r\n" + response.getTopic() + "\r\n" + response.getData());
+ }
+ }
//瑙ｆ瀽瀹屾垚,topic鍙戦�佷竴娆�
EventDispatcher.getInstance().post(response.getTopic(), response);
}
diff --git a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java
index 07b3f0a..6c5a295 100644
--- a/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java
+++ b/HDLLinkLocalSdk/src/main/java/com/hdl/sdk/link/core/utils/mqtt/MqttRecvClient.java
@@ -30,6 +30,7 @@
import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -239,7 +240,11 @@
return;
}
String bodyStr = new String(bytes);
- LogUtils.d(TAG, "\r\n" + "mqtt->杩滅▼鍥炲鏁版嵁" + bodyStr);
+ if (HDLConnectHelper.isInverterTopic(topic)) {
+ LogUtils.d(TAG, "\r\n" + "mqtt->杩滅▼鍥炲鏁版嵁" + Arrays.toString(HDLConnectHelper.byteArrayConvertIntArray(bytes)));
+ } else {
+ LogUtils.d(TAG, "\r\n" + "mqtt->杩滅▼鍥炲鏁版嵁" + bodyStr);
+ }
/**
* 绾㈠瀹濊澶囬�氳繃/thing/topo/found涓婚 涓婃姤绾㈠瀹濊澶囧凡缁忓叆缃戜簡 鐒跺悗鐩存帴return 涓嶉渶瑕佸啀涓嬭浜�
*/
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 3d9a32f..e74a28d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -156,6 +156,8 @@
if (MqttRecvClient.getInstance() != null) {
MqttRecvClient.getInstance().stop();
}
+ //瑕佹竻绌轰箣鍓峵cp杩炴帴缂撳瓨
+ // TODO: 10/10/23
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index 0986533..aa79f49 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -804,6 +804,7 @@
gatewayBean.setPowerPvNow(cloudInverterDeviceBean.getPowerPvNow());//鍙戠數鍔熺巼
gatewayBean.setTotalElectricityPvToday(cloudInverterDeviceBean.getTotalElectricityPvToday());//浠婃棩鍙戠數閲�
gatewayBean.setDevice_model(cloudInverterDeviceBean.getOmodel());//璁惧鍨嬪彿
+ gatewayBean.setSpk(cloudInverterDeviceBean.getSpk());//璁惧spk
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
index 986d82f..f7f64e7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlLogLogic.java
@@ -69,6 +69,10 @@
if (isDebug) {
return;
}
+// StringBuilder b = new StringBuilder();
+// b.append(title);
+// b.append(tag);
+// b.
System.out.println(title + tag + "======" + mgs + "(" + code + ")");
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 5be1e09..fd72ca5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -20,6 +20,7 @@
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
+import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import java.nio.charset.StandardCharsets;
@@ -518,6 +519,12 @@
HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�");
return;
}
+ //璁㈤槄瑕佸叏閮ㄥ彇娑�
+ if (MqttRecvClient.getInstance() != null) {
+ MqttRecvClient.getInstance().removeAllTopic();
+ }
+ //瑕佹竻绌轰箣鍓峵cp杩炴帴缂撳瓨
+ // TODO: 10/10/23
//鍒犻櫎鏃х殑浣忓畢鏂囦欢澶�
HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
//閲嶆柊璁剧疆浣忓畢id
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 49db1bd..def2843 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -468,7 +468,7 @@
// modBusBean.setOid("0101050217BBC400");
// }
if (modBusBean.getMac() == null || modBusBean.getData() == null) {
- HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getMac() + " data=" + modBusBean.getData());
+ HdlLogLogic.print("鍐呭涓虹┖,oid=" + modBusBean.getMac() + " data=" + Arrays.toString(modBusBean.getData()));
return;
}
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 e66f382..65c5431 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -6,25 +6,44 @@
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import com.google.gson.Gson;
+import com.hdl.linkpm.sdk.core.callback.IResponseCallBack;
import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.linkpm.sdk.device.HDLLinkPMDevice;
+import com.hdl.linkpm.sdk.device.bean.GatewayCloudBean;
import com.hdl.linkpm.sdk.home.type.HomeType;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.MqttInfo;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
+import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
+import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.PermissionUtils;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.ModbusResponse;
+import com.hdl.sdk.link.core.bean.eventbus.EventNotifyRefreshGatewayAesKeyInfo;
+import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
+import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
+
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.ArrayList;
+import java.util.List;
/**
@@ -226,5 +245,43 @@
});
}
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onEventMessage(EventNotifyRefreshGatewayAesKeyInfo event) {
+ //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡
+ if (event == null) {
+ return;
+ }
+ int index = -1;
+ List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean.getGatewayId().equals(event.getGatewayId())) {
+ index = i;
+ break;
+ }
+ }
+ if (index > -1) {
+ GatewayBean gatewayBean = list.get(index);
+ HdlDeviceLogic.getInstance().getDeviceRemoteInfo(UserConfigManage.getInstance().getHomeId(), gatewayBean.getSpk(), gatewayBean.getDevice_mac(), new CloudCallBeak<DeviceRemoteInfo>() {
+ @Override
+ public void onSuccess(DeviceRemoteInfo deviceRemoteInfo) {
+ if (deviceRemoteInfo != null) {
+ //鏇存柊mqtt閫氳鐨勬柊绉橀挜
+ gatewayBean.setAesKey(deviceRemoteInfo.getSecret());
+ //鐢ㄤ箣鍓嶇殑搴�,搴曞眰mqtt璁㈤槄锛屽姞瑙ｅ瘑浼氱敤鍒拌鍙傛暟;
+ HDLLinkConfig.getInstance().setAesKey(deviceRemoteInfo.getSecret());//璁剧疆mqtt閫氳绉橀挜搴�
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+
+ }
+ });
+ }
+
+
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 4f16261..f61d646 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -160,7 +160,7 @@
MqttRecvClient.getInstance().removeAllTopic();
}
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
- //杩涘幓浣忓畢璇︽儏璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡
+ //杩涘幓浣忓畢璇︽儏uni璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡
for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().size(); i++) {
//String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().get(i).getGatewayId();
//瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙ｆ瀽瀛楃涓�,鍙嬁getGatewayId()鍊�;
--
Gitblit v1.8.0