update 彈窗失去焦點消失

FrameworkLocal/UIClient/CenterViews/Dialogs/FullKeyboard.xaml

@@ -5,7 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:MECF.Framework.UI.Client.CenterViews.Dialogs"
         mc:Ignorable="d"
-        Title="FullKeyboard" x:Name="fullKeyboard" AllowsTransparency="True" WindowStyle="None" ResizeMode="NoResize" Background="#7F6F6F6F"  Height="270" Width="630" WindowStartupLocation="CenterScreen">
+        Title="FullKeyboard" x:Name="fullKeyboard"  Deactivated="Window_Deactivated" AllowsTransparency="True" WindowStyle="None" ResizeMode="NoResize" Background="#7F6F6F6F"  Height="270" Width="630" WindowStartupLocation="CenterScreen">
+  
     <Window.Resources>
         <Style x:Key="btnNum" TargetType="{x:Type Button}">
             <!--<Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}"/>-->

FrameworkLocal/UIClient/CenterViews/Dialogs/FullKeyboard.xaml.cs

@@ -46,7 +46,20 @@ namespace MECF.Framework.UI.Client.CenterViews.Dialogs
                 e.Handled = true;
             }
         }
+        private void Window_Deactivated(object sender, EventArgs e)
+        {
+            try
+            {
+                this.DialogResult = false;
+                this.Close();
 
+            }
+            catch (Exception)
+            {
+
+            }
+            // Close the window when it loses focus
+        }
         private void Button_PreviewTouchDown(object sender, TouchEventArgs e)
         //{
        // private void ButtonGrid_Click(object sender, RoutedEventArgs e)

FrameworkLocal/UIClient/CenterViews/Dialogs/NumberDigitKeyboard.xaml

@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="FullKeyboard" x:Name="fullKeyboard" AllowsTransparency="True" WindowStyle="None" ResizeMode="NoResize" Background="#7F6F6F6F"  Height="400" Width="264">
+        Title="FullKeyboard" x:Name="fullKeyboard"   Deactivated="Window_Deactivated" AllowsTransparency="True" WindowStyle="None" ResizeMode="NoResize" Background="#7F6F6F6F"  Height="400" Width="264">
     <Window.Resources>
         <Style x:Key="btnNum" TargetType="{x:Type Button}">
             <!--<Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}"/>-->

FrameworkLocal/UIClient/CenterViews/Dialogs/NumberDigitKeyboard.xaml.cs

@@ -87,6 +87,20 @@ namespace MECF.Framework.UI.Client.CenterViews.Dialogs
                     
             }
         }
+        private void Window_Deactivated(object sender, EventArgs e)
+        {
+            try
+            {
+                this.DialogResult = false;
+                this.Close();
+
+            }
+            catch (Exception)
+            {
+
+            }
+            // Close the window when it loses focus
+        }
         //通过判断按钮的content属性来做对应处理，以简化大量按钮的编程
         private void ButtonGrid_Click(object sender, RoutedEventArgs e)
         {

FrameworkLocal/UIClient/CenterViews/Dialogs/NumberKeyboard.xaml

@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
-        Title="FullKeyboard" x:Name="fullKeyboard" AllowsTransparency="True" WindowStyle="None" ResizeMode="NoResize" Background="#7F6F6F6F"  Height="316.667" Width="264" WindowStartupLocation="CenterScreen" >
+        Title="FullKeyboard" x:Name="fullKeyboard" Deactivated="Window_Deactivated" AllowsTransparency="True" WindowStyle="None" ResizeMode="NoResize" Background="#7F6F6F6F"  Height="316.667" Width="264" WindowStartupLocation="CenterScreen" >
     <Window.Resources>
         <Style x:Key="btnNum" TargetType="{x:Type Button}">
             

FrameworkLocal/UIClient/CenterViews/Dialogs/NumberKeyboard.xaml.cs

@@ -97,6 +97,20 @@ namespace MECF.Framework.UI.Client.CenterViews.Dialogs
 
             }
         }
