From 299b7eb6f4bf70b6a201d064661b0497da4a6630 Mon Sep 17 00:00:00 2001 From: liuwf Date: Fri, 8 Dec 2023 15:40:14 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20plc=EF=BC=8C=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=99=A8=E7=8A=B6=E6=80=81=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- Aucma.Scada.HikRobot/MvCodeHelper.cs | 2 +- Aucma.Scada.UI/Aucma.Scada.UI.csproj | 10 + Aucma.Scada.UI/MainWindow.xaml | 139 ++------ Aucma.Scada.UI/templates/image/Green.png | Bin 0 -> 9200 bytes Aucma.Scada.UI/templates/image/Red.png | Bin 0 -> 9160 bytes Aucma.Scada.UI/viewModel/MainViewModel.cs | 379 +++++++++++++++++++++- 7 files changed, 421 insertions(+), 112 deletions(-) create mode 100644 Aucma.Scada.UI/templates/image/Green.png create mode 100644 Aucma.Scada.UI/templates/image/Red.png diff --git a/.gitignore b/.gitignore index e9b35cdc..54638263 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ *.suo *.vs *.csproj.AssemblyReference.cache -*/obj/ \ No newline at end of file +*/obj/ +/Aucma.Scada.UI/bin/Debug/Log/2023-12-08 diff --git a/Aucma.Scada.HikRobot/MvCodeHelper.cs b/Aucma.Scada.HikRobot/MvCodeHelper.cs index 2d37bc85..9d72138a 100644 --- a/Aucma.Scada.HikRobot/MvCodeHelper.cs +++ b/Aucma.Scada.HikRobot/MvCodeHelper.cs @@ -38,7 +38,7 @@ namespace Aucma.Core.Scanner /// 获取不到任务设备即连接失败 /// /// - public bool ConnectionStatus(string ip) + public static bool ConnectionStatus(string ip) { // 遍历所有已打开相机 foreach (KeyValuePair hashmap in m_cMyDevices) diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 8a5c1f41..05b1cfb1 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -250,6 +250,12 @@ Settings.settings True + + Always + + + Always + ResXFileCodeGenerator Resources.Designer.cs @@ -294,6 +300,10 @@ {deabc30c-ec6f-472e-bd67-d65702fdaf74} HighWayIot.Log4net + + {4EE4C3E2-AC45-4275-8017-E99D70FC1F52} + HighWayIot.Plc + {d0dc3cfb-6748-4d5e-b56a-76fdc72ab4b3} HighWayIot.Repository diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml index 0b157f59..f1c26744 100644 --- a/Aucma.Scada.UI/MainWindow.xaml +++ b/Aucma.Scada.UI/MainWindow.xaml @@ -59,11 +59,6 @@ - - - - -