1

BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj

@@ -50,13 +50,19 @@
     <None Remove="Image\内部.png" />
     <None Remove="Image\告警.png" />
     <None Remove="Image\告警\Wifi_NO.ico" />
+    <None Remove="Image\告警\Wifi_NO.png" />
     <None Remove="Image\告警\Wifi_OK.ico" />
+    <None Remove="Image\告警\Wifi_OK.png" />
+    <None Remove="Image\告警\严重告警.png" />
     <None Remove="Image\告警\告警.png" />
     <None Remove="Image\告警\成功0ecb74.png" />
     <None Remove="Image\告警\报错.png" />
     <None Remove="Image\告警\提醒359fda.png" />
+    <None Remove="Image\告警\无告警.png" />
+    <None Remove="Image\告警\无告警1.png" />
     <None Remove="Image\告警\正常.png" />
     <None Remove="Image\告警\消息.png" />
+    <None Remove="Image\告警\轻微告警.png" />
     <None Remove="Image\告警\预警f44b4b.png" />
     <None Remove="Image\图层1.png" />
     <None Remove="Image\圆形.png" />
@@ -152,6 +158,12 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="Image\告警\Wifi_NO.png" />
+    <Resource Include="Image\告警\Wifi_OK.png" />
+    <Resource Include="Image\告警\严重告警.png" />
+    <Resource Include="Image\告警\无告警.png" />
+    <Resource Include="Image\告警\无告警1.png" />
+    <Resource Include="Image\告警\轻微告警.png" />
     <Resource Include="Image\边角.png" />
   </ItemGroup>
 

BPASmartClient.CustomResource/Themes/MyStyle.xaml

@@ -21,22 +21,23 @@
     <!--#region ToggleButton-->
     <Style x:Key="StatusBtnStyle告警" TargetType="ToggleButton">
         <Style.Setters>
-            <Setter Property="Width"  Value="36"></Setter>
-            <Setter Property="Height" Value="32"></Setter>
+            <Setter Property="Width"  Value="30"></Setter>
+            <Setter Property="Height" Value="19"></Setter>
             <Setter Property="Cursor" Value="Hand"></Setter>
             <Setter Property="IsChecked" Value="{Binding IsCheck,Mode=TwoWay}"></Setter>
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="ToggleButton">
                         <Grid Cursor="Hand">
-                            <Border x:Name="bd1" Cursor="Hand" Visibility="Collapsed" Width="25" Height="13" HorizontalAlignment="Right" Panel.ZIndex="100" VerticalAlignment="Top" Margin="0,-5,-5,0" CornerRadius="3" Background="#33FF0000" >
-                                <TextBlock Text="{Binding ListNum}"  Foreground="#FF2AA7D3" HorizontalAlignment="Center"></TextBlock>
+                            <Border x:Name="bd1" Cursor="Hand" Visibility="Collapsed" Width="25" Height="13" HorizontalAlignment="Right" Panel.ZIndex="100" VerticalAlignment="Top" Margin="0,-10,-5,0" CornerRadius="3" Background="#2600CAFF" >
+                                <TextBlock Text="{Binding ListNum}"  Foreground="#FF00E6F7" HorizontalAlignment="Center" FontSize="8"></TextBlock>
+                                <!---->
                             </Border>
-                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="/BPASmartClient.CustomResource;component/Image/告警.png" Panel.ZIndex="0" Stretch="UniformToFill" ></Image>
+                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="/BPASmartClient.CustomResource;component/Image/告警/无告警.png" Panel.ZIndex="0" UseLayoutRounding="True"  SnapsToDevicePixels="True" RenderOptions.BitmapScalingMode="HighQuality" ></Image>
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="true">
-                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png"></Setter>
+                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/严重告警.png"></Setter>
                             </Trigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
@@ -44,7 +45,7 @@
                                     <Condition Binding="{Binding IsAlarm}" Value="true"></Condition>
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
-                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/有告警.png"></Setter>
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/严重告警.png"></Setter>
                                     <Setter TargetName="bd1" Property="Visibility" Value="Visible"></Setter>
                                 </MultiDataTrigger.Setters>
                             </MultiDataTrigger>
@@ -65,11 +66,11 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="ToggleButton">
                         <Grid Cursor="Hand">
-                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="/BPASmartClient.CustomResource;component/Image/告警/Wifi_NO.ico" Panel.ZIndex="0" ></Image>
+                            <Image x:Name="image1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}"  Source="/BPASmartClient.CustomResource;component/Image/告警/Wifi_NO.png" Panel.ZIndex="0"  UseLayoutRounding="True"  SnapsToDevicePixels="True" RenderOptions.BitmapScalingMode="HighQuality"></Image>
                         </Grid>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="true">
-                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.ico"></Setter>
+                                <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.png"></Setter>
                             </Trigger>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
@@ -77,7 +78,7 @@
                                     <Condition Binding="{Binding IsAlarm}" Value="true"></Condition>
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
-                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.ico"></Setter>
+                                    <Setter TargetName="image1" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/告警/Wifi_OK.png"></Setter>
                                 </MultiDataTrigger.Setters>
                             </MultiDataTrigger>
                         </ControlTemplate.Triggers>
@@ -89,6 +90,14 @@
     <!--#endregion-->
     
     <!--#region Image -->
+    <Style  TargetType="Image">
+        <Style.Setters>
+            <Setter Property="UseLayoutRounding" Value="True"></Setter>
+            <Setter Property="SnapsToDevicePixels" Value="True"></Setter>
+            <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality"></Setter>
+        </Style.Setters>
+    </Style>
+
     <Style x:Key="imagetop_L" TargetType="Image">
         <Style.Setters>
             <Setter Property="Height" Value="80"></Setter>