update N2purge Valve非弹窗

FrameworkLocal/UICore/DeviceControl/AITGasIIIValve.xaml.cs

@@ -59,7 +59,16 @@ namespace Aitex.Core.UI.DeviceControl
                 _valveDisplayName = value;
             }
         }
+        public bool IsN2PurgeView
+        {
+            get { return (bool)this.GetValue(IsN2PurgeViewProperty); }
+            set { this.SetValue(IsN2PurgeViewProperty, value); }
+        }
 
+        // Using a DependencyProperty as the backing store for MenuVisibility.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty IsN2PurgeViewProperty =
+            DependencyProperty.Register("IsN2PurgeView", typeof(bool), typeof(AITGasIIIValve),
+                new FrameworkPropertyMetadata(false));
 
         public bool IsSim
         {
@@ -119,7 +128,7 @@ namespace Aitex.Core.UI.DeviceControl
                             {
                                 if (data.IsILKOK)
                                 {
-                                   
+
                                     Application.Current.Dispatcher.BeginInvoke(new Action(() =>
                                     {
                                         ValveName.Foreground = (Brush)_brushconvert.ConvertFromString("White");
@@ -309,7 +318,7 @@ namespace Aitex.Core.UI.DeviceControl
                     }
                     else if (DeviceData.IsILKOK && !DeviceData.Feedback && !(GasStateType == GasPanelStateType.Recipe))
                     {
-                       
+
                         Application.Current.Dispatcher.BeginInvoke(new Action(() =>
                         {
                             ValveName.Foreground = (Brush)_brushconvert.ConvertFromString("Black");
@@ -324,7 +333,7 @@ namespace Aitex.Core.UI.DeviceControl
                     }
                     else
                     {
-                       
+
                         Application.Current.Dispatcher.BeginInvoke(new Action(() =>
                         {
                             ValveName.Foreground = (Brush)_brushconvert.ConvertFromString("White");
@@ -340,7 +349,7 @@ namespace Aitex.Core.UI.DeviceControl
                 }
                 else
                 {
-                   
+
                     Application.Current.Dispatcher.BeginInvoke(new Action(() =>
                     {
                         ValveName.Foreground = (Brush)_brushconvert.ConvertFromString("Black");
@@ -495,25 +504,35 @@ namespace Aitex.Core.UI.DeviceControl
             }
             else
             {
-                //if (IsDisableMode) return;
-                switch (GasStateType)
+                if (IsN2PurgeView)
                 {
-                    case GasPanelStateType.Manual:
-                        DeviceData.Feedback = !DeviceData.IsOpen;
-                        rdTrig.CLK = (DeviceData == null || DeviceData.IsOpen);
-                        IsSwitchOpen = DeviceData.Feedback;
-                        //IsSwitchOpen = !IsSwitchOpen;
-                        //InvokeClient.Instance.Service.DoOperation($"{DeviceData.UniqueName}.{AITValveOperation.GVTurnValve}", IsSwitchOpen);
-                        break;
-                    case GasPanelStateType.Monitor:
-                        break;
-                    case GasPanelStateType.Recipe:
-                        IsVirtualSwitchOpen = !IsVirtualSwitchOpen;
-                        InvokeClient.Instance.Service.DoOperation($"{DeviceData.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", IsVirtualSwitchOpen);
-                        break;
-                    default:
-                        break;
+                    IsSwitchOpen = DeviceData.Feedback;
+                    IsSwitchOpen = !IsSwitchOpen;
+                    IsVirtualSwitchOpen = IsSwitchOpen;
+                }
+                else
+                {
+                    //if (IsDisableMode) return;
+                    switch (GasStateType)
+                    {
+                        case GasPanelStateType.Manual:
+                            DeviceData.Feedback = !DeviceData.IsOpen;
+                            rdTrig.CLK = (DeviceData == null || DeviceData.IsOpen);
+                            IsSwitchOpen = DeviceData.Feedback;
+                            //IsSwitchOpen = !IsSwitchOpen;
+                            //InvokeClient.Instance.Service.DoOperation($"{DeviceData.UniqueName}.{AITValveOperation.GVTurnValve}", IsSwitchOpen);
+                            break;
+                        case GasPanelStateType.Monitor:
+                            break;
+                        case GasPanelStateType.Recipe:
+                            IsVirtualSwitchOpen = !IsVirtualSwitchOpen;
+                            InvokeClient.Instance.Service.DoOperation($"{DeviceData.UniqueName}.{AITValveOperation.GVVirtualTurnValve}", IsVirtualSwitchOpen);
+                            break;
+                        default:
+                            break;
+                    }
                 }
+
                 if (Command == null)
                     return;
                 Command.Execute(new object[] { DeviceData.DeviceName, AITValveOperation.GVVirtualTurnValve, IsVirtualSwitchOpen });

Furnace/FurnaceUI/Views/Operations/Maintenances/N2PurgeStatusView.xaml

@@ -1472,13 +1472,13 @@
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="325"
                                 Canvas.Top="194"
-                                
+                                IsN2PurgeView="True"
+                                Command="{Binding CmdSetValve}"
                                 Width="{StaticResource AITGasValve_Size}"
                                 Height="{StaticResource AITGasValve_Size}"
                                 DeviceData="{Binding ValveAV66}"
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
                                 ValveOpenOrientation="Horizontal"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="325"
@@ -1489,7 +1489,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                            IsN2PurgeView="True"
+  Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Horizontal"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="285"
@@ -1500,7 +1501,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                                IsN2PurgeView="True"
+  Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Horizontal"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="508"
@@ -1511,7 +1513,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                                  IsN2PurgeView="True"
+  Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Horizontal"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="322"
@@ -1522,7 +1525,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                                IsN2PurgeView="True"
+  Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Vertical"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="321"
@@ -1533,7 +1537,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                           IsN2PurgeView="True"
+  Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Vertical"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="368"
@@ -1544,7 +1549,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                                 IsN2PurgeView="True"
+  Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Vertical"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="403"
@@ -1555,7 +1561,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                                IsN2PurgeView="True"
+                                Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Vertical"/>
                             <deviceControl:AITGasIIIValve
                                 Canvas.Left="443"
@@ -1566,7 +1573,8 @@
                                     
                                 GasStateType="{Binding SelectedGasStateType}"
                                 IsEnabled="{Binding IsManagerPermission}"
-                                IsShowSwitchDialog="True"
+                                IsN2PurgeView="True"
+                                Command="{Binding CmdSetValve}"
                                 ValveOpenOrientation="Vertical"/>
                         </Canvas>