From 318bd727e2fe02e4f541dfe943f77606af41d509 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 06 二月 2025 14:30:11 +0800
Subject: [PATCH] #

---
 app/src/main/java/com/example/agvcontroller/protocol/AgvPackage.java |   51 ++++++++++++++++++++++++---------------------------
 1 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/example/agvcontroller/protocol/AgvPackage.java b/app/src/main/java/com/example/agvcontroller/protocol/AgvPackage.java
index e50fa82..39f001f 100644
--- a/app/src/main/java/com/example/agvcontroller/protocol/AgvPackage.java
+++ b/app/src/main/java/com/example/agvcontroller/protocol/AgvPackage.java
@@ -1,8 +1,5 @@
-package com.zy.acs.gateway.domain;
+package com.example.agvcontroller.protocol;
 
-import com.core.common.Cools;
-import com.zy.acs.gateway.constant.AgvConstant;
-import com.zy.acs.gateway.constant.PacErrorType;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 
@@ -12,7 +9,7 @@
  * AGV鎶ユ枃妯″瀷
  * Created by vincent on 2023/3/10
  */
-public class AgvPackage implements PackageSupport {
+public class AgvPackage {
 
     /**
      * 婧愭暟鎹寘缂撳啿鍖�(寮曠敤)
@@ -58,14 +55,14 @@
         return agvPackage;
     }
 
-    public String toLogString() {
-        StringBuilder pacSb = new StringBuilder();
-        pacSb.append("AGV(").append(getHeader().getUniqueNo()).append(")")
-            .append("涓婁紶")
-            .append("[").append(getHeader().getProtocolType().getDes()).append("]娑堟伅.")
-            .append("鍘熷娑堟伅[").append(getSourceHexStr()).append("]");
-        return pacSb.toString();
-    }
+    //public String toLogString() {
+    //    StringBuilder pacSb = new StringBuilder();
+    //    pacSb.append("AGV(").append(getHeader().getUniqueNo()).append(")")
+    //        .append("涓婁紶")
+    //        .append("[").append(getHeader().getProtocolType().getDes()).append("]娑堟伅.")
+    //        .append("鍘熷娑堟伅[").append(getSourceHexStr()).append("]");
+    //    return pacSb.toString();
+    //}
 
     public ByteBuf getSourceBuff() {
         // 鍥犱负澶勭悊buffer鏃讹紝鎬绘槸甯屾湜鎷垮埌涓�涓噸缃簡readerIndex鐨刡uf
@@ -139,19 +136,19 @@
         return this;
     }
 
-    public ByteBuf convert(ByteBuf byteBuf){
-        byteBuf.writeByte(this.getHeader().getStartSymbol())
-                .writeShort(this.getHeader().getContentLength())
-                .writeByte(this.getHeader().getProtocolType().getCode())
-                .writeBytes(this.getHeader().getUniqueNo().getBytes(AgvConstant.CHARSET_GBK))
-                .writeByte(this.getHeader().getEncryptType().getCode())
-                .writeBytes(this.getBody().getContent())
-                .writeByte(this.getValidCode());
-        // 璁$畻骞惰缃牎楠岀爜
-//        this.setValidCode(ValidUtil.caculateValidByteFromBuff(byteBuf));
-        byteBuf.resetReaderIndex();
-        byteBuf.writerIndex(byteBuf.readableBytes() - 1).writeByte(this.getValidCode());
-        return byteBuf;
-    }
+//    public ByteBuf convert(ByteBuf byteBuf){
+//        byteBuf.writeByte(this.getHeader().getStartSymbol())
+//                .writeShort(this.getHeader().getContentLength())
+//                .writeByte(this.getHeader().getProtocolType().getCode())
+//                .writeBytes(this.getHeader().getUniqueNo().getBytes(AgvConstant.CHARSET_GBK))
+//                .writeByte(this.getHeader().getEncryptType().getCode())
+//                .writeBytes(this.getBody().getContent())
+//                .writeByte(this.getValidCode());
+//        // 璁$畻骞惰缃牎楠岀爜
+////        this.setValidCode(ValidUtil.caculateValidByteFromBuff(byteBuf));
+//        byteBuf.resetReaderIndex();
+//        byteBuf.writerIndex(byteBuf.readableBytes() - 1).writeByte(this.getValidCode());
+//        return byteBuf;
+//    }
 
 }

--
Gitblit v1.9.1