From c568cfab0138cce245d2f637eb8a1795b4edc87b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 15 三月 2024 16:09:11 +0800
Subject: [PATCH] 2024年03月15日16:09:06
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 9bda4c6..541edcf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -67,6 +67,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
@@ -115,8 +116,9 @@
return;
}
String type = getKeyValue("type", data);//灏忕被
+ String logTag = getKeyValue("logTag", data);//鏍囪uni鎸囦护
String mode_type = "澶х被->" + topic + "--->" + "灏忕被->" + type;//鐢ㄦ潵鎵撳嵃鐨�
- HdlLogLogic.print("uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
+ HdlLogLogic.print(logTag + ":" + "uni--->鍙戦��--->" + mode_type + "\r\n" + data, true);
if (HDLUniMP.UNI_EVENT_REPLY_USER_MODEL.equals(topic)) {
//鐢ㄦ埛妯″潡
switch (type) {
@@ -124,6 +126,7 @@
case HDLUniMP.UNI_EVENT_REPLY_USER_INFO: {
this.uniGetUserInfo(mode_type, data, callback);
}
+ break;
//鐢ㄦ埛澶村儚锛堟棫骞冲彴閫昏緫鏄ご鍍忓崟鐙幏鍙栦笅杞藉湴鍧�锛�
case HDLUniMP.UNI_EVENT_REPLY_USER_IMAGE: {
uniGetImageKey(mode_type, data, callback);
@@ -1133,7 +1136,7 @@
@Override
public void onFailure(HDLException e) {
- uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ uniCallbackData(type, cUserInfo, callback);
}
});
}
@@ -1550,7 +1553,7 @@
@Override
public void onError(HDLLinkException e) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
- //HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
+// HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
}
--
Gitblit v1.8.0