From 7ec2a54e7779694e58e3b19d3e26eaae2d3f8dde Mon Sep 17 00:00:00 2001 From: zqm Date: Sun, 4 Jan 2026 11:06:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=B8=A9=E5=BA=A6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CS/Framework4.0/Toprie/Toprie/Camera.cs | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs index ef78e4d..35b7eeb 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Camera.cs @@ -2888,38 +2888,40 @@ namespace JoyD.Windows.CS.Toprie } } - // 准备温度文本 - List temperatureTexts = new List(); - if (_showAverageTemperature) + // 6. 只有在全局温度模式下才显示温度数据 + if (isGlobalTemperatureMode) { - temperatureTexts.Add($"平均: {temperatureData.AverageTemperature:F2} °C"); - } - if (_showMinTemperature) - { - temperatureTexts.Add($"最低: {temperatureData.MinTemperature:F2} °C"); - } - if (_showMaxTemperature) - { - temperatureTexts.Add($"最高: {temperatureData.MaxTemperature:F2} °C"); - } + // 准备温度文本 + List temperatureTexts = new List(); + if (_showAverageTemperature) + { + temperatureTexts.Add($"平均: {temperatureData.AverageTemperature:F2} °C"); + } + if (_showMinTemperature) + { + temperatureTexts.Add($"最低: {temperatureData.MinTemperature:F2} °C"); + } + if (_showMaxTemperature) + { + temperatureTexts.Add($"最高: {temperatureData.MaxTemperature:F2} °C"); + } - // 记录温度数据日志 - if (temperatureTexts.Count > 0) - { - string mode = isGlobalTemperatureMode ? "全局温度" : "区域温度"; - WriteLog($"{mode}数据 - 平均: {temperatureData.AverageTemperature:F2} °C, 最低: {temperatureData.MinTemperature:F2} °C, 最高: {temperatureData.MaxTemperature:F2} °C"); + // 记录温度数据日志 + if (temperatureTexts.Count > 0) + { + WriteLog($"全局温度数据 - 平均: {temperatureData.AverageTemperature:F2} °C, 最低: {temperatureData.MinTemperature:F2} °C, 最高: {temperatureData.MaxTemperature:F2} °C"); + } + + // 如果没有要显示的温度文本,直接返回 + if (temperatureTexts.Count == 0) + return; + + // 将List转换为string[],以便传递给DrawTextInAreaCentered方法 + string[] textsArray = temperatureTexts.ToArray(); + + // 调用DrawTextInAreaCentered方法绘制温度文本 + DrawTextInAreaCentered(g, textsArray); } - - // 如果没有要显示的温度文本,直接返回 - if (temperatureTexts.Count == 0) - return; - - // 将List转换为string[],以便传递给DrawTextInAreaCentered方法 - string[] textsArray = temperatureTexts.ToArray(); - - // 调用DrawTextInAreaCentered方法绘制温度文本 - // 根据温度显示模式,使用不同的参数 - DrawTextInAreaCentered(g, textsArray); } // 设置显示状态标志