From 00fd3eb5037f07763d4e8d3e5729066d3dc097ea Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 08 一月 2025 14:47:43 +0800
Subject: [PATCH] #

---
 app/src/main/java/com/example/agvcontroller/protocol/AGV_02_DOWN.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/example/agvcontroller/protocol/AGV_02_DOWN.java b/app/src/main/java/com/example/agvcontroller/protocol/AGV_02_DOWN.java
index 74bde9d..e8346e1 100644
--- a/app/src/main/java/com/example/agvcontroller/protocol/AGV_02_DOWN.java
+++ b/app/src/main/java/com/example/agvcontroller/protocol/AGV_02_DOWN.java
@@ -1,8 +1,9 @@
-package com.zy.acs.common.domain.protocol;
+package com.example.agvcontroller.protocol;
 
-import com.zy.acs.common.utils.Utils;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
+
+import com.example.agvcontroller.action.AgvCompleteType;
+import com.example.agvcontroller.action.CommonConstant;
+import com.example.agvcontroller.socket.RadixTools;
 
 import java.io.Serializable;
 
@@ -10,7 +11,6 @@
  * 鍔ㄤ綔鍛戒护鍖�
  * Created by vincent on 2023/3/21
  */
-@Data
 public class AGV_02_DOWN implements IMessageBody, Serializable {
 
     private static final long serialVersionUID = 1664188062202647371L;
@@ -19,8 +19,10 @@
     public byte[] writeToBytes() {
         String serialNo = Utils.zeroFill(this.serialNo, 16);
         byte[] serialNoBytes = Utils.reverse(serialNo.getBytes());
-        byte cmdCodeByte = (byte) this.getCmdCode();
-        byte valByte = (byte) this.getVal();
+        //byte cmdCodeByte = (byte) this.getCmdCode();
+        byte cmdCodeByte = (byte) 1;
+        //byte valByte = (byte) this.getVal();
+        byte valByte = (byte) 1;
 
         byte[] cmdBodyBytes = commandBody.writeToBytes();
 
@@ -29,7 +31,13 @@
 
     @Override
     public void readFromBytes(byte[] messageBodyBytes) {
+        try {
+            this.serialNo = new String(Utils.sliceWithReverse(messageBodyBytes, 0, 16));
 
+            this.cmdCode = Utils.slice(messageBodyBytes, 16, 1)[0];
+        } catch (Exception e) {
+
+        }
     }
 
     // 娴佹按鍙� - 16
@@ -44,4 +52,35 @@
     // 鍔ㄤ綔鍙傛暟
     private ICommandBody commandBody;
 
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo;
+    }
+
+    public int getCmdCode() {
+        return cmdCode;
+    }
+
+    public void setCmdCode(int cmdCode) {
+        this.cmdCode = cmdCode;
+    }
+
+    public int getVal() {
+        return val;
+    }
+
+    public void setVal(int val) {
+        this.val = val;
+    }
+
+    public ICommandBody getCommandBody() {
+        return commandBody;
+    }
+
+    public void setCommandBody(ICommandBody commandBody) {
+        this.commandBody = commandBody;
+    }
 }

--
Gitblit v1.9.1