From b7cf4a3e5e89e6b39347bf12e6eafff258a84494 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期三, 08 十二月 2021 15:47:38 +0800
Subject: [PATCH] 通信协议完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java
index 2273818..e0ffc63 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.response;
+import cn.hutool.core.util.StrUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.IResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
@@ -9,6 +10,7 @@
/**
* @author chenjiantian
* @date 2021/12/6 18:20
+ * A5-81-02
* 鐏蹇冭烦鍖� 搴旂瓟
*/
@Data
@@ -25,7 +27,7 @@
@Override
public A5LightHeartbeatRespInnerFrame transformFrame(String hex) {
// 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
- if (hex == null || hex.length() != 116) {
+ if (StrUtil.isBlank(hex)) {
return null;
}
// MQTT閫氫俊鏂瑰紡(1)
@@ -44,7 +46,7 @@
setCrc32(hex.substring(108, 116));
// 鏍￠獙CRC32
- String frame = hex.substring(0, 14);
+ String frame = hex.substring(2, hex.length() - 8);
this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
return this;
}
--
Gitblit v1.9.3