修改色彩模式获取逻辑

This commit is contained in:
zqm
2025-10-28 17:17:05 +08:00
parent bfbe7696f3
commit df97526930
2 changed files with 133 additions and 124 deletions

View File

@@ -31,7 +31,8 @@ namespace JoyD.Windows.CS.Toprie
{
SHUTTER_CORRECTION = 0,
SET_AUTO_SHUTTER = 1,
SET_COLOR_PLATE = 2,
// 根据热像仪SDK设置色彩模式的命令类型
SET_COLOR_PLATE = 2, // 保持为2因为热像仪SDK中也是使用SET_COLOR_PLATE命令
SET_MIRROR_VIDEO = 3,
SET_VIDEO_MODE = 4,
SET_AREA_POS = 5,
@@ -46,10 +47,10 @@ namespace JoyD.Windows.CS.Toprie
SET_EMAIL_SERVER = 14,
SET_TFTP_SERVER = 15,
SET_NETWORK_ETH = 16,
SET_FUSION_DISTANCE = 17,
SET_ENVIR_PARAM = 18,
SET_ALARM_PARAM = 19,
GET_PARAMETER = 20,
GET_PARAMETER = 17,
SET_FUSION_DISTANCE = 18,
SET_ENVIR_PARAM = 19,
SET_ALARM_PARAM = 20,
POWER_REBOOT = 21,
PARAM_RECOVER = 22,
UPDATER = 23,
@@ -273,13 +274,10 @@ namespace JoyD.Windows.CS.Toprie
try
{
// 从第5个字符开始解析数值 (+RET:值$)
int endIndex = response.IndexOf('$');
if (endIndex > 5)
{
string valueStr = response.Substring(5, endIndex - 5);
return int.Parse(valueStr);
}
// 从第5个字符开始解析数值与热像仪SDK保持一致
// SDK使用atoi(buff + 5)直接解析,不检查$符号
string valueStr = response.Substring(5);
return int.Parse(valueStr);
}
catch (Exception ex)
{
@@ -637,9 +635,9 @@ namespace JoyD.Windows.CS.Toprie
{
Log($"[色彩模式设置] 验证成功,当前值确认为: {validatedValue}");
// 设置成功后重启图像接收以避免卡顿
Log($"[色彩模式设置] 设置成功后重启图像接收以避免卡顿");
SafeRestartImageReceiving();
// 移除图像接收重启逻辑,因为色彩模式不影响图像接收
// 仅保留短暂延迟确保设置生效
Log($"[色彩模式设置] 设置成功,不需要重启图像接收");
}
else
{