From 3c14188938e179189f1e14763aa5863791b8498b Mon Sep 17 00:00:00 2001 From: zqm Date: Thu, 30 Oct 2025 15:51:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=EF=BC=9A1.=20=E7=AE=80=E5=8C=96=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=202.=20=E8=AE=BE=E7=BD=AE=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs | 6 ++---- Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs | 2 +- .../Framework4.0/Toprie/Toprie/UdpCommunicationManager.cs | 3 +-- Windows/CS/Framework4.0/Toprie/Toprie/V8.cs | 7 ++++--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs index 750db86..7463317 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs @@ -118,8 +118,7 @@ namespace JoyD.Windows.CS.Toprie using (Font font = new Font("Arial", 48, FontStyle.Bold)) using (SolidBrush textBrush = new SolidBrush(textColor)) { - StringFormat format = new StringFormat(); - format.Alignment = StringAlignment.Center; + StringFormat format = new StringFormat() { Alignment = StringAlignment.Center }; // 将主文本居中显示 g.DrawString(text, font, textBrush, @@ -155,8 +154,7 @@ namespace JoyD.Windows.CS.Toprie using (Font font = new Font("Arial", 48, FontStyle.Bold)) using (SolidBrush textBrush = new SolidBrush(textColor)) { - StringFormat format = new StringFormat(); - format.Alignment = StringAlignment.Center; + StringFormat format = new StringFormat() { Alignment = StringAlignment.Center }; // 将主文本居中显示 g.DrawString(text, font, textBrush, diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs b/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs index bb9b0ef..14fb337 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/DeviceManager.cs @@ -182,7 +182,7 @@ namespace JoyD.Windows.CS.Toprie // 是否已释放 private bool _isDisposed = false; // 图像模式 - private ImageMode _currentImageMode = ImageMode.Infrared; + private readonly ImageMode _currentImageMode = ImageMode.Infrared; // 当前色彩模式 private PaletteType _currentPaletteType = PaletteType.WhiteHot; // 当前视频模式 diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/UdpCommunicationManager.cs b/Windows/CS/Framework4.0/Toprie/Toprie/UdpCommunicationManager.cs index 6f5bf00..46b4d53 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/UdpCommunicationManager.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/UdpCommunicationManager.cs @@ -69,8 +69,7 @@ namespace JoyD.Windows.CS.Toprie // 启动工作线程 _isRunning = true; - _workerThread = new Thread(ProcessRequests); - _workerThread.IsBackground = true; + _workerThread = new Thread(ProcessRequests) { IsBackground = true }; _workerThread.Start(); Console.WriteLine("UDP通信管理器已初始化"); diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/V8.cs b/Windows/CS/Framework4.0/Toprie/Toprie/V8.cs index 294c5e1..970386b 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/V8.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/V8.cs @@ -1129,9 +1129,10 @@ namespace JoyD.Windows.CS.Toprie if (SendCommand(command, out string response)) { // 创建默认的ImagePos对象 - SharedStructures.ImagePos data = new SharedStructures.ImagePos(); - data.area = new SharedStructures.AreaPos[6]; - data.spot = new SharedStructures.SpotPos[6]; + SharedStructures.ImagePos data = new SharedStructures.ImagePos() { + area = new SharedStructures.AreaPos[6], + spot = new SharedStructures.SpotPos[6] + }; // 这里应该解析完整的响应数据 // 简化实现，返回默认值