diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs index ee69af8..b1d89ce 100644 --- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs index ee69af8..b1d89ce 100644 --- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs index d43cde1..4557de0 100644 --- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs index ee69af8..b1d89ce 100644 --- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs index d43cde1..4557de0 100644 --- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs new file mode 100644 index 0000000..a4789a4 --- /dev/null +++ b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs @@ -0,0 +1,8 @@ +using GalaSoft.MvvmLight; + +namespace SubCabinetSolution.ViewModel +{ + public class RegisterFaceViewModel : ViewModelBase + { + } +} \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs index ee69af8..b1d89ce 100644 --- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs index d43cde1..4557de0 100644 --- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs new file mode 100644 index 0000000..a4789a4 --- /dev/null +++ b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs @@ -0,0 +1,8 @@ +using GalaSoft.MvvmLight; + +namespace SubCabinetSolution.ViewModel +{ + public class RegisterFaceViewModel : ViewModelBase + { + } +} \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs index 8cc1539..07bd3b5 100644 --- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs index ee69af8..b1d89ce 100644 --- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs index d43cde1..4557de0 100644 --- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs new file mode 100644 index 0000000..a4789a4 --- /dev/null +++ b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs @@ -0,0 +1,8 @@ +using GalaSoft.MvvmLight; + +namespace SubCabinetSolution.ViewModel +{ + public class RegisterFaceViewModel : ViewModelBase + { + } +} \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs index 8cc1539..07bd3b5 100644 --- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/ViewModelLocator.cs b/SubCabinetSolution/ViewModel/ViewModelLocator.cs index bd71330..c9ba6a2 100644 --- a/SubCabinetSolution/ViewModel/ViewModelLocator.cs +++ b/SubCabinetSolution/ViewModel/ViewModelLocator.cs @@ -44,10 +44,11 @@ SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); - + SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); @@ -99,6 +100,8 @@ new Uri("/SubCabinetSolution;component/Views/AddUserDialog.xaml", UriKind.Relative)); service.Configure("EditUserDialog", new Uri("/SubCabinetSolution;component/Views/EditUserDialog.xaml", UriKind.Relative)); + service.Configure("RegisterFaceWindow", + new Uri("/SubCabinetSolution;component/Views/RegisterFaceWindow.xaml", UriKind.Relative)); service.Configure("RecentUsePage", new Uri("/SubCabinetSolution;component/Views/RecentUsePage.xaml", UriKind.Relative)); @@ -142,6 +145,7 @@ public SettingsPageViewModel SettingsPage => ServiceLocator.Current.GetInstance(); public AddUserDialogViewModel AddUserDialog => ServiceLocator.Current.GetInstance(); public EditUserDialogViewModel EditUserDialog => ServiceLocator.Current.GetInstance(); + public RegisterFaceViewModel RegisterFaceWindow => ServiceLocator.Current.GetInstance(); public RecentUsePageViewModel RecentUsePage => ServiceLocator.Current.GetInstance(); public InventoryQueryPageViewModel InventoryQueryPage => diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs index ee69af8..b1d89ce 100644 --- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs index d43cde1..4557de0 100644 --- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs new file mode 100644 index 0000000..a4789a4 --- /dev/null +++ b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs @@ -0,0 +1,8 @@ +using GalaSoft.MvvmLight; + +namespace SubCabinetSolution.ViewModel +{ + public class RegisterFaceViewModel : ViewModelBase + { + } +} \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs index 8cc1539..07bd3b5 100644 --- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/ViewModelLocator.cs b/SubCabinetSolution/ViewModel/ViewModelLocator.cs index bd71330..c9ba6a2 100644 --- a/SubCabinetSolution/ViewModel/ViewModelLocator.cs +++ b/SubCabinetSolution/ViewModel/ViewModelLocator.cs @@ -44,10 +44,11 @@ SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); - + SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); @@ -99,6 +100,8 @@ new Uri("/SubCabinetSolution;component/Views/AddUserDialog.xaml", UriKind.Relative)); service.Configure("EditUserDialog", new Uri("/SubCabinetSolution;component/Views/EditUserDialog.xaml", UriKind.Relative)); + service.Configure("RegisterFaceWindow", + new Uri("/SubCabinetSolution;component/Views/RegisterFaceWindow.xaml", UriKind.Relative)); service.Configure("RecentUsePage", new Uri("/SubCabinetSolution;component/Views/RecentUsePage.xaml", UriKind.Relative)); @@ -142,6 +145,7 @@ public SettingsPageViewModel SettingsPage => ServiceLocator.Current.GetInstance(); public AddUserDialogViewModel AddUserDialog => ServiceLocator.Current.GetInstance(); public EditUserDialogViewModel EditUserDialog => ServiceLocator.Current.GetInstance(); + public RegisterFaceViewModel RegisterFaceWindow => ServiceLocator.Current.GetInstance(); public RecentUsePageViewModel RecentUsePage => ServiceLocator.Current.GetInstance(); public InventoryQueryPageViewModel InventoryQueryPage => diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 87e6a93..355e94d 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -55,7 +55,6 @@ - + @@ -101,6 +100,12 @@ + + + + + + @@ -129,6 +134,11 @@ + + + + + @@ -193,7 +203,7 @@ - + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index c41324b..eefff92 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 6a597d8..5b067cb 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -228,6 +228,7 @@ + diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index c07ce7c..79a1c7d 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -46,7 +48,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send("", MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 2410644..3739831 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -102,6 +102,12 @@ SettingsSelectedCommand = new RelayCommand(SettingsSelectionChanged); SearchDataCommand = new RelayCommand(SearchData); // 设置默认值 + SetDefaultImageTitle(); + Messenger.Default.Register(this, MessageToken.ChangeCabinetPage, s => { SetDefaultImageTitle(); }); + } + + private void SetDefaultImageTitle() + { MainTopImage = FunctionModels[7].Image; MainTopTitle = FunctionModels[7].Title; } @@ -113,7 +119,13 @@ private void ItemSelectionChanged(object sender) { - var functionModel = (FunctionModel)sender; + var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + + var functionModel = (FunctionModel)listBox.SelectedItem; MainTopImage = functionModel.Image; MainTopTitle = functionModel.Title; @@ -154,6 +166,9 @@ navigationService.NavigateTo("CabinetMainPage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SettingsSelectionChanged(object sender) @@ -177,9 +192,6 @@ case "灯光": MessageBox.Show(JsonConvert.SerializeObject(functionModel), "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); - - // 解决ListBox无法单击的问题 - listBox.SelectedIndex = -1; break; case "近消耗品": IsTopSearchBarVisible = "Collapsed"; @@ -187,6 +199,9 @@ navigationService.NavigateTo("RecentUsePage"); break; } + + // 解决ListBox无法单击的问题 + listBox.SelectedIndex = -1; } private void SearchData() diff --git a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs index 4c3f48a..116b712 100644 --- a/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs +++ b/SubCabinetSolution/ViewModel/EditUserDialogViewModel.cs @@ -30,6 +30,11 @@ private void ItemSelectionChanged(object sender) { var listBox = (ListBox)sender; + if (listBox.SelectedIndex == -1) + { + return; + } + switch (listBox.SelectedIndex) { case 0: //角色转换 diff --git a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs index 4d47ef1..c29bd9a 100644 --- a/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/EmergencyPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs index ee69af8..b1d89ce 100644 --- a/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/PutGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs index d43cde1..4557de0 100644 --- a/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/RefundSpdPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs new file mode 100644 index 0000000..a4789a4 --- /dev/null +++ b/SubCabinetSolution/ViewModel/RegisterFaceViewModel.cs @@ -0,0 +1,8 @@ +using GalaSoft.MvvmLight; + +namespace SubCabinetSolution.ViewModel +{ + public class RegisterFaceViewModel : ViewModelBase + { + } +} \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs index 8cc1539..07bd3b5 100644 --- a/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/ReturnGoodsPageViewModel.cs @@ -2,8 +2,10 @@ using CommonServiceLocator; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; +using GalaSoft.MvvmLight.Messaging; using GalaSoft.MvvmLight.Views; using SubCabinetSolution.Model; +using SubCabinetSolution.Utils; namespace SubCabinetSolution.ViewModel { @@ -59,7 +61,7 @@ GoBackCommand = new RelayCommand(() => { ServiceLocator.Current.GetInstance().NavigateTo("CabinetMainPage"); - //Messenger.Default.Send(MessageToken.ChangeCabinetPage); + Messenger.Default.Send(MessageToken.ChangeCabinetPage); }); } } diff --git a/SubCabinetSolution/ViewModel/ViewModelLocator.cs b/SubCabinetSolution/ViewModel/ViewModelLocator.cs index bd71330..c9ba6a2 100644 --- a/SubCabinetSolution/ViewModel/ViewModelLocator.cs +++ b/SubCabinetSolution/ViewModel/ViewModelLocator.cs @@ -44,10 +44,11 @@ SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); - + SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); + SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); SimpleIoc.Default.Register(); @@ -99,6 +100,8 @@ new Uri("/SubCabinetSolution;component/Views/AddUserDialog.xaml", UriKind.Relative)); service.Configure("EditUserDialog", new Uri("/SubCabinetSolution;component/Views/EditUserDialog.xaml", UriKind.Relative)); + service.Configure("RegisterFaceWindow", + new Uri("/SubCabinetSolution;component/Views/RegisterFaceWindow.xaml", UriKind.Relative)); service.Configure("RecentUsePage", new Uri("/SubCabinetSolution;component/Views/RecentUsePage.xaml", UriKind.Relative)); @@ -142,6 +145,7 @@ public SettingsPageViewModel SettingsPage => ServiceLocator.Current.GetInstance(); public AddUserDialogViewModel AddUserDialog => ServiceLocator.Current.GetInstance(); public EditUserDialogViewModel EditUserDialog => ServiceLocator.Current.GetInstance(); + public RegisterFaceViewModel RegisterFaceWindow => ServiceLocator.Current.GetInstance(); public RecentUsePageViewModel RecentUsePage => ServiceLocator.Current.GetInstance(); public InventoryQueryPageViewModel InventoryQueryPage => diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 87e6a93..355e94d 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -55,7 +55,6 @@ - + @@ -101,6 +100,12 @@ + + + + + + @@ -129,6 +134,11 @@ + + + + + @@ -193,7 +203,7 @@ - + diff --git a/SubCabinetSolution/Views/EditUserDialog.xaml b/SubCabinetSolution/Views/EditUserDialog.xaml index 6072683..856923b 100644 --- a/SubCabinetSolution/Views/EditUserDialog.xaml +++ b/SubCabinetSolution/Views/EditUserDialog.xaml @@ -13,6 +13,7 @@ DataContext="{Binding EditUserDialog, Source={StaticResource Locator}}" ResizeMode="NoResize" ShowInTaskbar="False" + Topmost="True" WindowStartupLocation="CenterOwner" WindowStyle="None" mc:Ignorable="d"> @@ -36,22 +37,22 @@ + Width="50" + Height="50" + Margin="15,0" + Background="#F1F1F1" + CornerRadius="25"> @@ -63,10 +64,20 @@ - + + + + + + @@ -81,8 +92,8 @@