chore: 优化项目文件结构

CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj

@@ -19,52 +19,52 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Views\Windows\Stations\Ankang\ExitScreenView.xaml.cs">
+    <Compile Update="Views\Ankang\ExitScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\BeijingXi\PrimaryScreenView.xaml.cs">
+    <Compile Update="Views\BeijingXi\PrimaryScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\ChengduDong\PrimaryTicketCheckScreenView.xaml.cs">
+    <Compile Update="Views\ChengduDong\PrimaryTicketCheckScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\ChengduDong\SecondaryScreenView.xaml.cs">
+    <Compile Update="Views\ChengduDong\SecondaryScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\XuzhouMetro\PlatformScreenView.xaml.cs">
+    <Compile Update="Views\XuzhouMetro\PlatformScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\ChengduMetro\PlatformScreenView.xaml.cs">
+    <Compile Update="Views\ChengduMetro\PlatformScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\GuangdongIntercity\SecondaryScreenView.xaml.cs">
+    <Compile Update="Views\GuangdongIntercity\SecondaryScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Guangyuan\PrimaryScreenView.xaml.cs">
+    <Compile Update="Views\Guangyuan\PrimaryScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Hanzhong\PlatformScreenView.xaml.cs">
+    <Compile Update="Views\Hanzhong\PlatformScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Harbin\PrimaryScreenView.xaml.cs">
+    <Compile Update="Views\Harbin\PrimaryScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Jinanxi\SmallScreenView.xaml.cs">
+    <Compile Update="Views\Jinanxi\SmallScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Shanghai\OutsideScreenView.xaml.cs">
+    <Compile Update="Views\Shanghai\OutsideScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Mianyang\PlatformScreenView.xaml.cs">
+    <Compile Update="Views\Mianyang\PlatformScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Tianjin\PlatformScreenView.xaml.cs">
+    <Compile Update="Views\Tianjin\PlatformScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Zibo\PrimaryScreenView.xaml.cs">
+    <Compile Update="Views\Zibo\PrimaryScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Views\Windows\Stations\Zibo\SecondaryScreenView.xaml.cs">
+    <Compile Update="Views\Zibo\SecondaryScreenView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>

CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml

@@ -130,6 +130,13 @@
                 </DataGridTextColumn>
 
                 <DataGridTextColumn MinWidth="180">
+                    <DataGridTextColumn.Binding>
+                        <MultiBinding Mode="OneWay" Converter="{StaticResource TrainStateConverter}">
+                            <Binding Path="ArrivalTime" />
+                            <Binding Path="DepartureTime" />
+                            <Binding Path="State" />
+                        </MultiBinding>
+                    </DataGridTextColumn.Binding>
                     <DataGridTextColumn.HeaderTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Vertical" Width="{Binding ActualWidth, RelativeSource={RelativeSource AncestorType=DataGridColumnHeader}}" Margin="0,0,0,1">
@@ -139,7 +146,6 @@
                     </DataGridTextColumn.HeaderTemplate>
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock" BasedOn="{StaticResource CommonTextBlockStyle}">
-                            <Setter Property="Text" Value="正点"/>
                             <Setter Property="Visibility" Value="{Binding TrainNumber,Converter={StaticResource EmptyToVisibilityConverter}}"/>
                         </Style>
                     </DataGridTextColumn.ElementStyle>