From b544d5cccd76735e034c8055918a50927b437474 Mon Sep 17 00:00:00 2001
From: wenxiangchao <wenxiangchao@ihengxin.com.cn>
Date: 星期二, 10 十一月 2026 08:29:04 +0800
Subject: [PATCH] fix: 维护模式重复进入失败与按钮灰死 + Broker 并发验证用例
---
Plugin.CurrentSensorControl/BurnInOven.xaml | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/Plugin.CurrentSensorControl/BurnInOven.xaml b/Plugin.CurrentSensorControl/BurnInOven.xaml
index dfbdb6f..6a2da9e 100644
--- a/Plugin.CurrentSensorControl/BurnInOven.xaml
+++ b/Plugin.CurrentSensorControl/BurnInOven.xaml
@@ -13,7 +13,8 @@
xmlns:pw="https://opensource.panuon.com/wpf"
xmlns:pu="https://opensource.panuon.com/wpf-ui"
xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
- d:DesignHeight="450" d:DesignWidth="800">
+ FontSize="10"
+ d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<Style x:Key="ovenTb" TargetType="TextBox" BasedOn="{StaticResource EditorTextBoxStyle}">
<Setter Property="Height" Value="20"/>
@@ -22,7 +23,7 @@
</Style>
</UserControl.Resources>
- <GroupBox Header="{Binding Header}">
+ <GroupBox Header="{Binding Header}" Background="#FFF" >
<Grid dp:GridHelper.Space="5" dp:GridHelper.SpaceIgnore="ALL">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
@@ -36,22 +37,29 @@
<pu:Switch CheckedContent="鐓ф槑寮�" x:Name="lightSw"
CheckedBackground="Green"
- Background="{StaticResource DangerColor}"
+ BoxHeight="14"
+ Background="{DynamicResource DangerColor}"
IsChecked="{Binding LightStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Content="鐓ф槑鍏�"/>
- <Button Background="{StaticResource PrimaryColor}" Foreground="{StaticResource PrimaryColorContract}"
- Click="Button_Click"
- Tag="0"
- Content="鍋滄绛夊緟"/>
- <Button Background="{StaticResource DangerColor}" Foreground="{StaticResource DangerColorContrast}"
- Click="Button_Click"
- Tag="1"
- Content="鍔犵儹鍚姩"/>
- <Button Background="{StaticResource SuccessColor}" Foreground="{StaticResource SuccessColorContrast}"
- Click="Button_Click"
- Tag="2"
- Content="鍐峰嵈鍚姩"/>
+ <Button Background="{DynamicResource PrimaryColor}" Foreground="{DynamicResource PrimaryColorContract}"
+ Click="Button_Click" Tag="0" Content="鍋滄绛夊緟"/>
+ <Button Background="{DynamicResource DangerColor}" Foreground="{DynamicResource DangerColorContrast}"
+ Click="Button_Click" Tag="1" Content="鍔犵儹鍚姩"/>
+ <Button Background="{DynamicResource SuccessColor}" Foreground="{DynamicResource SuccessColorContrast}"
+ Click="Button_Click" Tag="2" Content="鍐峰嵈鍚姩"/>
+
+ <pu:FormGroup Header="姘村喎鏈虹姸鎬�">
+ <TextBox Style="{StaticResource ovenTb}" IsReadOnly="True" Text="{Binding CoolerStatus}"/>
+ </pu:FormGroup>
+ <Button Background="{DynamicResource PrimaryColor}" Foreground="{DynamicResource PrimaryColorContract}"
+ Click="Button_Click2" Tag="1" Content="杩愭按"/>
+ <Button Background="{DynamicResource PrimaryColor}" Foreground="{DynamicResource DangerColorContrast}"
+ Click="Button_Click2" Tag="2" Content="鍚规按"/>
+ <Button Background="{DynamicResource PrimaryColor}" Foreground="{DynamicResource SuccessColorContrast}"
+ Click="Button_Click2" Tag="3" Content="娴嬪帇"/>
+ <Button Background="{DynamicResource DangerColor}" Foreground="{DynamicResource SuccessColorContrast}"
+ Click="Button_Click2" Tag="0" Content="鍋滄"/>
</StackPanel>
<StackPanel Grid.Row="1" Grid.Column="0" Orientation="Horizontal" dp:StackPanelHelper.ChildSpace="5">
--
Gitblit v1.9.1