From 2743d98b983b7ecd049093931749db749b4b2fe4 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 30 四月 2026 10:54:27 +0800
Subject: [PATCH] #
---
zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_06_UP.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_06_UP.java b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_06_UP.java
index 81c60b0..e57b78b 100644
--- a/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_06_UP.java
+++ b/zy-acs-common/src/main/java/com/zy/acs/common/domain/protocol/AGV_06_UP.java
@@ -1,6 +1,6 @@
package com.zy.acs.common.domain.protocol;
-import com.zy.acs.common.constant.CommonConstant;
+import com.zy.acs.common.utils.QrCodeCodecSupport;
import com.zy.acs.common.utils.Utils;
import com.zy.acs.framework.common.RadixTools;
import lombok.Data;
@@ -22,19 +22,22 @@
@Override
public void readFromBytes(byte[] bytes) {
+ int qrCodeBytes = QrCodeCodecSupport.qrCodeBytes();
+ int qrCodePos = 16;
+ int actionCodePos = qrCodePos + qrCodeBytes;
// 娴佹按鍙�
this.serialNo = new String(Utils.sliceWithReverse(bytes, 0, 16));
// 鍦伴潰鐮両D
- this.qrCode = Utils.zeroFill(String.valueOf(RadixTools.bytesToInt(Utils.sliceWithReverse(bytes, 16, 4))), CommonConstant.QR_CODE_LEN);
+ this.qrCode = QrCodeCodecSupport.decode(bytes, qrCodePos);
// 鍔ㄤ綔鐮�
- this.actionCode = Utils.slice(bytes, 20, 1)[0];
+ this.actionCode = Utils.slice(bytes, actionCodePos, 1)[0];
// 灞炴�у��
- this.val = Utils.slice(bytes, 21, 1)[0];
+ this.val = Utils.slice(bytes, actionCodePos + 1, 1)[0];
// 鍔ㄤ綔鍙傛暟
- byte[] actionBodyBytes = Utils.sliceWithReverse(bytes, 22, 2);
+ byte[] actionBodyBytes = Utils.sliceWithReverse(bytes, actionCodePos + 2, 2);
this.actionBody = RadixTools.byteToShort(actionBodyBytes);
//棰勭暀瀛楁
- this.reservedField = RadixTools.bytesToInt(Utils.sliceWithReverse(bytes, 24, 4));
+ this.reservedField = RadixTools.bytesToInt(Utils.sliceWithReverse(bytes, actionCodePos + 4, 4));
}
// 娴佹按鍙� - 16
--
Gitblit v1.9.1