From eff7feec9b9ccd6d6317599c47b63189869acd04 Mon Sep 17 00:00:00 2001 From: denglihong2007 <98096191+denglihong2007@users.noreply.github.com> Date: Sun, 12 Oct 2025 01:30:19 +0800 Subject: [PATCH] release: 3.1.0.0 [skip cliff] --- CRSim/Properties/PublishProfiles/win-x64.pubxml | 1 + .../DialogContents/TrainNumberStopDialog.xaml.cs | 8 ++++---- CRSim/Views/DialogContents/TrainStopDialog.xaml.cs | 14 +++++++------- CRSim/Views/StartWindow.xaml.cs | 6 +++--- Directory.Build.props | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/CRSim/Properties/PublishProfiles/win-x64.pubxml b/CRSim/Properties/PublishProfiles/win-x64.pubxml index c574ffc..ac2fbba 100644 --- a/CRSim/Properties/PublishProfiles/win-x64.pubxml +++ b/CRSim/Properties/PublishProfiles/win-x64.pubxml @@ -8,6 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. x64 win-x64 bin\\publish\ + true false Release net9.0-windows10.0.19041.0 diff --git a/CRSim/Views/DialogContents/TrainNumberStopDialog.xaml.cs b/CRSim/Views/DialogContents/TrainNumberStopDialog.xaml.cs index 6f4200e..8b80fee 100644 --- a/CRSim/Views/DialogContents/TrainNumberStopDialog.xaml.cs +++ b/CRSim/Views/DialogContents/TrainNumberStopDialog.xaml.cs @@ -1,4 +1,4 @@ -using CRSim.Core.Models; +using CRSim.Core.Models; namespace CRSim.Views; public sealed partial class TrainNumberStopDialog : Page @@ -99,19 +99,19 @@ public sealed partial class TrainNumberStopDialog : Page string selectedType = rb.SelectedItem as string; switch (selectedType) { - case "ʼվ": + case "始发站": StartHour.IsEnabled = false; StartMinute.IsEnabled = false; EndHour.IsEnabled = true; EndMinute.IsEnabled = true; break; - case "мվ": + case "中间站": StartHour.IsEnabled = true; StartMinute.IsEnabled = true; EndHour.IsEnabled = true; EndMinute.IsEnabled = true; break; - case "յվ": + case "终到站": StartHour.IsEnabled = true; StartMinute.IsEnabled = true; EndHour.IsEnabled = false; diff --git a/CRSim/Views/DialogContents/TrainStopDialog.xaml.cs b/CRSim/Views/DialogContents/TrainStopDialog.xaml.cs index 2532489..08c337b 100644 --- a/CRSim/Views/DialogContents/TrainStopDialog.xaml.cs +++ b/CRSim/Views/DialogContents/TrainStopDialog.xaml.cs @@ -1,11 +1,11 @@ -using CRSim.Core.Models; +using CRSim.Core.Models; namespace CRSim.Views; public sealed partial class TrainStopDialog : Page { public TrainStop GeneratedTrainStop; - public List Landmarks { get; set; } = ["", "ɫ", "ɫ", "ɫ", "ɫ", "ɫ", "ɫ", "ɫ"]; + public List Landmarks { get; set; } = ["无", "红色", "绿色", "褐色", "蓝色", "紫色", "黄色", "橙色"]; public List Platforms { get; set; } = []; @@ -38,7 +38,7 @@ public sealed partial class TrainStopDialog : Page ArrivalTextBox.Text = trainStop.Terminal; DepartureTextBox.Text = trainStop.Origin; PlatformComboBox.SelectedItem = trainStop.Platform; - LandmarkComboBox.SelectedItem = trainStop.Landmark ?? ""; + LandmarkComboBox.SelectedItem = trainStop.Landmark ?? "无"; if (trainStop.ArrivalTime.HasValue) { StartHour.Text = trainStop.ArrivalTime.Value.Hours.ToString("D2"); @@ -139,7 +139,7 @@ public sealed partial class TrainStopDialog : Page .Select(x => x.Id)] : null, Platform = (string)PlatformComboBox.SelectedItem, Length = int.Parse(LengthTextBox.Text), - Landmark = (string)LandmarkComboBox.SelectedItem == "" ? null : (string)LandmarkComboBox.SelectedItem, + Landmark = (string)LandmarkComboBox.SelectedItem == "无" ? null : (string)LandmarkComboBox.SelectedItem, Status = SuspendToggleSwitch.IsOn ? null : TimeSpan.FromMinutes(int.Parse(StatusTextBox.Text)) }; } @@ -152,21 +152,21 @@ public sealed partial class TrainStopDialog : Page string selectedType = rb.SelectedItem as string; switch (selectedType) { - case "ʼվ": + case "始发站": StartHour.IsEnabled = false; StartMinute.IsEnabled = false; EndHour.IsEnabled = true; EndMinute.IsEnabled = true; WaitingAreasList.IsEnabled = true; break; - case "мվ": + case "中间站": StartHour.IsEnabled = true; StartMinute.IsEnabled = true; EndHour.IsEnabled = true; EndMinute.IsEnabled = true; WaitingAreasList.IsEnabled = true; break; - case "յվ": + case "终到站": StartHour.IsEnabled = true; StartMinute.IsEnabled = true; EndHour.IsEnabled = false; diff --git a/CRSim/Views/StartWindow.xaml.cs b/CRSim/Views/StartWindow.xaml.cs index 4414cb5..a301b35 100644 --- a/CRSim/Views/StartWindow.xaml.cs +++ b/CRSim/Views/StartWindow.xaml.cs @@ -1,13 +1,13 @@ -using System.ComponentModel; +using System.ComponentModel; namespace CRSim.Views { public sealed partial class StartWindow : Window, INotifyPropertyChanged { - // ¼ + // 声明事件 public string AppVersion { get; set; } = App.AppVersion; - private string _status = "..."; + private string _status = "正在启动..."; public string Status { get => _status; diff --git a/Directory.Build.props b/Directory.Build.props index cca125d..46b40af 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 3.0.1.0 + 3.1.0.0 电排骨 https://github.com/denglihong2007/CRSim