From 4cfd0dee1abf5db41b54fb2d4bdd666792b1da72 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 31 一月 2024 10:17:28 +0800
Subject: [PATCH] 2024年01月31日10:17:12
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 0c22af1..8497d14 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -291,18 +291,10 @@
//璁惧鍙栨秷椹卞姩,鍥轰欢涓嬭浇鍗囩骇鏂囦欢
case HDLUniMP.UNI_EVENT_REPLY_OTA_DRIVER_CANCEL_DOWNLOAD: {
this.uniCancelDownloadingUpgradeFile(data, callback);
-// HdlThreadLogic.runSubThread(new Runnable() {
-// @Override
-// public void run() {
-// HdlLogLogic.print("褰撳墠绾跨▼鍚嶇О鍙栨秷涓嬭浇====" + Thread.currentThread().getName());
-// uniCancelDownloadingUpgradeFile(data, callback);
-// }
-// });
}
break;
//璁惧椹卞姩,鍥轰欢鍙栨秷鍗囩骇
case HDLUniMP.UNI_EVENT_REPLY_OTA_CANCEL_UPGRADE: {
-
this.uniCancelUpgrade(data, callback);
}
break;
@@ -334,6 +326,11 @@
//鑾峰彇浣嶇疆淇℃伅
case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
this.uniGetLocationInfo(data, callback);
+ }
+ //涓撻棬鏀堕泦uni鏃ュ織
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
+ String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
+ HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
}
}
}
@@ -1291,22 +1288,24 @@
// modBusBean.setOid("0101050217BBC400");
// }
if (modBusBean.getMac() == null || modBusBean.getData() == null) {
- HdlLogLogic.print("鍐呭涓虹┖--->oid--->" + modBusBean.getMac() + " data--->" + Arrays.toString(modBusBean.getData()), false);
+ HdlLogLogic.print("uni--->鍙戦��--->ModBus--->鍙戦�佸け璐�,(mac鎴栬�卭id)涓虹┖." + Arrays.toString(modBusBean.getData()), true);
return;
}
-
+ HdlLogLogic.print("uni--->鍙戦��--->ModBus--->" + Arrays.toString(modBusBean.getData()), true);
//鍙戦�乵odbus鍗忚
HDLModBusConnect.getInstance().Send(modBusBean.getMac(), modBusBean.getData(), new ModbusCallBack() {
@Override
public void onSuccess(int[] data) {
- Log.d("data", Arrays.toString(data));
uniCallbackData(data, callback);
+ HdlLogLogic.print("uni--->鎺ユ敹--->ModBus--->" + Arrays.toString(data), true);
+
}
@Override
public void onError(HDLLinkException e) {
uniCallbackData(null, e.getCode(), e.getMsg(), callback);
+ HdlLogLogic.print("uni--->寮傚父--->ModBus--->" + e.getMsg() + "(" + e.getCode() + ")", true);
}
});
}
--
Gitblit v1.8.0