From 2bee35fbadbc4d7e259317f933bbbe4e306a01cd Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期日, 12 一月 2025 10:26:22 +0800
Subject: [PATCH] 2025年01月12日10:26:09 已发布
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
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 e0327e1..e70f0e8 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -55,6 +55,7 @@
import com.hdl.photovoltaic.ui.bean.MemberBean;
import com.hdl.photovoltaic.ui.bean.NotRunBean;
import com.hdl.photovoltaic.ui.bean.OidBean;
+import com.hdl.photovoltaic.ui.bean.QrcodeUrlBean;
import com.hdl.photovoltaic.ui.bean.StaffBean;
import com.hdl.photovoltaic.ui.bean.UnCountBean;
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
@@ -428,12 +429,18 @@
break;
//閫嗗彉鍣ㄤ互澶綉閰嶇疆
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_SET: {
- uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
+ if (callback != null) {
+ uniSuccessCallback(type, "", callback);
+ }
+ //uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_EDIT, callback);
}
break;
//閫嗗彉鍣ㄤ互澶綉鑾峰彇
case HDLUniMP.UNI_EVENT_REPLY_DEVICE_ETHERNET_GET: {
- uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
+ if (callback != null) {
+ uniSuccessCallback(type, "", callback);
+ }
+ //uniGetAndSetNetwork(mode_type, data, TopicApi.DELETING_GATEWAY_ETHERNET_GET, callback);
}
break;
@@ -1002,9 +1009,8 @@
public void onSuccess(String obj) {
try {
Gson g = new Gson();
- JsonObject jObject = g.fromJson(obj, JsonObject.class);
- String deliveryUrl = jObject.get("deliveryUrl").toString();
- uniSuccessCallback(type, deliveryUrl, callback);
+ QrcodeUrlBean qrcodeUrlBean = g.fromJson(obj, QrcodeUrlBean.class);
+ uniSuccessCallback(type, qrcodeUrlBean.getDeliveryUrl(), callback);
} catch (Exception ignored) {
uniSuccessCallback(type, obj, callback);
}
@@ -2792,7 +2798,7 @@
//HdlLogLogic.print("uni---鍙戦��---ModBus---" + Arrays.toString(modBusBean.getData()), true);
//鍙戦�乵odbus鍗忚
long startTime = System.currentTimeMillis();
- HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
+ HDLModBusConnect.getInstance().asyncSend(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
@Override
public void onSuccess(int[] data) {
uniSuccessCallback(type, data, callback);
--
Gitblit v1.8.0