From b9f73f7363bef95fc5ba445ee2fd749f3639443f Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:29 +0800
Subject: [PATCH] 新增本地MQTT模块，新增xm本地开发配置环境，启用了心跳包自动插入单灯设备，覆写了原rrpc方法，原阿里云自定义事件调用已注释掉
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereQueryVersionReportInnerFrame.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereQueryVersionReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereQueryVersionReportInnerFrame.java
index cec354c..ca52679 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereQueryVersionReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereQueryVersionReportInnerFrame.java
@@ -16,10 +16,13 @@
public class A5AtmosphereQueryVersionReportInnerFrame extends BaseResponseInnerFrame<A5AtmosphereQueryVersionReportInnerFrame> {
//璁惧鍦板潃
private String deviceAddress;
+ //纭欢鐗堟湰
+ private String version;
@Override
public A5AtmosphereQueryVersionReportInnerFrame transformFrame(String hex) {
- if (StrUtil.isBlank(hex) || hex.length() != 100) {
+ //FE040004FFFF0105954FAA7F
+ if (StrUtil.isBlank(hex) || hex.length() != 24) {
return null;
}
// MQTT閫氫俊鏂瑰紡(1)
@@ -30,7 +33,13 @@
setPayloadLength(hex.substring(4, 8));
//璁惧鍦板潃
setDeviceAddress(hex.substring(8, 12));
- //
+ //纭欢鐗堟湰
+ String version1 = String.valueOf(Integer.parseInt(hex.substring(12, 14), 16));
+ String version2 = String.valueOf(Integer.parseInt(hex.substring(14, 16), 16));
+ if (version2.length() == 1) {
+ version2 = "0" + version2;
+ }
+ setVersion("纭欢鐗堟湰涓猴細" + version1 + "." + version2);
//鏍￠獙
setCrc32(hex.substring(hex.length() - 8));
--
Gitblit v1.9.3