Skip to content

H
hemei
Commit 3f406aa1 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

报警界面添加消音

parent 8b73bece
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 32 deletions
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorTable.xaml
View file @ 3f406aa1
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="768" d:DesignWidth="1024" d:DesignHeight="768" d:DesignWidth="1024"
...@@ -14,43 +15,87 @@ ...@@ -14,43 +15,87 @@
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/> <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
<ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/> <ResourceDictionary Source="pack://application:,,,/ThickTcpUiInWindow;component/Converter/Dictionary_MyConv.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<Style TargetType="Control" x:Key="iconPackStyle">
<Setter Property="Width" Value="25"/>
<Setter Property="Height" Value="25"/>
<Setter Property="VerticalAlignment" Value="Center"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
<Style TargetType="FrameworkElement" x:Key="backPackStyle">
<Setter Property="Width" Value="50"/>
<Setter Property="Height" Value="50"/>
</Style>
<Style TargetType="TextBlock" x:Key="titlePackStyle">
<Setter Property="Margin" Value="2"/>
<Setter Property="FontSize" Value="16"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
<Setter Property="Foreground" Value="White"/>
</Style>
<Style TargetType="Button" x:Key="buttonStyle" BasedOn="{StaticResource ButtonStyle_empty}">
<Setter Property="Margin" Value="20,0"/>
</Style>
</ResourceDictionary> </ResourceDictionary>
</Page.Resources> </Page.Resources>
<Grid Name="root_grid" > <Grid Name="root_grid" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" /> <RowDefinition Height="auto" />
<RowDefinition Height="496*" /> <RowDefinition Height="496*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="{StaticResource Background_Title}">
<StackPanel Orientation="Horizontal" Background="{StaticResource Background_Title}"> <Grid.ColumnDefinitions>
<Button Style="{StaticResource ButtonStyle_back2}" Click="button_back_Click" /> <ColumnDefinition/>
<TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="报警"/> <ColumnDefinition Width="auto"/>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center"> </Grid.ColumnDefinitions>
<Button Style="{StaticResource ResourceKey=ButtonStyle_empty}" Click="button_iotip_click" Margin="80,0,20,0"> <StackPanel Orientation="Horizontal" >
<StackPanel Orientation="Vertical"> <Button Style="{StaticResource ButtonStyle_back2}" Click="button_back_Click" />
<Grid Style="{StaticResource GridStyle_ButtonShadow}"> <TextBlock Style="{StaticResource TextBlockStyle_Title}" Text="报警"/>
<Ellipse Fill="{StaticResource Color_theme_static}" Stretch="Uniform" Width="60" Height="60" /> <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="60,0,0,0">
<Path Data="{StaticResource geometry_i}" Fill="White" Stretch="Uniform" Width="30" Height="30"/> <Button Style="{StaticResource buttonStyle}" Click="button_iotip_click" >
</Grid> <StackPanel Orientation="Vertical">
<TextBlock Text="IO信息" Padding="2" Foreground="{StaticResource Color_theme_static}" FontSize="18" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="2"/> <Grid Style="{StaticResource GridStyle_ButtonShadow}">
</StackPanel> <Ellipse Style="{StaticResource backPackStyle}" Fill="{StaticResource Color_theme_static}" />
</Button> <iconPacks:PackIconFontAwesome Kind="InfoSolid" Style="{StaticResource iconPackStyle}" Foreground="White"/>
<Button Style="{StaticResource ResourceKey=ButtonStyle_empty}" Click="button_access_click" Margin="20,0"> </Grid>
<TextBlock Text="IO信息" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
</Button>
<Button Style="{StaticResource buttonStyle}" Click="button_access_click" >
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Style="{StaticResource backPackStyle}" Fill="{StaticResource Color_theme_static}" />
<iconPacks:PackIconMaterial Kind="LockOpen" Style="{StaticResource iconPackStyle}" Foreground="White"/>
</Grid>
<TextBlock Text="授权" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
</Button>
<Button Style="{StaticResource buttonStyle}" Click="button_reset_click" >
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Style="{StaticResource backPackStyle}" Fill="#FFEE3232" />
<iconPacks:PackIconModern Kind="Reset" Style="{StaticResource iconPackStyle}" Foreground="White"/>
</Grid>
<TextBlock Text="复位" Style="{StaticResource titlePackStyle}"/>
</StackPanel>
</Button>
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Center" >
<Button Style="{StaticResource buttonStyle}" Click="button_silence_click" >
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}"> <Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="{StaticResource Color_theme_static}" Stretch="Uniform" Width="60" Height="60" /> <Ellipse Style="{StaticResource backPackStyle}" Fill="White"/>
<Path Data="{StaticResource Geometry_lock-open}" Fill="White" Stretch="Uniform" Width="30"/> <iconPacks:PackIconOcticons Kind="Mute" Style="{StaticResource iconPackStyle}" Foreground="#FFEE3232" />
</Grid> </Grid>
<TextBlock Text="授权" Padding="2" Foreground="{StaticResource Color_theme_static}" FontSize="18" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="2"/> <TextBlock Text="消音" Style="{StaticResource titlePackStyle}"/>
</StackPanel> </StackPanel>
</Button> </Button>
</StackPanel> </StackPanel>
</Grid>
</StackPanel>
<Grid Grid.Row="2"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" /> <ColumnDefinition Width="auto" />
<ColumnDefinition /> <ColumnDefinition />
...@@ -86,15 +131,7 @@ ...@@ -86,15 +131,7 @@
<StackPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10,-30,30,10" Orientation="Horizontal"> <StackPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10,-30,30,10" Orientation="Horizontal">
<Button Style="{StaticResource ResourceKey=ButtonStyle_empty}" Click="button_reset_click" Margin="20,0">
<StackPanel Orientation="Vertical">
<Grid Style="{StaticResource GridStyle_ButtonShadow}">
<Ellipse Fill="White" Stretch="Uniform" Width="60" Height="60" />
<Path Data="{StaticResource Geometry_alarm}" Fill="#FFEE3232" Stretch="Uniform" Width="60"/>
</Grid>
<TextBlock Text="复位" Padding="2" Foreground="#FFEE3232" FontSize="18" VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="2" />
</StackPanel>
</Button>
</StackPanel> </StackPanel>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/PgErrorTable.xaml.cs
View file @ 3f406aa1
...@@ -66,5 +66,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client ...@@ -66,5 +66,10 @@ namespace FLY.Thick.Blowing.UI.Fix.Client
w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this); w.Owner = FLY.ControlLibrary.COMMON.GetWindow(this);
w.ShowDialog(); w.ShowDialog();
} }
private void button_silence_click(object sender, RoutedEventArgs e)
{
mWarningService.Silence();
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment