From cb64e87efedfe8b2e17a33f0b92e018c436537db Mon Sep 17 00:00:00 2001 From: zhangyongpan Date: Thu, 24 Jul 2025 20:04:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Material=20Design=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ModbusDemo/App.xaml | 42 +++++++++++++-- ModbusDemo/App.xaml.cs | 2 +- ModbusDemo/MainWindow.xaml | 96 +++++++++++++++++++++++++++++++---- ModbusDemo/MainWindow.xaml.cs | 25 +++++++++ ModbusDemo/ModbusDemo.csproj | 6 +++ 5 files changed, 156 insertions(+), 15 deletions(-) diff --git a/ModbusDemo/App.xaml b/ModbusDemo/App.xaml index 04c2eea..53a33ed 100644 --- a/ModbusDemo/App.xaml +++ b/ModbusDemo/App.xaml @@ -3,8 +3,44 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:ModbusDemo" xmlns:prism="http://prismlibrary.com/" + xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" > - - - + + + + + + + + + + + + + diff --git a/ModbusDemo/App.xaml.cs b/ModbusDemo/App.xaml.cs index 63d701f..4938d93 100644 --- a/ModbusDemo/App.xaml.cs +++ b/ModbusDemo/App.xaml.cs @@ -17,7 +17,7 @@ namespace ModbusDemo /// 启动页面 protected override Window CreateShell() { - return Container.Resolve(); + return Container.Resolve(); } /// /// 实现控制反转和依赖注入功能 diff --git a/ModbusDemo/MainWindow.xaml b/ModbusDemo/MainWindow.xaml index 61e2f4c..4ea3813 100644 --- a/ModbusDemo/MainWindow.xaml +++ b/ModbusDemo/MainWindow.xaml @@ -1,12 +1,86 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +