From bd80ca98ffb4f483ca2eba47051281fa69e790ac Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 14 八月 2023 10:24:25 +0800
Subject: [PATCH] 代码同步
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
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 a5f0327..0907dac 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -8,6 +8,7 @@
import com.google.gson.reflect.TypeToken;
import com.hdl.hdlhttp.HxHttp;
import com.hdl.photovoltaic.bean.HttpResponsePack;
+import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -331,14 +332,15 @@
String requestUrl = TopicApi.GET_GATEWAY_OID_LIST;
TcpClient.getInstance().sendDataToLinkGateway(mac, requestUrl, null, "", new HDLLinkCallBack() {
@Override
- public void onSuccess(String msg) {
+ public void onSuccess(String json) {
try {
- if (!TextUtils.isEmpty(msg)) {
+ if (!TextUtils.isEmpty(json)) {
Gson gson = new Gson();
- String json = gson.toJson(msg);
+ LocalResponse localResponse = gson.fromJson(json, LocalResponse.class);
+ String objects = gson.toJson(localResponse.getObjects());
Type typeOfT = new TypeToken<List<OidBean>>() {
}.getType();
- List<OidBean> list = gson.fromJson(json, typeOfT);
+ List<OidBean> list = gson.fromJson(objects, typeOfT);
if (cloudCallBeak != null) {
cloudCallBeak.onSuccess(list);
}
--
Gitblit v1.8.0