From d9983b0a99198dc69ccec74874500751f9ea8010 Mon Sep 17 00:00:00 2001 From: 17351662861 Date: Tue, 29 Apr 2025 09:04:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...en_bankend.Models.csproj.nuget.dgspec.json | 21 +- ..._sreen_bankend.Models.csproj.nuget.g.props | 8 +- .../obj/project.assets.json | 21 +- .../obj/project.nuget.cache | 164 ++++----- .../ModuleNameModule.cs | 9 + .../ViewModels/HomePageViewModel.cs | 27 ++ .../ViewModels/SettingsPageViewModel.cs | 83 +++++ .../Views/Components/TopMenu.xaml.cs | 19 +- .../Views/Page/HomePage.xaml | 7 +- .../Views/Page/HomePage.xaml.cs | 2 +- .../Views/Page/SettingsPage.xaml | 100 ++++- .../Views/Page/SettingsPage.xaml.cs | 5 +- ...r_screen_bankend.Modules.ModuleName.csproj | 1 + ...odules.ModuleName.csproj.nuget.dgspec.json | 162 +++++--- ...nd.Modules.ModuleName.csproj.nuget.g.props | 12 +- .../obj/project.assets.json | 61 ++-- .../obj/project.nuget.cache | 187 +++++----- .../ILogService.cs | 1 + .../IMqttService.cs | 10 + .../IPortService.cs | 13 + .../IPrintService.cs | 9 + ...rvices.Interfaces.csproj.nuget.dgspec.json | 44 ++- ...d.Services.Interfaces.csproj.nuget.g.props | 8 +- .../obj/project.assets.json | 25 +- .../obj/project.nuget.cache | 164 ++++----- .../LogService.cs | 5 +- .../PortService.cs | 38 ++ .../PrintService.cs | 12 + ..._bankend.Services.csproj.nuget.dgspec.json | 67 ++-- ...reen_bankend.Services.csproj.nuget.g.props | 8 +- .../obj/project.assets.json | 25 +- .../obj/project.nuget.cache | 164 ++++----- ....ModuleName.Tests.csproj.nuget.dgspec.json | 193 ++++++---- ...ules.ModuleName.Tests.csproj.nuget.g.props | 14 +- .../obj/project.assets.json | 54 +-- .../obj/project.nuget.cache | 345 +++++++++--------- ...reen_bankend.Core.csproj.nuget.dgspec.json | 21 +- ...r_screen_bankend.Core.csproj.nuget.g.props | 12 +- .../obj/project.assets.json | 31 +- .../obj/project.nuget.cache | 37 +- .../linesider_screen_bankend/App.xaml.cs | 5 +- .../Views/MainPage.xaml.cs | 4 - ...er_screen_bankend.csproj.nuget.dgspec.json | 174 +++++---- ...esider_screen_bankend.csproj.nuget.g.props | 12 +- .../obj/project.assets.json | 52 ++- .../obj/project.nuget.cache | 301 ++++++++------- .../Debug/net6.0/linesider_screen_tool.dll | Bin 22528 -> 22528 bytes .../Debug/net6.0/linesider_screen_tool.pdb | Bin 14896 -> 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 +- ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../net6.0/linesider_screen_tool.assets.cache | Bin 4979 -> 5092 bytes ...screen_tool.csproj.AssemblyReference.cache | Bin 1558 -> 1606 bytes ...screen_tool.csproj.CoreCompileInputs.cache | 2 +- ...reen_tool.csproj.ResolveComReference.cache | Bin 268 -> 245 bytes .../Debug/net6.0/linesider_screen_tool.dll | Bin 22528 -> 22528 bytes .../Debug/net6.0/linesider_screen_tool.pdb | Bin 14896 -> 14892 bytes .../net6.0/ref/linesider_screen_tool.dll | Bin 11776 -> 11776 bytes .../net6.0/refint/linesider_screen_tool.dll | Bin 11776 -> 11776 bytes ...sider_screen_tool.csproj.nuget.dgspec.json | 21 +- ...linesider_screen_tool.csproj.nuget.g.props | 8 +- linesider_screen_tool/obj/project.assets.json | 21 +- linesider_screen_tool/obj/project.nuget.cache | 22 +- 64 files changed, 1587 insertions(+), 1230 deletions(-) create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/HomePageViewModel.cs create mode 100644 linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/SettingsPageViewModel.cs create mode 100644 linesider_screen_bankend/Services/linesider_screen_bankend.Services.Interfaces/IMqttService.cs create mode 100644 linesider_screen_bankend/Services/linesider_screen_bankend.Services.Interfaces/IPortService.cs create mode 100644 linesider_screen_bankend/Services/linesider_screen_bankend.Services.Interfaces/IPrintService.cs create mode 100644 linesider_screen_bankend/Services/linesider_screen_bankend.Services/PortService.cs create mode 100644 linesider_screen_bankend/Services/linesider_screen_bankend.Services/PrintService.cs diff --git a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.dgspec.json b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.dgspec.json index 2cbce57..6165c2f 100644 --- a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.dgspec.json +++ b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.dgspec.json @@ -1,23 +1,23 @@ { "format": 1, "restore": { - "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj": {} + "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj": {} }, "projects": { - "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj": { + "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", + "projectUniqueName": "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", "projectName": "linesider_sreen_bankend.Models", - "projectPath": "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", - "packagesPath": "C:\\Users\\33134\\.nuget\\packages\\", - "outputPath": "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\obj\\", + "projectPath": "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "E:\\sk 2022\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\33134\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -26,7 +26,6 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\dotnet\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { @@ -45,7 +44,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.100" + "SdkAnalysisLevel": "9.0.200" }, "frameworks": { "netstandard2.1": { @@ -76,7 +75,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203\\RuntimeIdentifierGraph.json" } } } diff --git a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.g.props b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.g.props index 5ce0901..1da3284 100644 --- a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.g.props +++ b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/linesider_sreen_bankend.Models.csproj.nuget.g.props @@ -5,12 +5,12 @@ NuGet $(MSBuildThisFileDirectory)project.assets.json $(UserProfile)\.nuget\packages\ - C:\Users\33134\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages + C:\Users\Administrator\.nuget\packages\;E:\sk 2022\NuGetPackages PackageReference - 6.12.2 + 6.13.2 - - + + \ No newline at end of file diff --git a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.assets.json b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.assets.json index 0643915..20df238 100644 --- a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.assets.json +++ b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.assets.json @@ -4326,23 +4326,23 @@ ] }, "packageFolders": { - "C:\\Users\\33134\\.nuget\\packages\\": {}, - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {} + "C:\\Users\\Administrator\\.nuget\\packages\\": {}, + "E:\\sk 2022\\NuGetPackages": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", + "projectUniqueName": "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", "projectName": "linesider_sreen_bankend.Models", - "projectPath": "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", - "packagesPath": "C:\\Users\\33134\\.nuget\\packages\\", - "outputPath": "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\obj\\", + "projectPath": "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", + "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", + "outputPath": "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ - "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" + "E:\\sk 2022\\NuGetPackages" ], "configFilePaths": [ - "C:\\Users\\33134\\AppData\\Roaming\\NuGet\\NuGet.Config", + "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config", "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config" ], @@ -4351,7 +4351,6 @@ ], "sources": { "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {}, - "C:\\Program Files\\dotnet\\library-packs": {}, "https://api.nuget.org/v3/index.json": {} }, "frameworks": { @@ -4370,7 +4369,7 @@ "auditLevel": "low", "auditMode": "direct" }, - "SdkAnalysisLevel": "9.0.100" + "SdkAnalysisLevel": "9.0.200" }, "frameworks": { "netstandard2.1": { @@ -4401,7 +4400,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.101\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.203\\RuntimeIdentifierGraph.json" } } } diff --git a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.nuget.cache b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.nuget.cache index dfb4405..b8d0ebd 100644 --- a/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.nuget.cache +++ b/linesider_screen_bankend/Models/linesider_sreen_bankend.Models/obj/project.nuget.cache @@ -1,89 +1,89 @@ { "version": 2, - "dgSpecHash": "LZfJdeSIUzA=", + "dgSpecHash": "R58nHtpFwBQ=", "success": true, - "projectFilePath": "C:\\Users\\33134\\Desktop\\shgxtzcjhoudaosaomadayinwpf\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", + "projectFilePath": "F:\\Git仓库\\上海干巷涂装车间-后道标签扫描-WPF\\linesider_screen_bankend\\Models\\linesider_sreen_bankend.Models\\linesider_sreen_bankend.Models.csproj", "expectedPackageFiles": [ - "C:\\Users\\33134\\.nuget\\packages\\azure.core\\1.38.0\\azure.core.1.38.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\azure.identity\\1.11.4\\azure.identity.1.11.4.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\bouncycastle.cryptography\\2.3.1\\bouncycastle.cryptography.2.3.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\google.protobuf\\3.26.1\\google.protobuf.3.26.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\k4os.compression.lz4\\1.3.8\\k4os.compression.lz4.1.3.8.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\k4os.compression.lz4.streams\\1.3.8\\k4os.compression.lz4.streams.1.3.8.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\k4os.hash.xxhash\\1.0.8\\k4os.hash.xxhash.1.0.8.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\9.0.0\\microsoft.bcl.asyncinterfaces.9.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.data.sqlclient\\5.2.2\\microsoft.data.sqlclient.5.2.2.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\5.2.0\\microsoft.data.sqlclient.sni.runtime.5.2.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.data.sqlite\\9.0.0\\microsoft.data.sqlite.9.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.data.sqlite.core\\9.0.0\\microsoft.data.sqlite.core.9.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identity.client\\4.61.3\\microsoft.identity.client.4.61.3.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identity.client.extensions.msal\\4.61.3\\microsoft.identity.client.extensions.msal.4.61.3.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identitymodel.abstractions\\6.35.0\\microsoft.identitymodel.abstractions.6.35.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.35.0\\microsoft.identitymodel.jsonwebtokens.6.35.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identitymodel.logging\\6.35.0\\microsoft.identitymodel.logging.6.35.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.35.0\\microsoft.identitymodel.protocols.6.35.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.35.0\\microsoft.identitymodel.protocols.openidconnect.6.35.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.35.0\\microsoft.identitymodel.tokens.6.35.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.1\\microsoft.netcore.platforms.1.1.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.netcore.targets\\1.1.3\\microsoft.netcore.targets.1.1.3.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.sqlserver.server\\1.0.0\\microsoft.sqlserver.server.1.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\mysql.data\\9.2.0\\mysql.data.9.2.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\npgsql\\5.0.18\\npgsql.5.0.18.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\oscar.data.sqlclient\\4.0.4\\oscar.data.sqlclient.4.0.4.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.10\\sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\sqlitepclraw.core\\2.1.10\\sqlitepclraw.core.2.1.10.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.10\\sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.10\\sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\sqlsugarcore\\5.1.4.188\\sqlsugarcore.5.1.4.188.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\sqlsugarcore.dm\\8.6.0\\sqlsugarcore.dm.8.6.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\sqlsugarcore.kdbndp\\9.3.7.311\\sqlsugarcore.kdbndp.9.3.7.311.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.clientmodel\\1.0.0\\system.clientmodel.1.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.configuration.configurationmanager\\8.0.0\\system.configuration.configurationmanager.8.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.diagnostics.diagnosticsource\\8.0.1\\system.diagnostics.diagnosticsource.8.0.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.35.0\\system.identitymodel.tokens.jwt.6.35.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.io.filesystem.accesscontrol\\5.0.0\\system.io.filesystem.accesscontrol.5.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.io.pipelines\\9.0.0\\system.io.pipelines.9.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.memory.data\\1.0.2\\system.memory.data.1.0.2.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.numerics.vectors\\4.5.0\\system.numerics.vectors.4.5.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.runtime\\4.3.1\\system.runtime.4.3.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.runtime.caching\\6.0.0\\system.runtime.caching.6.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.runtime.extensions\\4.3.1\\system.runtime.extensions.4.3.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.security.cryptography.protecteddata\\8.0.0\\system.security.cryptography.protecteddata.8.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.security.permissions\\8.0.0\\system.security.permissions.8.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.text.encodings.web\\9.0.0\\system.text.encodings.web.9.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.text.json\\9.0.0\\system.text.json.9.0.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.threading.channels\\4.7.0\\system.threading.channels.4.7.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512", - "C:\\Users\\33134\\.nuget\\packages\\zstdsharp.port\\0.8.0\\zstdsharp.port.0.8.0.nupkg.sha512" + "C:\\Users\\Administrator\\.nuget\\packages\\azure.core\\1.38.0\\azure.core.1.38.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\azure.identity\\1.11.4\\azure.identity.1.11.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\bouncycastle.cryptography\\2.3.1\\bouncycastle.cryptography.2.3.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\google.protobuf\\3.26.1\\google.protobuf.3.26.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\k4os.compression.lz4\\1.3.8\\k4os.compression.lz4.1.3.8.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\k4os.compression.lz4.streams\\1.3.8\\k4os.compression.lz4.streams.1.3.8.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\k4os.hash.xxhash\\1.0.8\\k4os.hash.xxhash.1.0.8.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\9.0.0\\microsoft.bcl.asyncinterfaces.9.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.csharp\\4.5.0\\microsoft.csharp.4.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.data.sqlclient\\5.2.2\\microsoft.data.sqlclient.5.2.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\5.2.0\\microsoft.data.sqlclient.sni.runtime.5.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.data.sqlite\\9.0.0\\microsoft.data.sqlite.9.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.data.sqlite.core\\9.0.0\\microsoft.data.sqlite.core.9.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identity.client\\4.61.3\\microsoft.identity.client.4.61.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identity.client.extensions.msal\\4.61.3\\microsoft.identity.client.extensions.msal.4.61.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.abstractions\\6.35.0\\microsoft.identitymodel.abstractions.6.35.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.35.0\\microsoft.identitymodel.jsonwebtokens.6.35.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.logging\\6.35.0\\microsoft.identitymodel.logging.6.35.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.35.0\\microsoft.identitymodel.protocols.6.35.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.35.0\\microsoft.identitymodel.protocols.openidconnect.6.35.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.35.0\\microsoft.identitymodel.tokens.6.35.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.platforms\\1.1.1\\microsoft.netcore.platforms.1.1.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.targets\\1.1.3\\microsoft.netcore.targets.1.1.3.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.sqlserver.server\\1.0.0\\microsoft.sqlserver.server.1.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mysql.data\\9.2.0\\mysql.data.9.2.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\newtonsoft.json\\13.0.2\\newtonsoft.json.13.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\npgsql\\5.0.18\\npgsql.5.0.18.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\oscar.data.sqlclient\\4.0.4\\oscar.data.sqlclient.4.0.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.10\\sqlitepclraw.bundle_e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sqlitepclraw.core\\2.1.10\\sqlitepclraw.core.2.1.10.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.10\\sqlitepclraw.lib.e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.10\\sqlitepclraw.provider.e_sqlite3.2.1.10.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sqlsugarcore\\5.1.4.188\\sqlsugarcore.5.1.4.188.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sqlsugarcore.dm\\8.6.0\\sqlsugarcore.dm.8.6.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\sqlsugarcore.kdbndp\\9.3.7.311\\sqlsugarcore.kdbndp.9.3.7.311.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.clientmodel\\1.0.0\\system.clientmodel.1.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.configuration.configurationmanager\\8.0.0\\system.configuration.configurationmanager.8.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.diagnostics.diagnosticsource\\8.0.1\\system.diagnostics.diagnosticsource.8.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.35.0\\system.identitymodel.tokens.jwt.6.35.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.io.filesystem.accesscontrol\\5.0.0\\system.io.filesystem.accesscontrol.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.io.pipelines\\9.0.0\\system.io.pipelines.9.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.memory.data\\1.0.2\\system.memory.data.1.0.2.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.numerics.vectors\\4.5.0\\system.numerics.vectors.4.5.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime\\4.3.1\\system.runtime.4.3.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.caching\\6.0.0\\system.runtime.caching.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.extensions\\4.3.1\\system.runtime.extensions.4.3.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.runtime.loader\\4.3.0\\system.runtime.loader.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.cryptography.protecteddata\\8.0.0\\system.security.cryptography.protecteddata.8.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.permissions\\8.0.0\\system.security.permissions.8.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.encodings.web\\9.0.0\\system.text.encodings.web.9.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.json\\9.0.0\\system.text.json.9.0.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.threading.channels\\4.7.0\\system.threading.channels.4.7.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512", + "C:\\Users\\Administrator\\.nuget\\packages\\zstdsharp.port\\0.8.0\\zstdsharp.port.0.8.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file 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 b0d7572..74ac16f 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 @@ -3,6 +3,8 @@ using System.Diagnostics; using System.Windows.Controls; using linesider_screen_bankend.Core; using linesider_screen_bankend.Modules.ModuleName.Views; +using linesider_screen_bankend.Services; +using linesider_screen_bankend.Services.Interfaces; using Prism.Ioc; using Prism.Modularity; using Prism.Regions; @@ -31,7 +33,14 @@ namespace linesider_screen_bankend.Modules.ModuleName containerRegistry.RegisterForNavigation("ViewA"); containerRegistry.RegisterForNavigation("CommonLogView"); containerRegistry.RegisterForNavigation("TopMenuView"); + containerRegistry.RegisterForNavigation("HomePage"); + containerRegistry.RegisterForNavigation("SettingsPage"); Debug.WriteLine($"Module视图注册成功"); + Debug.WriteLine($"尝试注册Service方法"); + containerRegistry.RegisterSingleton(); + containerRegistry.RegisterSingleton(); + containerRegistry.RegisterSingleton(); + Debug.WriteLine($"Service方法注册成功"); } } diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/HomePageViewModel.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/HomePageViewModel.cs new file mode 100644 index 0000000..9487769 --- /dev/null +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/HomePageViewModel.cs @@ -0,0 +1,27 @@ +using linesider_screen_bankend.Core.Mvvm; +using linesider_screen_bankend.Services.Interfaces; +using Prism.Regions; + +namespace linesider_screen_bankend.Modules.ModuleName.ViewModels +{ + public class HomePageViewModel : RegionViewModelBase + { + private string _message; + public string Message + { + get { return _message; } + set { SetProperty(ref _message, value); } + } + + public HomePageViewModel(IRegionManager regionManager, IMessageService messageService) : + base(regionManager) + { + Message = messageService.GetMessage(); + } + + public override void OnNavigatedTo(NavigationContext navigationContext) + { + //do something + } + } +} diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/SettingsPageViewModel.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/SettingsPageViewModel.cs new file mode 100644 index 0000000..01d0b85 --- /dev/null +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/ViewModels/SettingsPageViewModel.cs @@ -0,0 +1,83 @@ +using System.Collections.Generic; +using System.Diagnostics; +using linesider_screen_bankend.Core.Mvvm; +using linesider_screen_bankend.Services.Interfaces; +using Prism.Ioc; +using Prism.Regions; + +namespace linesider_screen_bankend.Modules.ModuleName.ViewModels +{ + public class SettingsPageViewModel : RegionViewModelBase + { + private List _portList; + public List PortList + { + get { return _portList; } + set { SetProperty(ref _portList, value); } + } + + private List _baudList; + public List BaudList + { + get { return _baudList; } + set { SetProperty(ref _baudList, value); } + } + + private string _message; + public string Message + { + get { return _message; } + set { SetProperty(ref _message, value); } + } + + // MQTT参数 + private string _mqttAddress; + public string MqttAddress + { + get { return _mqttAddress; } + set { SetProperty(ref _mqttAddress, value); } + } + private string _mqttPort; + public string MqttPort + { + get { return _mqttPort; } + set { SetProperty(ref _mqttPort, value); } + } + private string _mqttClientId; + public string MqttClientId + { + get { return _mqttClientId; } + set { SetProperty(ref _mqttClientId, value); } + } + private string _mqtttTopic; + public string MqttTopic + { + get { return _mqtttTopic; } + set { SetProperty(ref _mqtttTopic, value); } + } + + + + + IPortService _portService; + public SettingsPageViewModel(IRegionManager regionManager, IPortService portService) : + base(regionManager) + { + Debug.WriteLine("viewModel方法启动测试1"); + _portService = portService; + Message = "139.224.232.211"; + InitializePortAndBaudLists(); + } + + private void InitializePortAndBaudLists() + { + PortList = _portService.GetPortOptions(); + BaudList = _portService.GetBaudOptions(); + } + + public override void OnNavigatedTo(NavigationContext navigationContext) + { + //do something + } + } +} diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml.cs index 4467903..33283f4 100644 --- a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml.cs +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Components/TopMenu.xaml.cs @@ -1,22 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -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; -using linesider_screen_bankend.Core; -using Prism.Commands; +using System.Windows.Controls; using Prism.Regions; -using SqlSugar; namespace linesider_screen_bankend.Modules.ModuleName.Views { diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml index 6fee4e6..dfc991a 100644 --- a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml @@ -1,13 +1,12 @@ - + prism:ViewModelLocator.AutoWireViewModel="True"> diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml.cs b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml.cs index b9e8825..ccf87bb 100644 --- a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml.cs +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/HomePage.xaml.cs @@ -1,7 +1,7 @@ using System.Windows; using System.Windows.Controls; -namespace linesider_screen_bankend.Views +namespace linesider_screen_bankend.Modules.ModuleName.Views { /// /// HomePage.xaml 的交互逻辑 diff --git a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/SettingsPage.xaml b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/SettingsPage.xaml index a79ce72..e61d2e2 100644 --- a/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/SettingsPage.xaml +++ b/linesider_screen_bankend/Modules/linesider_screen_bankend.Modules.ModuleName/Views/Page/SettingsPage.xaml @@ -1,16 +1,94 @@ - - - - - - - - + xmlns:local="clr-namespace:linesider_screen_bankend.Modules.ModuleName.Views" + xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" + xmlns:prism="http://prismlibrary.com/" + prism:ViewModelLocator.AutoWireViewModel="True"> + + + + + + + + + + + + + + + + + + + + + + + + + + +