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/BurnInCell.xaml | 75 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 13 deletions(-)
diff --git a/Plugin.CurrentSensorControl/BurnInCell.xaml b/Plugin.CurrentSensorControl/BurnInCell.xaml
index cd24846..69802ad 100644
--- a/Plugin.CurrentSensorControl/BurnInCell.xaml
+++ b/Plugin.CurrentSensorControl/BurnInCell.xaml
@@ -13,20 +13,26 @@
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"
+ FontSize="10"
d:DesignHeight="450" d:DesignWidth="800">
<UserControl.Resources>
<Style TargetType="pu:Switch">
<Setter Property="ContentPlacement" Value="Left" />
- <Setter Property="BoxHeight" Value="16" />
- <Setter Property="CheckedBackground" Value="{StaticResource GreenVerBar}" />
- <Setter Property="Background" Value="{StaticResource DangerColor}" />
+ <Setter Property="BoxHeight" Value="14" />
+ <Setter Property="CheckedBackground" Value="{DynamicResource GreenVerBar}" />
+ <Setter Property="Background" Value="{DynamicResource DangerColor}" />
<Setter Property="ToggleSize" Value="10" />
<Setter Property="ToggleShadowColor" Value="{x:Null}" />
+ <Setter Property="Margin" Value="0"/>
+ <Setter Property="Padding" Value="0"/>
+ </Style>
+ <Style TargetType="Label">
+ <Setter Property="VerticalContentAlignment" Value="Center"/>
</Style>
</UserControl.Resources>
<GroupBox Header="{Binding Header}">
- <Grid>
+ <!--<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
@@ -36,9 +42,9 @@
<ColumnDefinition/>
</Grid.ColumnDefinitions>
- <pu:Switch Grid.Row="0" Grid.Column="0" CheckedContent="鐢垫簮寮�" x:Name="powerSw"
- IsChecked="{Binding PowerStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
- Content="鐢垫簮鍏�"/>
+ <pu:Switch Grid.Row="0" Grid.Column="0" CheckedContent="鐢垫簮寮�" x:Name="powerSw"
+IsChecked="{Binding PowerStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+Content="鐢垫簮鍏�"/>
<pu:Switch Grid.Row="0" Grid.Column="1" CheckedContent="婵�娲�" x:Name="activationSw"
IsChecked="{Binding ActivationStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
@@ -47,19 +53,62 @@
<pu:Switch Grid.Row="1" Grid.Column="0" CheckedContent="OK浜�" x:Name="okLightSw"
IsChecked="{Binding OkLightOn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Content="OK鐏�"/>
-
+
<pu:Switch Grid.Row="1" Grid.Column="1" CheckedContent="NG浜�" x:Name="ngLightSw"
IsChecked="{Binding NgLightOn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Content="NG鐏�"/>
+ </Grid>-->
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
+ <RowDefinition Height="Auto"/>
+ </Grid.RowDefinitions>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition />
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition />
+ </Grid.ColumnDefinitions>
+ <Label>鐢垫簮</Label>
+ <pu:Switch Grid.Row="0" Grid.Column="1" x:Name="powerSw"
+IsChecked="{Binding PowerStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
- <!--<ui:LightBall Grid.Row="1" Grid.Column="0" Value="{Binding CellStatus}" Content="OK/NG鐘舵��"/>-->
+ <Label Grid.Row="0" Grid.Column="2">婵�娲�</Label>
+ <pu:Switch Grid.Row="0" Grid.Column="3" x:Name="activationSw"
+IsChecked="{Binding ActivationStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
- <!--<TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding PowerStatus}"/>
-
- <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding ActivationStatus}"/>-->
-
+ <Label Grid.Row="1" Grid.Column="0">OK鐏�</Label>
+ <pu:Switch Grid.Row="1" Grid.Column="1" x:Name="okLightSw"
+ IsChecked="{Binding OkLightOn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+
+ <Label Grid.Row="1" Grid.Column="2">NG鐏�</Label>
+ <pu:Switch Grid.Row="1" Grid.Column="3" x:Name="ngLightSw"
+ IsChecked="{Binding NgLightOn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+
+ <Label Grid.Row="2" Grid.Column="0">鐢垫祦</Label>
+ <TextBox Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" IsReadOnly="True"
+ Style="{StaticResource EditorTextBoxStyle}" Height="18" Text="{Binding Current}"/>
</Grid>
+ <!--<UniformGrid Rows="2" Columns="2">
+ <pu:Switch Grid.Row="0" Grid.Column="0" CheckedContent="鐢垫簮寮�" x:Name="powerSw"
+IsChecked="{Binding PowerStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+Content="鐢垫簮鍏�"/>
+
+ <pu:Switch Grid.Row="0" Grid.Column="1" CheckedContent="婵�娲�" x:Name="activationSw"
+IsChecked="{Binding ActivationStatus,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+Content="鏈縺娲�"/>
+
+ <pu:Switch Grid.Row="1" Grid.Column="0" CheckedContent="OK浜�" x:Name="okLightSw"
+ IsChecked="{Binding OkLightOn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+Content="OK鐏�"/>
+
+
+ <pu:Switch Grid.Row="1" Grid.Column="1" CheckedContent="NG浜�" x:Name="ngLightSw"
+ IsChecked="{Binding NgLightOn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+Content="NG鐏�"/>
+ </UniformGrid>-->
</GroupBox>
</UserControl>
--
Gitblit v1.9.1