diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 589f03f..eb8c8d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -62,6 +62,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Setup .NET 9.0 uses: actions/setup-dotnet@v3 diff --git a/CRSim.ScreenSimulator/Models/StylesInfoData.json b/CRSim.ScreenSimulator/Models/StylesInfoData.json index f879a47..0a33885 100644 --- a/CRSim.ScreenSimulator/Models/StylesInfoData.json +++ b/CRSim.ScreenSimulator/Models/StylesInfoData.json @@ -2,22 +2,22 @@ { "UniqueId": "ChengduDong.SecondaryScreen", "Title": "成都东站次要看板", - "Station": "成都东", + "Region": "成都", "Author": "电排骨", "Type": "车站大屏", "Parameters": [ - "Station", + "Region", "Text" ] }, { "UniqueId": "ChengduDong.PrimaryTicketCheckScreen", "Title": "成都东站检票口主要看板", - "Station": "成都东", + "Region": "成都", "Author": "电排骨", "Type": "检票口屏", "Parameters": [ - "Station", + "Region", "TicketCheck", "Text" ] @@ -25,22 +25,22 @@ { "UniqueId": "ChengduDong.PillarTicketCheckScreen", "Title": "成都东站检票口立柱看板", - "Station": "成都东", + "Region": "成都", "Author": "电排骨", "Type": "检票口屏", "Parameters": [ - "Station", + "Region", "TicketCheck" ] }, { "UniqueId": "Fuzhou.TicketCheckScreen", "Title": "福州站检票口看板", - "Station": "福州", + "Region": "福州", "Author": "电排骨", "Type": "检票口屏", "Parameters": [ - "Station", + "Region", "TicketCheck", "Text" ] @@ -48,11 +48,11 @@ { "UniqueId": "FuzhouNan.TicketCheckScreen", "Title": "福州南站检票口看板", - "Station": "福州南", + "Region": "福州", "Author": "电排骨", "Type": "检票口屏", "Parameters": [ - "Station", + "Region", "TicketCheck", "Text" ] @@ -60,32 +60,32 @@ { "UniqueId": "BeijingXi.PrimaryScreen", "Title": "北京西站主要看板", - "Station": "北京西", + "Region": "北京", "Author": "电排骨", "Type": "车站大屏", "Parameters": [ - "Station" + "Region" ] }, { "UniqueId": "Harbin.PrimaryScreen", "Title": "哈尔滨站主要看板", - "Station": "哈尔滨", + "Region": "哈尔滨", "Author": "电排骨", "Type": "车站大屏", "Parameters": [ - "Station", + "Region", "Text" ] }, { "UniqueId": "ChengduMetro.PlatformScreen", "Title": "成都地铁站台看板", - "Station": "成都地铁", + "Region": "成都", "Author": "电排骨", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Text", "Video", "Platform" @@ -94,11 +94,11 @@ { "UniqueId": "XuzhouMetro.PlatformScreen", "Title": "徐州地铁站台看板", - "Station": "徐州地铁", + "Region": "徐州", "Author": "电排骨", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Text", "Video", "Platform" @@ -107,11 +107,11 @@ { "UniqueId": "TianjinMetro.PlatformScreen", "Title": "天津地铁站台看板", - "Station": "天津地铁", + "Region": "天津", "Author": "电排骨", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Text", "Video", "Platform" @@ -120,32 +120,32 @@ { "UniqueId": "Guangyuan.PrimaryScreen", "Title": "广元站主要看板", - "Station": "广元", + "Region": "广元", "Author": "电排骨", "Type": "车站大屏", "Parameters": [ - "Station", + "Region", "Text" ] }, { "UniqueId": "Shanghai.OutsideScreen", "Title": "上海站站外看板", - "Station": "上海", + "Region": "上海", "Author": "电排骨", "Type": "车站大屏", "Parameters": [ - "Station" + "Region" ] }, { "UniqueId": "Hanzhong.PlatformScreen", "Title": "汉中站站台看板", - "Station": "汉中", + "Region": "汉中", "Author": "电排骨", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Platform", "Text" ] @@ -153,11 +153,11 @@ { "UniqueId": "Tianjin.PlatformScreen", "Title": "天津站站台看板", - "Station": "天津", + "Region": "天津", "Author": "电排骨", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Platform", "Location" ] @@ -165,11 +165,11 @@ { "UniqueId": "Mianyang.PlatformScreen", "Title": "绵阳站站台看板", - "Station": "绵阳", + "Region": "绵阳", "Author": "电排骨", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Platform", "Location" ] @@ -177,31 +177,31 @@ { "UniqueId": "Zibo.PrimaryScreen", "Title": "淄博站主要看板", - "Station": "淄博", + "Region": "淄博", "Author": "wxl0430", "Type": "车站大屏", "Parameters": [ - "Station" + "Region" ] }, { "UniqueId": "Zibo.SecondaryScreen", "Title": "淄博站次要看板", - "Station": "淄博", + "Region": "淄博", "Author": "wxl0430", "Type": "车站大屏", "Parameters": [ - "Station" + "Region" ] }, { "UniqueId": "Zibo.TicketCheckScreen", "Title": "淄博站检票口看板", - "Station": "淄博", + "Region": "淄博", "Author": "wxl0430", "Type": "检票口屏", "Parameters": [ - "Station", + "Region", "TicketCheck", "Text" ] @@ -209,11 +209,11 @@ { "UniqueId": "Zibo.PlatformScreen", "Title": "淄博站站台看板", - "Station": "淄博", + "Region": "淄博", "Author": "wxl0430", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Platform", "Location", "Text" @@ -222,11 +222,11 @@ { "UniqueId": "Zibo.ConcourseBridgeScreen", "Title": "淄博站廊桥看板", - "Station": "淄博", + "Region": "淄博", "Author": "wxl0430", "Type": "走廊出发屏", "Parameters": [ - "Station", + "Region", "Platform", "Location" ] @@ -234,65 +234,65 @@ { "UniqueId": "Jinanxi.SmallScreen", "Title": "济南西站小屏看板", - "Station": "济南西", + "Region": "济南", "Author": "wxl0430", "Type": "车站大屏", "Parameters": [ - "Station" + "Region" ] }, { "UniqueId": "GuangdongIntercity.SecondaryScreen", "Title": "广东城际次要看板", - "Station": "广东城际", + "Region": "广东", "Author": "电排骨", "Type": "车站大屏", "Parameters": [ - "Station", + "Region", "Text" ] }, { "UniqueId": "Ankang.ExitScreen", "Title": "安康站出站口看板", - "Station": "安康", + "Region": "安康", "Author": "电排骨", "Type": "出站口屏", "Parameters": [ - "Station", + "Region", "Text" ] }, { "UniqueId": "Niuzhou.PrimaryScreen", "Title": "柳州站主要看板", - "Station": "柳州", + "Region": "柳州", "Author": "电排骨", "Type": "车站大屏", "Parameters": [ - "Station", + "Region", "Text" ] }, { "UniqueId": "Beijing.ArrivalScreen", "Title": "北京站地道到达看板", - "Station": "北京", + "Region": "北京", "Author": "wxl0430", "Type": "走廊到达屏", "Parameters": [ - "Station", + "Region", "Platform" ] }, { "UniqueId": "DaqingDong.ConcourseBridgeScreen", "Title": "大庆东站廊桥看板", - "Station": "大庆东", + "Region": "大庆", "Author": "wxl0430", "Type": "走廊出发屏", "Parameters": [ - "Station", + "Region", "Platform", "Location" ] @@ -300,11 +300,11 @@ { "UniqueId": "DaqingDong.PlatformScreen", "Title": "大庆东站站台看板", - "Station": "大庆东", + "Region": "大庆", "Author": "wxl0430", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Platform", "Location" ] @@ -312,11 +312,11 @@ { "UniqueId": "HarbinXi.PlatformScreen", "Title": "哈尔滨西站站台看板", - "Station": "哈尔滨西", + "Region": "哈尔滨", "Author": "wxl0430", "Type": "站台屏", "Parameters": [ - "Station", + "Region", "Platform", "Location", "Text" diff --git a/CRSim.ScreenSimulator/Models/StylesInfoDataSource.cs b/CRSim.ScreenSimulator/Models/StylesInfoDataSource.cs index 81ecdcf..a26cd04 100644 --- a/CRSim.ScreenSimulator/Models/StylesInfoDataSource.cs +++ b/CRSim.ScreenSimulator/Models/StylesInfoDataSource.cs @@ -7,7 +7,7 @@ namespace CRSim.ScreenSimulator.Models { public string UniqueId { get; set; } public string Title { get; set; } - public string Station { get; set; } + public string Region { get; set; } public string Author { get; set; } public string Type { get; set; } public Type ViewType diff --git a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs index 34e9edf..b675fb3 100644 --- a/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs +++ b/CRSim/ViewModels/Pages/Simulation/ScreenSimulationPageViewModel.cs @@ -227,7 +227,7 @@ public partial class ScreenSimulationPageViewModel : ObservableObject private string _station = string.Empty; private string _type = string.Empty; private string _author = string.Empty; - public List StyleStations { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Station).Distinct())]; + public List StyleStations { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Region).Distinct())]; public List StyleTypes { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Type).Distinct())]; public List StyleAuthors { get; private set; } = [.. new[] { "全部" }.Concat(StylesInfoDataSource.Instance.StylesInfo.Select(x => x.Author).Distinct())]; @@ -269,7 +269,7 @@ public partial class ScreenSimulationPageViewModel : ObservableObject } private void Search() { - StyleCards = [.. StylesInfoDataSource.Instance.StylesInfo.Where(x =>(x.Station==_station||_station==string.Empty||_station=="全部") && (x.Type==_type||_type==string.Empty||_type=="全部") && (x.Author==_author||_author==string.Empty||_author=="全部") && x.Title.Contains(_keyWord))]; + StyleCards = [.. StylesInfoDataSource.Instance.StylesInfo.Where(x =>(x.Region==_station||_station==string.Empty||_station=="全部") && (x.Type==_type||_type==string.Empty||_type=="全部") && (x.Author==_author||_author==string.Empty||_author=="全部") && x.Title.Contains(_keyWord))]; } #endregion } diff --git a/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml b/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml index fcbb27f..ddf62ee 100644 --- a/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml +++ b/CRSim/Views/Pages/Simulation/ScreenSimulationPage.xaml @@ -82,7 +82,7 @@ + Text="" FontSize="12" Margin="8,0"/> @@ -94,7 +94,7 @@ - +