From 2d481986b1be911bad6012c56fe3e45e973f843d Mon Sep 17 00:00:00 2001 From: applelon <380149513@qq.com> Date: Thu, 18 Aug 2022 10:52:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DosingSystem/App.xaml.cs | 4 +- SmartClient.sln | 23 +++ WPFDemo/App.xaml | 9 ++ WPFDemo/App.xaml.cs | 17 +++ WPFDemo/AssemblyInfo.cs | 10 ++ WPFDemo/MainWindow.xaml | 23 +++ WPFDemo/MainWindow.xaml.cs | 53 +++++++ WPFDemo/Segment.cs | 31 ++++ WPFDemo/Silo.xaml | 36 +++++ WPFDemo/Silo.xaml.cs | 60 ++++++++ WPFDemo/SiloPanel.xaml | 16 +++ WPFDemo/SiloPanel.xaml.cs | 288 +++++++++++++++++++++++++++++++++++++ WPFDemo/WPFDemo.csproj | 24 ++++ WPFDemo/device.png | Bin 0 -> 2655 bytes 14 files changed, 592 insertions(+), 2 deletions(-) create mode 100644 WPFDemo/App.xaml create mode 100644 WPFDemo/App.xaml.cs create mode 100644 WPFDemo/AssemblyInfo.cs create mode 100644 WPFDemo/MainWindow.xaml create mode 100644 WPFDemo/MainWindow.xaml.cs create mode 100644 WPFDemo/Segment.cs create mode 100644 WPFDemo/Silo.xaml create mode 100644 WPFDemo/Silo.xaml.cs create mode 100644 WPFDemo/SiloPanel.xaml create mode 100644 WPFDemo/SiloPanel.xaml.cs create mode 100644 WPFDemo/WPFDemo.csproj create mode 100644 WPFDemo/device.png diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs index bd6c6670..126af7ed 100644 --- a/DosingSystem/App.xaml.cs +++ b/DosingSystem/App.xaml.cs @@ -30,8 +30,8 @@ namespace BPASmartClient.DosingSystem MenuInit(); DataInit(); DeviceInquire.GetInstance.Init();//配料机设备上线监听,设备列表初始化 - NewMaterialDeviceParView newMaterialDeviceParView = new NewMaterialDeviceParView(); - newMaterialDeviceParView.ShowDialog(); + //NewMaterialDeviceParView newMaterialDeviceParView = new NewMaterialDeviceParView(); + //newMaterialDeviceParView.ShowDialog(); MainView mv = new MainView(); //mv.Show(); LoginView lv = new LoginView(); diff --git a/SmartClient.sln b/SmartClient.sln index f2ae20db..e2b2a72e 100644 --- a/SmartClient.sln +++ b/SmartClient.sln @@ -132,6 +132,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.JXJFoodBigSt EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.JXJFoodSmallStation", "BPASmartClient.JXJFoodSmallStation\BPASmartClient.JXJFoodSmallStation.csproj", "{D609C4CF-FA5C-4D39-B12F-07A60FFE5E40}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFDemo", "WPFDemo\WPFDemo.csproj", "{A456D582-D910-4CA2-8620-6D8F63344B47}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -1266,6 +1268,26 @@ Global {D609C4CF-FA5C-4D39-B12F-07A60FFE5E40}.Release|x64.Build.0 = Release|Any CPU {D609C4CF-FA5C-4D39-B12F-07A60FFE5E40}.Release|x86.ActiveCfg = Release|Any CPU {D609C4CF-FA5C-4D39-B12F-07A60FFE5E40}.Release|x86.Build.0 = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|ARM.ActiveCfg = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|ARM.Build.0 = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|ARM64.Build.0 = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|x64.ActiveCfg = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|x64.Build.0 = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|x86.ActiveCfg = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Debug|x86.Build.0 = Debug|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|Any CPU.Build.0 = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|ARM.ActiveCfg = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|ARM.Build.0 = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|ARM64.ActiveCfg = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|ARM64.Build.0 = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x64.ActiveCfg = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x64.Build.0 = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x86.ActiveCfg = Release|Any CPU + {A456D582-D910-4CA2-8620-6D8F63344B47}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1327,6 +1349,7 @@ Global {D1F2379E-1755-4B50-9D67-15C960C33FFA} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625} {FA695D7E-6F12-4483-A16D-8494609FAE68} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} {D609C4CF-FA5C-4D39-B12F-07A60FFE5E40} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} + {A456D582-D910-4CA2-8620-6D8F63344B47} = {8712125E-14CD-4E1B-A1CE-4BDE03805942} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC} diff --git a/WPFDemo/App.xaml b/WPFDemo/App.xaml new file mode 100644 index 00000000..fae8c33d --- /dev/null +++ b/WPFDemo/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/WPFDemo/App.xaml.cs b/WPFDemo/App.xaml.cs new file mode 100644 index 00000000..5bde2402 --- /dev/null +++ b/WPFDemo/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace WPFDemo +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/WPFDemo/AssemblyInfo.cs b/WPFDemo/AssemblyInfo.cs new file mode 100644 index 00000000..8b5504ec --- /dev/null +++ b/WPFDemo/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/WPFDemo/MainWindow.xaml b/WPFDemo/MainWindow.xaml new file mode 100644 index 00000000..b542c9f7 --- /dev/null +++ b/WPFDemo/MainWindow.xaml @@ -0,0 +1,23 @@ + + + + + + + +