From ddd686a24cf45ca91aebcaf07c5b2b347b0cd455 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 06 十一月 2023 16:37:44 +0800
Subject: [PATCH] 2023年11月06日16:37:26
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
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 d80232f..4885c41 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -7,6 +7,7 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Process;
+import android.text.TextUtils;
import android.view.View;
import com.google.gson.Gson;
@@ -30,6 +31,7 @@
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.BaseEventBus;
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;
@@ -209,7 +211,7 @@
if (response.getTopic() == null) {
return;
}
- HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁==="+new Gson().toJson(response),false);
+ HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁===" + new Gson().toJson(response), false);
// if (response.getTopic().endsWith("custom/native/inverter/up")) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
@@ -237,22 +239,30 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触==="+e.getMessage(), e.getCode(),true);
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触===" + e.getMessage(), e.getCode(), true);
}
});
}
@Subscribe(threadMode = ThreadMode.MAIN)
- public void onEventMessage(EventNotifyRefreshGatewayAesKeyInfo event) {
+ public void onEventMessage(BaseEventBus event) {
//缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡
if (event == null) {
+ return;
+ }
+ if (TextUtils.isEmpty(event.getTopic())) {
+ return;
+ }
+ String[] topics = event.getTopic().split("/");
+ //涓婚涓嶇鍚堣鍒欎笉澶勭悊
+ if (topics.length < 3) {
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())) {
+ if (gatewayBean.getGatewayId().equals(topics[2])) {
index = i;
break;
}
--
Gitblit v1.8.0