From 7058c848a939c14504d54cbf203f02cf489d3f5c Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Tue, 20 Sep 2022 10:25:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E4=B8=BA=20=E5=B7=A5=E7=A8=8B=E7=9B=B8=E5=AF=B9?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.SCADAControl/CustomerControls/StatusLight.cs | 6 +++---
 BPASmartClient.SCADAControl/Themes/Generic.xaml             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BPASmartClient.SCADAControl/CustomerControls/StatusLight.cs b/BPASmartClient.SCADAControl/CustomerControls/StatusLight.cs
index bbec8abf..f1a21b7d 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/StatusLight.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/StatusLight.cs
@@ -75,13 +75,13 @@ namespace BPASmartClient.SCADAControl.CustomerControls
                         image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State0.png", UriKind.Relative));
                         break;
                     case -1:
-                        image.Source = new BitmapImage(new Uri("pack://application:,,,/Images/State11.png", UriKind.Absolute));
+                        image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State11.png", UriKind.Relative));
                         break;
                     case 1:
-                        image.Source = new BitmapImage(new Uri("pack://application:,,,/Images/State1.png", UriKind.Absolute));
+                        image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State1.png", UriKind.Relative));
                         break;
                     case 2:
-                        image.Source = new BitmapImage(new Uri("pack://application:,,,/Images/State2.png", UriKind.Absolute));
+                        image.Source = new BitmapImage(new Uri(@"/BPASmartClient.SCADAControl;component/Images/State2.png", UriKind.Relative));
                         break;
                     default:
                         break;
diff --git a/BPASmartClient.SCADAControl/Themes/Generic.xaml b/BPASmartClient.SCADAControl/Themes/Generic.xaml
index 11f1fcb0..4c28efcb 100644
--- a/BPASmartClient.SCADAControl/Themes/Generic.xaml
+++ b/BPASmartClient.SCADAControl/Themes/Generic.xaml
@@ -1429,11 +1429,11 @@
         <Setter Property="FocusVisualStyle" Value="{StaticResource CheckRadioFocusVisual}" />
         <Setter Property="Foreground" Value="{DynamicResource foreground}" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <!--<Setter Property="Background">
+        <Setter Property="Background">
             <Setter.Value>
-                <ImageBrush ImageSource="../Images/btnkeys.png" />
+                <ImageBrush ImageSource="/BPASmartClient.SCADAControl;component/Images/btnkeys.png"  />
             </Setter.Value>
-        </Setter>-->
+        </Setter>
         <Setter Property="Padding" Value="2,0,0,0" />
         <Setter Property="Template">
             <Setter.Value>