From a091a0552ba1374386910571ab9d929f84582fb5 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 20 十二月 2021 14:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
index 5a44b37..c48128f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
@@ -23,7 +24,7 @@
/**
* 鏁呴殰鐮�
*/
- private String errorCode;
+ private int errorCode;
@Override
public A5LightErrorCodeReportInnerFrame transformFrame(String hex) {
@@ -39,7 +40,10 @@
setDestinationAddress(hex.substring(8, 12));
- setErrorCode(hex.substring(12, 16));
+ String errorCodeHex = hex.substring(12, 16);
+ errorCode = HexUtil.hexToInt(errorCodeHex);
+ System.out.println("鏁呴殰鐮侊細"+ errorCodeHex +" - " + errorCode);
+
setCrc32(hex.substring(hex.length() - 8));
// 鏍￠獙CRC32
String frame = getFunctionCode() + getPayloadLength() + getDestinationAddress() + getErrorCode();
--
Gitblit v1.9.3