topview解决冲突

Venus/Venus_MainPages/ViewModels/TopViewModel.cs

@@ -1,6 +1,7 @@
 using Aitex.Core.Common.DeviceData;
 using Aitex.Core.RT.Event;
 using Aitex.Core.WCF;
+using FabConnect.SecsGemInterface.GemModel;
 using MECF.Framework.Common.DataCenter;
 using MECF.Framework.Common.OperationCenter;
 using Prism.Commands;
@@ -132,7 +133,18 @@ namespace Venus_MainPages.ViewModels
             }
 
         }
-
+        public bool _IsDisableEnable;
+        public bool IsEnableEnable
+        {
+            get { return _IsDisableEnable; }
+            set { SetProperty(ref _IsDisableEnable, value); }
+        }
+        public bool _IsEnableDisable;
+        public bool IsEnableDisable
+        {
+            get { return _IsEnableDisable; }
+            set { SetProperty(ref _IsEnableDisable, value); }
+        }
 
         public bool IsDisableFAEnable
         {
@@ -142,6 +154,14 @@ namespace Venus_MainPages.ViewModels
             }
 
         }
+        public CommunicationState FACommunicationState
+        {
+            get
+            {
+                return string.IsNullOrEmpty(HostCommunicationStatus) ? CommunicationState.Disabled
+                    : (CommunicationState)Enum.Parse(typeof(CommunicationState), HostCommunicationStatus);
+            }
+        }
         #endregion
 
         #region 命令
@@ -199,9 +219,12 @@ namespace Venus_MainPages.ViewModels
 
         void timer_Tick(object sender, EventArgs e)
         {
-            RtDataValues = QueryDataClient.Instance.Service.PollData(m_RtDataKeys);           
+            RtDataValues = QueryDataClient.Instance.Service.PollData(m_RtDataKeys);    
+            
             SignalTowerData = CommonFunction.GetValue<AITSignalTowerData>(RtDataValues, $"{ModuleName}.SignalTower.DeviceData");
             HostCommunicationStatus= CommonFunction.GetValue<String>(RtDataValues,"System.CommunicationStatus");
+            IsEnableEnable = FACommunicationState == CommunicationState.Disabled;
+            IsEnableDisable = FACommunicationState != CommunicationState.Disabled;
             HostBack = HostCommunicationStatusBackground;
 
         }

Venus/Venus_MainPages/Views/TopView.xaml

@@ -22,12 +22,12 @@
         <converters2:LLStateConverter x:Key="LLStateConverter"/>
         <converters2:SystemStateConverter x:Key="SystemStateConverter"/>
     </UserControl.Resources>
-    
+
     <Canvas Background="{StaticResource Login_BG}">
         <TextBlock Style="{StaticResource textBlockStyle}" Text="{Binding Title}" FontSize="60"    FontStyle="Italic" Canvas.Left="5"/>
         <TextBlock Text="{Binding SoftwareVersion}" Foreground="White"    FontSize="20"  Canvas.Left="70" Canvas.Top="80" />
 
-        <Grid Canvas.Left="240" Width="1300" Height="104">
+        <Grid Canvas.Left="240" Width="1560" Height="104">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -38,21 +38,39 @@
                 <ColumnDefinition/>
                 <ColumnDefinition/>
                 <ColumnDefinition/>
+                <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <userControls:StateTitle Title="System"  TextBoxValue="{Binding RtDataValues[SYSTEM.FsmState]}" TextBoxColor="{Binding RtDataValues[SYSTEM.FsmState],Converter={StaticResource SystemStateConverter}}" Canvas.Left="220"  Canvas.Top="5"/>
             <userControls:StateTitle Title="EFEM"  Grid.Column="1"  TextBoxValue="{Binding RtDataValues[EFEM.FsmState]}"    Canvas.Left="520"   Canvas.Top="5"/>
             <userControls:StateTitle Title="LLA"   Grid.Column="2"   TextBoxValue="{Binding RtDataValues[LLA.FsmState]}"    TextBoxColor="{Binding RtDataValues[LLA.FsmState],Converter={StaticResource LLStateConverter}}"  Canvas.Left="820"   Canvas.Top="5"/>
             <userControls:StateTitle Title="LLB"   Grid.Column="3"  TextBoxValue="{Binding RtDataValues[LLB.FsmState]}"    TextBoxColor="{Binding RtDataValues[LLB.FsmState],Converter={StaticResource LLStateConverter}}"  Canvas.Left="1120"  Canvas.Top="5"/>
