底部按钮添加背景色

Venus/Venus_MainPages/Views/OverKepler2300View.xaml

@@ -1202,7 +1202,7 @@
                         <RotateTransform  Angle="15" CenterX="1" CenterY="15"></RotateTransform>
                     </Border.RenderTransform>
                 </Border>
-                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="0,0,50,0" Height="40"  attach:IconElement.Margin="-20" />
+                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="5,0,50,0" Height="40"  attach:IconElement.Margin="-20" />
                 <customControls:PathButton  Width="130" Height="30" Content="Vent"          Command="{Binding VentCommand}"         IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Purge"    Command="{Binding PurgeCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Down"     Command="{Binding PumpCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>

Venus/Venus_MainPages/Views/OverVenusView.xaml

@@ -1218,7 +1218,7 @@
                         <RotateTransform  Angle="15" CenterX="1" CenterY="15"></RotateTransform>
                     </Border.RenderTransform>
                 </Border>
-                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="0,0,50,0" Height="40"  attach:IconElement.Margin="-20" />
+                <customControls:AduRadioButtonIcon Content="AF" IsChecked="{Binding IsAutoMode,Mode=TwoWay}"   Margin="5,0,50,0" Height="40"  attach:IconElement.Margin="-20" />
                 <customControls:PathButton  Width="130" Height="30" Content="Vent"          Command="{Binding VentCommand}"         IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" />
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Purge"    Command="{Binding PurgeCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
                 <customControls:PathButton  Width="134" Height="30" Content="Pump Down"     Command="{Binding PumpCommand}"         Margin="50,0,0,0" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>

Venus/Venus_RT/Devices/ESC5HighVoltage.cs

@@ -348,8 +348,18 @@ namespace Venus_RT.Devices
             {
                 return false;
             }
+            if (on)
+            {
+                SetPointCommandQueue.Add(_noneParaCommandOp[Operation.EnableOutputVoltage]);
+            }
+            else
+            { 
+                SetPointCommandQueue.Add(_noneParaCommandOp[Operation.DisableOutputVoltage]);
 
-            return SendCommand(on ? Operation.EnableOutputVoltage : Operation.DisableOutputVoltage);
+            }
+            //SetPointCommandQueue.Add(on ? Operation.EnableOutputVoltage : Operation.DisableOutputVoltage);
+            //return SendCommand(on ? Operation.EnableOutputVoltage : Operation.DisableOutputVoltage);
+            return true;
         }
     }
 }

Venus/Venus_Themes/CustomControls/AduRadioButton.xaml

@@ -16,6 +16,8 @@
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="FontWeight"  Value="DemiBold" />
         <Setter Property="Foreground" Value="White" />
+        <Setter Property="Opacity"  Value=".8" />
+
         <!--<Setter Property="Effect">
             <Setter.Value>
                 <DropShadowEffect Color="LightBlue"></DropShadowEffect>
@@ -31,14 +33,17 @@
                 <ControlTemplate TargetType="{x:Type customControl:AduRadioButtonIcon}">
                     <Border
                         x:Name="templateRoot"
-                        Background="#00FFFFFF"
+                        Background="{Binding DefaultBackground, RelativeSource={RelativeSource Mode=TemplatedParent}}"
                         Margin="{TemplateBinding Margin}"
                         Padding="{TemplateBinding Padding}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="5">
                         <StackPanel
                             VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
                             Orientation="Horizontal"
+                            Margin="-10,0,0,0"
                             SnapsToDevicePixels="True">
                             <Border>
                                 <Path x:Name="Icon" VerticalAlignment="Center" Width="{TemplateBinding Attach:IconElement.Width}" Margin="{TemplateBinding Attach:IconElement.Margin}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" Data="{TemplateBinding Attach:IconElement.PathData}" />
@@ -57,14 +62,14 @@
                         </StackPanel>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True" >
+                        <!--<Trigger Property="IsMouseOver" Value="True" >
                             <Setter TargetName="templateRoot" Property="Opacity" Value=".8" />
-                        </Trigger>
+                        </Trigger>-->
                         <Trigger Property="IsEnabled" Value="False" />
                         <Trigger Property="IsPressed" Value="True" />
                         <Trigger Property="IsChecked" Value="True">
                             <Setter TargetName="templateRoot" Property="Background" Value="{Binding SelectBackground, RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
-                            <Setter TargetName="templateRoot" Property="Opacity" Value=".8" />
+                            <Setter TargetName="templateRoot" Property="Opacity" Value="1" />
                             <Setter TargetName="templateRoot" Property="BorderThickness" Value="0" />
                             <Setter TargetName="Icon" Property="Fill" Value="{Binding SelectColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
                             <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding SelectColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
@@ -74,7 +79,7 @@
                                     <DropShadowEffect Color="Black"></DropShadowEffect>
                                 </Setter.Value>
                             </Setter>
-                            <Setter Property="customControl:AduRadioButtonIcon.FontSize" Value="26"/>
+                            <!--<Setter Property="customControl:AduRadioButtonIcon.FontSize" Value="26"/>-->
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

Venus/Venus_Themes/CustomControls/AduRadioButtonIcon.cs

@@ -38,6 +38,15 @@ namespace Venus_Themes.CustomControls
             set { SetValue(SelectBackgroundProperty, value); }
         }
 
-      
+        public static readonly DependencyProperty DefaultBackgroundProperty = DependencyProperty.Register("DefaultBackground"
+               , typeof(Brush), typeof(AduRadioButtonIcon), new FrameworkPropertyMetadata(new SolidColorBrush(Color.FromArgb(0, 0, 0, 0))));
+        /// <summary>
+        /// 选中时背景色颜色
+        /// </summary>
+        public Brush DefaultBackground
+        {
+            get { return (Brush)GetValue(DefaultBackgroundProperty); }
+            set { SetValue(DefaultBackgroundProperty, value); }
+        }
     }
 }

Venus/Venus_UI/Views/ShellView.xaml

@@ -147,7 +147,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="104"/>
             <RowDefinition/>
-            <RowDefinition Height="48"/>
+            <RowDefinition Height="50"/>
         </Grid.RowDefinitions>
 
         <ContentControl x:Name="Top_Frame" Grid.Row="0"  prism:RegionManager.RegionName="TopRegion"/>

Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -81,6 +81,16 @@ namespace Venus_UI.Views
                 IconElement.SetPathData(aduRadioButtonIcon,(Geometry)aduRadioButtonIcon.FindResource($"Icon_{VenusMenu[i].Id}"));
                 aduRadioButtonIcon.Content = VenusMenu[i].Id;
                 aduRadioButtonIcon.Click += AduRadioButtonIcon_Click;
+                aduRadioButtonIcon.SelectBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#6AD7FF"));
+                aduRadioButtonIcon.SelectColor = new SolidColorBrush((Colors.Black));
+                //aduRadioButtonIcon.DefaultBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#6AD7FF"));
+                aduRadioButtonIcon.DefaultBackground = new SolidColorBrush(Colors.DarkGray);
+                
+
+                aduRadioButtonIcon.Width = 180;
+                aduRadioButtonIcon.Height= 40;
+                
+                //aduRadioButtonIcon.Foreground=Brushes.White;
                 aduRadioButtonIcon.Tag = index;
                 index += 1;
                 Bottom_Frame.Children.Add(aduRadioButtonIcon);