浏览代码

update EFEM UI;

chenkui 3 月之前
父节点
当前提交
be3b324847
共有 2 个文件被更改,包括 7 次插入10 次删除
  1. 1 10
      CyberX8_MainPages/Views/EfemView.xaml
  2. 6 0
      CyberX8_RT/Modules/PUF/PUFEntity.cs

+ 1 - 10
CyberX8_MainPages/Views/EfemView.xaml

@@ -282,7 +282,7 @@
 
         </StackPanel>
 
-        <StackPanel Orientation="Horizontal" Canvas.Bottom="-50" Canvas.Left="100">
+        <StackPanel Orientation="Horizontal" Canvas.Bottom="10" Canvas.Left="100">
             <Grid  Width="470" Visibility="{Binding IsLP1Installed, Converter={StaticResource bool2VisibilityConverter}}" IsEnabled="{Binding IsLP1Unable,Converter={StaticResource BoolToBool}}">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="24"/>
@@ -291,9 +291,6 @@
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="100"/>
@@ -407,9 +404,6 @@
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
 
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
@@ -532,9 +526,6 @@
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
                     <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="30"/>
 
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>

+ 6 - 0
CyberX8_RT/Modules/PUF/PUFEntity.cs

@@ -252,6 +252,11 @@ namespace CyberX8_RT.Modules.PUF
             {
                 return false;
             }
+            bool chuckIn = _pufVacuum.CheckChuckIn();
+            if (!chuckIn)
+            {
+                return false;
+            }
             return true;
         }
         /// <summary>
@@ -270,6 +275,7 @@ namespace CyberX8_RT.Modules.PUF
             {
                 return false;
             }
+            
             return true;
         }
         /// <summary>