From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java
index 108a0b0..b185b89 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java
@@ -18,6 +18,7 @@
// 鐩爣鍦板潃 4
private String destinationAddress;
+ private String mcuUdid;
@Override
public A5C3CommonReportInnerFrame transformFrame(String hex) {
@@ -34,6 +35,13 @@
setDestinationAddress(hex.substring(8, 16));
+ /**
+ * 璁剧疆mcu_udid
+ */
+ if(getFunctionCode().equals("40")){
+ setMcuUdid(hex.substring(16, hex.length() - 8));
+ }
+
setCrc32(hex.substring(hex.length() - 8));
// 鏍￠獙CRC32
String frame = hex.substring(2, hex.length() - 8);
--
Gitblit v1.9.3