-
+            <Button  Background="{DynamicResource TopFrame_TableBG}"  Content="Host Enable" Grid.Column="4" Height="35" Width="100" IsEnabled="{Binding IsEnableEnable}" Command="{Binding FAEnableCommand}" Canvas.Left="1422"  Canvas.Top="5" FontSize="16" Margin="0,-1,212,1">
+                <Button.Template >
+                    <ControlTemplate TargetType="{x:Type Button}" >
+                        <Border BorderBrush="white" BorderThickness="1" CornerRadius="6,6,6,6" Background="{DynamicResource TopFrame_TableBG}">
+                            <ContentPresenter Content="Host Enable" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
+                        </Border>
+                    </ControlTemplate>
+                </Button.Template>
+            </Button>
+            <TextBox Style="{StaticResource TextBox_Top}" Width="212" Grid.Column="4" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" BorderThickness="1" BorderBrush="Black" FontSize="18" Canvas.Left="1522" TextWrapping="Wrap" Text="{Binding HostCommunicationStatus}" Background="{Binding HostBack}"  Canvas.Top="5" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="100,0,0,0" Height="36"/>
             <userControls:StateTitle Title="PMA"   Grid.Column="0"  Grid.Row="1"  TextBoxValue="{Binding RtDataValues[PMA.FsmState]}"    TextBoxColor="{Binding RtDataValues[PMA.FsmState],Converter={StaticResource PMStateConverter}}"  Canvas.Left="220"   Canvas.Top="40"/>
             <userControls:StateTitle Title="PMB"   Grid.Column="1"  Grid.Row="1"  TextBoxValue="{Binding RtDataValues[PMB.FsmState]}"    TextBoxColor="{Binding RtDataValues[PMB.FsmState],Converter={StaticResource PMStateConverter}}"  Canvas.Left="520"   Canvas.Top="40"/>
 
             <userControls:StateTitle Title="PMC"   Grid.Column="2"  Grid.Row="1"  TextBoxValue="{Binding RtDataValues[PMC.FsmState]}"    TextBoxColor="{Binding RtDataValues[PMC.FsmState],Converter={StaticResource PMStateConverter}}"  Canvas.Left="820"   Canvas.Top="40"/>
             <userControls:StateTitle Title="PMD"   Grid.Column="3"  Grid.Row="1"  TextBoxValue="{Binding RtDataValues[PMD.FsmState]}"    TextBoxColor="{Binding RtDataValues[PMD.FsmState],Converter={StaticResource PMStateConverter}}"  Canvas.Left="1120"  Canvas.Top="40"/>
-
+            <Button Content="Host Disable" Grid.Column="4"  Grid.Row="1" Background="{DynamicResource TopFrame_TableBG}" Height="35" Width="100" IsEnabled="{Binding IsEnableDisable}" Command="{Binding FADisableCommand}" Canvas.Left="1422"  Canvas.Top="41" FontSize="16" Margin="0,0,212,34" Grid.RowSpan="2">
+                <Button.Template >
+                    <ControlTemplate TargetType="{x:Type Button}" >
+                        <Border BorderBrush="white" BorderThickness="1" CornerRadius="6,6,6,6" Background="{DynamicResource TopFrame_TableBG}">
+                            <ContentPresenter Content="Host Disable" HorizontalAlignment="Center" VerticalAlignment="Center" ></ContentPresenter>
+                        </Border>
+                    </ControlTemplate>
+                </Button.Template>
+            </Button>
             <userControls:StateTitle Title="TM"    Grid.Row="2"    TextBoxValue="{Binding RtDataValues[TM.FsmState]}"     TextBoxColor="{Binding RtDataValues[TM.FsmState],Converter={StaticResource TMStateConverter}}"  Canvas.Left="220"  Canvas.Top="75"/>
 
-            <StackPanel Orientation="Horizontal" Grid.Column="1"  Grid.Row="2" Grid.ColumnSpan="3">
+            <StackPanel Orientation="Horizontal" Grid.Column="1"  Grid.Row="2" Grid.ColumnSpan="4">
                 <Label Content="Log" Style="{StaticResource TopLable_LeftTop}" Canvas.Left="520" Width="100" Canvas.Top="76" BorderThickness="1" BorderBrush="White"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Height="30"/>
                 <ComboBox  Width="720" Canvas.Left="620" Canvas.Top="74.2" Height="32"
                                        ItemsSource="{Binding EventLogList}"   
@@ -93,23 +111,23 @@
                 <Button  Content="Skip"   BorderThickness="0,0,1,0"  BorderBrush="White"        Style="{StaticResource SysBtnStyle}"   Command="{Binding SkipCommand}"  Width="70"    FontSize="15" Canvas.Left="1306"  Canvas.Top="76" Height="30"/>
                 <Button  Content="Clear"  BorderThickness="0"        BorderBrush="Transparent"  Style="{StaticResource SysBtnStyle}"   Command="{Binding ClearCommand}" Width="70"    FontSize="15" Canvas.Left="1376"  Canvas.Top="76" Height="30"/>
             </StackPanel>
-           
-           
+
+
         </Grid>
 
 
-       
-            <Viewbox  Height="100" Width="40" Canvas.Right="10" Canvas.Top="6"    >
-                <deviceControl:AITSignalTower  
+
+        <Viewbox  Height="100" Width="40" Canvas.Right="10" Canvas.Top="6"    >
+            <deviceControl:AITSignalTower  
                                               IsRedLightOn   ="{Binding SignalTowerData.IsRedLightOn}"
                                               IsYellowLightOn="{Binding SignalTowerData.IsYellowLightOn}"
                                               IsGreenLightOn ="{Binding SignalTowerData.IsGreenLightOn}"
                                               IsBlueLightOn  ="{Binding SignalTowerData.IsBlueLightOn}"
                                               IsBuzzerOn     ="{Binding SignalTowerData.IsBuzzerOn}"/>
-            </Viewbox>
+        </Viewbox>
+
 
- 
 
     </Canvas>
-   
+
 </UserControl>