From fac5207c5d42ca886a97b599a065190a0bbee924 Mon Sep 17 00:00:00 2001
From: HuangXin <xajhuang@163.com>
Date: Sun, 3 Sep 2023 16:27:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=94=AF=E6=8C=81String=E8=BD=AC=20GB2312?=
 =?UTF-8?q?=20=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/netty/encode/YuanRongProtocolEncode.java      |  7 ++++---
 .../java/com/zjyr/beidouservice/misc/HelperUtils.java  | 10 ++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java
index def7e16..71f574f 100644
--- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java
+++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java
@@ -1,6 +1,7 @@
 package com.zjyr.beidouservice.adapter.impl.netty.encode;
 
 import com.zjyr.beidouservice.common.impl.ControlCommandName;
+import com.zjyr.beidouservice.misc.HelperUtils;
 import com.zjyr.beidouservice.pojo.vo.binary.BaseBinaryProtocol;
 import com.zjyr.beidouservice.pojo.vo.binary.HeartProtocol;
 import com.zjyr.beidouservice.pojo.vo.binary.QuerySensorProtocol;
@@ -14,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
 
 @Component
 @RequiredArgsConstructor
@@ -46,7 +46,8 @@ public class YuanRongProtocolEncode<T> extends MessageToByteEncoder<BaseBinaryPr
             byte[] ttsArray = new byte[0];
 
             if (msg.getTtsContent() != null && !msg.getTtsContent().isEmpty()) {
-                ttsArray = msg.getTtsContent().getBytes(StandardCharsets.UTF_16BE);
+                //ttsArray = msg.getTtsContent().getBytes(StandardCharsets.UTF_16BE);
+                ttsArray = HelperUtils.convertStringToGB2312(msg.getTtsContent());
                 ttsSize  = ttsArray.length;
             } else {
                 ttsSize = 0;
@@ -64,7 +65,7 @@ public class YuanRongProtocolEncode<T> extends MessageToByteEncoder<BaseBinaryPr
             byteBuf.writeByte(msg.getRepeatTimes().byteValue());
             byteBuf.writeShort((short) ttsSize);
 
-            if(ttsSize > 0) {
+            if (ttsSize > 0) {
                 byteBuf.writeBytes(ttsArray);
             }
 
diff --git a/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java b/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java
index 091d24b..72b37ae 100644
--- a/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java
+++ b/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java
@@ -1,5 +1,8 @@
 package com.zjyr.beidouservice.misc;
 
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+
 public class HelperUtils {
     public static String bytesToHexString(byte[] bArray) {
         StringBuilder sb = new StringBuilder(bArray.length);
@@ -13,6 +16,13 @@ public class HelperUtils {
         }
         return sb.toString();
     }
+
+    public static byte[] convertStringToGB2312(String str) throws UnsupportedEncodingException {
+        String utf8    = new String(str.getBytes(StandardCharsets.UTF_8));
+        String unicode = new String(utf8.getBytes(), StandardCharsets.UTF_8);
+        String gbk     = new String(unicode.getBytes("GB2312"));
+        return gbk.getBytes();
+    }
 //
 //    @SuppressWarnings("unchecked")
 //    public static <T> BaseBinaryProtocol<T> CastBaseBinaryProtocol(Object obj) {