From 3e904bfa8a1bb53dcf461e5c717f9b808e179245 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 08 一月 2025 16:27:48 +0800
Subject: [PATCH] 2025年01月08日16:27:46
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 20 ++++++++++++++------
1 files changed, 14 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 b4bb9f3..bc70bde 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -428,12 +428,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;
@@ -816,7 +822,7 @@
public void openUniMP(String path, JSONObject jsonObject) {
JSONObject json = this.createdJSONObject(jsonObject, true);
HDLUniMPSDKManager.getInstance().openUniMP(HDLUniMP.UNI_APP_ID, path, json, HdlUniLogic.this);
- HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
+// HdlLogLogic.print("uni---缁勮uni鍙戦�佹暟鎹牸寮�---" + json, false);
}
/**
@@ -845,7 +851,7 @@
//region ******uni鎺ュ彛鏂规硶******
/**
- * link杩涜瀵嗙爜楠岃瘉
+ * link杩涜鏈湴瀵嗙爜鐧诲綍楠岃瘉
*/
private void uniCheckPasswordVerification(String type, Object data, DCUniMPJSCallback callback) {
String password = getKeyValue("password", getKeyValue("data", data));
@@ -2791,12 +2797,14 @@
//HdlLogLogic.print("uni---鍙戦��---ModBus---" + Arrays.toString(modBusBean.getData()), true);
//鍙戦�乵odbus鍗忚
- HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
+ long startTime = System.currentTimeMillis();
+ HDLModBusConnect.getInstance().asyncSend(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
@Override
public void onSuccess(int[] data) {
uniSuccessCallback(type, data, callback);
// HdlLogLogic.print("uni---鎺ユ敹---ModBus---" + Arrays.toString(data), true);
-
+ long endTime = System.currentTimeMillis() - startTime;
+ Log.d("====Mobus鑰楁椂鏃堕棿====", String.valueOf(endTime));
}
@Override
--
Gitblit v1.8.0