From d3637e070077208953a3fb8a69c1c73060ba7632 Mon Sep 17 00:00:00 2001 From: 17351662861 Date: Mon, 28 Apr 2025 10:06:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=A1=86=E6=9E=B6=E6=90=AD?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ModuleNameModule.cs | 16 +- .../ViewModels/CommonLogViewModel.cs | 36 ++ .../ViewModels/TopMenuViewModel.cs | 37 ++ .../Views/Components/CommonLog.xaml | 16 + .../Views/Components/CommonLog.xaml.cs | 28 + .../Views/Components/TopMenu.xaml | 20 + .../Views/Components/TopMenu.xaml.cs | 39 ++ .../Views/{ => Components}/ViewA.xaml | 26 +- .../Views/{ => Components}/ViewA.xaml.cs | 56 +- .../Views/Page/HomePage.xaml | 131 ++++ .../Views/Page/HomePage.xaml.cs | 20 + .../Views/Page/SettingsPage.xaml | 16 + .../Views/Page/SettingsPage.xaml.cs | 15 + ...r_screen_bankend.Modules.ModuleName.csproj | 8 + ...een_bankend.Modules.ModuleName.csproj.user | 12 + ...odules.ModuleName.csproj.nuget.dgspec.json | 12 + ...nd.Modules.ModuleName.csproj.nuget.g.props | 3 +- .../obj/project.assets.json | 235 ++++++- .../obj/project.nuget.cache | 9 +- .../ILogService.cs | 8 + .../LogService.cs | 18 + ....ModuleName.Tests.csproj.nuget.dgspec.json | 12 + ...ules.ModuleName.Tests.csproj.nuget.g.props | 3 +- .../obj/project.assets.json | 235 ++++++- .../obj/project.nuget.cache | 9 +- .../RegionNames.cs | 2 + .../linesider_screen_bankend.Core.csproj | 3 + ...reen_bankend.Core.csproj.nuget.dgspec.json | 12 + ...r_screen_bankend.Core.csproj.nuget.g.props | 3 +- ...screen_bankend.Core.csproj.nuget.g.targets | 6 +- .../obj/project.assets.json | 282 ++++++++- .../obj/project.nuget.cache | 10 +- .../linesider_screen_bankend/App.xaml | 11 +- .../linesider_screen_bankend/App.xaml.cs | 56 +- .../Views/MainPage.xaml | 131 +--- .../Views/MainPage.xaml.cs | 60 +- .../linesider_screen_bankend.csproj | 3 - ...er_screen_bankend.csproj.nuget.dgspec.json | 24 +- ...ider_screen_bankend.csproj.nuget.g.targets | 1 - ...d_3l2oahla_wpftmp.csproj.nuget.dgspec.json | 591 ++++++++++++++++++ ...nkend_3l2oahla_wpftmp.csproj.nuget.g.props | 20 + ...end_3l2oahla_wpftmp.csproj.nuget.g.targets | 11 + ...d_4fpbzn0p_wpftmp.csproj.nuget.dgspec.json | 591 ++++++++++++++++++ ...nkend_4fpbzn0p_wpftmp.csproj.nuget.g.props | 20 + ...end_4fpbzn0p_wpftmp.csproj.nuget.g.targets | 11 + ...d_jwympbmb_wpftmp.csproj.nuget.dgspec.json | 591 ++++++++++++++++++ ...nkend_jwympbmb_wpftmp.csproj.nuget.g.props | 20 + ...end_jwympbmb_wpftmp.csproj.nuget.g.targets | 11 + ...d_ty2snvhb_wpftmp.csproj.nuget.dgspec.json | 591 ++++++++++++++++++ ...nkend_ty2snvhb_wpftmp.csproj.nuget.g.props | 20 + ...end_ty2snvhb_wpftmp.csproj.nuget.g.targets | 11 + ...d_vih0igd0_wpftmp.csproj.nuget.dgspec.json | 591 ++++++++++++++++++ ...nkend_vih0igd0_wpftmp.csproj.nuget.g.props | 20 + ...end_vih0igd0_wpftmp.csproj.nuget.g.targets | 10 + .../obj/project.assets.json | 20 +- .../obj/project.nuget.cache | 2 +- .../Debug/net6.0/linesider_screen_tool.dll | Bin 22528 -> 22528 bytes .../Debug/net6.0/linesider_screen_tool.pdb | Bin 14892 -> 14892 bytes .../obj/Debug/net6.0/Interop.BarTender.dll | Bin 161280 -> 161280 bytes .../linesider_screen_tool.AssemblyInfo.cs | 2 +- ...sider_screen_tool.AssemblyInfoInputs.cache | 2 +- ...reen_tool.csproj.ResolveComReference.cache | Bin 241 -> 245 bytes .../Debug/net6.0/linesider_screen_tool.dll | Bin 22528 -> 22528 bytes .../Debug/net6.0/linesider_screen_tool.pdb | Bin 14892 -> 14892 bytes .../net6.0/ref/linesider_screen_tool.dll | Bin 11776 -> 11776 bytes .../net6.0/refint/linesider_screen_tool.dll | Bin 11776 -> 11776 bytes 66 files changed, 4479 insertions(+), 280 deletions(-) create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/CommonLogViewModel.cs create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/TopMenuViewModel.cs create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml.cs create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml.cs rename linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/{ => Components}/ViewA.xaml (98%) rename linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/{ => Components}/ViewA.xaml.cs (95%) create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml.cs create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/SettingsPage.xaml create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/SettingsPage.xaml.cs create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/linesider_screen_bankend.Modules.ModuleName.csproj.user create mode 100644 linesider_screen_bankend/Services/linesider_screen_bankend.Services.Interfaces/ILogService.cs create mode 100644 linesider_screen_bankend/Services/linesider_screen_bankend.Services/LogService.cs create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_3l2oahla_wpftmp.csproj.nuget.dgspec.json create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_3l2oahla_wpftmp.csproj.nuget.g.props create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_3l2oahla_wpftmp.csproj.nuget.g.targets create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_4fpbzn0p_wpftmp.csproj.nuget.dgspec.json create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_4fpbzn0p_wpftmp.csproj.nuget.g.props create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_4fpbzn0p_wpftmp.csproj.nuget.g.targets create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_jwympbmb_wpftmp.csproj.nuget.dgspec.json create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_jwympbmb_wpftmp.csproj.nuget.g.props create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_jwympbmb_wpftmp.csproj.nuget.g.targets create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_ty2snvhb_wpftmp.csproj.nuget.dgspec.json create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_ty2snvhb_wpftmp.csproj.nuget.g.props create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_ty2snvhb_wpftmp.csproj.nuget.g.targets create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_vih0igd0_wpftmp.csproj.nuget.dgspec.json create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_vih0igd0_wpftmp.csproj.nuget.g.props create mode 100644 linesider_screen_bankend/linesider_screen_bankend/obj/linesider_screen_bankend_vih0igd0_wpftmp.csproj.nuget.g.targets diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ModuleNameModule.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ModuleNameModule.cs index 5e1b56f..b0d7572 100644 --- a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ModuleNameModule.cs +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ModuleNameModule.cs @@ -1,4 +1,7 @@ -using linesider_screen_bankend.Core; +using System; +using System.Diagnostics; +using System.Windows.Controls; +using linesider_screen_bankend.Core; using linesider_screen_bankend.Modules.ModuleName.Views; using Prism.Ioc; using Prism.Modularity; @@ -17,12 +20,19 @@ namespace linesider_screen_bankend.Modules.ModuleName public void OnInitialized(IContainerProvider containerProvider) { - _regionManager.RequestNavigate(RegionNames.ContentRegion, "ViewA"); + //_regionManager.RequestNavigate(RegionNames.ContentRegion, "ViewA"); + //Navigate(RegionNames.LogRegion, "CommonLogView"); + //Navigate(RegionNames.TopMenuRegion, "TopMenuView"); } public void RegisterTypes(IContainerRegistry containerRegistry) { - containerRegistry.RegisterForNavigation(); + Debug.WriteLine($"尝试注册Module视图"); + containerRegistry.RegisterForNavigation("ViewA"); + containerRegistry.RegisterForNavigation("CommonLogView"); + containerRegistry.RegisterForNavigation("TopMenuView"); + Debug.WriteLine($"Module视图注册成功"); } + } } \ No newline at end of file diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/CommonLogViewModel.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/CommonLogViewModel.cs new file mode 100644 index 0000000..d191661 --- /dev/null +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/CommonLogViewModel.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using linesider_screen_bankend.Core.Mvvm; +using linesider_screen_bankend.Services.Interfaces; +using Prism.Regions; + +namespace linesider_screen_bankend.Modules.ModuleName.ViewModels +{ + public class CommonLogViewModel : RegionViewModelBase + { + ILogService _logService; + private string _logMessage; + public string LogMessage + { + get { return _logMessage; } + set { SetProperty(ref _logMessage, value); } + } + public CommonLogViewModel(IRegionManager regionManager, ILogService logService) : base(regionManager) + { + LogMessage = logService.GetInitMessage(); + _logService = logService; + } + + public void AddLogMessage() + { + _logService.AddMessage("123"); + } + public override void OnNavigatedTo(NavigationContext navigationContext) + { + //do something + } + } +} diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/TopMenuViewModel.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/TopMenuViewModel.cs new file mode 100644 index 0000000..fd380fa --- /dev/null +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/TopMenuViewModel.cs @@ -0,0 +1,37 @@ +using linesider_screen_bankend.Core; +using linesider_screen_bankend.Core.Mvvm; +using linesider_screen_bankend.Services.Interfaces; +using Prism.Commands; +using Prism.Regions; + +namespace linesider_screen_bankend.Modules.ModuleName.ViewModels +{ + public class TopMenuViewModel : RegionViewModelBase + { + private readonly IRegionManager _regionManager; + public DelegateCommand NavigateToHomeCommand { get; private set; } + public DelegateCommand NavigateToSettingsCommand { get; private set; } + public TopMenuViewModel(IRegionManager regionManager) : + base(regionManager) + { + _regionManager = regionManager; + NavigateToHomeCommand = new DelegateCommand(NavigateToHome); + NavigateToSettingsCommand = new DelegateCommand(NavigateToSettings); + } + public override void OnNavigatedTo(NavigationContext navigationContext) + { + //do something + } + private void NavigateToHome() + { + _regionManager.RequestNavigate(RegionNames.ContentRegion, "HomePage"); + } + + private void NavigateToSettings() + { + _regionManager.RequestNavigate(RegionNames.ContentRegion, "SettingsPage"); + } + + + } +} diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml new file mode 100644 index 0000000..e380e07 --- /dev/null +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml.cs new file mode 100644 index 0000000..6de2b0f --- /dev/null +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/CommonLog.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace linesider_screen_bankend.Modules.ModuleName.Views +{ + /// + /// CommonLog.xaml 的交互逻辑 + /// + public partial class CommonLog : UserControl + { + public CommonLog() + { + InitializeComponent(); + } + } +} diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml new file mode 100644 index 0000000..d048199 --- /dev/null +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml @@ -0,0 +1,20 @@ + + + + + + + + +