From f45f4c003220e2a6f6ec316e9622b25b5ccf9c26 Mon Sep 17 00:00:00 2001
From: nxiaoxiao <3247747442@qq.com>
Date: Mon, 19 Aug 2024 00:07:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DtextMessage=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?bug=E5=92=8C=E9=83=A8=E9=97=A8=E5=91=BD=E5=90=8D=E8=A7=84?=
 =?UTF-8?q?=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Instructs/Instruct.cs            | 14 +++++++-------
 Instructs/TextMessageInstruct.cs |  7 ++++++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Instructs/Instruct.cs b/Instructs/Instruct.cs
index 0d3951d..e33b599 100644
--- a/Instructs/Instruct.cs
+++ b/Instructs/Instruct.cs
@@ -95,22 +95,22 @@ namespace OMS.NET.Instructs
         {
             //JsonSerializer.Serialize(writer, (object)value, options); 这个在Data是对象时导致了无限递归调用
             writer.WriteStartObject();
-            writer.WriteString(InstructNamingPolicy.Convert(nameof(Instruct.Type)), value.Type);
+            writer.WriteString("type", value.Type);
             if (value.Class != null)
             {
-                writer.WriteString(InstructNamingPolicy.Convert(nameof(Instruct.Class)), value.Class);
+                writer.WriteString("class", value.Class);
             }
             if (value.Conveyor != null)
             {
-                writer.WriteString(InstructNamingPolicy.Convert(nameof(Instruct.Conveyor)), value.Conveyor);
+                writer.WriteString("conveyor", value.Conveyor);
             }
             if (value.Time != null)
             {
-                writer.WriteString(InstructNamingPolicy.Convert(nameof(Instruct.Time)), value.Time);
+                writer.WriteString("time", value.Time);
             }
             if (value.Data != null)
             {
-                writer.WritePropertyName(InstructNamingPolicy.Convert(nameof(Instruct.Data)));
+                writer.WritePropertyName("data");
                 if (value.Data.GetType() == typeof(List<ActiveDataElement>))
                 {
                     JsonSerializer.Serialize(writer, value.Data, value.Data.GetType(), ActiveDataElement.options);
@@ -130,10 +130,10 @@ namespace OMS.NET.Instructs
         {
             ReadCommentHandling = JsonCommentHandling.Skip, //允许注释
             AllowTrailingCommas = true,//允许尾随逗号
-            PropertyNamingPolicy = new InstructNamingPolicy(), // 属性名为定制转换
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase, // 属性名为定制转换
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, // 忽略 null 值
             WriteIndented = true, // 美化输出
-            //PropertyNameCaseInsensitive = true,//属性名忽略大小写
+            PropertyNameCaseInsensitive = true,//属性名忽略大小写
             Converters = { new InstructConverter() },
         };
         public string Type { get; set; }
diff --git a/Instructs/TextMessageInstruct.cs b/Instructs/TextMessageInstruct.cs
index 6bcfbb4..8899dc5 100644
--- a/Instructs/TextMessageInstruct.cs
+++ b/Instructs/TextMessageInstruct.cs
@@ -27,7 +27,12 @@ namespace OMS.NET.Instructs
                         IsBroadcast = true,
                         Conveyor = conveyor,
                         Time = time,
-                        Data = Data
+                        Data = new
+                        {
+                            message,
+                            headColor = Data.GetProperty("headColor").GetString(),
+                            name = Data.GetProperty("name").GetString()
+                        }
                     });
                 }
                 catch (Exception ex)