From 80dddfa238404c7ff6aede77018eacb692d49611 Mon Sep 17 00:00:00 2001
From: MoYue <18168119590@163.com>
Date: Fri, 3 Feb 2023 15:14:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Button=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MonitoringTechnology/Views/LYScanPage.xaml    | 18 ++++++++--
 .../Views/SystemOperationView.xaml            | 33 ++++++++++++++-----
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/MonitoringTechnology/Views/LYScanPage.xaml b/MonitoringTechnology/Views/LYScanPage.xaml
index 1c104d6..4501c98 100644
--- a/MonitoringTechnology/Views/LYScanPage.xaml
+++ b/MonitoringTechnology/Views/LYScanPage.xaml
@@ -34,6 +34,18 @@
                 </StackPanel>
             </Grid>
         </DataTemplate>
+        
+        <ControlTemplate TargetType="Button" x:Key="ButtonTemplate">
+            <Border Background="#FF3269DE" Name="back" CornerRadius="3">
+                <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"
+                                  Content="{TemplateBinding Content}" TextBlock.Foreground="White"/>
+            </Border>
+            <ControlTemplate.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Background" Value="#CC3269DE" TargetName="back"/>
+                </Trigger>
+            </ControlTemplate.Triggers>
+        </ControlTemplate>
     </Window.Resources>
     <Grid>
         <Grid.Background>
@@ -56,8 +68,10 @@
                  ItemsSource="{Binding Devices}" ItemTemplate="{StaticResource DeviceTemplate}"
                  MouseDoubleClick="deviceListBox_MouseDoubleClick" Grid.ColumnSpan="3" Margin="0,0,0,48" Grid.RowSpan="2"/>
         <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Grid.ColumnSpan="2"  Grid.Column="1">
-            <Button x:Name="btnConnect" Margin="0, 10, 10, 10" Click="btnConnect_Click" Height="28" Width="150" FontSize="14">连接选中的设备</Button>
-            <Button x:Name="btnStartScan" Margin="0, 10, 10, 10" Click="btnStartScan_Click"   Height="28" Width="90" FontSize="14">扫描设备</Button>
+            <Button x:Name="btnConnect" Content="连接选中的设备" Margin="0, 10, 10, 10"  Height="28" Width="150" FontSize="14" 
+                    Click="btnConnect_Click"  Template="{StaticResource ButtonTemplate}"/>
+            <Button x:Name="btnStartScan" Content="扫描设备" Margin="0, 10, 10, 10"    Height="28" Width="90" FontSize="14"
+                    Click="btnStartScan_Click" Template="{StaticResource ButtonTemplate}"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/MonitoringTechnology/Views/SystemOperationView.xaml b/MonitoringTechnology/Views/SystemOperationView.xaml
index 25c8ba4..12632f3 100644
--- a/MonitoringTechnology/Views/SystemOperationView.xaml
+++ b/MonitoringTechnology/Views/SystemOperationView.xaml
@@ -49,6 +49,17 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        <ControlTemplate TargetType="Button" x:Key="ButtonTemplate">
+            <Border Background="#FF3269DE" Name="back" CornerRadius="3">
+                <ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center"
+                                  Content="{TemplateBinding Content}" TextBlock.Foreground="White"/>
+            </Border>
+            <ControlTemplate.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Background" Value="#CC3269DE" TargetName="back"/>
+                </Trigger>
+            </ControlTemplate.Triggers>
+        </ControlTemplate>
     </UserControl.Resources>
     <ScrollViewer VerticalScrollBarVisibility="Hidden">
         <Grid>
@@ -84,11 +95,15 @@
                         <Label Grid.Column="0" Content="{Binding DeviceName}" Foreground="White" FontSize="22" FontWeight="Bold"/>
                         <Label Grid.Column="1" Content="{Binding DeviceAddress}" Margin="0, 10, 0, 0"  Foreground="White"/>
                         <Label Grid.Column="2"/>
