From 92eb86bd97445c780fdcc6a0cb685aabef7d48c5 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 1 Nov 2021 22:49:58 +0800 Subject: [PATCH] =?UTF-8?q?feat.=E6=8D=A2=E7=8F=AD=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=AF=8F=E4=B8=AA=E8=AE=BE=E6=96=BD=E7=9A=84?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InfrastructureConstructionViewModel.cs | 30 +++++++++++-------- .../Views/InfrastructureConstructionView.xaml | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/MeoAsstGui/ViewModels/InfrastructureConstructionViewModel.cs b/src/MeoAsstGui/ViewModels/InfrastructureConstructionViewModel.cs index 10173a7cb7..701247d862 100644 --- a/src/MeoAsstGui/ViewModels/InfrastructureConstructionViewModel.cs +++ b/src/MeoAsstGui/ViewModels/InfrastructureConstructionViewModel.cs @@ -47,13 +47,13 @@ namespace MeoAsstGui public void InitializeItems() { - ItemViewModels.Add(new ItemViewModel(1, "宿舍")); - ItemViewModels.Add(new ItemViewModel(2, "制造站")); - ItemViewModels.Add(new ItemViewModel(3, "贸易站")); - ItemViewModels.Add(new ItemViewModel(4, "发电站")); - ItemViewModels.Add(new ItemViewModel(5, "会客室")); - ItemViewModels.Add(new ItemViewModel(6, "办公室")); - ItemViewModels.Add(new ItemViewModel(7, "宿舍")); + ItemViewModels.Add(new ItemViewModel("宿舍")); + ItemViewModels.Add(new ItemViewModel("制造站")); + ItemViewModels.Add(new ItemViewModel("贸易站")); + ItemViewModels.Add(new ItemViewModel("发电站")); + ItemViewModels.Add(new ItemViewModel("会客室")); + ItemViewModels.Add(new ItemViewModel("办公室")); + ItemViewModels.Add(new ItemViewModel("宿舍")); //ItemViewModels.Add(new ItemViewModel(8, "控制中枢")); } @@ -147,6 +147,10 @@ namespace MeoAsstGui var orderList = new List(); foreach (var item in ItemViewModels) { + if (item.IsChecked == false) + { + continue; + } orderList.Add(facility_key[item.Name]); } @@ -162,10 +166,10 @@ namespace MeoAsstGui public class ItemViewModel : PropertyChangedBase { - public ItemViewModel(int id, string name) + public ItemViewModel(string name, bool isChecked = true) { - this.ID = id; this.Name = name; + this.IsChecked = IsChecked; } private string _name; @@ -179,14 +183,14 @@ namespace MeoAsstGui } } - private int _id; + private bool _isChecked = true; - public int ID + public bool IsChecked { - get { return _id; } + get { return _isChecked; } set { - SetAndNotify(ref _id, value); + SetAndNotify(ref _isChecked, value); } } diff --git a/src/MeoAsstGui/Views/InfrastructureConstructionView.xaml b/src/MeoAsstGui/Views/InfrastructureConstructionView.xaml index c3f9ec8c27..de500398b4 100644 --- a/src/MeoAsstGui/Views/InfrastructureConstructionView.xaml +++ b/src/MeoAsstGui/Views/InfrastructureConstructionView.xaml @@ -27,7 +27,7 @@ - +