From d507b178572d3ba73cebabd04dea21139c7f4c50 Mon Sep 17 00:00:00 2001
From: denglihong2007 <98096191+denglihong2007@users.noreply.github.com>
Date: Sun, 18 May 2025 18:22:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=20=E6=97=A0=E6=B3=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=BD=A6=E7=AB=99=20[skip=20cliff]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/StylesInfoData.json                | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/CRSim.ScreenSimulator/Models/StylesInfoData.json b/CRSim.ScreenSimulator/Models/StylesInfoData.json
index 0a33885..5eb278d 100644
--- a/CRSim.ScreenSimulator/Models/StylesInfoData.json
+++ b/CRSim.ScreenSimulator/Models/StylesInfoData.json
@@ -6,7 +6,7 @@
     "Author": "电排骨",
     "Type": "车站大屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text"
     ]
   },
@@ -17,7 +17,7 @@
     "Author": "电排骨",
     "Type": "检票口屏",
     "Parameters": [
-      "Region",
+      "Station",
       "TicketCheck",
       "Text"
     ]
@@ -29,7 +29,7 @@
     "Author": "电排骨",
     "Type": "检票口屏",
     "Parameters": [
-      "Region",
+      "Station",
       "TicketCheck"
     ]
   },
@@ -40,7 +40,7 @@
     "Author": "电排骨",
     "Type": "检票口屏",
     "Parameters": [
-      "Region",
+      "Station",
       "TicketCheck",
       "Text"
     ]
@@ -52,7 +52,7 @@
     "Author": "电排骨",
     "Type": "检票口屏",
     "Parameters": [
-      "Region",
+      "Station",
       "TicketCheck",
       "Text"
     ]
@@ -74,7 +74,7 @@
     "Author": "电排骨",
     "Type": "车站大屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text"
     ]
   },
@@ -85,7 +85,7 @@
     "Author": "电排骨",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text",
       "Video",
       "Platform"
@@ -98,7 +98,7 @@
     "Author": "电排骨",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text",
       "Video",
       "Platform"
@@ -111,7 +111,7 @@
     "Author": "电排骨",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text",
       "Video",
       "Platform"
@@ -124,7 +124,7 @@
     "Author": "电排骨",
     "Type": "车站大屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text"
     ]
   },
@@ -145,7 +145,7 @@
     "Author": "电排骨",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Text"
     ]
@@ -157,7 +157,7 @@
     "Author": "电排骨",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Location"
     ]
@@ -169,7 +169,7 @@
     "Author": "电排骨",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Location"
     ]
@@ -201,7 +201,7 @@
     "Author": "wxl0430",
     "Type": "检票口屏",
     "Parameters": [
-      "Region",
+      "Station",
       "TicketCheck",
       "Text"
     ]
@@ -213,7 +213,7 @@
     "Author": "wxl0430",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Location",
       "Text"
@@ -226,7 +226,7 @@
     "Author": "wxl0430",
     "Type": "走廊出发屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Location"
     ]
@@ -248,7 +248,7 @@
     "Author": "电排骨",
     "Type": "车站大屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text"
     ]
   },
@@ -259,7 +259,7 @@
     "Author": "电排骨",
     "Type": "出站口屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text"
     ]
   },
@@ -270,7 +270,7 @@
     "Author": "电排骨",
     "Type": "车站大屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Text"
     ]
   },
@@ -281,7 +281,7 @@
     "Author": "wxl0430",
     "Type": "走廊到达屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform"
     ]
   },
@@ -292,7 +292,7 @@
     "Author": "wxl0430",
     "Type": "走廊出发屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Location"
     ]
@@ -304,7 +304,7 @@
     "Author": "wxl0430",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Location"
     ]
@@ -316,7 +316,7 @@
     "Author": "wxl0430",
     "Type": "站台屏",
     "Parameters": [
-      "Region",
+      "Station",
       "Platform",
       "Location",
       "Text"

From 9640997115c6741b23fbb356a5365ec7580e9961 Mon Sep 17 00:00:00 2001
From: denglihong2007 <98096191+denglihong2007@users.noreply.github.com>
Date: Sun, 18 May 2025 19:01:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E8=87=AA=E5=B8=A6?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E8=B5=84=E6=BA=90=E6=97=A0=E6=B3=95=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj |  13 -------------
 .../Assets/Advertisement-1.mp4                     | Bin
 .../Assets/Advertisement-2.mp4                     | Bin
 .../Assets/Advertisement-3.mp4                     | Bin
 CRSim/CRSim.csproj                                 |  12 ++++++++++++
 5 files changed, 12 insertions(+), 13 deletions(-)
 rename {CRSim.ScreenSimulator => CRSim}/Assets/Advertisement-1.mp4 (100%)
 rename {CRSim.ScreenSimulator => CRSim}/Assets/Advertisement-2.mp4 (100%)
 rename {CRSim.ScreenSimulator => CRSim}/Assets/Advertisement-3.mp4 (100%)

diff --git a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
index 0523a0d..d926b28 100644
--- a/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
+++ b/CRSim.ScreenSimulator/CRSim.ScreenSimulator.csproj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Assets\Advertisement-3.mp4" />
     <None Remove="Assets\ChengduDong\cdcz.png" />
     <None Remove="Assets\ChengduDong\PillarTicketCheckScreen.png" />
     <None Remove="Assets\ChengduDong\TicketCheck.png" />
@@ -17,18 +16,6 @@
     <None Remove="Assets\TianjinMetro\TianjinMetro-Icon.png" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="Assets\Advertisement-1.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Advertisement-2.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\Advertisement-3.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Models\StylesInfoData.json" />
   </ItemGroup>
diff --git a/CRSim.ScreenSimulator/Assets/Advertisement-1.mp4 b/CRSim/Assets/Advertisement-1.mp4
similarity index 100%
rename from CRSim.ScreenSimulator/Assets/Advertisement-1.mp4
rename to CRSim/Assets/Advertisement-1.mp4
diff --git a/CRSim.ScreenSimulator/Assets/Advertisement-2.mp4 b/CRSim/Assets/Advertisement-2.mp4
similarity index 100%
rename from CRSim.ScreenSimulator/Assets/Advertisement-2.mp4
rename to CRSim/Assets/Advertisement-2.mp4
diff --git a/CRSim.ScreenSimulator/Assets/Advertisement-3.mp4 b/CRSim/Assets/Advertisement-3.mp4
similarity index 100%
rename from CRSim.ScreenSimulator/Assets/Advertisement-3.mp4
rename to CRSim/Assets/Advertisement-3.mp4
diff --git a/CRSim/CRSim.csproj b/CRSim/CRSim.csproj
index 8560d1a..fdd9495 100644
--- a/CRSim/CRSim.csproj
+++ b/CRSim/CRSim.csproj
@@ -14,8 +14,20 @@
 
 	<ItemGroup>
 		<ApplicationDefinition Remove="App.xaml" />
+		<None Remove="Assets\Advertisement-1.mp4" />
+		<None Remove="Assets\Advertisement-2.mp4" />
+		<None Remove="Assets\Advertisement-3.mp4" />
 		<None Remove="Assets\HomeHeaderTiles\Header-docs.png" />
 		<None Remove="Assets\HomeHeaderTiles\Header-docs.svg" />
+		<Content Include="Assets\Advertisement-1.mp4">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="Assets\Advertisement-2.mp4">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+		<Content Include="Assets\Advertisement-3.mp4">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
 		<Content Include="Assets\CRSimIcon.ico" />
 		<Resource Include="Assets\ControlImages\Data Management.png" />
 		<Resource Include="Assets\ControlImages\Gate Simulation.png" />