+        private void Window_Deactivated(object sender, EventArgs e)
+        {
+            try
+            {
+                this.DialogResult = false;
+                this.Close();
+
+            }
+            catch (Exception)
+            {
+
+            }
+            // Close the window when it loses focus
+        }
         ////通过判断按钮的content属性来做对应处理，以简化大量按钮的编程
         private void Button_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {

Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -1298,7 +1298,7 @@
 
 	</IoMFMs>
 	<IoFFUs classType="FurnaceRT.Devices.IoFFU" assembly="FurnaceRT">
-		<IoFFU id="FFU4" display="FFU4" schematicId="FFU4" unit=""
+		<IoFFU id="FFU1" display="FFU_1" schematicId="FFU1" unit=""
 					diDataWriteDone=""
 					diDataWriteError=""
 					diDataReadError=""
@@ -1309,21 +1309,21 @@
 					aiMaxSpeed=""
 					aiReset=""
 					aiErrorTimer=""
-					aiCurrentSpeed="AI_FFU4CurrentSpeed"
+					aiCurrentSpeed="AI_FFU1CurrentSpeed"
 					aiVoltage=""
 					aiCurrent=""
-					aiStatus="AI_FFU4Status"
+					aiStatus="AI_FFU1Status"
 			   
 					aoSwitch=""
-					aoSetSpeed="AO_FFU4SetSpeed"
+					aoSetSpeed="AO_FFU1SetSpeed"
 					aoReset=""
 				
 					doEnable=""
-					doWriteCommand="DO_FFU4WriteCommand"
-			   
+					doWriteCommand=""
+		   scRootPath="FFU"
 					aioType="float"
 				/>
-		<IoFFU id="FFU5" display="FFU5" schematicId="FFU5" unit=""
+		<IoFFU id="FFU2" display="FFU_2" schematicId="FFU2" unit=""
 				diDataWriteDone=""
 				diDataWriteError=""
 				diDataReadError=""
@@ -1334,21 +1334,21 @@
 				aiMaxSpeed=""
 				aiReset=""
 				aiErrorTimer=""
-				aiCurrentSpeed="AI_FFU5CurrentSpeed"
+				aiCurrentSpeed="AI_FFU2CurrentSpeed"
 				aiVoltage=""
 				aiCurrent=""
-				aiStatus="AI_FFU5Status"
+				aiStatus="AI_FFU2Status"
 	   
 				aoSwitch=""
-				aoSetSpeed="AO_FFU5SetSpeed"
+				aoSetSpeed="AO_FFU2SetSpeed"
 				aoReset=""
 		
 				doEnable=""
-				doWriteCommand="DO_FFU5WriteCommand"
-	   
+				doWriteCommand=""
+   scRootPath="FFU"
 				aioType="float"
 		/>
-		<IoFFU id="FFU6" display="FFU6" schematicId="FFU6" unit=""
+		<IoFFU id="FFU3" display="FFU_3" schematicId="FFU3" unit=""
 				diDataWriteDone=""
 				diDataWriteError=""
 				diDataReadError=""
@@ -1359,21 +1359,21 @@
 				aiMaxSpeed=""
 				aiReset=""
 				aiErrorTimer=""
-				aiCurrentSpeed="AI_FFU6CurrentSpeed"
+				aiCurrentSpeed="AI_FFU3CurrentSpeed"
 				aiVoltage=""
 				aiCurrent=""
-				aiStatus="AI_FFU6Status"
+				aiStatus="AI_FFU3Status"
 	   
 				aoSwitch=""
-				aoSetSpeed="AO_FFU6SetSpeed"
+				aoSetSpeed="AO_FFU3SetSpeed"
 				aoReset=""
 		
 				doEnable=""
-				doWriteCommand="DO_FFU6WriteCommand"
-	   
+				doWriteCommand=""
+   scRootPath="FFU"
 				aioType="float"
 		/>
-		<IoFFU id="FFU7" display="FFU7" schematicId="FFU7" unit=""
+		<IoFFU id="FFU4" display="FFU_4" schematicId="FFU4" unit=""
 				diDataWriteDone=""
 				diDataWriteError=""
 				diDataReadError=""
@@ -1384,18 +1384,18 @@
 				aiMaxSpeed=""
 				aiReset=""
 				aiErrorTimer=""
-				aiCurrentSpeed="AI_FFU7CurrentSpeed"
+				aiCurrentSpeed="AI_FFU4CurrentSpeed"
 				aiVoltage=""
 				aiCurrent=""
-				aiStatus="AI_FFU7Status"
+				aiStatus="AI_FFU4Status"
 	   
 				aoSwitch=""
-				aoSetSpeed="AO_FFU7SetSpeed"
+				aoSetSpeed="AO_FFU4SetSpeed"
 				aoReset=""
 		
 				doEnable=""
-				doWriteCommand="DO_FFU7WriteCommand"
-	   
+				doWriteCommand=""
+   scRootPath="FFU"
 				aioType="float"
 		/>
 	</IoFFUs>

Furnace/FurnaceRT/Config/IO/ELK/_ioDefinePM.xml

@@ -1419,17 +1419,17 @@
 		<AI_ITEM Index="344"    Name="AI_VG32Pressure"                                      BufferOffset="344"                                      Addr="D5688"                      Description="VG32 Pressure"                       />
 		<AI_ITEM Index="345"    Name="AI_VG33Pressure"                                      BufferOffset="345"                                      Addr="D5690"                      Description="VG33 Pressure"                       />
 		
-		<AI_ITEM Index="387"    Name="AI_FFU4CurrentSpeed"                                      BufferOffset="387"                                      Addr="D5774"                      Description="FFU4 Current speed"                       />
-		<AI_ITEM Index="388"    Name="AI_FFU4Status"                                      BufferOffset="388"                                      Addr="D5776"                      Description="FFU4 voltage"                       />
+		<AI_ITEM Index="387"    Name="AI_FFU1CurrentSpeed"                                      BufferOffset="387"                                      Addr="D5774"                      Description="FFU4 Current speed"                       />
+		<AI_ITEM Index="388"    Name="AI_FFU1Status"                                      BufferOffset="388"                                      Addr="D5776"                      Description="FFU4 voltage"                       />
 		
-		<AI_ITEM Index="397"    Name="AI_FFU5CurrentSpeed"                                      BufferOffset="397"                                      Addr="D5794"                      Description="FFU5 Current speed"                       />
-		<AI_ITEM Index="398"    Name="AI_FFU5Status"                                      BufferOffset="398"                                      Addr="D5796"                      Description="FFU5 voltage"                       />
+		<AI_ITEM Index="397"    Name="AI_FFU2CurrentSpeed"                                      BufferOffset="397"                                      Addr="D5794"                      Description="FFU5 Current speed"                       />
+		<AI_ITEM Index="398"    Name="AI_FFU2Status"                                      BufferOffset="398"                                      Addr="D5796"                      Description="FFU5 voltage"                       />
 		
-		<AI_ITEM Index="407"    Name="AI_FFU6CurrentSpeed"                                      BufferOffset="407"                                      Addr="D5814"                      Description="FFU6 Current speed"                       />
-		<AI_ITEM Index="408"    Name="AI_FFU6Status"                                      BufferOffset="408"                                      Addr="D5816"                      Description="FFU6 voltage"                       />
+		<AI_ITEM Index="407"    Name="AI_FFU3CurrentSpeed"                                      BufferOffset="407"                                      Addr="D5814"                      Description="FFU6 Current speed"                       />
+		<AI_ITEM Index="408"    Name="AI_FFU3Status"                                      BufferOffset="408"                                      Addr="D5816"                      Description="FFU6 voltage"                       />
 	    
-		<AI_ITEM Index="417"    Name="AI_FFU7CurrentSpeed"                                      BufferOffset="417"                                      Addr="D5834"                      Description="FFU7 Current speed"                       />
-		<AI_ITEM Index="418"    Name="AI_FFU7Status"                                      BufferOffset="418"                                      Addr="D5836"                      Description="FFU7 voltage"                       />
+		<AI_ITEM Index="417"    Name="AI_FFU4CurrentSpeed"                                      BufferOffset="417"                                      Addr="D5834"                      Description="FFU7 Current speed"                       />
+		<AI_ITEM Index="418"    Name="AI_FFU4Status"                                      BufferOffset="418"                                      Addr="D5836"                      Description="FFU7 voltage"                       />
 		
 		<AI_ITEM Index="450"    Name="AI_MFC1AirFlowPV"                                      BufferOffset="450"                                      Addr="D5900"                      Description="MFC1 air flow PV"                       />
 		<AI_ITEM Index="451"    Name="AI_MFC2AirFlowPV"                                      BufferOffset="451"                                      Addr="D5902"                      Description="MFC2 air flow PV"                       />
@@ -1622,10 +1622,10 @@
 		<AO_ITEM Index="112"    Name="AO_LAO2checkSV"                                      BufferOffset="112"                                      Addr="D10224"                      Description="LA O2 check SV"                       />
 		<AO_ITEM Index="113"    Name="AO_FOUPO2CheckSV"                                      BufferOffset="113"                                      Addr="D10226"                      Description="FOUP O2 Check SV"                       />
 		
-		<AO_ITEM Index="176"    Name="AO_FFU4SetSpeed"                                      BufferOffset="176"                                      Addr="D10352"                      Description="FFU4 Set speed"                       />
-		<AO_ITEM Index="182"    Name="AO_FFU5SetSpeed"                                      BufferOffset="182"                                      Addr="D10364"                      Description="FFU5 Set speed"                       />
-		<AO_ITEM Index="188"    Name="AO_FFU6SetSpeed"                                      BufferOffset="188"                                      Addr="D10376"                      Description="FFU6 Set speed"                       />
-		<AO_ITEM Index="194"    Name="AO_FFU7SetSpeed"                                      BufferOffset="194"                                      Addr="D10388"                      Description="FFU7 Set speed"                       />
+		<AO_ITEM Index="176"    Name="AO_FFU1SetSpeed"                                      BufferOffset="176"                                      Addr="D10352"                      Description="FFU4 Set speed"                       />
+		<AO_ITEM Index="182"    Name="AO_FFU2SetSpeed"                                      BufferOffset="182"                                      Addr="D10364"                      Description="FFU5 Set speed"                       />
+		<AO_ITEM Index="188"    Name="AO_FFU3SetSpeed"                                      BufferOffset="188"                                      Addr="D10376"                      Description="FFU6 Set speed"                       />
+		<AO_ITEM Index="194"    Name="AO_FFU4SetSpeed"                                      BufferOffset="194"                                      Addr="D10388"                      Description="FFU7 Set speed"                       />
 		
 		<AO_ITEM Index="215"    Name="AO_MFC1AirFlowSV"                                      BufferOffset="215"                                      Addr="D10430"                      Description="MFC1 air flow SV"                       />
 		<AO_ITEM Index="216"    Name="AO_MFC2AirFlowSV"                                      BufferOffset="216"                                      Addr="D10432"                      Description="MFC2 air flow SV"                       />