From 56e5a54a86b5d1a6bbd13e8a468fa3cf63161124 Mon Sep 17 00:00:00 2001
From: denglihong2007 <2639367181@qq.com>
Date: Wed, 16 Apr 2025 23:56:36 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CRSim.ScreenSimulator.csproj              | 32 +++++++++----------
 .../Ankang/ExitScreenViewModel.cs             |  0
 .../BeijingXi/PrimaryScreenViewModel.cs       |  0
 .../PrimaryTicketCheckScreenViewModel.cs      |  0
 .../ChengduDong/SecondaryScreenViewModel.cs   |  0
 .../ChengduMetro/PlatformScreenViewModel.cs   |  0
 .../Fuzhou/TicketCheckScreenViewModel.cs      |  0
 .../FuzhouNan/TicketCheckScreenViewModel.cs   |  0
 .../SecondaryScreenViewModel.cs               |  0
 .../Guangyuan/PrimaryScreenViewModel.cs       |  0
 .../Hanzhong/PlatformScreenViewModel.cs       |  0
 .../Harbin/PrimaryScreenViewModel.cs          |  0
 .../Jinanxi/SmallScreenViewModel.cs           |  0
 .../Mianyang/PlatformScreenViewModel.cs       |  0
 .../{Windows => }/ScreenViewModel.cs          |  0
 .../Shanghai/OutsideScreenViewModel.cs        |  0
 .../Tianjin/PlatformScreenViewModel.cs        |  0
 .../XuzhouMetro/PlatformScreenViewModel.cs    |  0
 .../Zibo/PlatformScreenViewModel.cs           |  0
 .../Zibo/PrimaryScreenViewModel.cs            |  0
 .../Zibo/SecondaryScreenViewModel.cs          |  0
 .../Zibo/TicketCheckScreenViewModel.cs        |  0
 .../Stations => }/Ankang/ExitScreenView.xaml  |  8 ++++-
 .../Ankang/ExitScreenView.xaml.cs             |  0
 .../BeijingXi/PrimaryScreenView.xaml          |  0
 .../BeijingXi/PrimaryScreenView.xaml.cs       |  0
 .../PrimaryTicketCheckScreenView.xaml         |  0
 .../PrimaryTicketCheckScreenView.xaml.cs      |  0
 .../ChengduDong/SecondaryScreenView.xaml      |  0
 .../ChengduDong/SecondaryScreenView.xaml.cs   |  0
 .../ChengduMetro/PlatformScreenView.xaml      |  0
 .../ChengduMetro/PlatformScreenView.xaml.cs   |  0
 .../Fuzhou/TicketCheckScreenView.xaml         |  0
 .../Fuzhou/TicketCheckScreenView.xaml.cs      |  0
 .../FuzhouNan/TicketCheckScreenView.xaml      |  0
 .../FuzhouNan/TicketCheckScreenView.xaml.cs   |  0
 .../SecondaryScreenView.xaml                  |  0
 .../SecondaryScreenView.xaml.cs               |  0
 .../Guangyuan/PrimaryScreenView.xaml          |  0
 .../Guangyuan/PrimaryScreenView.xaml.cs       |  0
 .../Hanzhong/PlatformScreenView.xaml          |  0
 .../Hanzhong/PlatformScreenView.xaml.cs       |  0
 .../Harbin/PrimaryScreenView.xaml             |  0
 .../Harbin/PrimaryScreenView.xaml.cs          |  0
 .../Jinanxi/SmallScreenView.xaml              |  0
 .../Jinanxi/SmallScreenView.xaml.cs           |  0
 .../Mianyang/PlatformScreenView.xaml          |  0
 .../Mianyang/PlatformScreenView.xaml.cs       |  0
 .../Shanghai/OutsideScreenView.xaml           |  0
 .../Shanghai/OutsideScreenView.xaml.cs        |  0
 .../Tianjin/PlatformScreenView.xaml           |  0
 .../Tianjin/PlatformScreenView.xaml.cs        |  0
 .../XuzhouMetro/PlatformScreenView.xaml       |  0
 .../XuzhouMetro/PlatformScreenView.xaml.cs    |  0
 .../Zibo/PlatformScreenView.xaml              |  0
 .../Zibo/PlatformScreenView.xaml.cs           |  0
 .../Stations => }/Zibo/PrimaryScreenView.xaml |  0
 .../Zibo/PrimaryScreenView.xaml.cs            |  0
 .../Zibo/SecondaryScreenView.xaml             |  0
 .../Zibo/SecondaryScreenView.xaml.cs          |  0
 .../Zibo/TicketCheckScreenView.xaml           |  0
 .../Zibo/TicketCheckScreenView.xaml.cs        |  0
 62 files changed, 23 insertions(+), 17 deletions(-)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Ankang/ExitScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/BeijingXi/PrimaryScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/ChengduDong/PrimaryTicketCheckScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/ChengduDong/SecondaryScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/ChengduMetro/PlatformScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Fuzhou/TicketCheckScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/FuzhouNan/TicketCheckScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/GuangdongIntercity/SecondaryScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Guangyuan/PrimaryScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Hanzhong/PlatformScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Harbin/PrimaryScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Jinanxi/SmallScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Mianyang/PlatformScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows => }/ScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Shanghai/OutsideScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Tianjin/PlatformScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/XuzhouMetro/PlatformScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Zibo/PlatformScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Zibo/PrimaryScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Zibo/SecondaryScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/ViewModels/{Windows/Stations => }/Zibo/TicketCheckScreenViewModel.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Ankang/ExitScreenView.xaml (96%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Ankang/ExitScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/BeijingXi/PrimaryScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/BeijingXi/PrimaryScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/ChengduDong/PrimaryTicketCheckScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/ChengduDong/PrimaryTicketCheckScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/ChengduDong/SecondaryScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/ChengduDong/SecondaryScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/ChengduMetro/PlatformScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/ChengduMetro/PlatformScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Fuzhou/TicketCheckScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Fuzhou/TicketCheckScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/FuzhouNan/TicketCheckScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/FuzhouNan/TicketCheckScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/GuangdongIntercity/SecondaryScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/GuangdongIntercity/SecondaryScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Guangyuan/PrimaryScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Guangyuan/PrimaryScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Hanzhong/PlatformScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Hanzhong/PlatformScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Harbin/PrimaryScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Harbin/PrimaryScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Jinanxi/SmallScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Jinanxi/SmallScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Mianyang/PlatformScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Mianyang/PlatformScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Shanghai/OutsideScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Shanghai/OutsideScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Tianjin/PlatformScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Tianjin/PlatformScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/XuzhouMetro/PlatformScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/XuzhouMetro/PlatformScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/PlatformScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/PlatformScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/PrimaryScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/PrimaryScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/SecondaryScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/SecondaryScreenView.xaml.cs (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/TicketCheckScreenView.xaml (100%)
 rename CRSim.ScreenSimulator/Views/{Windows/Stations => }/Zibo/TicketCheckScreenView.xaml.cs (100%)

diff --git a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
index 6799b35..9a47959 100644
--- a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
+++ b/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>
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Ankang/ExitScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Ankang/ExitScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Ankang/ExitScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/BeijingXi/PrimaryScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/BeijingXi/PrimaryScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/BeijingXi/PrimaryScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/ChengduDong/PrimaryTicketCheckScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/ChengduDong/PrimaryTicketCheckScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/ChengduDong/SecondaryScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduDong/SecondaryScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/ChengduDong/SecondaryScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/ChengduMetro/PlatformScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/ChengduMetro/PlatformScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/ChengduMetro/PlatformScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Fuzhou/TicketCheckScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Fuzhou/TicketCheckScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Fuzhou/TicketCheckScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/FuzhouNan/TicketCheckScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/FuzhouNan/TicketCheckScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/FuzhouNan/TicketCheckScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/FuzhouNan/TicketCheckScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/GuangdongIntercity/SecondaryScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/GuangdongIntercity/SecondaryScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/GuangdongIntercity/SecondaryScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Guangyuan/PrimaryScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Guangyuan/PrimaryScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Guangyuan/PrimaryScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Hanzhong/PlatformScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Hanzhong/PlatformScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Hanzhong/PlatformScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Harbin/PrimaryScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Harbin/PrimaryScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Harbin/PrimaryScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Jinanxi/SmallScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Jinanxi/SmallScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Jinanxi/SmallScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Mianyang/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Mianyang/PlatformScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Mianyang/PlatformScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Mianyang/PlatformScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/ScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/ScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/ScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/ScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Shanghai/OutsideScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Shanghai/OutsideScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Shanghai/OutsideScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Tianjin/PlatformScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Tianjin/PlatformScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Tianjin/PlatformScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/XuzhouMetro/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/XuzhouMetro/PlatformScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/XuzhouMetro/PlatformScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/XuzhouMetro/PlatformScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/PlatformScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Zibo/PlatformScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/PlatformScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Zibo/PlatformScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Zibo/PrimaryScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/PrimaryScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Zibo/PrimaryScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Zibo/SecondaryScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/SecondaryScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Zibo/SecondaryScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/TicketCheckScreenViewModel.cs b/CRSim.ScreenSimulator/ViewModels/Zibo/TicketCheckScreenViewModel.cs
similarity index 100%
rename from CRSim.ScreenSimulator/ViewModels/Windows/Stations/Zibo/TicketCheckScreenViewModel.cs
rename to CRSim.ScreenSimulator/ViewModels/Zibo/TicketCheckScreenViewModel.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml b/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml
similarity index 96%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml
index bb290d8..da49121 100644
--- a/CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml
+++ b/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>
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Ankang/ExitScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Ankang/ExitScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/BeijingXi/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/BeijingXi/PrimaryScreenView.xaml
rename to CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/BeijingXi/PrimaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/BeijingXi/PrimaryScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/BeijingXi/PrimaryScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenView.xaml
rename to CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/PrimaryTicketCheckScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/ChengduDong/PrimaryTicketCheckScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml
rename to CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/ChengduDong/SecondaryScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/ChengduDong/SecondaryScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml
rename to CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/ChengduMetro/PlatformScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/ChengduMetro/PlatformScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Fuzhou/TicketCheckScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Fuzhou/TicketCheckScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/FuzhouNan/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/FuzhouNan/TicketCheckScreenView.xaml
rename to CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/FuzhouNan/TicketCheckScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/FuzhouNan/TicketCheckScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/FuzhouNan/TicketCheckScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml
rename to CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/GuangdongIntercity/SecondaryScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/GuangdongIntercity/SecondaryScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Guangyuan/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Guangyuan/PrimaryScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Guangyuan/PrimaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Guangyuan/PrimaryScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Guangyuan/PrimaryScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Hanzhong/PlatformScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Hanzhong/PlatformScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Harbin/PrimaryScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Harbin/PrimaryScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Jinanxi/SmallScreenView.xaml b/CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Jinanxi/SmallScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Jinanxi/SmallScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Jinanxi/SmallScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Jinanxi/SmallScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Mianyang/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Mianyang/PlatformScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Mianyang/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Mianyang/PlatformScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Mianyang/PlatformScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml b/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Shanghai/OutsideScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Shanghai/OutsideScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Tianjin/PlatformScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Tianjin/PlatformScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/XuzhouMetro/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/XuzhouMetro/PlatformScreenView.xaml
rename to CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/XuzhouMetro/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/XuzhouMetro/PlatformScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/XuzhouMetro/PlatformScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PlatformScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PlatformScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PlatformScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PlatformScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Zibo/PlatformScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/PrimaryScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Zibo/PrimaryScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/SecondaryScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Zibo/SecondaryScreenView.xaml.cs
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/TicketCheckScreenView.xaml b/CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/TicketCheckScreenView.xaml
rename to CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml
diff --git a/CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/TicketCheckScreenView.xaml.cs b/CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml.cs
similarity index 100%
rename from CRSim.ScreenSimulator/Views/Windows/Stations/Zibo/TicketCheckScreenView.xaml.cs
rename to CRSim.ScreenSimulator/Views/Zibo/TicketCheckScreenView.xaml.cs