From ecaff4ffd05c630ac32e49daf3b9b8904052b0fe Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 29 十二月 2023 15:16:07 +0800
Subject: [PATCH] 备份一下
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 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 e02daf2..ce90d7d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -13,6 +13,7 @@
import android.view.View;
import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
import com.hdl.photovoltaic.R;
@@ -33,6 +34,7 @@
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
+import com.hdl.photovoltaic.ui.bean.OidBean;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.PermissionUtils;
@@ -49,6 +51,7 @@
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+import java.lang.reflect.Type;
import java.util.List;
@@ -265,7 +268,7 @@
if (response.getTopic() == null) {
return;
}
- HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁--->" + new Gson().toJson(response), false);
+ HdlLogLogic.print("鐩戝惉鍒癕odbus鏁版嵁--->" + new Gson().toJson(response), false);
// if (response.getTopic().endsWith("custom/native/inverter/up")) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
@@ -284,11 +287,33 @@
uniCallBackBaseBean.setData(linkResponse.getData());
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
+ } else if (linkResponse.getTopic().endsWith("/custom/device/list/upload")) {
+ //閫嗗彉鍣ㄦ湁鏂皁id閫氱煡涓婚
+ if (linkResponse.getData() == null) {
+ HdlLogLogic.print("閫嗗彉鍣ㄦ湁鏂皁id閫氱煡--->鏁版嵁涓虹┖", false);
+ return;
+ }
+ try {
+ Gson gson = new Gson();
+ Type typeOfT = new TypeToken<List<OidBean>>() {
+ }.getType();
+ String json = gson.toJson(linkResponse.getData());
+ List<OidBean> oidList = gson.fromJson(json, typeOfT);
+ //澧為噺澧炲姞add
+ HdlDeviceLogic.getInstance().updateOidAdd(UserConfigManage.getInstance().getHomeId(), oidList, null);
+ } catch (Exception ignored) {
+ }
+
+
}
}
}
- };
- HDLLinkLocalSdk.getInstance().registerAllTopicsListener(allTopicsListener);
+ }
+
+ ;
+ HDLLinkLocalSdk.getInstance().
+
+ registerAllTopicsListener(allTopicsListener);
}
/**
@@ -327,7 +352,7 @@
return;
}
int index = -1;
- List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList();
+ List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId());
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
if (gatewayBean.getGatewayId().equals(topics[2])) {
@@ -421,9 +446,6 @@
}
super.onBackPressed();
}
-
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0