-                        <Button Grid.Column="3" x:Name="SearchDevice"  Width="90" Height="30" Margin="10,-2,10,6" Click="SearchDevice_Click" >搜索设备</Button>
-                        <Button Grid.Column="4" x:Name="buttonConnect"  Width="90" Height="30" Margin="10,-2,10,6" Click="buttonConnect_Click" Content="{Binding connectDevice}"/>
-                        <Button Grid.Column="5" x:Name="buttonSendOne" Width="90" Height="30" Margin="10,-2,10,6" Click="buttonSendOne_Click"  Content="单询"/>
-                        <Button Grid.Column="6" x:Name="buttonSend" Width="90" Height="30" Margin="10,-2,10,6" Click="buttonSend_Click" Content="轮询"/>
-                        <Button Grid.Column="7" x:Name="buttonRead"  Width="90" Height="30" Margin="10,-2,10,6" Click="buttonRead_Click">读取名称</Button>
+                        <Button Grid.Column="3" x:Name="SearchDevice"  Content="搜索设备" Width="90" Height="30" Margin="10,-2,10,6" 
+                                Click="SearchDevice_Click"  Template="{StaticResource ButtonTemplate}" />
+                        <Button Grid.Column="4" x:Name="buttonConnect" Content="{Binding connectDevice}" Width="90" Height="30" Margin="10,-2,10,6"       Click="buttonConnect_Click"   Template="{StaticResource ButtonTemplate}"/>
+                        <Button Grid.Column="5" x:Name="buttonSendOne" Content="单询" Width="90" Height="30" Margin="10,-2,10,6" 
+                                Click="buttonSendOne_Click"    Template="{StaticResource ButtonTemplate}"/>
+                        <Button Grid.Column="6" x:Name="buttonSend"  Content="轮询" Width="90" Height="30" Margin="10,-2,10,6" 
+                                Click="buttonSend_Click" Template="{StaticResource ButtonTemplate}"/>
+                        <Button Grid.Column="7" x:Name="buttonRead" Content="读取名称" Width="90" Height="30" Margin="10,-2,10,6" 
+                                Click="buttonRead_Click" Template="{StaticResource ButtonTemplate}"/>
                     </Grid>
                     <Label Grid.Row="1" Content="日志记录" Foreground="White"/>
                     <!-- Log区，禁止 ListBox 横向滚动 TextBlock 才能实现自动换行 -->
@@ -124,7 +139,8 @@
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <TextBox Grid.Column="0" x:Name="VersionQueryData"  Text="{Binding VersionQueryData}" Foreground="White" HorizontalAlignment="Stretch" VerticalAlignment="Center"/>
-                            <Button  Grid.Column="1" x:Name="VersionQueryButton"  Content="版本查询" Margin="10,0" Click="VersionQueryButton_Click" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                            
+                            <Button  Grid.Column="1" x:Name="VersionQueryButton"  Content="版本查询" Margin="10,0" Width="100" HorizontalAlignment="Left"  Click="VersionQueryButton_Click" Template="{StaticResource ButtonTemplate}"/>
                         </Grid>
                         <Grid Grid.Row="2">
                             <Grid.ColumnDefinitions>
@@ -132,8 +148,9 @@
                                 <ColumnDefinition/>
                             </Grid.ColumnDefinitions>
                             <TextBox Grid.Column="0" x:Name="FileSelectionData"  Text="{Binding FileSelectionData}" Foreground="White" HorizontalAlignment="Stretch" VerticalAlignment="Center" />
-                            <Button Grid.Column="1" x:Name="FileSelectionButton" Content="文件选择" Margin="10,0" Click="FileSelectionButton_Click"  HorizontalAlignment="Left" VerticalAlignment="Center"/>
-                            <Button Grid.Column="1" x:Name="FileSendingButton" Content="文件发送"  Margin="40,0" Click="FileSendingButton_Click" HorizontalAlignment="Right" VerticalAlignment="Center"/>
+
+                            <Button Grid.Column="1" x:Name="FileSelectionButton" Content="文件选择" Margin="10,0"  Width="100"  HorizontalAlignment="Left" VerticalAlignment="Center" Click="FileSelectionButton_Click"  Template="{StaticResource ButtonTemplate}"/>
+                            <Button Grid.Column="1" x:Name="FileSendingButton" Content="文件发送"  Margin="40,0" Width="100"  HorizontalAlignment="Right" VerticalAlignment="Center"  Click="FileSendingButton_Click" Template="{StaticResource ButtonTemplate}"/>
                         </Grid>
                       
                     </Grid>