From e5855812e90849d87fd2cce304602451eec2a2ca Mon Sep 17 00:00:00 2001
From: zqm <zqm@example.com>
Date: Fri, 9 Jan 2026 10:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A3=80=E6=B5=8B=E5=8C=BA?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs  | 2 +-
 Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs
index faac0e2..cf00e52 100644
--- a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs
+++ b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs
@@ -2393,7 +2393,7 @@ namespace JoyD.Windows.CS.Toprie
                     
                     // 保存检测区配置
                     csvContent.AppendLine(); // 添加空行
-                    csvContent.AppendLine($"detectionZone,{_detectionZone.X},{_detectionZone.Y},{_detectionZone.Width},{_detectionZone.Height},{_detectionZone.Color.Name}");
+                    csvContent.AppendLine($"detectionZone,{_detectionZone.X},{_detectionZone.Y},{_detectionZone.Width},{_detectionZone.Height},{ColorTranslator.ToHtml(_detectionZone.Color)}");
                 }
                 catch (Exception ex)
                 {
diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs
index 7499bd7..7a26739 100644
--- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs
+++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs
@@ -3568,9 +3568,6 @@ namespace JoyD.Windows.CS
                     // 更新选中的颜色
                     _selectedColor = colorDialog.Color;
                     
-                    // 更新按钮图标，显示新选择的颜色
-                    UpdateColorButtonIcon();
-                    
                     // 检测区修改模式下，更新检测区的颜色
                     if (_isModifyingDetectionZone)
                     {
@@ -3588,6 +3585,9 @@ namespace JoyD.Windows.CS
                         }
                     }
                     
+                    // 更新按钮图标，显示新选择的颜色
+                    UpdateColorButtonIcon();
+                    
                     // 重绘图片区域，显示新颜色的矩形或检测区
                     picBoxTemp.Invalidate();
                 }
@@ -5076,6 +5076,8 @@ namespace JoyD.Windows.CS
                     // 显示修改检测区按钮和颜色选择按钮
                     btnModifyDetectionZone.Visible = true;
                     btnSelectColor.Visible = true;
+                    // 更新颜色选择按钮图标，确保显示检测区的颜色
+                    UpdateColorButtonIcon();
                 }
                 else
                 {
@@ -5087,6 +5089,7 @@ namespace JoyD.Windows.CS
                     _detectionZone.Y = _tempDetectionZone.Y;
                     _detectionZone.Width = _tempDetectionZone.Width;
                     _detectionZone.Height = _tempDetectionZone.Height;
+                    _detectionZone.Color = _tempDetectionZone.Color; // 保存检测区颜色
                     
                     // 恢复叠加层绘制，显示测温区和温差图
                     CreateRectangleOverlayImage();