From 1ab1baa42f133ab6fe802a91390167c2ba7e610b Mon Sep 17 00:00:00 2001 From: ZhaoGang <15196688790@163.com> Date: Thu, 21 Nov 2024 16:38:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E9=98=80=E9=97=A8?= =?UTF-8?q?=E7=94=B5=E6=9C=BA=E7=AD=89=E6=8E=A7=E5=88=B6=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E3=80=82=20modify:=E6=97=8B=E8=BD=AC=E7=94=B5=E6=9C=BA?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=8C=89=E4=B8=8B=E7=BD=AE1=EF=BC=8C?= =?UTF-8?q?=E6=9D=BE=E5=BC=80=E7=BD=AE0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BPASmartClient.Academy/App.xaml.cs | 2 +- .../BPASmartClient.Academy.csproj | 1 + .../View/DeviceControlView.xaml | 91 ++++++++++++ .../View/DeviceControlView.xaml.cs | 133 ++++++++++++++++++ .../View/ReactionKettle50LView.xaml | 61 ++++---- .../View/ReactionKettle50LView.xaml.cs | 116 ++++++++++++--- .../ViewModel/DeviceControlViewModel.cs | 16 +++ 7 files changed, 374 insertions(+), 46 deletions(-) create mode 100644 BPASmartClient.Academy/View/DeviceControlView.xaml create mode 100644 BPASmartClient.Academy/View/DeviceControlView.xaml.cs create mode 100644 BPASmartClient.Academy/ViewModel/DeviceControlViewModel.cs diff --git a/BPASmartClient.Academy/App.xaml.cs b/BPASmartClient.Academy/App.xaml.cs index 8da6032b..f22c92a9 100644 --- a/BPASmartClient.Academy/App.xaml.cs +++ b/BPASmartClient.Academy/App.xaml.cs @@ -47,7 +47,7 @@ namespace BPASmartClient.Academy Environment.Exit(0); } base.OnStartup(e); - SystemHelper.GetInstance.CreateDesktopShortcut(); + //SystemHelper.GetInstance.CreateDesktopShortcut(); DataInit(); MenuInit(); MainView mv = new MainView(); diff --git a/BPASmartClient.Academy/BPASmartClient.Academy.csproj b/BPASmartClient.Academy/BPASmartClient.Academy.csproj index a8400e6f..fffb170e 100644 --- a/BPASmartClient.Academy/BPASmartClient.Academy.csproj +++ b/BPASmartClient.Academy/BPASmartClient.Academy.csproj @@ -22,6 +22,7 @@ + diff --git a/BPASmartClient.Academy/View/DeviceControlView.xaml b/BPASmartClient.Academy/View/DeviceControlView.xaml new file mode 100644 index 00000000..2d784bcc --- /dev/null +++ b/BPASmartClient.Academy/View/DeviceControlView.xaml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +